Update auto-generated bindings

Memory leaks during tests are now:
    193 allocations remained for 1136846 bytes.

Author: TheBlueMatt

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

@@ -473,15 +473,12 @@ public void channel_monitor_updated(OutPoint funding_txo, long highest_applied_u
 	 * [`PaymentReceived::payment_preimage`]: events::Event::PaymentReceived::payment_preimage
 	 * [`create_inbound_payment_for_hash`]: Self::create_inbound_payment_for_hash
 	 */
-	public TwoTuple<byte[], byte[]> create_inbound_payment(Option_u64Z min_value_msat, int invoice_expiry_delta_secs, long user_payment_id) {
+	public TwoTuple_PaymentHashPaymentSecretZ create_inbound_payment(Option_u64Z min_value_msat, int invoice_expiry_delta_secs, long user_payment_id) {
 		long ret = bindings.ChannelManager_create_inbound_payment(this.ptr, min_value_msat.ptr, invoice_expiry_delta_secs, user_payment_id);
 		if (ret < 1024) { return null; }
-		byte[] ret_a = bindings.LDKC2Tuple_PaymentHashPaymentSecretZ_get_a(ret);
-		byte[] ret_b = bindings.LDKC2Tuple_PaymentHashPaymentSecretZ_get_b(ret);
-		TwoTuple<byte[], byte[]> ret_conv = new TwoTuple<byte[], byte[]>(ret_a, ret_b, () -> {
-			bindings.C2Tuple_PaymentHashPaymentSecretZ_free(ret);
-		});
-		return ret_conv;
+		TwoTuple_PaymentHashPaymentSecretZ ret_hu_conv = new TwoTuple_PaymentHashPaymentSecretZ(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
 	/**

src/main/java/org/ldk/impl/version.class

@@ -82,46 +82,28 @@ public long get_latest_update_id() {
 	/**
 	 * Gets the funding transaction outpoint of the channel this ChannelMonitor is monitoring for.
 	 */
-	public TwoTuple<OutPoint, byte[]> get_funding_txo() {
+	public TwoTuple_OutPointScriptZ get_funding_txo() {
 		long ret = bindings.ChannelMonitor_get_funding_txo(this.ptr);
 		if (ret < 1024) { return null; }
-		long ret_a = bindings.LDKC2Tuple_OutPointScriptZ_get_a(ret);
-		OutPoint ret_a_hu_conv = new OutPoint(null, ret_a);
-		ret_a_hu_conv.ptrs_to.add(this);;
-		byte[] ret_b = bindings.LDKC2Tuple_OutPointScriptZ_get_b(ret);
-		TwoTuple<OutPoint, byte[]> ret_conv = new TwoTuple<OutPoint, byte[]>(ret_a_hu_conv, ret_b, () -> {
-			bindings.C2Tuple_OutPointScriptZ_free(ret);
-		});
-		ret_a_hu_conv.ptrs_to.add(ret_conv);
-		return ret_conv;
+		TwoTuple_OutPointScriptZ ret_hu_conv = new TwoTuple_OutPointScriptZ(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
 	/**
 	 * Gets a list of txids, with their output scripts (in the order they appear in the
 	 * transaction), which we must learn about spends of via block_connected().
 	 */
-	public TwoTuple<byte[], TwoTuple<Integer, byte[]>[]>[] get_outputs_to_watch() {
+	public TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ[] get_outputs_to_watch() {
 		long[] ret = bindings.ChannelMonitor_get_outputs_to_watch(this.ptr);
-		TwoTuple<byte[], TwoTuple<Integer, byte[]>[]>[] ret_conv_47_arr = new TwoTuple[ret.length];
-		for (int v = 0; v < ret.length; v++) {
-			long ret_conv_47 = ret[v];
-			byte[] ret_conv_47_a = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a(ret_conv_47);
-			long[] ret_conv_47_b = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(ret_conv_47);
-			TwoTuple<Integer, byte[]>[] ret_conv_47_b_conv_27_arr = new TwoTuple[ret_conv_47_b.length];
-			for (int b = 0; b < ret_conv_47_b.length; b++) {
-				long ret_conv_47_b_conv_27 = ret_conv_47_b[b];
-				int ret_conv_47_b_conv_27_a = bindings.LDKC2Tuple_u32ScriptZ_get_a(ret_conv_47_b_conv_27);
-				byte[] ret_conv_47_b_conv_27_b = bindings.LDKC2Tuple_u32ScriptZ_get_b(ret_conv_47_b_conv_27);
-				TwoTuple<Integer, byte[]> ret_conv_47_b_conv_27_conv = new TwoTuple<Integer, byte[]>(ret_conv_47_b_conv_27_a, ret_conv_47_b_conv_27_b, () -> {
-					bindings.C2Tuple_u32ScriptZ_free(ret_conv_47_b_conv_27);
-				});
-				ret_conv_47_b_conv_27_arr[b] = ret_conv_47_b_conv_27_conv;
-			};
-			TwoTuple<byte[], TwoTuple<Integer, byte[]>[]> ret_conv_47_conv = new TwoTuple<byte[], TwoTuple<Integer, byte[]>[]>(ret_conv_47_a, ret_conv_47_b_conv_27_arr);
-			// Warning: We may not free the C tuple object!
-			ret_conv_47_arr[v] = ret_conv_47_conv;
+		TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ[] ret_conv_40_arr = new TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ[ret.length];
+		for (int o = 0; o < ret.length; 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);
+			ret_conv_40_arr[o] = ret_conv_40_hu_conv;
 		}
-		return ret_conv_47_arr;
+		return ret_conv_40_arr;
 	}
 
 	/**
@@ -200,33 +182,19 @@ public byte[][] get_latest_holder_commitment_txn(Logger logger) {
 	 * 
 	 * [`get_outputs_to_watch`]: #method.get_outputs_to_watch
 	 */
-	public TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] block_connected(byte[] header, TwoTuple<Long, byte[]>[] txdata, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
-		long[] ret = bindings.ChannelMonitor_block_connected(this.ptr, header, txdata != null ? Arrays.stream(txdata).mapToLong(txdata_conv_24 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_24.a, txdata_conv_24.b)).toArray() : null, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
-		TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] ret_conv_46_arr = new TwoTuple[ret.length];
-		for (int u = 0; u < ret.length; u++) {
-			long ret_conv_46 = ret[u];
-			byte[] ret_conv_46_a = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(ret_conv_46);
-			long[] ret_conv_46_b = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(ret_conv_46);
-			TwoTuple<Integer, TxOut>[] ret_conv_46_b_conv_26_arr = new TwoTuple[ret_conv_46_b.length];
-			for (int a = 0; a < ret_conv_46_b.length; a++) {
-				long ret_conv_46_b_conv_26 = ret_conv_46_b[a];
-				int ret_conv_46_b_conv_26_a = bindings.LDKC2Tuple_u32TxOutZ_get_a(ret_conv_46_b_conv_26);
-				long ret_conv_46_b_conv_26_b = bindings.TxOut_clone(bindings.LDKC2Tuple_u32TxOutZ_get_b(ret_conv_46_b_conv_26));
-				TxOut ret_conv_46_b_conv_26_b_conv = new TxOut(null, ret_conv_46_b_conv_26_b);;
-				TwoTuple<Integer, TxOut> ret_conv_46_b_conv_26_conv = new TwoTuple<Integer, TxOut>(ret_conv_46_b_conv_26_a, ret_conv_46_b_conv_26_b_conv, () -> {
-					bindings.C2Tuple_u32TxOutZ_free(ret_conv_46_b_conv_26);
-				});
-				ret_conv_46_b_conv_26_b_conv.ptrs_to.add(ret_conv_46_b_conv_26_conv);
-				ret_conv_46_b_conv_26_arr[a] = ret_conv_46_b_conv_26_conv;
-			};
-			TwoTuple<byte[], TwoTuple<Integer, TxOut>[]> ret_conv_46_conv = new TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>(ret_conv_46_a, ret_conv_46_b_conv_26_arr);
-			// Warning: We may not free the C tuple object!
-			ret_conv_46_arr[u] = ret_conv_46_conv;
+	public TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] block_connected(byte[] header, TwoTuple_usizeTransactionZ[] txdata, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
+		long[] ret = bindings.ChannelMonitor_block_connected(this.ptr, header, txdata != null ? Arrays.stream(txdata).mapToLong(txdata_conv_28 -> txdata_conv_28 != null ? txdata_conv_28.ptr : 0).toArray() : null, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
+		TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] ret_conv_39_arr = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[ret.length];
+		for (int n = 0; n < ret.length; 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);
+			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);
-		return ret_conv_46_arr;
+		return ret_conv_39_arr;
 	}
 
 	/**
@@ -249,33 +217,19 @@ public void block_disconnected(byte[] header, int height, BroadcasterInterface b
 	 * 
 	 * [`block_connected`]: Self::block_connected
 	 */
-	public TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] transactions_confirmed(byte[] header, TwoTuple<Long, byte[]>[] txdata, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
-		long[] ret = bindings.ChannelMonitor_transactions_confirmed(this.ptr, header, txdata != null ? Arrays.stream(txdata).mapToLong(txdata_conv_24 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_24.a, txdata_conv_24.b)).toArray() : null, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
-		TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] ret_conv_46_arr = new TwoTuple[ret.length];
-		for (int u = 0; u < ret.length; u++) {
-			long ret_conv_46 = ret[u];
-			byte[] ret_conv_46_a = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(ret_conv_46);
-			long[] ret_conv_46_b = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(ret_conv_46);
-			TwoTuple<Integer, TxOut>[] ret_conv_46_b_conv_26_arr = new TwoTuple[ret_conv_46_b.length];
-			for (int a = 0; a < ret_conv_46_b.length; a++) {
-				long ret_conv_46_b_conv_26 = ret_conv_46_b[a];
-				int ret_conv_46_b_conv_26_a = bindings.LDKC2Tuple_u32TxOutZ_get_a(ret_conv_46_b_conv_26);
-				long ret_conv_46_b_conv_26_b = bindings.TxOut_clone(bindings.LDKC2Tuple_u32TxOutZ_get_b(ret_conv_46_b_conv_26));
-				TxOut ret_conv_46_b_conv_26_b_conv = new TxOut(null, ret_conv_46_b_conv_26_b);;
-				TwoTuple<Integer, TxOut> ret_conv_46_b_conv_26_conv = new TwoTuple<Integer, TxOut>(ret_conv_46_b_conv_26_a, ret_conv_46_b_conv_26_b_conv, () -> {
-					bindings.C2Tuple_u32TxOutZ_free(ret_conv_46_b_conv_26);
-				});
-				ret_conv_46_b_conv_26_b_conv.ptrs_to.add(ret_conv_46_b_conv_26_conv);
-				ret_conv_46_b_conv_26_arr[a] = ret_conv_46_b_conv_26_conv;
-			};
-			TwoTuple<byte[], TwoTuple<Integer, TxOut>[]> ret_conv_46_conv = new TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>(ret_conv_46_a, ret_conv_46_b_conv_26_arr);
-			// Warning: We may not free the C tuple object!
-			ret_conv_46_arr[u] = ret_conv_46_conv;
+	public TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] transactions_confirmed(byte[] header, TwoTuple_usizeTransactionZ[] txdata, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
+		long[] ret = bindings.ChannelMonitor_transactions_confirmed(this.ptr, header, txdata != null ? Arrays.stream(txdata).mapToLong(txdata_conv_28 -> txdata_conv_28 != null ? txdata_conv_28.ptr : 0).toArray() : null, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
+		TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] ret_conv_39_arr = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[ret.length];
+		for (int n = 0; n < ret.length; 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);
+			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);
-		return ret_conv_46_arr;
+		return ret_conv_39_arr;
 	}
 
 	/**
@@ -302,33 +256,19 @@ public void transaction_unconfirmed(byte[] txid, BroadcasterInterface broadcaste
 	 * 
 	 * [`block_connected`]: Self::block_connected
 	 */
-	public TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] best_block_updated(byte[] header, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
+	public TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] best_block_updated(byte[] header, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
 		long[] ret = bindings.ChannelMonitor_best_block_updated(this.ptr, header, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
-		TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] ret_conv_46_arr = new TwoTuple[ret.length];
-		for (int u = 0; u < ret.length; u++) {
-			long ret_conv_46 = ret[u];
-			byte[] ret_conv_46_a = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(ret_conv_46);
-			long[] ret_conv_46_b = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(ret_conv_46);
-			TwoTuple<Integer, TxOut>[] ret_conv_46_b_conv_26_arr = new TwoTuple[ret_conv_46_b.length];
-			for (int a = 0; a < ret_conv_46_b.length; a++) {
-				long ret_conv_46_b_conv_26 = ret_conv_46_b[a];
-				int ret_conv_46_b_conv_26_a = bindings.LDKC2Tuple_u32TxOutZ_get_a(ret_conv_46_b_conv_26);
-				long ret_conv_46_b_conv_26_b = bindings.TxOut_clone(bindings.LDKC2Tuple_u32TxOutZ_get_b(ret_conv_46_b_conv_26));
-				TxOut ret_conv_46_b_conv_26_b_conv = new TxOut(null, ret_conv_46_b_conv_26_b);;
-				TwoTuple<Integer, TxOut> ret_conv_46_b_conv_26_conv = new TwoTuple<Integer, TxOut>(ret_conv_46_b_conv_26_a, ret_conv_46_b_conv_26_b_conv, () -> {
-					bindings.C2Tuple_u32TxOutZ_free(ret_conv_46_b_conv_26);
-				});
-				ret_conv_46_b_conv_26_b_conv.ptrs_to.add(ret_conv_46_b_conv_26_conv);
-				ret_conv_46_b_conv_26_arr[a] = ret_conv_46_b_conv_26_conv;
-			};
-			TwoTuple<byte[], TwoTuple<Integer, TxOut>[]> ret_conv_46_conv = new TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>(ret_conv_46_a, ret_conv_46_b_conv_26_arr);
-			// Warning: We may not free the C tuple object!
-			ret_conv_46_arr[u] = ret_conv_46_conv;
+		TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] ret_conv_39_arr = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[ret.length];
+		for (int n = 0; n < ret.length; 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);
+			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);
-		return ret_conv_46_arr;
+		return ret_conv_39_arr;
 	}
 
 	/**

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

@@ -70,7 +70,7 @@ public static interface ConfirmInterface {
 		 * [chain order]: Confirm#Order
 		 * [`best_block_updated`]: Self::best_block_updated
 		 */
-		void transactions_confirmed(byte[] header, TwoTuple<Long, byte[]>[] txdata, int height);
+		void transactions_confirmed(byte[] header, TwoTuple_usizeTransactionZ[] txdata, int height);
 		/**
 		 * Processes a transaction that is no longer confirmed as result of a chain reorganization.
 		 * 
@@ -111,17 +111,14 @@ public static Confirm new_impl(ConfirmInterface arg) {
 		final LDKConfirmHolder impl_holder = new LDKConfirmHolder();
 		impl_holder.held = new Confirm(new bindings.LDKConfirm() {
 			@Override public void transactions_confirmed(byte[] header, long[] txdata, int height) {
-				TwoTuple<Long, byte[]>[] txdata_conv_24_arr = new TwoTuple[txdata.length];
-				for (int y = 0; y < txdata.length; y++) {
-					long txdata_conv_24 = txdata[y];
-					long txdata_conv_24_a = bindings.LDKC2Tuple_usizeTransactionZ_get_a(txdata_conv_24);
-					byte[] txdata_conv_24_b = bindings.LDKC2Tuple_usizeTransactionZ_get_b(txdata_conv_24);
-					TwoTuple<Long, byte[]> txdata_conv_24_conv = new TwoTuple<Long, byte[]>(txdata_conv_24_a, txdata_conv_24_b, () -> {
-						bindings.C2Tuple_usizeTransactionZ_free(txdata_conv_24);
-					});
-					txdata_conv_24_arr[y] = txdata_conv_24_conv;
+				TwoTuple_usizeTransactionZ[] txdata_conv_28_arr = new TwoTuple_usizeTransactionZ[txdata.length];
+				for (int c = 0; c < txdata.length; c++) {
+					long txdata_conv_28 = txdata[c];
+					TwoTuple_usizeTransactionZ txdata_conv_28_hu_conv = new TwoTuple_usizeTransactionZ(null, txdata_conv_28);
+					txdata_conv_28_hu_conv.ptrs_to.add(this);
+					txdata_conv_28_arr[c] = txdata_conv_28_hu_conv;
 				}
-				arg.transactions_confirmed(header, txdata_conv_24_arr, height);
+				arg.transactions_confirmed(header, txdata_conv_28_arr, height);
 			}
 			@Override public void transaction_unconfirmed(byte[] txid) {
 				arg.transaction_unconfirmed(txid);
@@ -151,8 +148,8 @@ public static Confirm new_impl(ConfirmInterface arg) {
 	 * [chain order]: Confirm#Order
 	 * [`best_block_updated`]: Self::best_block_updated
 	 */
-	public void transactions_confirmed(byte[] header, TwoTuple<Long, byte[]>[] txdata, int height) {
-		bindings.Confirm_transactions_confirmed(this.ptr, header, txdata != null ? Arrays.stream(txdata).mapToLong(txdata_conv_24 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_24.a, txdata_conv_24.b)).toArray() : null, height);
+	public void transactions_confirmed(byte[] header, TwoTuple_usizeTransactionZ[] txdata, int height) {
+		bindings.Confirm_transactions_confirmed(this.ptr, header, txdata != null ? Arrays.stream(txdata).mapToLong(txdata_conv_28 -> txdata_conv_28 != null ? txdata_conv_28.ptr : 0).toArray() : null, height);
 	}
 
 	/**

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

@@ -36,7 +36,7 @@ public static interface CustomMessageHandlerInterface {
 		 * correspond to the intended recipients node ids. If no connection to one of the
 		 * specified node does not exist, the message is simply not sent to it.
 		 */
-		TwoTuple<byte[], Type>[] get_and_clear_pending_msg();
+		TwoTuple_PublicKeyTypeZ[] get_and_clear_pending_msg();
 	}
 	private static class LDKCustomMessageHandlerHolder { CustomMessageHandler held; }
 	public static CustomMessageHandler new_impl(CustomMessageHandlerInterface arg, CustomMessageReader.CustomMessageReaderInterface CustomMessageReader_impl) {
@@ -50,9 +50,8 @@ public static CustomMessageHandler new_impl(CustomMessageHandlerInterface arg, C
 				return result;
 			}
 			@Override public long[] get_and_clear_pending_msg() {
-				TwoTuple<byte[], Type>[] ret = arg.get_and_clear_pending_msg();
-				long[] result = ret != null ? Arrays.stream(ret).mapToLong(ret_conv_24 -> bindings.C2Tuple_PublicKeyTypeZ_new(ret_conv_24.a, ret_conv_24.b == null ? 0 : ret_conv_24.b.ptr)).toArray() : null;
-				for (TwoTuple<byte[], Type> ret_conv_24: ret) { impl_holder.held.ptrs_to.add(ret_conv_24.b); };
+				TwoTuple_PublicKeyTypeZ[] ret = arg.get_and_clear_pending_msg();
+				long[] result = ret != null ? Arrays.stream(ret).mapToLong(ret_conv_25 -> ret_conv_25 != null ? ret_conv_25.ptr : 0).toArray() : null;
 				return result;
 			}
 		}, CustomMessageReader.new_impl(CustomMessageReader_impl).bindings_instance);
