X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelMonitor.java;h=5281d6d0f22e28ef43ecdb1dddfcd82206044113;hb=18faab2952bff2302d55528dea556246be63950a;hp=b484c92fbadca6ec6c61badaea29c315b2e10823;hpb=00e9cb703daea4fae4c89b14c8a584677ad74fca;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ChannelMonitor.java b/src/main/java/org/ldk/structs/ChannelMonitor.java index b484c92f..5281d6d0 100644 --- a/src/main/java/org/ldk/structs/ChannelMonitor.java +++ b/src/main/java/org/ldk/structs/ChannelMonitor.java @@ -53,20 +53,14 @@ public class ChannelMonitor extends CommonBase { 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[] block_connected(byte[] header, TwoTuple[] 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 -> bindings.C2Tuple_usizeTransactionZ_new(arr_conv_29.a, arr_conv_29.b.ptr)).toArray(), height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr); + public TwoTuple[] block_connected(byte[] header, TwoTuple[] 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[] arr_conv_27_arr = new TwoTuple[ret.length]; for (int b = 0; b < ret.length; b++) { long arr_conv_27 = ret[b]; @@ -81,7 +75,7 @@ public class ChannelMonitor extends CommonBase { TwoTuple arr_conv_27_conv = new TwoTuple(arr_conv_27_a, arr_conv_7_arr); arr_conv_27_arr[b] = arr_conv_27_conv; } - /* TODO 2 TwoTuple */; + /* TODO 2 TwoTuple */; this.ptrs_to.add(broadcaster); this.ptrs_to.add(fee_estimator); this.ptrs_to.add(logger);