Merge pull request #126 from TheBlueMatt/main
[ldk-java] / src / main / java / org / ldk / structs / Watch.java
index 85602ac83a4135f09079c490791dcf1242224bc9..87ae3274ca67b5679e44c88d60704cea10a3d93b 100644 (file)
@@ -4,6 +4,8 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import java.lang.ref.Reference;
+import javax.annotation.Nullable;
 
 /**
  * The `Watch` trait defines behavior for watching on-chain activity pertaining to channels as
@@ -21,12 +23,10 @@ import java.util.Arrays;
  * If an implementation maintains multiple instances of a channel's monitor (e.g., by storing
  * backup copies), then it must ensure that updates are applied across all instances. Otherwise, it
  * could result in a revoked transaction being broadcast, allowing the counterparty to claim all
- * funds in the channel. See [`ChannelMonitorUpdateErr`] for more details about how to handle
+ * funds in the channel. See [`ChannelMonitorUpdateStatus`] for more details about how to handle
  * multiple instances.
  * 
- * [`ChannelMonitor`]: channelmonitor/struct.ChannelMonitor.html
- * [`ChannelMonitorUpdateErr`]: channelmonitor/enum.ChannelMonitorUpdateErr.html
- * [`PermanentFailure`]: channelmonitor/enum.ChannelMonitorUpdateErr.html#variant.PermanentFailure
+ * [`PermanentFailure`]: ChannelMonitorUpdateStatus::PermanentFailure
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class Watch extends CommonBase {
@@ -41,7 +41,19 @@ public class Watch extends CommonBase {
        protected void finalize() throws Throwable {
                if (ptr != 0) { bindings.Watch_free(ptr); } super.finalize();
        }
-
+       /**
+        * Destroys the object, freeing associated resources. After this call, any access
+        * to this object may result in a SEGFAULT or worse.
+        *
+        * You should generally NEVER call this method. You should let the garbage collector
+        * do this for you when it finalizes objects. However, it may be useful for types
+        * which represent locks and should be closed immediately to avoid holding locks
+        * until the GC runs.
+        */
+       public void destroy() {
+               if (ptr != 0) { bindings.Watch_free(ptr); }
+               ptr = 0;
+       }
        public static interface WatchInterface {
                /**
                 * Watches a channel identified by `funding_txo` using `monitor`.
@@ -50,53 +62,61 @@ public class Watch extends CommonBase {
                 * with any spends of outputs returned by [`get_outputs_to_watch`]. In practice, this means
                 * calling [`block_connected`] and [`block_disconnected`] on the monitor.
                 * 
-                * [`get_outputs_to_watch`]: channelmonitor/struct.ChannelMonitor.html#method.get_outputs_to_watch
-                * [`block_connected`]: channelmonitor/struct.ChannelMonitor.html#method.block_connected
-                * [`block_disconnected`]: channelmonitor/struct.ChannelMonitor.html#method.block_disconnected
+                * Note: this interface MUST error with [`ChannelMonitorUpdateStatus::PermanentFailure`] if
+                * the given `funding_txo` has previously been registered via `watch_channel`.
+                * 
+                * [`get_outputs_to_watch`]: channelmonitor::ChannelMonitor::get_outputs_to_watch
+                * [`block_connected`]: channelmonitor::ChannelMonitor::block_connected
+                * [`block_disconnected`]: channelmonitor::ChannelMonitor::block_disconnected
                 */
-               Result_NoneChannelMonitorUpdateErrZ watch_channel(OutPoint funding_txo, ChannelMonitor monitor);
+               ChannelMonitorUpdateStatus watch_channel(OutPoint funding_txo, ChannelMonitor monitor);
                /**
                 * Updates a channel identified by `funding_txo` by applying `update` to its monitor.
                 * 
                 * Implementations must call [`update_monitor`] with the given update. See
-                * [`ChannelMonitorUpdateErr`] for invariants around returning an error.
+                * [`ChannelMonitorUpdateStatus`] for invariants around returning an error.
                 * 
-                * [`update_monitor`]: channelmonitor/struct.ChannelMonitor.html#method.update_monitor
-                * [`ChannelMonitorUpdateErr`]: channelmonitor/enum.ChannelMonitorUpdateErr.html
+                * [`update_monitor`]: channelmonitor::ChannelMonitor::update_monitor
                 */
-               Result_NoneChannelMonitorUpdateErrZ update_channel(OutPoint funding_txo, ChannelMonitorUpdate update);
+               ChannelMonitorUpdateStatus update_channel(OutPoint funding_txo, ChannelMonitorUpdate update);
                /**
                 * Returns any monitor events since the last call. Subsequent calls must only return new
                 * events.
+                * 
+                * Note that after any block- or transaction-connection calls to a [`ChannelMonitor`], no
+                * further events may be returned here until the [`ChannelMonitor`] has been fully persisted
+                * to disk.
+                * 
+                * For details on asynchronous [`ChannelMonitor`] updating and returning
+                * [`MonitorEvent::Completed`] here, see [`ChannelMonitorUpdateStatus::InProgress`].
                 */
-               MonitorEvent[] release_pending_monitor_events();
+               ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ[] release_pending_monitor_events();
        }
        private static class LDKWatchHolder { Watch held; }
        public static Watch new_impl(WatchInterface arg) {
                final LDKWatchHolder impl_holder = new LDKWatchHolder();
                impl_holder.held = new Watch(new bindings.LDKWatch() {
-                       @Override public long watch_channel(long funding_txo, long monitor) {
-                               OutPoint funding_txo_hu_conv = new OutPoint(null, funding_txo);
-                               funding_txo_hu_conv.ptrs_to.add(this);
-                               ChannelMonitor monitor_hu_conv = new ChannelMonitor(null, monitor);
-                               monitor_hu_conv.ptrs_to.add(this);
-                               Result_NoneChannelMonitorUpdateErrZ ret = arg.watch_channel(funding_txo_hu_conv, monitor_hu_conv);
-                               long result = ret != null ? ret.ptr : 0;
-                               return result;
+                       @Override public ChannelMonitorUpdateStatus watch_channel(long funding_txo, long monitor) {
+                               org.ldk.structs.OutPoint funding_txo_hu_conv = null; if (funding_txo < 0 || funding_txo > 4096) { funding_txo_hu_conv = new org.ldk.structs.OutPoint(null, funding_txo); }
+                               if (funding_txo_hu_conv != null) { funding_txo_hu_conv.ptrs_to.add(this); };
+                               org.ldk.structs.ChannelMonitor monitor_hu_conv = null; if (monitor < 0 || monitor > 4096) { monitor_hu_conv = new org.ldk.structs.ChannelMonitor(null, monitor); }
+                               if (monitor_hu_conv != null) { monitor_hu_conv.ptrs_to.add(this); };
+                               ChannelMonitorUpdateStatus ret = arg.watch_channel(funding_txo_hu_conv, monitor_hu_conv);
+                               Reference.reachabilityFence(arg);
+                               return ret;
                        }
-                       @Override public long update_channel(long funding_txo, long update) {
-                               OutPoint funding_txo_hu_conv = new OutPoint(null, funding_txo);
-                               funding_txo_hu_conv.ptrs_to.add(this);
-                               ChannelMonitorUpdate update_hu_conv = new ChannelMonitorUpdate(null, update);
-                               update_hu_conv.ptrs_to.add(this);
-                               Result_NoneChannelMonitorUpdateErrZ ret = arg.update_channel(funding_txo_hu_conv, update_hu_conv);
-                               long result = ret != null ? ret.ptr : 0;
-                               return result;
+                       @Override public ChannelMonitorUpdateStatus update_channel(long funding_txo, long update) {
+                               org.ldk.structs.OutPoint funding_txo_hu_conv = null; if (funding_txo < 0 || funding_txo > 4096) { funding_txo_hu_conv = new org.ldk.structs.OutPoint(null, funding_txo); }
+                               if (funding_txo_hu_conv != null) { funding_txo_hu_conv.ptrs_to.add(this); };
+                               org.ldk.structs.ChannelMonitorUpdate update_hu_conv = null; if (update < 0 || update > 4096) { update_hu_conv = new org.ldk.structs.ChannelMonitorUpdate(null, update); }
+                               ChannelMonitorUpdateStatus ret = arg.update_channel(funding_txo_hu_conv, update_hu_conv);
+                               Reference.reachabilityFence(arg);
+                               return ret;
                        }
                        @Override public long[] release_pending_monitor_events() {
-                               MonitorEvent[] ret = arg.release_pending_monitor_events();
-                               long[] result = Arrays.stream(ret).mapToLong(ret_conv_14 -> ret_conv_14.ptr).toArray();
-                               /* TODO 2 MonitorEvent  */;
+                               ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ[] ret = arg.release_pending_monitor_events();
+                               Reference.reachabilityFence(arg);
+                               long[] result = ret != null ? Arrays.stream(ret).mapToLong(ret_conv_49 -> ret_conv_49 == null ? 0 : ret_conv_49.clone_ptr()).toArray() : null;
                                return result;
                        }
                });
@@ -109,49 +129,64 @@ public class Watch extends CommonBase {
         * with any spends of outputs returned by [`get_outputs_to_watch`]. In practice, this means
         * calling [`block_connected`] and [`block_disconnected`] on the monitor.
         * 
-        * [`get_outputs_to_watch`]: channelmonitor/struct.ChannelMonitor.html#method.get_outputs_to_watch
-        * [`block_connected`]: channelmonitor/struct.ChannelMonitor.html#method.block_connected
-        * [`block_disconnected`]: channelmonitor/struct.ChannelMonitor.html#method.block_disconnected
+        * Note: this interface MUST error with [`ChannelMonitorUpdateStatus::PermanentFailure`] if
+        * the given `funding_txo` has previously been registered via `watch_channel`.
+        * 
+        * [`get_outputs_to_watch`]: channelmonitor::ChannelMonitor::get_outputs_to_watch
+        * [`block_connected`]: channelmonitor::ChannelMonitor::block_connected
+        * [`block_disconnected`]: channelmonitor::ChannelMonitor::block_disconnected
         */
-       public Result_NoneChannelMonitorUpdateErrZ watch_channel(OutPoint funding_txo, ChannelMonitor monitor) {
-               long ret = bindings.Watch_watch_channel(this.ptr, funding_txo == null ? 0 : funding_txo.ptr & ~1, monitor == null ? 0 : monitor.ptr & ~1);
-               Result_NoneChannelMonitorUpdateErrZ ret_hu_conv = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret);
-               this.ptrs_to.add(funding_txo);
-               this.ptrs_to.add(monitor);
-               return ret_hu_conv;
+       public ChannelMonitorUpdateStatus watch_channel(org.ldk.structs.OutPoint funding_txo, org.ldk.structs.ChannelMonitor monitor) {
+               ChannelMonitorUpdateStatus ret = bindings.Watch_watch_channel(this.ptr, funding_txo == null ? 0 : funding_txo.ptr, monitor == null ? 0 : monitor.ptr);
+               Reference.reachabilityFence(this);
+               Reference.reachabilityFence(funding_txo);
+               Reference.reachabilityFence(monitor);
+               if (this != null) { this.ptrs_to.add(funding_txo); };
+               if (this != null) { this.ptrs_to.add(monitor); };
+               return ret;
        }
 
        /**
         * Updates a channel identified by `funding_txo` by applying `update` to its monitor.
         * 
         * Implementations must call [`update_monitor`] with the given update. See
-        * [`ChannelMonitorUpdateErr`] for invariants around returning an error.
+        * [`ChannelMonitorUpdateStatus`] for invariants around returning an error.
         * 
-        * [`update_monitor`]: channelmonitor/struct.ChannelMonitor.html#method.update_monitor
-        * [`ChannelMonitorUpdateErr`]: channelmonitor/enum.ChannelMonitorUpdateErr.html
+        * [`update_monitor`]: channelmonitor::ChannelMonitor::update_monitor
         */
-       public Result_NoneChannelMonitorUpdateErrZ update_channel(OutPoint funding_txo, ChannelMonitorUpdate update) {
-               long ret = bindings.Watch_update_channel(this.ptr, funding_txo == null ? 0 : funding_txo.ptr & ~1, update == null ? 0 : update.ptr & ~1);
-               Result_NoneChannelMonitorUpdateErrZ ret_hu_conv = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret);
-               this.ptrs_to.add(funding_txo);
-               this.ptrs_to.add(update);
-               return ret_hu_conv;
+       public ChannelMonitorUpdateStatus update_channel(org.ldk.structs.OutPoint funding_txo, org.ldk.structs.ChannelMonitorUpdate update) {
+               ChannelMonitorUpdateStatus ret = bindings.Watch_update_channel(this.ptr, funding_txo == null ? 0 : funding_txo.ptr, update == null ? 0 : update.ptr);
+               Reference.reachabilityFence(this);
+               Reference.reachabilityFence(funding_txo);
+               Reference.reachabilityFence(update);
+               if (this != null) { this.ptrs_to.add(funding_txo); };
+               if (this != null) { this.ptrs_to.add(update); };
+               return ret;
        }
 
        /**
         * Returns any monitor events since the last call. Subsequent calls must only return new
         * events.
+        * 
+        * Note that after any block- or transaction-connection calls to a [`ChannelMonitor`], no
+        * further events may be returned here until the [`ChannelMonitor`] has been fully persisted
+        * to disk.
+        * 
+        * For details on asynchronous [`ChannelMonitor`] updating and returning
+        * [`MonitorEvent::Completed`] here, see [`ChannelMonitorUpdateStatus::InProgress`].
         */
-       public MonitorEvent[] release_pending_monitor_events() {
+       public ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ[] release_pending_monitor_events() {
                long[] ret = bindings.Watch_release_pending_monitor_events(this.ptr);
-               MonitorEvent[] ret_conv_14_arr = new MonitorEvent[ret.length];
-               for (int o = 0; o < ret.length; o++) {
-                       long ret_conv_14 = ret[o];
-                       MonitorEvent ret_conv_14_hu_conv = MonitorEvent.constr_from_ptr(ret_conv_14);
-                       ret_conv_14_hu_conv.ptrs_to.add(this);
-                       ret_conv_14_arr[o] = ret_conv_14_hu_conv;
+               Reference.reachabilityFence(this);
+               int ret_conv_49_len = ret.length;
+               ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ[] ret_conv_49_arr = new ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ[ret_conv_49_len];
+               for (int x = 0; x < ret_conv_49_len; x++) {
+                       long ret_conv_49 = ret[x];
+                       ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ ret_conv_49_hu_conv = new ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ(null, ret_conv_49);
+                       if (ret_conv_49_hu_conv != null) { ret_conv_49_hu_conv.ptrs_to.add(this); };
+                       ret_conv_49_arr[x] = ret_conv_49_hu_conv;
                }
-               return ret_conv_14_arr;
+               return ret_conv_49_arr;
        }
 
 }