@@ -86,22 +85,16 @@ public Result_NoneLightningErrorZ handle_custom_message(Type msg, byte[] sender_
 	 * correspond to the intended recipients node ids. If no connection to one of the
 	 * specified node does not exist, the message is simply not sent to it.
 	 */
-	public TwoTuple<byte[], Type>[] get_and_clear_pending_msg() {
+	public TwoTuple_PublicKeyTypeZ[] get_and_clear_pending_msg() {
 		long[] ret = bindings.CustomMessageHandler_get_and_clear_pending_msg(this.ptr);
-		TwoTuple<byte[], Type>[] ret_conv_24_arr = new TwoTuple[ret.length];
-		for (int y = 0; y < ret.length; y++) {
-			long ret_conv_24 = ret[y];
-			byte[] ret_conv_24_a = bindings.LDKC2Tuple_PublicKeyTypeZ_get_a(ret_conv_24);
-			long ret_conv_24_b = bindings.LDKC2Tuple_PublicKeyTypeZ_get_b(ret_conv_24);
-			Type ret_hu_conv = new Type(null, ret_conv_24_b);
-			ret_hu_conv.ptrs_to.add(this);;
-			TwoTuple<byte[], Type> ret_conv_24_conv = new TwoTuple<byte[], Type>(ret_conv_24_a, ret_hu_conv, () -> {
-				bindings.C2Tuple_PublicKeyTypeZ_free(ret_conv_24);
-			});
-			ret_hu_conv.ptrs_to.add(ret_conv_24_conv);
-			ret_conv_24_arr[y] = ret_conv_24_conv;
+		TwoTuple_PublicKeyTypeZ[] ret_conv_25_arr = new TwoTuple_PublicKeyTypeZ[ret.length];
+		for (int z = 0; z < ret.length; z++) {
+			long ret_conv_25 = ret[z];
+			TwoTuple_PublicKeyTypeZ ret_conv_25_hu_conv = new TwoTuple_PublicKeyTypeZ(null, ret_conv_25);
+			ret_conv_25_hu_conv.ptrs_to.add(this);
+			ret_conv_25_arr[z] = ret_conv_25_hu_conv;
 		}
-		return ret_conv_24_arr;
+		return ret_conv_25_arr;
 	}
 
 }