[Java] Update auto-generated Java files
[ldk-java] / src / main / java / org / ldk / structs / ChannelMonitor.java
index 6ebf105ab385a2f98983ab6e4db9cc6857410737..80a97f3491565b34d3f9c1bf662e27c9b81e2a55 100644 (file)
@@ -48,8 +48,8 @@ public class ChannelMonitor extends CommonBase {
                long ret = bindings.ChannelMonitor_clone(this.ptr);
                Reference.reachabilityFence(this);
                if (ret >= 0 && ret <= 4096) { return null; }
-               ChannelMonitor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelMonitor(null, ret); }
-               ret_hu_conv.ptrs_to.add(this);
+               org.ldk.structs.ChannelMonitor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelMonitor(null, ret); }
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
                return ret_hu_conv;
        }
 
@@ -69,7 +69,7 @@ public class ChannelMonitor extends CommonBase {
         * panics if the given update is not the next update by update_id.
         */
        public Result_NoneNoneZ update_monitor(ChannelMonitorUpdate updates, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
-               long ret = bindings.ChannelMonitor_update_monitor(this.ptr, updates == null ? 0 : updates.ptr & ~1, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
+               long ret = bindings.ChannelMonitor_update_monitor(this.ptr, updates == null ? 0 : updates.ptr, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
                Reference.reachabilityFence(this);
                Reference.reachabilityFence(updates);
                Reference.reachabilityFence(broadcaster);
@@ -77,10 +77,10 @@ public class ChannelMonitor extends CommonBase {
                Reference.reachabilityFence(logger);
                if (ret >= 0 && ret <= 4096) { return null; }
                Result_NoneNoneZ ret_hu_conv = Result_NoneNoneZ.constr_from_ptr(ret);
-               this.ptrs_to.add(updates);
-               this.ptrs_to.add(broadcaster);
-               this.ptrs_to.add(fee_estimator);
-               this.ptrs_to.add(logger);
+               if (this != null) { this.ptrs_to.add(updates); };
+               if (this != null) { this.ptrs_to.add(broadcaster); };
+               if (this != null) { this.ptrs_to.add(fee_estimator); };
+               if (this != null) { this.ptrs_to.add(logger); };
                return ret_hu_conv;
        }
 
@@ -102,7 +102,7 @@ public class ChannelMonitor extends CommonBase {
                Reference.reachabilityFence(this);
                if (ret >= 0 && ret <= 4096) { return null; }
                TwoTuple_OutPointScriptZ ret_hu_conv = new TwoTuple_OutPointScriptZ(null, ret);
-               ret_hu_conv.ptrs_to.add(this);
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
                return ret_hu_conv;
        }
 
@@ -113,11 +113,12 @@ public class ChannelMonitor extends CommonBase {
        public TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ[] get_outputs_to_watch() {
                long[] ret = bindings.ChannelMonitor_get_outputs_to_watch(this.ptr);
                Reference.reachabilityFence(this);
-               TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ[] ret_conv_40_arr = new TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ[ret.length];
-               for (int o = 0; o < ret.length; o++) {
+               int ret_conv_40_len = ret.length;
+               TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ[] ret_conv_40_arr = new TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ[ret_conv_40_len];
+               for (int o = 0; o < ret_conv_40_len; o++) {
                        long ret_conv_40 = ret[o];
                        TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ ret_conv_40_hu_conv = new TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ(null, ret_conv_40);
-                       ret_conv_40_hu_conv.ptrs_to.add(this);
+                       if (ret_conv_40_hu_conv != null) { ret_conv_40_hu_conv.ptrs_to.add(this); };
                        ret_conv_40_arr[o] = ret_conv_40_hu_conv;
                }
                return ret_conv_40_arr;
@@ -132,7 +133,7 @@ public class ChannelMonitor extends CommonBase {
                bindings.ChannelMonitor_load_outputs_to_watch(this.ptr, filter == null ? 0 : filter.ptr);
                Reference.reachabilityFence(this);
                Reference.reachabilityFence(filter);
-               this.ptrs_to.add(filter);
+               if (this != null) { this.ptrs_to.add(filter); };
        }
 
        /**
@@ -142,11 +143,12 @@ public class ChannelMonitor extends CommonBase {
        public MonitorEvent[] get_and_clear_pending_monitor_events() {
                long[] ret = bindings.ChannelMonitor_get_and_clear_pending_monitor_events(this.ptr);
                Reference.reachabilityFence(this);
-               MonitorEvent[] ret_conv_14_arr = new MonitorEvent[ret.length];
-               for (int o = 0; o < ret.length; o++) {
+               int ret_conv_14_len = ret.length;
+               MonitorEvent[] ret_conv_14_arr = new MonitorEvent[ret_conv_14_len];
+               for (int o = 0; o < ret_conv_14_len; 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);
+                       org.ldk.structs.MonitorEvent ret_conv_14_hu_conv = org.ldk.structs.MonitorEvent.constr_from_ptr(ret_conv_14);
+                       if (ret_conv_14_hu_conv != null) { ret_conv_14_hu_conv.ptrs_to.add(this); };
                        ret_conv_14_arr[o] = ret_conv_14_hu_conv;
                }
                return ret_conv_14_arr;
@@ -163,16 +165,32 @@ public class ChannelMonitor extends CommonBase {
        public Event[] get_and_clear_pending_events() {
                long[] ret = bindings.ChannelMonitor_get_and_clear_pending_events(this.ptr);
                Reference.reachabilityFence(this);
-               Event[] ret_conv_7_arr = new Event[ret.length];
-               for (int h = 0; h < ret.length; h++) {
+               int ret_conv_7_len = ret.length;
+               Event[] ret_conv_7_arr = new Event[ret_conv_7_len];
+               for (int h = 0; h < ret_conv_7_len; h++) {
                        long ret_conv_7 = ret[h];
-                       Event ret_conv_7_hu_conv = Event.constr_from_ptr(ret_conv_7);
-                       ret_conv_7_hu_conv.ptrs_to.add(this);
+                       org.ldk.structs.Event ret_conv_7_hu_conv = org.ldk.structs.Event.constr_from_ptr(ret_conv_7);
+                       if (ret_conv_7_hu_conv != null) { ret_conv_7_hu_conv.ptrs_to.add(this); };
                        ret_conv_7_arr[h] = ret_conv_7_hu_conv;
                }
                return ret_conv_7_arr;
        }
 
+       /**
+        * Gets the `node_id` of the counterparty for this channel.
+        * 
+        * Will be `None` for channels constructed on LDK versions prior to 0.0.110 and always `Some`
+        * otherwise.
+        * 
+        * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
+        */
+       @Nullable
+       public byte[] get_counterparty_node_id() {
+               byte[] ret = bindings.ChannelMonitor_get_counterparty_node_id(this.ptr);
+               Reference.reachabilityFence(this);
+               return ret;
+       }
+
        /**
         * Used by ChannelManager deserialization to broadcast the latest holder state if its copy of
         * the Channel was out-of-date. You may use it to get a broadcastable holder toxic tx in case of
@@ -188,7 +206,7 @@ public class ChannelMonitor extends CommonBase {
                byte[][] ret = bindings.ChannelMonitor_get_latest_holder_commitment_txn(this.ptr, logger == null ? 0 : logger.ptr);
                Reference.reachabilityFence(this);
                Reference.reachabilityFence(logger);
-               this.ptrs_to.add(logger);
+               if (this != null) { this.ptrs_to.add(logger); };
                return ret;
        }
 
@@ -214,16 +232,17 @@ public class ChannelMonitor extends CommonBase {
                Reference.reachabilityFence(broadcaster);
                Reference.reachabilityFence(fee_estimator);
                Reference.reachabilityFence(logger);
-               TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] ret_conv_39_arr = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[ret.length];
-               for (int n = 0; n < ret.length; n++) {
+               int ret_conv_39_len = ret.length;
+               TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] ret_conv_39_arr = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[ret_conv_39_len];
+               for (int n = 0; n < ret_conv_39_len; n++) {
                        long ret_conv_39 = ret[n];
                        TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ ret_conv_39_hu_conv = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ(null, ret_conv_39);
-                       ret_conv_39_hu_conv.ptrs_to.add(this);
+                       if (ret_conv_39_hu_conv != null) { ret_conv_39_hu_conv.ptrs_to.add(this); };
                        ret_conv_39_arr[n] = ret_conv_39_hu_conv;
                }
-               this.ptrs_to.add(broadcaster);
-               this.ptrs_to.add(fee_estimator);
-               this.ptrs_to.add(logger);
+               if (this != null) { this.ptrs_to.add(broadcaster); };
+               if (this != null) { this.ptrs_to.add(fee_estimator); };
+               if (this != null) { this.ptrs_to.add(logger); };
                return ret_conv_39_arr;
        }
 
@@ -239,9 +258,9 @@ public class ChannelMonitor extends CommonBase {
                Reference.reachabilityFence(broadcaster);
                Reference.reachabilityFence(fee_estimator);
                Reference.reachabilityFence(logger);
-               this.ptrs_to.add(broadcaster);
-               this.ptrs_to.add(fee_estimator);
-               this.ptrs_to.add(logger);
+               if (this != null) { this.ptrs_to.add(broadcaster); };
+               if (this != null) { this.ptrs_to.add(fee_estimator); };
+               if (this != null) { this.ptrs_to.add(logger); };
        }
 
        /**
@@ -262,16 +281,17 @@ public class ChannelMonitor extends CommonBase {
                Reference.reachabilityFence(broadcaster);
                Reference.reachabilityFence(fee_estimator);
                Reference.reachabilityFence(logger);
-               TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] ret_conv_39_arr = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[ret.length];
-               for (int n = 0; n < ret.length; n++) {
+               int ret_conv_39_len = ret.length;
+               TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] ret_conv_39_arr = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[ret_conv_39_len];
+               for (int n = 0; n < ret_conv_39_len; n++) {
                        long ret_conv_39 = ret[n];
                        TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ ret_conv_39_hu_conv = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ(null, ret_conv_39);
-                       ret_conv_39_hu_conv.ptrs_to.add(this);
+                       if (ret_conv_39_hu_conv != null) { ret_conv_39_hu_conv.ptrs_to.add(this); };
                        ret_conv_39_arr[n] = ret_conv_39_hu_conv;
                }
-               this.ptrs_to.add(broadcaster);
-               this.ptrs_to.add(fee_estimator);
-               this.ptrs_to.add(logger);
+               if (this != null) { this.ptrs_to.add(broadcaster); };
+               if (this != null) { this.ptrs_to.add(fee_estimator); };
+               if (this != null) { this.ptrs_to.add(logger); };
                return ret_conv_39_arr;
        }
 
@@ -290,9 +310,9 @@ public class ChannelMonitor extends CommonBase {
                Reference.reachabilityFence(broadcaster);
                Reference.reachabilityFence(fee_estimator);
                Reference.reachabilityFence(logger);
-               this.ptrs_to.add(broadcaster);
-               this.ptrs_to.add(fee_estimator);
-               this.ptrs_to.add(logger);
+               if (this != null) { this.ptrs_to.add(broadcaster); };
+               if (this != null) { this.ptrs_to.add(fee_estimator); };
+               if (this != null) { this.ptrs_to.add(logger); };
        }
 
        /**
@@ -312,16 +332,17 @@ public class ChannelMonitor extends CommonBase {
                Reference.reachabilityFence(broadcaster);
                Reference.reachabilityFence(fee_estimator);
                Reference.reachabilityFence(logger);
-               TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] ret_conv_39_arr = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[ret.length];
-               for (int n = 0; n < ret.length; n++) {
+               int ret_conv_39_len = ret.length;
+               TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] ret_conv_39_arr = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[ret_conv_39_len];
+               for (int n = 0; n < ret_conv_39_len; n++) {
                        long ret_conv_39 = ret[n];
                        TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ ret_conv_39_hu_conv = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ(null, ret_conv_39);
-                       ret_conv_39_hu_conv.ptrs_to.add(this);
+                       if (ret_conv_39_hu_conv != null) { ret_conv_39_hu_conv.ptrs_to.add(this); };
                        ret_conv_39_arr[n] = ret_conv_39_hu_conv;
                }
-               this.ptrs_to.add(broadcaster);
-               this.ptrs_to.add(fee_estimator);
-               this.ptrs_to.add(logger);
+               if (this != null) { this.ptrs_to.add(broadcaster); };
+               if (this != null) { this.ptrs_to.add(fee_estimator); };
+               if (this != null) { this.ptrs_to.add(logger); };
                return ret_conv_39_arr;
        }
 
@@ -342,8 +363,8 @@ public class ChannelMonitor extends CommonBase {
                long ret = bindings.ChannelMonitor_current_best_block(this.ptr);
                Reference.reachabilityFence(this);
                if (ret >= 0 && ret <= 4096) { return null; }
-               BestBlock ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new BestBlock(null, ret); }
-               ret_hu_conv.ptrs_to.add(this);
+               org.ldk.structs.BestBlock ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.BestBlock(null, ret); }
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
                return ret_hu_conv;
        }
 
@@ -357,8 +378,9 @@ public class ChannelMonitor extends CommonBase {
         * balance, or until our counterparty has claimed the balance and accrued several
         * confirmations on the claim transaction.
         * 
-        * Note that the balances available when you or your counterparty have broadcasted revoked
-        * state(s) may not be fully captured here.
+        * Note that for `ChannelMonitors` which track a channel which went on-chain with versions of
+        * LDK prior to 0.0.111, balances may not be fully captured if our counterparty broadcasted
+        * a revoked state.
         * 
         * See [`Balance`] for additional details on the types of claimable balances which
         * may be returned here and their meanings.
@@ -366,11 +388,12 @@ public class ChannelMonitor extends CommonBase {
        public Balance[] get_claimable_balances() {
                long[] ret = bindings.ChannelMonitor_get_claimable_balances(this.ptr);
                Reference.reachabilityFence(this);
-               Balance[] ret_conv_9_arr = new Balance[ret.length];
-               for (int j = 0; j < ret.length; j++) {
+               int ret_conv_9_len = ret.length;
+               Balance[] ret_conv_9_arr = new Balance[ret_conv_9_len];
+               for (int j = 0; j < ret_conv_9_len; j++) {
                        long ret_conv_9 = ret[j];
-                       Balance ret_conv_9_hu_conv = Balance.constr_from_ptr(ret_conv_9);
-                       ret_conv_9_hu_conv.ptrs_to.add(this);
+                       org.ldk.structs.Balance ret_conv_9_hu_conv = org.ldk.structs.Balance.constr_from_ptr(ret_conv_9);
+                       if (ret_conv_9_hu_conv != null) { ret_conv_9_hu_conv.ptrs_to.add(this); };
                        ret_conv_9_arr[j] = ret_conv_9_hu_conv;
                }
                return ret_conv_9_arr;