X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FMonitorEvent.java;h=0beb6f645b31c92cf313175e81fde6afe123e8cd;hb=ff3dacec3be60f870d81f6df11bd9fff92aa6047;hp=38a63b38a112bf8a488127346129cd09bdd5976b;hpb=f3e670e9341decac613d33fc52febf19cea32f20;p=ldk-java diff --git a/src/main/java/org/ldk/structs/MonitorEvent.java b/src/main/java/org/ldk/structs/MonitorEvent.java index 38a63b38..0beb6f64 100644 --- a/src/main/java/org/ldk/structs/MonitorEvent.java +++ b/src/main/java/org/ldk/structs/MonitorEvent.java @@ -4,6 +4,7 @@ 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; @@ -39,7 +40,7 @@ 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; @@ -52,7 +53,7 @@ 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; @@ -71,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`]. @@ -96,7 +97,7 @@ 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; @@ -107,6 +108,7 @@ public class MonitorEvent extends CommonBase { } long clone_ptr() { long ret = bindings.MonitorEvent_clone_ptr(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -115,8 +117,9 @@ public class MonitorEvent extends CommonBase { */ public MonitorEvent clone() { 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; } @@ -126,8 +129,9 @@ public class MonitorEvent extends CommonBase { */ public static MonitorEvent htlcevent(HTLCUpdate a) { long ret = bindings.MonitorEvent_htlcevent(a == null ? 0 : a.ptr & ~1); + 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); return ret_hu_conv; } @@ -137,8 +141,9 @@ public class MonitorEvent extends CommonBase { */ public static MonitorEvent commitment_tx_confirmed(OutPoint a) { long ret = bindings.MonitorEvent_commitment_tx_confirmed(a == null ? 0 : a.ptr & ~1); + 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); return ret_hu_conv; } @@ -148,8 +153,10 @@ public class MonitorEvent extends CommonBase { */ 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); + 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); return ret_hu_conv; } @@ -159,8 +166,9 @@ public class MonitorEvent extends CommonBase { */ public static MonitorEvent update_failed(OutPoint a) { long ret = bindings.MonitorEvent_update_failed(a == null ? 0 : a.ptr & ~1); + 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); return ret_hu_conv; } @@ -170,6 +178,7 @@ public class MonitorEvent extends CommonBase { */ public byte[] write() { byte[] ret = bindings.MonitorEvent_write(this.ptr); + Reference.reachabilityFence(this); return ret; }