X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelManager.java;h=4878056820d2e08f2ad72dcd374cd2b7461e65e7;hb=246459dcbc3be28c38b4951140a5933f4b3aa024;hp=dbf4fedaeccf18e9bb53ea97a5e8dce395b55234;hpb=2ed9081562d00a8645604b07629e963231d49e0f;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelManager.java b/src/main/java/org/ldk/structs/ChannelManager.java
index dbf4feda..48780568 100644
--- a/src/main/java/org/ldk/structs/ChannelManager.java
+++ b/src/main/java/org/ldk/structs/ChannelManager.java
@@ -2,43 +2,95 @@ 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 ChannelManager extends CommonBase {
 	ChannelManager(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.ChannelManager_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.ChannelManager_free(ptr); }
 	}
 
-	public ChannelManager(LDKNetwork network, FeeEstimator fee_est, Watch chain_monitor, BroadcasterInterface tx_broadcaster, Logger logger, KeysInterface keys_manager, UserConfig config, long current_blockchain_height) {
-		super(bindings.ChannelManager_new(network, 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, current_blockchain_height));
-		this.ptrs_to.add(fee_est);
-		this.ptrs_to.add(chain_monitor);
-		this.ptrs_to.add(tx_broadcaster);
-		this.ptrs_to.add(logger);
-		this.ptrs_to.add(keys_manager);
-		this.ptrs_to.add(config);
+	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, byte[] params_latest_hash_arg, long params_latest_height_arg) {
+		long 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_latest_hash_arg, params_latest_height_arg));
+		ChannelManager ret_hu_conv = new ChannelManager(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(fee_est);
+		ret_hu_conv.ptrs_to.add(chain_monitor);
+		ret_hu_conv.ptrs_to.add(tx_broadcaster);
+		ret_hu_conv.ptrs_to.add(logger);
+		ret_hu_conv.ptrs_to.add(keys_manager);
+		ret_hu_conv.ptrs_to.add(config);
+		return ret_hu_conv;
 	}
 
