[Java] Update auto-generated Java bindings

Author: TheBlueMatt

src/main/java/org/ldk/impl/bindings.java

@@ -220,11 +220,12 @@ public static APIError monitor_update_failed() {
 	 * Utility method to constructs a new IncompatibleShutdownScript-variant APIError
 	 */
 	public static APIError incompatible_shutdown_script(ShutdownScript script) {
-		long ret = bindings.APIError_incompatible_shutdown_script(script == null ? 0 : script.ptr & ~1);
+		long ret = bindings.APIError_incompatible_shutdown_script(script == null ? 0 : script.ptr);
 		Reference.reachabilityFence(script);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(script);
 		return ret_hu_conv;
 	}
 

src/main/java/org/ldk/structs/APIError.java

@@ -301,9 +301,10 @@ public ChannelTypeFeatures get_channel_type() {
 	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
 	public void set_channel_type(@Nullable ChannelTypeFeatures val) {
-		bindings.AcceptChannel_set_channel_type(this.ptr, val == null ? 0 : val.ptr & ~1);
+		bindings.AcceptChannel_set_channel_type(this.ptr, val == null ? 0 : val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		this.ptrs_to.add(val);
 	}
 
 	long clone_ptr() {

src/main/java/org/ldk/structs/AcceptChannel.java

@@ -93,7 +93,7 @@ protected void finalize() throws Throwable {
 	 * Note that scorer (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
 	public static BackgroundProcessor start(Persister persister, EventHandler event_handler, ChainMonitor chain_monitor, ChannelManager channel_manager, GossipSync gossip_sync, PeerManager peer_manager, Logger logger, @Nullable MultiThreadedLockableScore scorer) {
-		long ret = bindings.BackgroundProcessor_start(persister == null ? 0 : persister.ptr, event_handler == null ? 0 : event_handler.ptr, chain_monitor == null ? 0 : chain_monitor.ptr & ~1, channel_manager == null ? 0 : channel_manager.ptr & ~1, gossip_sync.ptr, peer_manager == null ? 0 : peer_manager.ptr & ~1, logger == null ? 0 : logger.ptr, scorer == null ? 0 : scorer.ptr & ~1);
+		long ret = bindings.BackgroundProcessor_start(persister == null ? 0 : persister.ptr, event_handler == null ? 0 : event_handler.ptr, chain_monitor == null ? 0 : chain_monitor.ptr, channel_manager == null ? 0 : channel_manager.ptr, gossip_sync.ptr, peer_manager == null ? 0 : peer_manager.ptr, logger == null ? 0 : logger.ptr, scorer == null ? 0 : scorer.ptr);
 		Reference.reachabilityFence(persister);
 		Reference.reachabilityFence(event_handler);
 		Reference.reachabilityFence(chain_monitor);

src/main/java/org/ldk/structs/BackgroundProcessor.java

@@ -198,7 +198,7 @@ public static Balance maybe_claimable_htlcawaiting_timeout(long claimable_amount
 	 * This ignores pointers and is_owned flags and looks at the values in fields.
 	 */
 	public boolean eq(Balance b) {
-		boolean ret = bindings.Balance_eq(this.ptr, b == null ? 0 : b.ptr & ~1);
+		boolean ret = bindings.Balance_eq(this.ptr, b == null ? 0 : b.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(b);
 		return ret;

src/main/java/org/ldk/structs/Balance.java

@@ -343,7 +343,7 @@ public byte[] release_commitment_secret(long idx) {
 	 * irrelevant or duplicate preimages.
 	 */
 	public Result_NoneNoneZ validate_holder_commitment(HolderCommitmentTransaction holder_tx, byte[][] preimages) {
-		long ret = bindings.BaseSign_validate_holder_commitment(this.ptr, holder_tx == null ? 0 : holder_tx.ptr & ~1, preimages != null ? Arrays.stream(preimages).map(preimages_conv_8 -> InternalUtils.check_arr_len(preimages_conv_8, 32)).toArray(byte[][]::new) : null);
+		long ret = bindings.BaseSign_validate_holder_commitment(this.ptr, holder_tx == null ? 0 : holder_tx.ptr, preimages != null ? Arrays.stream(preimages).map(preimages_conv_8 -> InternalUtils.check_arr_len(preimages_conv_8, 32)).toArray(byte[][]::new) : null);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(holder_tx);
 		Reference.reachabilityFence(preimages);
@@ -380,7 +380,7 @@ public byte[] channel_keys_id() {
 	 * irrelevant or duplicate preimages.
 	 */
 	public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(CommitmentTransaction commitment_tx, byte[][] preimages) {
-		long ret = bindings.BaseSign_sign_counterparty_commitment(this.ptr, commitment_tx == null ? 0 : commitment_tx.ptr & ~1, preimages != null ? Arrays.stream(preimages).map(preimages_conv_8 -> InternalUtils.check_arr_len(preimages_conv_8, 32)).toArray(byte[][]::new) : null);
+		long ret = bindings.BaseSign_sign_counterparty_commitment(this.ptr, commitment_tx == null ? 0 : commitment_tx.ptr, preimages != null ? Arrays.stream(preimages).map(preimages_conv_8 -> InternalUtils.check_arr_len(preimages_conv_8, 32)).toArray(byte[][]::new) : null);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(commitment_tx);
 		Reference.reachabilityFence(preimages);
@@ -420,7 +420,7 @@ public Result_NoneNoneZ validate_counterparty_revocation(long idx, byte[] secret
 	 * May return Err if key derivation fails.  Callers, such as ChannelMonitor, will panic in such a case.
 	 */
 	public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htlcs(HolderCommitmentTransaction commitment_tx) {
-		long ret = bindings.BaseSign_sign_holder_commitment_and_htlcs(this.ptr, commitment_tx == null ? 0 : commitment_tx.ptr & ~1);
+		long ret = bindings.BaseSign_sign_holder_commitment_and_htlcs(this.ptr, commitment_tx == null ? 0 : commitment_tx.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(commitment_tx);
 		if (ret >= 0 && ret <= 4096) { return null; }
@@ -477,7 +477,7 @@ public Result_SignatureNoneZ sign_justice_revoked_output(byte[] justice_tx, long
 	 * (which is committed to in the BIP 143 signatures).
 	 */
 	public Result_SignatureNoneZ sign_justice_revoked_htlc(byte[] justice_tx, long input, long amount, byte[] per_commitment_key, HTLCOutputInCommitment htlc) {
-		long ret = bindings.BaseSign_sign_justice_revoked_htlc(this.ptr, justice_tx, input, amount, InternalUtils.check_arr_len(per_commitment_key, 32), htlc == null ? 0 : htlc.ptr & ~1);
+		long ret = bindings.BaseSign_sign_justice_revoked_htlc(this.ptr, justice_tx, input, amount, InternalUtils.check_arr_len(per_commitment_key, 32), htlc == null ? 0 : htlc.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(justice_tx);
 		Reference.reachabilityFence(input);
@@ -510,7 +510,7 @@ public Result_SignatureNoneZ sign_justice_revoked_htlc(byte[] justice_tx, long i
 	 * BIP 143 signature.
 	 */
 	public Result_SignatureNoneZ sign_counterparty_htlc_transaction(byte[] htlc_tx, long input, long amount, byte[] per_commitment_point, HTLCOutputInCommitment htlc) {
-		long ret = bindings.BaseSign_sign_counterparty_htlc_transaction(this.ptr, htlc_tx, input, amount, InternalUtils.check_arr_len(per_commitment_point, 33), htlc == null ? 0 : htlc.ptr & ~1);
+		long ret = bindings.BaseSign_sign_counterparty_htlc_transaction(this.ptr, htlc_tx, input, amount, InternalUtils.check_arr_len(per_commitment_point, 33), htlc == null ? 0 : htlc.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(htlc_tx);
 		Reference.reachabilityFence(input);
@@ -530,7 +530,7 @@ public Result_SignatureNoneZ sign_counterparty_htlc_transaction(byte[] htlc_tx,
 	 * chosen to forgo their output as dust.
 	 */
 	public Result_SignatureNoneZ sign_closing_transaction(ClosingTransaction closing_tx) {
-		long ret = bindings.BaseSign_sign_closing_transaction(this.ptr, closing_tx == null ? 0 : closing_tx.ptr & ~1);
+		long ret = bindings.BaseSign_sign_closing_transaction(this.ptr, closing_tx == null ? 0 : closing_tx.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(closing_tx);
 		if (ret >= 0 && ret <= 4096) { return null; }
@@ -551,7 +551,7 @@ public Result_SignatureNoneZ sign_closing_transaction(ClosingTransaction closing
 	 * protocol.
 	 */
 	public Result_C2Tuple_SignatureSignatureZNoneZ sign_channel_announcement(UnsignedChannelAnnouncement msg) {
-		long ret = bindings.BaseSign_sign_channel_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1);
+		long ret = bindings.BaseSign_sign_channel_announcement(this.ptr, msg == null ? 0 : msg.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(msg);
 		if (ret >= 0 && ret <= 4096) { return null; }
@@ -573,7 +573,7 @@ public Result_C2Tuple_SignatureSignatureZNoneZ sign_channel_announcement(Unsigne
 	 * Will be called before any signatures are applied.
 	 */
 	public void ready_channel(ChannelTransactionParameters channel_parameters) {
-		bindings.BaseSign_ready_channel(this.ptr, channel_parameters == null ? 0 : channel_parameters.ptr & ~1);
+		bindings.BaseSign_ready_channel(this.ptr, channel_parameters == null ? 0 : channel_parameters.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(channel_parameters);
 		this.ptrs_to.add(channel_parameters);

src/main/java/org/ldk/structs/BaseSign.java

@@ -67,7 +67,7 @@ public static ChainMonitor of(Option_FilterZ chain_source, BroadcasterInterface
 	 * inclusion in the return value.
 	 */
 	public Balance[] get_claimable_balances(ChannelDetails[] ignored_channels) {
-		long[] ret = bindings.ChainMonitor_get_claimable_balances(this.ptr, ignored_channels != null ? Arrays.stream(ignored_channels).mapToLong(ignored_channels_conv_16 -> ignored_channels_conv_16 == null ? 0 : ignored_channels_conv_16.ptr & ~1).toArray() : null);
+		long[] ret = bindings.ChainMonitor_get_claimable_balances(this.ptr, ignored_channels != null ? Arrays.stream(ignored_channels).mapToLong(ignored_channels_conv_16 -> ignored_channels_conv_16 == null ? 0 : ignored_channels_conv_16.ptr).toArray() : null);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(ignored_channels);
 		int ret_conv_9_len = ret.length;
@@ -78,6 +78,7 @@ public Balance[] get_claimable_balances(ChannelDetails[] ignored_channels) {
 			ret_conv_9_hu_conv.ptrs_to.add(this);
 			ret_conv_9_arr[j] = ret_conv_9_hu_conv;
 		}
+		for (ChannelDetails ignored_channels_conv_16: ignored_channels) { this.ptrs_to.add(ignored_channels_conv_16); };
 		return ret_conv_9_arr;
 	}
 
@@ -89,11 +90,12 @@ public Balance[] get_claimable_balances(ChannelDetails[] ignored_channels) {
 	 * indefinitely.
 	 */
 	public Result_LockedChannelMonitorNoneZ get_monitor(OutPoint funding_txo) {
-		long ret = bindings.ChainMonitor_get_monitor(this.ptr, funding_txo == null ? 0 : funding_txo.ptr & ~1);
+		long ret = bindings.ChainMonitor_get_monitor(this.ptr, funding_txo == null ? 0 : funding_txo.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(funding_txo);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_LockedChannelMonitorNoneZ ret_hu_conv = Result_LockedChannelMonitorNoneZ.constr_from_ptr(ret);
+		this.ptrs_to.add(funding_txo);
 		return ret_hu_conv;
 	}
 
@@ -133,12 +135,14 @@ public OutPoint[] list_monitors() {
 	 * registered [`ChannelMonitor`]s.
 	 */
 	public Result_NoneAPIErrorZ channel_monitor_updated(OutPoint funding_txo, MonitorUpdateId completed_update_id) {
-		long ret = bindings.ChainMonitor_channel_monitor_updated(this.ptr, funding_txo == null ? 0 : funding_txo.ptr & ~1, completed_update_id == null ? 0 : completed_update_id.ptr & ~1);
+		long ret = bindings.ChainMonitor_channel_monitor_updated(this.ptr, funding_txo == null ? 0 : funding_txo.ptr, completed_update_id == null ? 0 : completed_update_id.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(funding_txo);
 		Reference.reachabilityFence(completed_update_id);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneAPIErrorZ ret_hu_conv = Result_NoneAPIErrorZ.constr_from_ptr(ret);
+		this.ptrs_to.add(funding_txo);
+		this.ptrs_to.add(completed_update_id);
 		return ret_hu_conv;
 	}
 

src/main/java/org/ldk/structs/ChainMonitor.java

@@ -62,21 +62,23 @@ public BestBlock get_best_block() {
 	 * Used to track on-chain channel funding outputs and send payments with reliable timelocks.
 	 */
 	public void set_best_block(BestBlock val) {
-		bindings.ChainParameters_set_best_block(this.ptr, val == null ? 0 : val.ptr & ~1);
+		bindings.ChainParameters_set_best_block(this.ptr, val == null ? 0 : val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		this.ptrs_to.add(val);
 	}
 
 	/**
 	 * Constructs a new ChainParameters given each field
 	 */
 	public static ChainParameters of(org.ldk.enums.Network network_arg, BestBlock best_block_arg) {
-		long ret = bindings.ChainParameters_new(network_arg, best_block_arg == null ? 0 : best_block_arg.ptr & ~1);
+		long ret = bindings.ChainParameters_new(network_arg, best_block_arg == null ? 0 : best_block_arg.ptr);
 		Reference.reachabilityFence(network_arg);
 		Reference.reachabilityFence(best_block_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.ChainParameters ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChainParameters(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(best_block_arg);
 		return ret_hu_conv;
 	}
 

src/main/java/org/ldk/structs/ChainParameters.java

@@ -108,16 +108,17 @@ public UnsignedChannelAnnouncement get_contents() {
 	 * The actual announcement
 	 */
 	public void set_contents(UnsignedChannelAnnouncement val) {
-		bindings.ChannelAnnouncement_set_contents(this.ptr, val == null ? 0 : val.ptr & ~1);
+		bindings.ChannelAnnouncement_set_contents(this.ptr, val == null ? 0 : val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		this.ptrs_to.add(val);
 	}
 
 	/**
 	 * Constructs a new ChannelAnnouncement given each field
 	 */
 	public static ChannelAnnouncement of(byte[] node_signature_1_arg, byte[] node_signature_2_arg, byte[] bitcoin_signature_1_arg, byte[] bitcoin_signature_2_arg, UnsignedChannelAnnouncement contents_arg) {
-		long ret = bindings.ChannelAnnouncement_new(InternalUtils.check_arr_len(node_signature_1_arg, 64), InternalUtils.check_arr_len(node_signature_2_arg, 64), InternalUtils.check_arr_len(bitcoin_signature_1_arg, 64), InternalUtils.check_arr_len(bitcoin_signature_2_arg, 64), contents_arg == null ? 0 : contents_arg.ptr & ~1);
+		long ret = bindings.ChannelAnnouncement_new(InternalUtils.check_arr_len(node_signature_1_arg, 64), InternalUtils.check_arr_len(node_signature_2_arg, 64), InternalUtils.check_arr_len(bitcoin_signature_1_arg, 64), InternalUtils.check_arr_len(bitcoin_signature_2_arg, 64), contents_arg == null ? 0 : contents_arg.ptr);
 		Reference.reachabilityFence(node_signature_1_arg);
 		Reference.reachabilityFence(node_signature_2_arg);
 		Reference.reachabilityFence(bitcoin_signature_1_arg);
@@ -126,6 +127,7 @@ public static ChannelAnnouncement of(byte[] node_signature_1_arg, byte[] node_si
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.ChannelAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelAnnouncement(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(contents_arg);
 		return ret_hu_conv;
 	}
 

src/main/java/org/ldk/structs/ChannelAnnouncement.java

@@ -59,9 +59,10 @@ public InitFeatures get_features() {
 	 * many routing-relevant features are present in the init context.
 	 */
 	public void set_features(InitFeatures val) {
-		bindings.ChannelCounterparty_set_features(this.ptr, val == null ? 0 : val.ptr & ~1);
+		bindings.ChannelCounterparty_set_features(this.ptr, val == null ? 0 : val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		this.ptrs_to.add(val);
 	}
 
 	/**
@@ -117,9 +118,10 @@ public CounterpartyForwardingInfo get_forwarding_info() {
 	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
 	public void set_forwarding_info(@Nullable CounterpartyForwardingInfo val) {
-		bindings.ChannelCounterparty_set_forwarding_info(this.ptr, val == null ? 0 : val.ptr & ~1);
+		bindings.ChannelCounterparty_set_forwarding_info(this.ptr, val == null ? 0 : val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		this.ptrs_to.add(val);
 	}
 
 	/**
@@ -172,7 +174,7 @@ public void set_outbound_htlc_maximum_msat(Option_u64Z val) {
 	 * Constructs a new ChannelCounterparty given each field
 	 */
 	public static ChannelCounterparty of(byte[] node_id_arg, InitFeatures features_arg, long unspendable_punishment_reserve_arg, CounterpartyForwardingInfo forwarding_info_arg, Option_u64Z outbound_htlc_minimum_msat_arg, Option_u64Z outbound_htlc_maximum_msat_arg) {
-		long ret = bindings.ChannelCounterparty_new(InternalUtils.check_arr_len(node_id_arg, 33), features_arg == null ? 0 : features_arg.ptr & ~1, unspendable_punishment_reserve_arg, forwarding_info_arg == null ? 0 : forwarding_info_arg.ptr & ~1, outbound_htlc_minimum_msat_arg.ptr, outbound_htlc_maximum_msat_arg.ptr);
+		long ret = bindings.ChannelCounterparty_new(InternalUtils.check_arr_len(node_id_arg, 33), features_arg == null ? 0 : features_arg.ptr, unspendable_punishment_reserve_arg, forwarding_info_arg == null ? 0 : forwarding_info_arg.ptr, outbound_htlc_minimum_msat_arg.ptr, outbound_htlc_maximum_msat_arg.ptr);
 		Reference.reachabilityFence(node_id_arg);
 		Reference.reachabilityFence(features_arg);
 		Reference.reachabilityFence(unspendable_punishment_reserve_arg);
@@ -182,6 +184,8 @@ public static ChannelCounterparty of(byte[] node_id_arg, InitFeatures features_a
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.ChannelCounterparty ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelCounterparty(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(features_arg);
+		ret_hu_conv.ptrs_to.add(forwarding_info_arg);
 		return ret_hu_conv;
 	}