X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelMonitor.java;h=9284814f0760008245011281a6833b11c841225f;hb=3c60e0fd0da579be9932801c1be2b32014c944a5;hp=2f5b4d2e9fe96bb1d2ca453ea0660a895299d4ec;hpb=64bcaa6a2a2f05653c14b9cb8bb97ab2480eaaa5;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelMonitor.java b/src/main/java/org/ldk/structs/ChannelMonitor.java
index 2f5b4d2e..9284814f 100644
--- a/src/main/java/org/ldk/structs/ChannelMonitor.java
+++ b/src/main/java/org/ldk/structs/ChannelMonitor.java
@@ -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;
 	}
 
@@ -118,7 +118,7 @@ public class ChannelMonitor extends CommonBase {
 		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;
@@ -133,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); };
 	}
 
 	/**
@@ -147,8 +147,8 @@ public class ChannelMonitor extends CommonBase {
 		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;
@@ -169,13 +169,28 @@ public class ChannelMonitor extends CommonBase {
 		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
@@ -191,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;
 	}
 
@@ -222,12 +237,12 @@ public class ChannelMonitor extends CommonBase {
 		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;
 	}
 
@@ -243,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); };
 	}
 
 	/**
@@ -271,12 +286,12 @@ public class ChannelMonitor extends CommonBase {
 		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;
 	}
 
@@ -295,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); };
 	}
 
 	/**
@@ -322,12 +337,12 @@ public class ChannelMonitor extends CommonBase {
 		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;
 	}
 
@@ -348,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;
 	}
 
@@ -376,8 +391,8 @@ public class ChannelMonitor extends CommonBase {
 		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;