Merge pull request #113 from TheBlueMatt/main

Update to latest LDK-C-Bindings and fix assorted TS bugs

Author: TheBlueMatt

gen_type_mapping.py

@@ -187,8 +187,6 @@ def _do_map_type_with_info(self, ty_info, print_void, ret_arr_len, is_free, hold
                     if is_nullable:
                         ret_conv = (ret_conv[0], ret_conv[1] + "\n}")
 
-                to_hu_conv = None
-                to_hu_conv_name = None
                 if subty.to_hu_conv is not None:
                     to_hu_conv = self.consts.var_decl_statement(self.consts.c_type_map["uint32_t"][0], conv_name + "_len", self.consts.get_java_arr_len(arr_name)) + ";\n"
                     to_hu_conv += self.consts.var_decl_statement(ty_info.java_hu_ty, conv_name + "_arr", self.consts.constr_hu_array(ty_info, conv_name + "_len"))
@@ -200,6 +198,12 @@ def _do_map_type_with_info(self, ty_info, print_void, ret_arr_len, is_free, hold
                     if cleanup is not None:
                         to_hu_conv += "\n" + cleanup
                     to_hu_conv_name = conv_name + "_arr"
+                else:
+                    to_hu_conv = self.consts.primitive_arr_to_hu(ty_info.subty, None, arr_name, arr_name + "_conv")
+                    if to_hu_conv is not None:
+                        to_hu_conv_name = arr_name + "_conv"
+                    else:
+                        to_hu_conv_name = None
                 from_hu_conv = self.consts.primitive_arr_from_hu(ty_info.subty, None, arr_name)
                 if subty.from_hu_conv is not None:
                     hu_conv_b = ""

genbindings.sh

@@ -237,9 +237,9 @@ else
 			NODE_V="$(node --version)"
 			if [ "${NODE_V:1:2}" -gt 14 ]; then
 				cd ../ts
-				node test/node.mjs
+				node --stack_trace_limit=200 --trace-uncaught test/node.mjs
 				cd ../node-net
-				node test/test.mjs
+				node --stack_trace_limit=200 --trace-uncaught test/test.mjs
 			fi
 		fi
 	fi

src/main/java/org/ldk/impl/bindings.java

@@ -4621,6 +4621,8 @@ public final static class Timeout extends LDKRetry {
 	public static native short DelayedPaymentOutputDescriptor_get_to_self_delay(long this_ptr);
 	// void DelayedPaymentOutputDescriptor_set_to_self_delay(struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr, uint16_t val);
 	public static native void DelayedPaymentOutputDescriptor_set_to_self_delay(long this_ptr, short val);
+	// struct LDKTxOut DelayedPaymentOutputDescriptor_get_output(const struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr);
+	public static native long DelayedPaymentOutputDescriptor_get_output(long this_ptr);
 	// void DelayedPaymentOutputDescriptor_set_output(struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr, struct LDKTxOut val);
 	public static native void DelayedPaymentOutputDescriptor_set_output(long this_ptr, long val);
 	// struct LDKPublicKey DelayedPaymentOutputDescriptor_get_revocation_pubkey(const struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr);
@@ -4651,6 +4653,8 @@ public final static class Timeout extends LDKRetry {
 	public static native long StaticPaymentOutputDescriptor_get_outpoint(long this_ptr);
 	// void StaticPaymentOutputDescriptor_set_outpoint(struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR this_ptr, struct LDKOutPoint val);
 	public static native void StaticPaymentOutputDescriptor_set_outpoint(long this_ptr, long val);
+	// struct LDKTxOut StaticPaymentOutputDescriptor_get_output(const struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR this_ptr);
+	public static native long StaticPaymentOutputDescriptor_get_output(long this_ptr);
 	// void StaticPaymentOutputDescriptor_set_output(struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR this_ptr, struct LDKTxOut val);
 	public static native void StaticPaymentOutputDescriptor_set_output(long this_ptr, long val);
 	// const uint8_t (*StaticPaymentOutputDescriptor_get_channel_keys_id(const struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR this_ptr))[32];
@@ -5561,6 +5565,8 @@ public final static class Timeout extends LDKRetry {
 	public static native byte[] CommitmentSigned_get_signature(long this_ptr);
 	// void CommitmentSigned_set_signature(struct LDKCommitmentSigned *NONNULL_PTR this_ptr, struct LDKSignature val);
 	public static native void CommitmentSigned_set_signature(long this_ptr, byte[] val);
+	// struct LDKCVec_SignatureZ CommitmentSigned_get_htlc_signatures(const struct LDKCommitmentSigned *NONNULL_PTR this_ptr);
+	public static native byte[][] CommitmentSigned_get_htlc_signatures(long this_ptr);
 	// void CommitmentSigned_set_htlc_signatures(struct LDKCommitmentSigned *NONNULL_PTR this_ptr, struct LDKCVec_SignatureZ val);
 	public static native void CommitmentSigned_set_htlc_signatures(long this_ptr, byte[][] val);
 	// MUST_USE_RES struct LDKCommitmentSigned CommitmentSigned_new(struct LDKThirtyTwoBytes channel_id_arg, struct LDKSignature signature_arg, struct LDKCVec_SignatureZ htlc_signatures_arg);
@@ -5705,6 +5711,8 @@ public final static class Timeout extends LDKRetry {
 	public static native byte[] UnsignedNodeAnnouncement_get_alias(long this_ptr);
 	// void UnsignedNodeAnnouncement_set_alias(struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val);
 	public static native void UnsignedNodeAnnouncement_set_alias(long this_ptr, byte[] val);
+	// struct LDKCVec_NetAddressZ UnsignedNodeAnnouncement_get_addresses(const struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr);
+	public static native long[] UnsignedNodeAnnouncement_get_addresses(long this_ptr);
 	// void UnsignedNodeAnnouncement_set_addresses(struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr, struct LDKCVec_NetAddressZ val);
 	public static native void UnsignedNodeAnnouncement_set_addresses(long this_ptr, long[] val);
 	// uintptr_t UnsignedNodeAnnouncement_clone_ptr(LDKUnsignedNodeAnnouncement *NONNULL_PTR arg);
@@ -5827,6 +5835,8 @@ public final static class Timeout extends LDKRetry {
 	public static native int UnsignedChannelUpdate_get_fee_proportional_millionths(long this_ptr);
 	// void UnsignedChannelUpdate_set_fee_proportional_millionths(struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr, uint32_t val);
 	public static native void UnsignedChannelUpdate_set_fee_proportional_millionths(long this_ptr, int val);
+	// struct LDKCVec_u8Z UnsignedChannelUpdate_get_excess_data(const struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr);
+	public static native byte[] UnsignedChannelUpdate_get_excess_data(long this_ptr);
 	// void UnsignedChannelUpdate_set_excess_data(struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr, struct LDKCVec_u8Z val);
 	public static native void UnsignedChannelUpdate_set_excess_data(long this_ptr, byte[] val);
 	// MUST_USE_RES struct LDKUnsignedChannelUpdate UnsignedChannelUpdate_new(struct LDKThirtyTwoBytes chain_hash_arg, uint64_t short_channel_id_arg, uint32_t timestamp_arg, uint8_t flags_arg, uint16_t cltv_expiry_delta_arg, uint64_t htlc_minimum_msat_arg, uint64_t htlc_maximum_msat_arg, uint32_t fee_base_msat_arg, uint32_t fee_proportional_millionths_arg, struct LDKCVec_u8Z excess_data_arg);
@@ -5889,6 +5899,8 @@ public final static class Timeout extends LDKRetry {
 	public static native boolean ReplyChannelRange_get_sync_complete(long this_ptr);
 	// void ReplyChannelRange_set_sync_complete(struct LDKReplyChannelRange *NONNULL_PTR this_ptr, bool val);
 	public static native void ReplyChannelRange_set_sync_complete(long this_ptr, boolean val);
+	// struct LDKCVec_u64Z ReplyChannelRange_get_short_channel_ids(const struct LDKReplyChannelRange *NONNULL_PTR this_ptr);
+	public static native long[] ReplyChannelRange_get_short_channel_ids(long this_ptr);
 	// void ReplyChannelRange_set_short_channel_ids(struct LDKReplyChannelRange *NONNULL_PTR this_ptr, struct LDKCVec_u64Z val);
 	public static native void ReplyChannelRange_set_short_channel_ids(long this_ptr, long[] val);
 	// MUST_USE_RES struct LDKReplyChannelRange ReplyChannelRange_new(struct LDKThirtyTwoBytes chain_hash_arg, uint32_t first_blocknum_arg, uint32_t number_of_blocks_arg, bool sync_complete_arg, struct LDKCVec_u64Z short_channel_ids_arg);
@@ -5903,6 +5915,8 @@ public final static class Timeout extends LDKRetry {
 	public static native byte[] QueryShortChannelIds_get_chain_hash(long this_ptr);
 	// void QueryShortChannelIds_set_chain_hash(struct LDKQueryShortChannelIds *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val);
 	public static native void QueryShortChannelIds_set_chain_hash(long this_ptr, byte[] val);
+	// struct LDKCVec_u64Z QueryShortChannelIds_get_short_channel_ids(const struct LDKQueryShortChannelIds *NONNULL_PTR this_ptr);
+	public static native long[] QueryShortChannelIds_get_short_channel_ids(long this_ptr);
 	// void QueryShortChannelIds_set_short_channel_ids(struct LDKQueryShortChannelIds *NONNULL_PTR this_ptr, struct LDKCVec_u64Z val);
 	public static native void QueryShortChannelIds_set_short_channel_ids(long this_ptr, long[] val);
 	// MUST_USE_RES struct LDKQueryShortChannelIds QueryShortChannelIds_new(struct LDKThirtyTwoBytes chain_hash_arg, struct LDKCVec_u64Z short_channel_ids_arg);
@@ -6453,6 +6467,8 @@ public final static class Timeout extends LDKRetry {
 	public static native byte[] HolderCommitmentTransaction_get_counterparty_sig(long this_ptr);
 	// void HolderCommitmentTransaction_set_counterparty_sig(struct LDKHolderCommitmentTransaction *NONNULL_PTR this_ptr, struct LDKSignature val);
 	public static native void HolderCommitmentTransaction_set_counterparty_sig(long this_ptr, byte[] val);
+	// struct LDKCVec_SignatureZ HolderCommitmentTransaction_get_counterparty_htlc_sigs(const struct LDKHolderCommitmentTransaction *NONNULL_PTR this_ptr);
+	public static native byte[][] HolderCommitmentTransaction_get_counterparty_htlc_sigs(long this_ptr);
 	// void HolderCommitmentTransaction_set_counterparty_htlc_sigs(struct LDKHolderCommitmentTransaction *NONNULL_PTR this_ptr, struct LDKCVec_SignatureZ val);
 	public static native void HolderCommitmentTransaction_set_counterparty_htlc_sigs(long this_ptr, byte[][] val);
 	// uintptr_t HolderCommitmentTransaction_clone_ptr(LDKHolderCommitmentTransaction *NONNULL_PTR arg);
@@ -7143,6 +7159,8 @@ public final static class Timeout extends LDKRetry {
 	public static native long NodeAnnouncementInfo_get_alias(long this_ptr);
 	// void NodeAnnouncementInfo_set_alias(struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr, struct LDKNodeAlias val);
 	public static native void NodeAnnouncementInfo_set_alias(long this_ptr, long val);
+	// struct LDKCVec_NetAddressZ NodeAnnouncementInfo_get_addresses(const struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr);
+	public static native long[] NodeAnnouncementInfo_get_addresses(long this_ptr);
 	// void NodeAnnouncementInfo_set_addresses(struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr, struct LDKCVec_NetAddressZ val);
 	public static native void NodeAnnouncementInfo_set_addresses(long this_ptr, long[] val);
 	// struct LDKNodeAnnouncement NodeAnnouncementInfo_get_announcement_message(const struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr);
@@ -7177,6 +7195,8 @@ public final static class Timeout extends LDKRetry {
 	public static native long NodeAlias_read(byte[] ser);
 	// void NodeInfo_free(struct LDKNodeInfo this_obj);
 	public static native void NodeInfo_free(long this_obj);
+	// struct LDKCVec_u64Z NodeInfo_get_channels(const struct LDKNodeInfo *NONNULL_PTR this_ptr);
+	public static native long[] NodeInfo_get_channels(long this_ptr);
 	// void NodeInfo_set_channels(struct LDKNodeInfo *NONNULL_PTR this_ptr, struct LDKCVec_u64Z val);
 	public static native void NodeInfo_set_channels(long this_ptr, long[] val);
 	// struct LDKRoutingFees NodeInfo_get_lowest_inbound_channel_fees(const struct LDKNodeInfo *NONNULL_PTR this_ptr);
@@ -7233,8 +7253,12 @@ public final static class Timeout extends LDKRetry {
 	public static native long NetworkGraph_update_channel_unsigned(long this_arg, long msg);
 	// MUST_USE_RES struct LDKChannelInfo ReadOnlyNetworkGraph_channel(const struct LDKReadOnlyNetworkGraph *NONNULL_PTR this_arg, uint64_t short_channel_id);
 	public static native long ReadOnlyNetworkGraph_channel(long this_arg, long short_channel_id);
+	// MUST_USE_RES struct LDKCVec_u64Z ReadOnlyNetworkGraph_list_channels(const struct LDKReadOnlyNetworkGraph *NONNULL_PTR this_arg);
+	public static native long[] ReadOnlyNetworkGraph_list_channels(long this_arg);
 	// MUST_USE_RES struct LDKNodeInfo ReadOnlyNetworkGraph_node(const struct LDKReadOnlyNetworkGraph *NONNULL_PTR this_arg, const struct LDKNodeId *NONNULL_PTR node_id);
 	public static native long ReadOnlyNetworkGraph_node(long this_arg, long node_id);
+	// MUST_USE_RES struct LDKCVec_NodeIdZ ReadOnlyNetworkGraph_list_nodes(const struct LDKReadOnlyNetworkGraph *NONNULL_PTR this_arg);
+	public static native long[] ReadOnlyNetworkGraph_list_nodes(long this_arg);
 	// MUST_USE_RES struct LDKCOption_CVec_NetAddressZZ ReadOnlyNetworkGraph_get_addresses(const struct LDKReadOnlyNetworkGraph *NONNULL_PTR this_arg, struct LDKPublicKey pubkey);
 	public static native long ReadOnlyNetworkGraph_get_addresses(long this_arg, byte[] pubkey);
 	// void RouteHop_free(struct LDKRouteHop this_obj);
@@ -7359,6 +7383,8 @@ public final static class Timeout extends LDKRetry {
 	public static native byte PaymentParameters_get_max_channel_saturation_power_of_half(long this_ptr);
 	// void PaymentParameters_set_max_channel_saturation_power_of_half(struct LDKPaymentParameters *NONNULL_PTR this_ptr, uint8_t val);
 	public static native void PaymentParameters_set_max_channel_saturation_power_of_half(long this_ptr, byte val);
+	// struct LDKCVec_u64Z PaymentParameters_get_previously_failed_channels(const struct LDKPaymentParameters *NONNULL_PTR this_ptr);
+	public static native long[] PaymentParameters_get_previously_failed_channels(long this_ptr);
 	// void PaymentParameters_set_previously_failed_channels(struct LDKPaymentParameters *NONNULL_PTR this_ptr, struct LDKCVec_u64Z val);
 	public static native void PaymentParameters_set_previously_failed_channels(long this_ptr, long[] val);
 	// MUST_USE_RES struct LDKPaymentParameters PaymentParameters_new(struct LDKPublicKey payee_pubkey_arg, struct LDKInvoiceFeatures features_arg, struct LDKCVec_RouteHintZ route_hints_arg, struct LDKCOption_u64Z expiry_time_arg, uint32_t max_total_cltv_expiry_delta_arg, uint8_t max_path_count_arg, uint8_t max_channel_saturation_power_of_half_arg, struct LDKCVec_u64Z previously_failed_channels_arg);

src/main/java/org/ldk/structs/CommitmentSigned.java

@@ -56,6 +56,17 @@ public void set_signature(byte[] val) {
 		Reference.reachabilityFence(val);
 	}
 
+	/**
+	 * Signatures on the HTLC transactions
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public byte[][] get_htlc_signatures() {
+		byte[][] ret = bindings.CommitmentSigned_get_htlc_signatures(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Signatures on the HTLC transactions
 	 */

src/main/java/org/ldk/structs/DelayedPaymentOutputDescriptor.java

@@ -80,6 +80,19 @@ public void set_to_self_delay(short val) {
 		Reference.reachabilityFence(val);
 	}
 
+	/**
+	 * The output which is referenced by the given outpoint
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public TxOut get_output() {
+		long ret = bindings.DelayedPaymentOutputDescriptor_get_output(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		TxOut ret_conv = new TxOut(null, ret);
+		return ret_conv;
+	}
+
 	/**
 	 * The output which is referenced by the given outpoint
 	 */

src/main/java/org/ldk/structs/HolderCommitmentTransaction.java

@@ -40,6 +40,17 @@ public void set_counterparty_sig(byte[] val) {
 		Reference.reachabilityFence(val);
 	}
 
+	/**
+	 * All non-dust counterparty HTLC signatures, in the order they appear in the transaction
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public byte[][] get_counterparty_htlc_sigs() {
+		byte[][] ret = bindings.HolderCommitmentTransaction_get_counterparty_htlc_sigs(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * All non-dust counterparty HTLC signatures, in the order they appear in the transaction
 	 */

src/main/java/org/ldk/structs/NodeAnnouncementInfo.java

@@ -104,6 +104,25 @@ public void set_alias(NodeAlias val) {
 		Reference.reachabilityFence(val);
 	}
 
+	/**
+	 * Internet-level addresses via which one can connect to the node
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public NetAddress[] get_addresses() {
+		long[] ret = bindings.NodeAnnouncementInfo_get_addresses(this.ptr);
+		Reference.reachabilityFence(this);
+		int ret_conv_12_len = ret.length;
+		NetAddress[] ret_conv_12_arr = new NetAddress[ret_conv_12_len];
+		for (int m = 0; m < ret_conv_12_len; m++) {
+			long ret_conv_12 = ret[m];
+			org.ldk.structs.NetAddress ret_conv_12_hu_conv = org.ldk.structs.NetAddress.constr_from_ptr(ret_conv_12);
+			ret_conv_12_hu_conv.ptrs_to.add(this);
+			ret_conv_12_arr[m] = ret_conv_12_hu_conv;
+		}
+		return ret_conv_12_arr;
+	}
+
 	/**
 	 * Internet-level addresses via which one can connect to the node
 	 */

src/main/java/org/ldk/structs/NodeInfo.java

@@ -20,6 +20,17 @@ protected void finalize() throws Throwable {
 		if (ptr != 0) { bindings.NodeInfo_free(ptr); }
 	}
 
+	/**
+	 * All valid channels a node has announced
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public long[] get_channels() {
+		long[] ret = bindings.NodeInfo_get_channels(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * All valid channels a node has announced
 	 */

src/main/java/org/ldk/structs/PaymentParameters.java

@@ -203,6 +203,19 @@ public void set_max_channel_saturation_power_of_half(byte val) {
 		Reference.reachabilityFence(val);
 	}
 
+	/**
+	 * A list of SCIDs which this payment was previously attempted over and which caused the
+	 * payment to fail. Future attempts for the same payment shouldn't be relayed through any of
+	 * these SCIDs.
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public long[] get_previously_failed_channels() {
+		long[] ret = bindings.PaymentParameters_get_previously_failed_channels(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * A list of SCIDs which this payment was previously attempted over and which caused the
 	 * payment to fail. Future attempts for the same payment shouldn't be relayed through any of

src/main/java/org/ldk/structs/QueryShortChannelIds.java

@@ -45,6 +45,17 @@ public void set_chain_hash(byte[] val) {
 		Reference.reachabilityFence(val);
 	}
 
+	/**
+	 * The short_channel_ids that are being queried
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public long[] get_short_channel_ids() {
+		long[] ret = bindings.QueryShortChannelIds_get_short_channel_ids(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * The short_channel_ids that are being queried
 	 */