X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FChannelMonitor.ts;h=19dced0664de59f57cdfb9e3d9f17facf6e07f05;hb=b3302d48f4dec85e9d23d9b6324d33b7c8619770;hp=af5d1cf911b540cbe2c4ccd017680c4a6ccb570b;hpb=b0c50b891cbca28d3bd1d86276c132ff5221d8e4;p=ldk-java

diff --git a/ts/structs/ChannelMonitor.ts b/ts/structs/ChannelMonitor.ts
index af5d1cf9..19dced06 100644
--- a/ts/structs/ChannelMonitor.ts
+++ b/ts/structs/ChannelMonitor.ts
@@ -118,7 +118,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 	}
 
 	public TwoTuple<Uint8Array, TwoTuple<Number, TxOut>[]>[] block_connected(Uint8Array header, TwoTuple<Number, Uint8Array>[] txdata, number height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
-		number[] ret = bindings.ChannelMonitor_block_connected(this.ptr, header, Arrays.stream(txdata).map(txdata_conv_30 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_30.a, txdata_conv_30.b)).toArray(number[]::new), height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
+		number[] ret = bindings.ChannelMonitor_block_connected(this.ptr, header, txdata != null ? Arrays.stream(txdata).map(txdata_conv_30 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_30.a, txdata_conv_30.b)).toArray(number[]::new) : null, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
 		TwoTuple<Uint8Array, TwoTuple<Number, TxOut>[]>[] ret_conv_49_arr = new TwoTuple[ret.length];
 		for (int x = 0; x < ret.length; x++) {
 			number ret_conv_49 = ret[x];
@@ -140,7 +140,6 @@ import * as bindings from '../bindings' // TODO: figure out location
 			// Warning: We may not free the C tuple object!
 			ret_conv_49_arr[x] = ret_conv_49_conv;
 		}
-		/* TODO 2 TwoTuple<Number, Uint8Array>  */;
 		this.ptrs_to.add(broadcaster);
 		this.ptrs_to.add(fee_estimator);
 		this.ptrs_to.add(logger);
@@ -155,7 +154,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 	}
 
 	public TwoTuple<Uint8Array, TwoTuple<Number, TxOut>[]>[] transactions_confirmed(Uint8Array header, TwoTuple<Number, Uint8Array>[] txdata, number height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
-		number[] ret = bindings.ChannelMonitor_transactions_confirmed(this.ptr, header, Arrays.stream(txdata).map(txdata_conv_30 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_30.a, txdata_conv_30.b)).toArray(number[]::new), height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
+		number[] ret = bindings.ChannelMonitor_transactions_confirmed(this.ptr, header, txdata != null ? Arrays.stream(txdata).map(txdata_conv_30 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_30.a, txdata_conv_30.b)).toArray(number[]::new) : null, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
 		TwoTuple<Uint8Array, TwoTuple<Number, TxOut>[]>[] ret_conv_49_arr = new TwoTuple[ret.length];
 		for (int x = 0; x < ret.length; x++) {
 			number ret_conv_49 = ret[x];
@@ -177,7 +176,6 @@ import * as bindings from '../bindings' // TODO: figure out location
 			// Warning: We may not free the C tuple object!
 			ret_conv_49_arr[x] = ret_conv_49_conv;
 		}
-		/* TODO 2 TwoTuple<Number, Uint8Array>  */;
 		this.ptrs_to.add(broadcaster);
 		this.ptrs_to.add(fee_estimator);
 		this.ptrs_to.add(logger);
@@ -225,4 +223,23 @@ import * as bindings from '../bindings' // TODO: figure out location
 		return ret;
 	}
 
+	public BestBlock current_best_block() {
+		number ret = bindings.ChannelMonitor_current_best_block(this.ptr);
+		const ret_hu_conv: BestBlock = new BestBlock(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	public Balance[] get_claimable_balances() {
+		number[] ret = bindings.ChannelMonitor_get_claimable_balances(this.ptr);
+		Balance[] ret_conv_9_arr = new Balance[ret.length];
+		for (int j = 0; j < ret.length; j++) {
+			number ret_conv_9 = ret[j];
+			Balance ret_conv_9_hu_conv = Balance.constr_from_ptr(ret_conv_9);
+			ret_conv_9_hu_conv.ptrs_to.add(this);
+			ret_conv_9_arr[j] = ret_conv_9_hu_conv;
+		}
+		return ret_conv_9_arr;
+	}
+
 }