-	// Skipped ChannelManager_create_channel
-	// Skipped ChannelManager_list_channels
-	// Skipped ChannelManager_list_usable_channels
-	// Skipped ChannelManager_close_channel
-	public void force_close_channel(byte[] channel_id) {
-		bindings.ChannelManager_force_close_channel(this.ptr, channel_id);
+	public Result_NoneAPIErrorZ create_channel(byte[] their_network_key, long channel_value_satoshis, long push_msat, long user_id, UserConfig override_config) {
+		long ret = bindings.ChannelManager_create_channel(this.ptr, their_network_key, channel_value_satoshis, push_msat, user_id, override_config == null ? 0 : override_config.ptr & ~1);
+		Result_NoneAPIErrorZ ret_hu_conv = Result_NoneAPIErrorZ.constr_from_ptr(ret);
+		this.ptrs_to.add(override_config);
+		return ret_hu_conv;
+	}
+
+	public ChannelDetails[] list_channels() {
+		long[] ret = bindings.ChannelManager_list_channels(this.ptr);
+		ChannelDetails[] ret_conv_16_arr = new ChannelDetails[ret.length];
+		for (int q = 0; q < ret.length; q++) {
+			long ret_conv_16 = ret[q];
+			ChannelDetails ret_conv_16_hu_conv = new ChannelDetails(null, ret_conv_16);
+			ret_conv_16_hu_conv.ptrs_to.add(this);
+			ret_conv_16_arr[q] = ret_conv_16_hu_conv;
+		}
+		return ret_conv_16_arr;
+	}
+
+	public ChannelDetails[] list_usable_channels() {
+		long[] ret = bindings.ChannelManager_list_usable_channels(this.ptr);
+		ChannelDetails[] ret_conv_16_arr = new ChannelDetails[ret.length];
+		for (int q = 0; q < ret.length; q++) {
+			long ret_conv_16 = ret[q];
+			ChannelDetails ret_conv_16_hu_conv = new ChannelDetails(null, ret_conv_16);
+			ret_conv_16_hu_conv.ptrs_to.add(this);
+			ret_conv_16_arr[q] = ret_conv_16_hu_conv;
+		}
+		return ret_conv_16_arr;
+	}
+
+	public Result_NoneAPIErrorZ close_channel(byte[] channel_id) {
+		long ret = bindings.ChannelManager_close_channel(this.ptr, channel_id);
+		Result_NoneAPIErrorZ ret_hu_conv = Result_NoneAPIErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
+	}
+
+	public Result_NoneAPIErrorZ force_close_channel(byte[] channel_id) {
+		long ret = bindings.ChannelManager_force_close_channel(this.ptr, channel_id);
+		Result_NoneAPIErrorZ ret_hu_conv = Result_NoneAPIErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 	public void force_close_all_channels() {
 		bindings.ChannelManager_force_close_all_channels(this.ptr);
 	}
 
-	// Skipped ChannelManager_send_payment
+	public Result_NonePaymentSendFailureZ send_payment(Route route, byte[] payment_hash, byte[] payment_secret) {
+		long ret = bindings.ChannelManager_send_payment(this.ptr, route == null ? 0 : route.ptr & ~1, payment_hash, payment_secret);
+		Result_NonePaymentSendFailureZ ret_hu_conv = Result_NonePaymentSendFailureZ.constr_from_ptr(ret);
+		this.ptrs_to.add(route);
+		return ret_hu_conv;
+	}
+
 	public void funding_transaction_generated(byte[] temporary_channel_id, OutPoint funding_txo) {
 		bindings.ChannelManager_funding_transaction_generated(this.ptr, temporary_channel_id, funding_txo == null ? 0 : funding_txo.ptr & ~1);
 		this.ptrs_to.add(funding_txo);
 	}
 
-	// Skipped ChannelManager_broadcast_node_announcement
+	public void broadcast_node_announcement(byte[] rgb, byte[] alias, NetAddress[] addresses) {
+		bindings.ChannelManager_broadcast_node_announcement(this.ptr, rgb, alias, Arrays.stream(addresses).mapToLong(addresses_conv_12 -> addresses_conv_12.ptr).toArray());
+		/* TODO 2 NetAddress  */;
+	}
+
 	public void process_pending_htlc_forwards() {
 		bindings.ChannelManager_process_pending_htlc_forwards(this.ptr);
 	}
@@ -68,25 +120,48 @@ public class ChannelManager extends CommonBase {
 	}
 
 	public MessageSendEventsProvider as_MessageSendEventsProvider() {
-		MessageSendEventsProvider ret = new MessageSendEventsProvider(null, bindings.ChannelManager_as_MessageSendEventsProvider(this.ptr));
-		ret.ptrs_to.add(this);
-		return ret;
+		long ret = bindings.ChannelManager_as_MessageSendEventsProvider(this.ptr);
+		MessageSendEventsProvider ret_hu_conv = new MessageSendEventsProvider(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
 	public EventsProvider as_EventsProvider() {
-		EventsProvider ret = new EventsProvider(null, bindings.ChannelManager_as_EventsProvider(this.ptr));
-		ret.ptrs_to.add(this);
-		return ret;
+		long ret = bindings.ChannelManager_as_EventsProvider(this.ptr);
+		EventsProvider ret_hu_conv = new EventsProvider(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	public Listen as_Listen() {
+		long ret = bindings.ChannelManager_as_Listen(this.ptr);
+		Listen ret_hu_conv = new Listen(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	public void block_connected(byte[] header, TwoTuple<Long, byte[]>[] txdata, int height) {
+		bindings.ChannelManager_block_connected(this.ptr, header, Arrays.stream(txdata).mapToLong(txdata_conv_24 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_24.a, txdata_conv_24.b)).toArray(), height);
+		/* TODO 2 TwoTuple<Long, byte[]>  */;
 	}
 
-	// Skipped ChannelManager_block_connected
 	public void block_disconnected(byte[] header) {
 		bindings.ChannelManager_block_disconnected(this.ptr, header);
 	}
 
+	public void await_persistable_update() {
+		bindings.ChannelManager_await_persistable_update(this.ptr);
+	}
+
 	public ChannelMessageHandler as_ChannelMessageHandler() {
-		ChannelMessageHandler ret = new ChannelMessageHandler(null, bindings.ChannelManager_as_ChannelMessageHandler(this.ptr));
-		ret.ptrs_to.add(this);
+		long ret = bindings.ChannelManager_as_ChannelMessageHandler(this.ptr);
+		ChannelMessageHandler ret_hu_conv = new ChannelMessageHandler(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	public byte[] write() {
+		byte[] ret = bindings.ChannelManager_write(this.ptr);
 		return ret;
 	}