X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FMonitorEvent.java;h=b69385cf92a71e03d11a91ca31c85212d7d43cc5;hb=13cdf8bde340072288b39a5e29f0946d3e095ad4;hp=5ba0cc37f2b87fa30d87994a1aeafae2fd9e7926;hpb=1854b5cebef22ace9e9e4dd191f609818df9ce08;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/MonitorEvent.java b/src/main/java/org/ldk/structs/MonitorEvent.java
index 5ba0cc37..b69385cf 100644
--- a/src/main/java/org/ldk/structs/MonitorEvent.java
+++ b/src/main/java/org/ldk/structs/MonitorEvent.java
@@ -40,11 +40,11 @@ public class MonitorEvent extends CommonBase {
 	 * A monitor event containing an HTLCUpdate.
 	 */
 	public final static class HTLCEvent extends MonitorEvent {
-		public final HTLCUpdate htlc_event;
+		public final org.ldk.structs.HTLCUpdate htlc_event;
 		private HTLCEvent(long ptr, bindings.LDKMonitorEvent.HTLCEvent obj) {
 			super(null, ptr);
 			long htlc_event = obj.htlc_event;
-			HTLCUpdate htlc_event_hu_conv = null; if (htlc_event < 0 || htlc_event > 4096) { htlc_event_hu_conv = new HTLCUpdate(null, htlc_event); }
+			org.ldk.structs.HTLCUpdate htlc_event_hu_conv = null; if (htlc_event < 0 || htlc_event > 4096) { htlc_event_hu_conv = new org.ldk.structs.HTLCUpdate(null, htlc_event); }
 			htlc_event_hu_conv.ptrs_to.add(this);
 			this.htlc_event = htlc_event_hu_conv;
 		}
@@ -53,11 +53,11 @@ public class MonitorEvent extends CommonBase {
 	 * A monitor event that the Channel's commitment transaction was confirmed.
 	 */
 	public final static class CommitmentTxConfirmed extends MonitorEvent {
-		public final OutPoint commitment_tx_confirmed;
+		public final org.ldk.structs.OutPoint commitment_tx_confirmed;
 		private CommitmentTxConfirmed(long ptr, bindings.LDKMonitorEvent.CommitmentTxConfirmed obj) {
 			super(null, ptr);
 			long commitment_tx_confirmed = obj.commitment_tx_confirmed;
-			OutPoint commitment_tx_confirmed_hu_conv = null; if (commitment_tx_confirmed < 0 || commitment_tx_confirmed > 4096) { commitment_tx_confirmed_hu_conv = new OutPoint(null, commitment_tx_confirmed); }
+			org.ldk.structs.OutPoint commitment_tx_confirmed_hu_conv = null; if (commitment_tx_confirmed < 0 || commitment_tx_confirmed > 4096) { commitment_tx_confirmed_hu_conv = new org.ldk.structs.OutPoint(null, commitment_tx_confirmed); }
 			commitment_tx_confirmed_hu_conv.ptrs_to.add(this);
 			this.commitment_tx_confirmed = commitment_tx_confirmed_hu_conv;
 		}
@@ -72,7 +72,7 @@ public class MonitorEvent extends CommonBase {
 		/**
 		 * The funding outpoint of the [`ChannelMonitor`] that was updated
 		*/
-		public final OutPoint funding_txo;
+		public final org.ldk.structs.OutPoint funding_txo;
 		/**
 		 * The Update ID from [`ChannelMonitorUpdate::update_id`] which was applied or
 		 * [`ChannelMonitor::get_latest_update_id`].
@@ -84,7 +84,7 @@ public class MonitorEvent extends CommonBase {
 		private UpdateCompleted(long ptr, bindings.LDKMonitorEvent.UpdateCompleted obj) {
 			super(null, ptr);
 			long funding_txo = obj.funding_txo;
-			OutPoint funding_txo_hu_conv = null; if (funding_txo < 0 || funding_txo > 4096) { funding_txo_hu_conv = new OutPoint(null, funding_txo); }
+			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); }
 			funding_txo_hu_conv.ptrs_to.add(this);
 			this.funding_txo = funding_txo_hu_conv;
 			this.monitor_update_id = obj.monitor_update_id;
@@ -97,11 +97,11 @@ public class MonitorEvent extends CommonBase {
 	 * [`ChannelMonitorUpdateErr::PermanentFailure`]: super::ChannelMonitorUpdateErr::PermanentFailure
 	 */
 	public final static class UpdateFailed extends MonitorEvent {
-		public final OutPoint update_failed;
+		public final org.ldk.structs.OutPoint update_failed;
 		private UpdateFailed(long ptr, bindings.LDKMonitorEvent.UpdateFailed obj) {
 			super(null, ptr);
 			long update_failed = obj.update_failed;
-			OutPoint update_failed_hu_conv = null; if (update_failed < 0 || update_failed > 4096) { update_failed_hu_conv = new OutPoint(null, update_failed); }
+			org.ldk.structs.OutPoint update_failed_hu_conv = null; if (update_failed < 0 || update_failed > 4096) { update_failed_hu_conv = new org.ldk.structs.OutPoint(null, update_failed); }
 			update_failed_hu_conv.ptrs_to.add(this);
 			this.update_failed = update_failed_hu_conv;
 		}
@@ -119,7 +119,7 @@ public class MonitorEvent extends CommonBase {
 		long ret = bindings.MonitorEvent_clone(this.ptr);
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		MonitorEvent ret_hu_conv = MonitorEvent.constr_from_ptr(ret);
+		org.ldk.structs.MonitorEvent ret_hu_conv = org.ldk.structs.MonitorEvent.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -128,11 +128,12 @@ public class MonitorEvent extends CommonBase {
 	 * Utility method to constructs a new HTLCEvent-variant MonitorEvent
 	 */
 	public static MonitorEvent htlcevent(HTLCUpdate a) {
-		long ret = bindings.MonitorEvent_htlcevent(a == null ? 0 : a.ptr & ~1);
+		long ret = bindings.MonitorEvent_htlcevent(a == null ? 0 : a.ptr);
 		Reference.reachabilityFence(a);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		MonitorEvent ret_hu_conv = MonitorEvent.constr_from_ptr(ret);
+		org.ldk.structs.MonitorEvent ret_hu_conv = org.ldk.structs.MonitorEvent.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(a);
 		return ret_hu_conv;
 	}
 
@@ -140,11 +141,12 @@ public class MonitorEvent extends CommonBase {
 	 * Utility method to constructs a new CommitmentTxConfirmed-variant MonitorEvent
 	 */
 	public static MonitorEvent commitment_tx_confirmed(OutPoint a) {
-		long ret = bindings.MonitorEvent_commitment_tx_confirmed(a == null ? 0 : a.ptr & ~1);
+		long ret = bindings.MonitorEvent_commitment_tx_confirmed(a == null ? 0 : a.ptr);
 		Reference.reachabilityFence(a);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		MonitorEvent ret_hu_conv = MonitorEvent.constr_from_ptr(ret);
+		org.ldk.structs.MonitorEvent ret_hu_conv = org.ldk.structs.MonitorEvent.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(a);
 		return ret_hu_conv;
 	}
 
@@ -152,12 +154,13 @@ public class MonitorEvent extends CommonBase {
 	 * Utility method to constructs a new UpdateCompleted-variant MonitorEvent
 	 */
 	public static MonitorEvent update_completed(OutPoint funding_txo, long monitor_update_id) {
-		long ret = bindings.MonitorEvent_update_completed(funding_txo == null ? 0 : funding_txo.ptr & ~1, monitor_update_id);
+		long ret = bindings.MonitorEvent_update_completed(funding_txo == null ? 0 : funding_txo.ptr, monitor_update_id);
 		Reference.reachabilityFence(funding_txo);
 		Reference.reachabilityFence(monitor_update_id);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		MonitorEvent ret_hu_conv = MonitorEvent.constr_from_ptr(ret);
+		org.ldk.structs.MonitorEvent ret_hu_conv = org.ldk.structs.MonitorEvent.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(funding_txo);
 		return ret_hu_conv;
 	}
 
@@ -165,11 +168,12 @@ public class MonitorEvent extends CommonBase {
 	 * Utility method to constructs a new UpdateFailed-variant MonitorEvent
 	 */
 	public static MonitorEvent update_failed(OutPoint a) {
-		long ret = bindings.MonitorEvent_update_failed(a == null ? 0 : a.ptr & ~1);
+		long ret = bindings.MonitorEvent_update_failed(a == null ? 0 : a.ptr);
 		Reference.reachabilityFence(a);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		MonitorEvent ret_hu_conv = MonitorEvent.constr_from_ptr(ret);
+		org.ldk.structs.MonitorEvent ret_hu_conv = org.ldk.structs.MonitorEvent.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(a);
 		return ret_hu_conv;
 	}