X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelMonitor.java;h=666ed72f0de3523bfdcbfd519cc23b07791a6cf0;hb=90f8a21c87ba652884d5b94404b9b24a18f0cefc;hp=1e95a1b56818f5489adac1eacaab0b17dbed1155;hpb=f70bcf067b290c88dc9dc26f4aca86475e5f6ed7;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelMonitor.java b/src/main/java/org/ldk/structs/ChannelMonitor.java
index 1e95a1b5..666ed72f 100644
--- a/src/main/java/org/ldk/structs/ChannelMonitor.java
+++ b/src/main/java/org/ldk/structs/ChannelMonitor.java
@@ -11,7 +11,12 @@ public class ChannelMonitor extends CommonBase {
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
 		super.finalize();
-		bindings.ChannelMonitor_free(ptr);
+		if (ptr != 0) { bindings.ChannelMonitor_free(ptr); }
+	}
+
+	public byte[] write() {
+		byte[] ret = bindings.ChannelMonitor_write(this.ptr);
+		return ret;
 	}
 
 	public Result_NoneMonitorUpdateErrorZ update_monitor(ChannelMonitorUpdate updates, BroadcasterInterface broadcaster, Logger logger) {
@@ -47,25 +52,20 @@ public class ChannelMonitor extends CommonBase {
 		for (int h = 0; h < ret.length; h++) {
 			long arr_conv_7 = ret[h];
 			Event arr_conv_7_hu_conv = Event.constr_from_ptr(arr_conv_7);
+			arr_conv_7_hu_conv.ptrs_to.add(this);
 			arr_conv_7_arr[h] = arr_conv_7_hu_conv;
 		}
 		return arr_conv_7_arr;
 	}
 
-	public Transaction[] get_latest_holder_commitment_txn(Logger logger) {
-		long[] ret = bindings.ChannelMonitor_get_latest_holder_commitment_txn(this.ptr, logger == null ? 0 : logger.ptr);
-		Transaction[] arr_conv_13_arr = new Transaction[ret.length];
-		for (int n = 0; n < ret.length; n++) {
-			long arr_conv_13 = ret[n];
-			Transaction arr_conv_13_conv = new Transaction(null, arr_conv_13);
-			arr_conv_13_arr[n] = arr_conv_13_conv;
-		}
+	public byte[][] get_latest_holder_commitment_txn(Logger logger) {
+		byte[][] ret = bindings.ChannelMonitor_get_latest_holder_commitment_txn(this.ptr, logger == null ? 0 : logger.ptr);
 		this.ptrs_to.add(logger);
-		return arr_conv_13_arr;
+		return ret;
 	}
 
-	public TwoTuple<byte[], TxOut[]>[] block_connected(byte[] header, TwoTuple<Long, Transaction>[] txdata, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
-		long[] ret = bindings.ChannelMonitor_block_connected(this.ptr, header, Arrays.stream(txdata).mapToLong(arr_conv_29 -> /*TODO b*/0).toArray(), height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
+	public TwoTuple<byte[], 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, Arrays.stream(txdata).mapToLong(arr_conv_24 -> bindings.C2Tuple_usizeTransactionZ_new(arr_conv_24.a, arr_conv_24.b)).toArray(), height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
 		TwoTuple<byte[], TxOut[]>[] arr_conv_27_arr = new TwoTuple[ret.length];
 		for (int b = 0; b < ret.length; b++) {
 			long arr_conv_27 = ret[b];
@@ -80,7 +80,7 @@ public class ChannelMonitor extends CommonBase {
 			TwoTuple<byte[], TxOut[]> arr_conv_27_conv = new TwoTuple<byte[], TxOut[]>(arr_conv_27_a, arr_conv_7_arr);
 			arr_conv_27_arr[b] = arr_conv_27_conv;
 		}
-		/* TODO 2 TwoTuple<Long, Transaction>  */;
+		/* TODO 2 TwoTuple<Long, byte[]>  */;
 		this.ptrs_to.add(broadcaster);
 		this.ptrs_to.add(fee_estimator);
 		this.ptrs_to.add(logger);