X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FChannelMonitor.ts;h=e6ee3f5f6233e36582bbff4acf93cc30180527db;hb=6f84978154512148a47502caad48038e3f264392;hp=8baaf1897141c0c97ad929fc4d825284bcf7b22f;hpb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;p=ldk-java diff --git a/ts/structs/ChannelMonitor.ts b/ts/structs/ChannelMonitor.ts index 8baaf189..e6ee3f5f 100644 --- a/ts/structs/ChannelMonitor.ts +++ b/ts/structs/ChannelMonitor.ts @@ -51,32 +51,64 @@ import * as bindings from '../bindings' // TODO: figure out location const ret_a_hu_conv: OutPoint = new OutPoint(null, ret_a); ret_a_hu_conv.ptrs_to.add(this);; Uint8Array ret_b = bindings.LDKC2Tuple_OutPointScriptZ_get_b(ret); - TwoTuple ret_conv = new TwoTuple(ret_a_hu_conv, ret_b); + TwoTuple ret_conv = new TwoTuple(ret_a_hu_conv, ret_b, () -> { + bindings.C2Tuple_OutPointScriptZ_free(ret); + }); + ret_a_hu_conv.ptrs_to.add(ret_conv); return ret_conv; } + public TwoTuple[]>[] get_outputs_to_watch() { + number[] ret = bindings.ChannelMonitor_get_outputs_to_watch(this.ptr); + TwoTuple[]>[] ret_conv_54_arr = new TwoTuple[ret.length]; + for (int c = 0; c < ret.length; c++) { + number ret_conv_54 = ret[c]; + Uint8Array ret_conv_54_a = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a(ret_conv_54); + number[] ret_conv_54_b = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(ret_conv_54); + TwoTuple[] ret_conv_54_b_conv_30_arr = new TwoTuple[ret_conv_54_b.length]; + for (int e = 0; e < ret_conv_54_b.length; e++) { + number ret_conv_54_b_conv_30 = ret_conv_54_b[e]; + number ret_conv_54_b_conv_30_a = bindings.LDKC2Tuple_u32ScriptZ_get_a(ret_conv_54_b_conv_30); + Uint8Array ret_conv_54_b_conv_30_b = bindings.LDKC2Tuple_u32ScriptZ_get_b(ret_conv_54_b_conv_30); + TwoTuple ret_conv_54_b_conv_30_conv = new TwoTuple(ret_conv_54_b_conv_30_a, ret_conv_54_b_conv_30_b, () -> { + bindings.C2Tuple_u32ScriptZ_free(ret_conv_54_b_conv_30); + }); + ret_conv_54_b_conv_30_arr[e] = ret_conv_54_b_conv_30_conv; + }; + TwoTuple[]> ret_conv_54_conv = new TwoTuple[]>(ret_conv_54_a, ret_conv_54_b_conv_30_arr); + // Warning: We may not free the C tuple object! + ret_conv_54_arr[c] = ret_conv_54_conv; + } + return ret_conv_54_arr; + } + + public void load_outputs_to_watch(Filter filter) { + bindings.ChannelMonitor_load_outputs_to_watch(this.ptr, filter == null ? 0 : filter.ptr); + this.ptrs_to.add(filter); + } + public MonitorEvent[] get_and_clear_pending_monitor_events() { number[] ret = bindings.ChannelMonitor_get_and_clear_pending_monitor_events(this.ptr); - MonitorEvent[] arr_conv_14_arr = new MonitorEvent[ret.length]; + MonitorEvent[] ret_conv_14_arr = new MonitorEvent[ret.length]; for (int o = 0; o < ret.length; o++) { - number arr_conv_14 = ret[o]; - const arr_conv_14_hu_conv: MonitorEvent = new MonitorEvent(null, arr_conv_14); - arr_conv_14_hu_conv.ptrs_to.add(this); - arr_conv_14_arr[o] = arr_conv_14_hu_conv; + number ret_conv_14 = ret[o]; + MonitorEvent ret_conv_14_hu_conv = MonitorEvent.constr_from_ptr(ret_conv_14); + ret_conv_14_hu_conv.ptrs_to.add(this); + ret_conv_14_arr[o] = ret_conv_14_hu_conv; } - return arr_conv_14_arr; + return ret_conv_14_arr; } public Event[] get_and_clear_pending_events() { number[] ret = bindings.ChannelMonitor_get_and_clear_pending_events(this.ptr); - Event[] arr_conv_7_arr = new Event[ret.length]; + Event[] ret_conv_7_arr = new Event[ret.length]; for (int h = 0; h < ret.length; h++) { - number 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; + number ret_conv_7 = ret[h]; + Event ret_conv_7_hu_conv = Event.constr_from_ptr(ret_conv_7); + ret_conv_7_hu_conv.ptrs_to.add(this); + ret_conv_7_arr[h] = ret_conv_7_hu_conv; } - return arr_conv_7_arr; + return ret_conv_7_arr; } public Uint8Array[] get_latest_holder_commitment_txn(Logger logger) { @@ -86,29 +118,33 @@ import * as bindings from '../bindings' // TODO: figure out location } public TwoTuple[]>[] block_connected(Uint8Array header, TwoTuple[] txdata, number height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) { - number[] ret = bindings.ChannelMonitor_block_connected(this.ptr, header, (number[])Arrays.stream(txdata).map(arr_conv_30 -> bindings.C2Tuple_usizeTransactionZ_new(arr_conv_30.a, arr_conv_30.b)).toArray(), height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr); - TwoTuple[]>[] arr_conv_49_arr = new TwoTuple[ret.length]; + 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); + TwoTuple[]>[] ret_conv_49_arr = new TwoTuple[ret.length]; for (int x = 0; x < ret.length; x++) { - number arr_conv_49 = ret[x]; - Uint8Array arr_conv_49_a = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(arr_conv_49); - number[] arr_conv_49_b = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(arr_conv_49); - TwoTuple[] arr_conv_25_arr = new TwoTuple[arr_conv_49_b.length]; - for (int z = 0; z < arr_conv_49_b.length; z++) { - number arr_conv_25 = arr_conv_49_b[z]; - number arr_conv_25_a = bindings.LDKC2Tuple_u32TxOutZ_get_a(arr_conv_25); - number arr_conv_25_b = bindings.TxOut_clone(bindings.LDKC2Tuple_u32TxOutZ_get_b(arr_conv_25)); - TxOut arr_conv_25_b_conv = new TxOut(null, arr_conv_25_b);; - TwoTuple arr_conv_25_conv = new TwoTuple(arr_conv_25_a, arr_conv_25_b_conv); - arr_conv_25_arr[z] = arr_conv_25_conv; + number ret_conv_49 = ret[x]; + Uint8Array ret_conv_49_a = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(ret_conv_49); + number[] ret_conv_49_b = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(ret_conv_49); + TwoTuple[] ret_conv_49_b_conv_25_arr = new TwoTuple[ret_conv_49_b.length]; + for (int z = 0; z < ret_conv_49_b.length; z++) { + number ret_conv_49_b_conv_25 = ret_conv_49_b[z]; + number ret_conv_49_b_conv_25_a = bindings.LDKC2Tuple_u32TxOutZ_get_a(ret_conv_49_b_conv_25); + number ret_conv_49_b_conv_25_b = bindings.TxOut_clone(bindings.LDKC2Tuple_u32TxOutZ_get_b(ret_conv_49_b_conv_25)); + TxOut ret_conv_49_b_conv_25_b_conv = new TxOut(null, ret_conv_49_b_conv_25_b);; + TwoTuple ret_conv_49_b_conv_25_conv = new TwoTuple(ret_conv_49_b_conv_25_a, ret_conv_49_b_conv_25_b_conv, () -> { + bindings.C2Tuple_u32TxOutZ_free(ret_conv_49_b_conv_25); + }); + ret_conv_49_b_conv_25_b_conv.ptrs_to.add(ret_conv_49_b_conv_25_conv); + ret_conv_49_b_conv_25_arr[z] = ret_conv_49_b_conv_25_conv; }; - TwoTuple[]> arr_conv_49_conv = new TwoTuple[]>(arr_conv_49_a, arr_conv_25_arr); - arr_conv_49_arr[x] = arr_conv_49_conv; + TwoTuple[]> ret_conv_49_conv = new TwoTuple[]>(ret_conv_49_a, ret_conv_49_b_conv_25_arr); + // Warning: We may not free the C tuple object! + ret_conv_49_arr[x] = ret_conv_49_conv; } /* TODO 2 TwoTuple */; this.ptrs_to.add(broadcaster); this.ptrs_to.add(fee_estimator); this.ptrs_to.add(logger); - return arr_conv_49_arr; + return ret_conv_49_arr; } public void block_disconnected(Uint8Array header, number height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) { @@ -118,4 +154,75 @@ import * as bindings from '../bindings' // TODO: figure out location this.ptrs_to.add(logger); } + public TwoTuple[]>[] transactions_confirmed(Uint8Array header, TwoTuple[] 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); + TwoTuple[]>[] ret_conv_49_arr = new TwoTuple[ret.length]; + for (int x = 0; x < ret.length; x++) { + number ret_conv_49 = ret[x]; + Uint8Array ret_conv_49_a = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(ret_conv_49); + number[] ret_conv_49_b = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(ret_conv_49); + TwoTuple[] ret_conv_49_b_conv_25_arr = new TwoTuple[ret_conv_49_b.length]; + for (int z = 0; z < ret_conv_49_b.length; z++) { + number ret_conv_49_b_conv_25 = ret_conv_49_b[z]; + number ret_conv_49_b_conv_25_a = bindings.LDKC2Tuple_u32TxOutZ_get_a(ret_conv_49_b_conv_25); + number ret_conv_49_b_conv_25_b = bindings.TxOut_clone(bindings.LDKC2Tuple_u32TxOutZ_get_b(ret_conv_49_b_conv_25)); + TxOut ret_conv_49_b_conv_25_b_conv = new TxOut(null, ret_conv_49_b_conv_25_b);; + TwoTuple ret_conv_49_b_conv_25_conv = new TwoTuple(ret_conv_49_b_conv_25_a, ret_conv_49_b_conv_25_b_conv, () -> { + bindings.C2Tuple_u32TxOutZ_free(ret_conv_49_b_conv_25); + }); + ret_conv_49_b_conv_25_b_conv.ptrs_to.add(ret_conv_49_b_conv_25_conv); + ret_conv_49_b_conv_25_arr[z] = ret_conv_49_b_conv_25_conv; + }; + TwoTuple[]> ret_conv_49_conv = new TwoTuple[]>(ret_conv_49_a, ret_conv_49_b_conv_25_arr); + // Warning: We may not free the C tuple object! + ret_conv_49_arr[x] = ret_conv_49_conv; + } + /* TODO 2 TwoTuple */; + this.ptrs_to.add(broadcaster); + this.ptrs_to.add(fee_estimator); + this.ptrs_to.add(logger); + return ret_conv_49_arr; + } + + public void transaction_unconfirmed(Uint8Array txid, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) { + bindings.ChannelMonitor_transaction_unconfirmed(this.ptr, txid, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr); + this.ptrs_to.add(broadcaster); + this.ptrs_to.add(fee_estimator); + this.ptrs_to.add(logger); + } + + public TwoTuple[]>[] update_best_block(Uint8Array header, number height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) { + number[] ret = bindings.ChannelMonitor_update_best_block(this.ptr, header, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr); + TwoTuple[]>[] ret_conv_49_arr = new TwoTuple[ret.length]; + for (int x = 0; x < ret.length; x++) { + number ret_conv_49 = ret[x]; + Uint8Array ret_conv_49_a = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(ret_conv_49); + number[] ret_conv_49_b = bindings.LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(ret_conv_49); + TwoTuple[] ret_conv_49_b_conv_25_arr = new TwoTuple[ret_conv_49_b.length]; + for (int z = 0; z < ret_conv_49_b.length; z++) { + number ret_conv_49_b_conv_25 = ret_conv_49_b[z]; + number ret_conv_49_b_conv_25_a = bindings.LDKC2Tuple_u32TxOutZ_get_a(ret_conv_49_b_conv_25); + number ret_conv_49_b_conv_25_b = bindings.TxOut_clone(bindings.LDKC2Tuple_u32TxOutZ_get_b(ret_conv_49_b_conv_25)); + TxOut ret_conv_49_b_conv_25_b_conv = new TxOut(null, ret_conv_49_b_conv_25_b);; + TwoTuple ret_conv_49_b_conv_25_conv = new TwoTuple(ret_conv_49_b_conv_25_a, ret_conv_49_b_conv_25_b_conv, () -> { + bindings.C2Tuple_u32TxOutZ_free(ret_conv_49_b_conv_25); + }); + ret_conv_49_b_conv_25_b_conv.ptrs_to.add(ret_conv_49_b_conv_25_conv); + ret_conv_49_b_conv_25_arr[z] = ret_conv_49_b_conv_25_conv; + }; + TwoTuple[]> ret_conv_49_conv = new TwoTuple[]>(ret_conv_49_a, ret_conv_49_b_conv_25_arr); + // Warning: We may not free the C tuple object! + ret_conv_49_arr[x] = ret_conv_49_conv; + } + this.ptrs_to.add(broadcaster); + this.ptrs_to.add(fee_estimator); + this.ptrs_to.add(logger); + return ret_conv_49_arr; + } + + public Uint8Array[] get_relevant_txids() { + Uint8Array[] ret = bindings.ChannelMonitor_get_relevant_txids(this.ptr); + return ret; + } + }