X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FChannelManager.ts;h=1e6443d4715885e485f135e1a96ccdd9e27b869b;hb=b6cc0960eaee5a5bbc7fde79a56152d6dcd649d8;hp=bced3f3df04c1b3752cc18d19ddaf936d0dc2565;hpb=6f84978154512148a47502caad48038e3f264392;p=ldk-java

diff --git a/ts/structs/ChannelManager.ts b/ts/structs/ChannelManager.ts
index bced3f3d..1e6443d4 100644
--- a/ts/structs/ChannelManager.ts
+++ b/ts/structs/ChannelManager.ts
@@ -18,8 +18,8 @@ import * as bindings from '../bindings' // TODO: figure out location
                         bindings.ChannelManager_free(this.ptr);
                     }
                 }
-	public static ChannelManager constructor_new(FeeEstimator fee_est, Watch chain_monitor, BroadcasterInterface tx_broadcaster, Logger logger, KeysInterface keys_manager, UserConfig config, LDKNetwork params_network_arg, BestBlock params_best_block_arg) {
-		number ret = bindings.ChannelManager_new(fee_est == null ? 0 : fee_est.ptr, chain_monitor == null ? 0 : chain_monitor.ptr, tx_broadcaster == null ? 0 : tx_broadcaster.ptr, logger == null ? 0 : logger.ptr, keys_manager == null ? 0 : keys_manager.ptr, config == null ? 0 : config.ptr & ~1, bindings.ChainParameters_new(params_network_arg, params_best_block_arg == null ? 0 : params_best_block_arg.ptr & ~1));
+	public static ChannelManager constructor_new(FeeEstimator fee_est, Watch chain_monitor, BroadcasterInterface tx_broadcaster, Logger logger, KeysInterface keys_manager, UserConfig config, ChainParameters params) {
+		number ret = bindings.ChannelManager_new(fee_est == null ? 0 : fee_est.ptr, chain_monitor == null ? 0 : chain_monitor.ptr, tx_broadcaster == null ? 0 : tx_broadcaster.ptr, logger == null ? 0 : logger.ptr, keys_manager == null ? 0 : keys_manager.ptr, config == null ? 0 : config.ptr & ~1, params == null ? 0 : params.ptr & ~1);
 		const ret_hu_conv: ChannelManager = new ChannelManager(null, ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		ret_hu_conv.ptrs_to.add(fee_est);
@@ -28,7 +28,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 		ret_hu_conv.ptrs_to.add(logger);
 		ret_hu_conv.ptrs_to.add(keys_manager);
 		ret_hu_conv.ptrs_to.add(config);
-		ret_hu_conv.ptrs_to.add(params_best_block_arg);
+		ret_hu_conv.ptrs_to.add(params);
 		return ret_hu_conv;
 	}
 
@@ -112,13 +112,13 @@ import * as bindings from '../bindings' // TODO: figure out location
 		bindings.ChannelManager_timer_tick_occurred(this.ptr);
 	}
 
-	public boolean fail_htlc_backwards(Uint8Array payment_hash, Uint8Array payment_secret) {
-		boolean ret = bindings.ChannelManager_fail_htlc_backwards(this.ptr, payment_hash, payment_secret);
+	public boolean fail_htlc_backwards(Uint8Array payment_hash) {
+		boolean ret = bindings.ChannelManager_fail_htlc_backwards(this.ptr, payment_hash);
 		return ret;
 	}
 
-	public boolean claim_funds(Uint8Array payment_preimage, Uint8Array payment_secret, number expected_amount) {
-		boolean ret = bindings.ChannelManager_claim_funds(this.ptr, payment_preimage, payment_secret, expected_amount);
+	public boolean claim_funds(Uint8Array payment_preimage) {
+		boolean ret = bindings.ChannelManager_claim_funds(this.ptr, payment_preimage);
 		return ret;
 	}
 
@@ -132,6 +132,22 @@ import * as bindings from '../bindings' // TODO: figure out location
 		this.ptrs_to.add(funding_txo);
 	}
 
+	public TwoTuple<Uint8Array, Uint8Array> create_inbound_payment(Option_u64Z min_value_msat, number invoice_expiry_delta_secs, number user_payment_id) {
+		number ret = bindings.ChannelManager_create_inbound_payment(this.ptr, min_value_msat.ptr, invoice_expiry_delta_secs, user_payment_id);
+		Uint8Array ret_a = bindings.LDKC2Tuple_PaymentHashPaymentSecretZ_get_a(ret);
+		Uint8Array ret_b = bindings.LDKC2Tuple_PaymentHashPaymentSecretZ_get_b(ret);
+		TwoTuple<Uint8Array, Uint8Array> ret_conv = new TwoTuple<Uint8Array, Uint8Array>(ret_a, ret_b, () -> {
+			bindings.C2Tuple_PaymentHashPaymentSecretZ_free(ret);
+		});
+		return ret_conv;
+	}
+
+	public Result_PaymentSecretAPIErrorZ create_inbound_payment_for_hash(Uint8Array payment_hash, Option_u64Z min_value_msat, number invoice_expiry_delta_secs, number user_payment_id) {
+		number ret = bindings.ChannelManager_create_inbound_payment_for_hash(this.ptr, payment_hash, min_value_msat.ptr, invoice_expiry_delta_secs, user_payment_id);
+		Result_PaymentSecretAPIErrorZ ret_hu_conv = Result_PaymentSecretAPIErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
+	}
+
 	public MessageSendEventsProvider as_MessageSendEventsProvider() {
 		number ret = bindings.ChannelManager_as_MessageSendEventsProvider(this.ptr);
 		MessageSendEventsProvider ret_hu_conv = new MessageSendEventsProvider(null, ret);
@@ -153,22 +169,11 @@ import * as bindings from '../bindings' // TODO: figure out location
 		return ret_hu_conv;
 	}
 
-	public void transactions_confirmed(Uint8Array header, number height, TwoTuple<Number, Uint8Array>[] txdata) {
-		bindings.ChannelManager_transactions_confirmed(this.ptr, header, height, Arrays.stream(txdata).map(txdata_conv_30 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_30.a, txdata_conv_30.b)).toArray(number[]::new));
-		/* TODO 2 TwoTuple<Number, Uint8Array>  */;
-	}
-
-	public void update_best_block(Uint8Array header, number height) {
-		bindings.ChannelManager_update_best_block(this.ptr, header, height);
-	}
-
-	public Uint8Array[] get_relevant_txids() {
-		Uint8Array[] ret = bindings.ChannelManager_get_relevant_txids(this.ptr);
-		return ret;
-	}
-
-	public void transaction_unconfirmed(Uint8Array txid) {
-		bindings.ChannelManager_transaction_unconfirmed(this.ptr, txid);
+	public Confirm as_Confirm() {
+		number ret = bindings.ChannelManager_as_Confirm(this.ptr);
+		Confirm ret_hu_conv = new Confirm(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
 	public boolean await_persistable_update_timeout(number max_wait) {