X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChainMonitor.java;h=ae957504105d1ee275e30d1323c6d673cc0adae4;hb=18faab2952bff2302d55528dea556246be63950a;hp=24ed59fdee1ff759e3433b76fe87c1da8f68647b;hpb=3d559f3266fde7c6a21248c10d9a7145125b5e69;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChainMonitor.java b/src/main/java/org/ldk/structs/ChainMonitor.java
index 24ed59fd..ae957504 100644
--- a/src/main/java/org/ldk/structs/ChainMonitor.java
+++ b/src/main/java/org/ldk/structs/ChainMonitor.java
@@ -2,37 +2,49 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class ChainMonitor extends CommonBase {
 	ChainMonitor(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.ChainMonitor_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.ChainMonitor_free(ptr); }
+	}
+
+	public void block_connected(byte[] header, TwoTuple<Long, byte[]>[] txdata, int height) {
+		bindings.ChainMonitor_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);
+		/* TODO 2 TwoTuple<Long, byte[]>  */;
 	}
 
-	// Skipped ChainMonitor_block_connected
 	public void block_disconnected(byte[] header, int disconnected_height) {
 		bindings.ChainMonitor_block_disconnected(this.ptr, header, disconnected_height);
 	}
 
-	public ChainMonitor(Filter chain_source, BroadcasterInterface broadcaster, Logger logger, FeeEstimator feeest) {
-		super(bindings.ChainMonitor_new(chain_source.ptr, broadcaster.ptr, logger.ptr, feeest.ptr));
-		this.ptrs_to.add(chain_source);
-		this.ptrs_to.add(broadcaster);
-		this.ptrs_to.add(logger);
-		this.ptrs_to.add(feeest);
+	public static ChainMonitor constructor_new(Filter chain_source, BroadcasterInterface broadcaster, Logger logger, FeeEstimator feeest) {
+		long ret = bindings.ChainMonitor_new(chain_source == null ? 0 : chain_source.ptr, broadcaster == null ? 0 : broadcaster.ptr, logger == null ? 0 : logger.ptr, feeest == null ? 0 : feeest.ptr);
+		ChainMonitor ret_hu_conv = new ChainMonitor(null, ret);
+		ret_hu_conv.ptrs_to.add(chain_source);
+		ret_hu_conv.ptrs_to.add(broadcaster);
+		ret_hu_conv.ptrs_to.add(logger);
+		ret_hu_conv.ptrs_to.add(feeest);
+		return ret_hu_conv;
 	}
 
 	public Watch as_Watch() {
-		Watch ret = new Watch(null, bindings.ChainMonitor_as_Watch(this.ptr));
-		ret.ptrs_to.add(this);
-		return ret;
+		long ret = bindings.ChainMonitor_as_Watch(this.ptr);
+		Watch ret_hu_conv = new Watch(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
 	public EventsProvider as_EventsProvider() {
-		EventsProvider ret = new EventsProvider(null, bindings.ChainMonitor_as_EventsProvider(this.ptr));
-		ret.ptrs_to.add(this);
-		return ret;
+		long ret = bindings.ChainMonitor_as_EventsProvider(this.ptr);
+		EventsProvider ret_hu_conv = new EventsProvider(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
 }