[TS] Update auto-generated bindings with changes + upstream changes

TheBlueMatt · TheBlueMatt · commit bbf1ef578b7c · 2022-08-05T21:43:20.000Z
diff --git a/ts/bindings.c b/ts/bindings.c
diff --git a/ts/bindings.c.body b/ts/bindings.c.body
diff --git a/ts/bindings.mts b/ts/bindings.mts
diff --git a/ts/structs/CommitmentSigned.mts b/ts/structs/CommitmentSigned.mts
@@ -397,6 +397,24 @@ export class CommitmentSigned extends CommonBase {
 		bindings.CommitmentSigned_set_signature(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(val, 64)));
 	}
 
+	/**
+	 * Signatures on the HTLC transactions
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public get_htlc_signatures(): Uint8Array[] {
+		const ret: number = bindings.CommitmentSigned_get_htlc_signatures(this.ptr);
+		const ret_conv_12_len: number = bindings.getArrayLength(ret);
+		const ret_conv_12_arr: Uint8Array[] = new Array(ret_conv_12_len).fill(null);
+		for (var m = 0; m < ret_conv_12_len; m++) {
+			const ret_conv_12: number = bindings.getU32ArrayElem(ret, m);
+			const ret_conv_12_conv: Uint8Array = bindings.decodeUint8Array(ret_conv_12);
+			ret_conv_12_arr[m] = ret_conv_12_conv;
+		}
+		bindings.freeWasmMemory(ret)
+		return ret_conv_12_arr;
+	}
+
 	/**
 	 * Signatures on the HTLC transactions
 	 */
diff --git a/ts/structs/CommonBase.mts b/ts/structs/CommonBase.mts
@@ -367,7 +367,7 @@ export class CommonBase {
 	protected constructor(ptr: number, free_fn: (ptr: number) => void) {
 		this.ptr = ptr;
 		if (Number.isFinite(ptr) && ptr != 0){
-			finalizer.register(this, get_freeer(ptr, free_fn));
+			finalizer.register(this, get_freeer(ptr, free_fn), this);
 		}
 	}
 	// In Java, protected means "any subclass can access fields on any other subclass'"
@@ -381,7 +381,10 @@ export class CommonBase {
 	}
 	protected static set_null_skip_free(o: CommonBase) {
 		o.ptr = 0;
-		finalizer.unregister(o);
+		// @ts-ignore TypeScript is wrong about the returnvalue of unregister here!
+		const did_unregister: boolean = finalizer.unregister(o);
+		if (!did_unregister)
+			throw new Error("FinalizationRegistry unregister should always unregister unless you double-free'd");
 	}
 }
 
diff --git a/ts/structs/DelayedPaymentOutputDescriptor.mts b/ts/structs/DelayedPaymentOutputDescriptor.mts
@@ -416,6 +416,17 @@ export class DelayedPaymentOutputDescriptor extends CommonBase {
 		bindings.DelayedPaymentOutputDescriptor_set_to_self_delay(this.ptr, val);
 	}
 
+	/**
+	 * The output which is referenced by the given outpoint
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public get_output(): TxOut {
+		const ret: number = bindings.DelayedPaymentOutputDescriptor_get_output(this.ptr);
+		const ret_conv: TxOut = new TxOut(null, ret);
+		return ret_conv;
+	}
+
 	/**
 	 * The output which is referenced by the given outpoint
 	 */
diff --git a/ts/structs/HolderCommitmentTransaction.mts b/ts/structs/HolderCommitmentTransaction.mts
@@ -383,6 +383,24 @@ export class HolderCommitmentTransaction extends CommonBase {
 		bindings.HolderCommitmentTransaction_set_counterparty_sig(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(val, 64)));
 	}
 
+	/**
+	 * All non-dust counterparty HTLC signatures, in the order they appear in the transaction
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public get_counterparty_htlc_sigs(): Uint8Array[] {
+		const ret: number = bindings.HolderCommitmentTransaction_get_counterparty_htlc_sigs(this.ptr);
+		const ret_conv_12_len: number = bindings.getArrayLength(ret);
+		const ret_conv_12_arr: Uint8Array[] = new Array(ret_conv_12_len).fill(null);
+		for (var m = 0; m < ret_conv_12_len; m++) {
+			const ret_conv_12: number = bindings.getU32ArrayElem(ret, m);
+			const ret_conv_12_conv: Uint8Array = bindings.decodeUint8Array(ret_conv_12);
+			ret_conv_12_arr[m] = ret_conv_12_conv;
+		}
+		bindings.freeWasmMemory(ret)
+		return ret_conv_12_arr;
+	}
+
 	/**
 	 * All non-dust counterparty HTLC signatures, in the order they appear in the transaction
 	 */
diff --git a/ts/structs/LockedChannelMonitor.mts b/ts/structs/LockedChannelMonitor.mts
@@ -355,8 +355,9 @@ import { DefaultRouter } from '../structs/DefaultRouter.mjs';
 import { CommonBase, UInt5, WitnessVersion, UnqualifiedError } from './CommonBase.mjs';
 import * as bindings from '../bindings.mjs'
 
-/** XXX: DO NOT USE THIS - it remains locked until the GC runs (if that ever happens */
+
 /**
+ * This type represents a lock and MUST BE MANUALLY FREE'd!
  * A read-only reference to a current ChannelMonitor.
  * 
  * Note that this holds a mutex in [`ChainMonitor`] and may block other events until it is
@@ -365,7 +366,12 @@ import * as bindings from '../bindings.mjs'
 export class LockedChannelMonitor extends CommonBase {
 	/* @internal */
 	public constructor(_dummy: object, ptr: number) {
-		super(ptr, bindings.LockedChannelMonitor_free);
+		super(ptr, () => { throw new Error("Locks must be manually freed with free()"); });
+	}
+	/** Releases this lock */
+	public free() {
+		bindings.LockedChannelMonitor_free(this.ptr);
+		CommonBase.set_null_skip_free(this);
 	}
 
 }
diff --git a/ts/structs/NodeAnnouncementInfo.mts b/ts/structs/NodeAnnouncementInfo.mts
@@ -436,6 +436,25 @@ export class NodeAnnouncementInfo extends CommonBase {
 		bindings.NodeAnnouncementInfo_set_alias(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1);
 	}
 
+	/**
+	 * Internet-level addresses via which one can connect to the node
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public get_addresses(): NetAddress[] {
+		const ret: number = bindings.NodeAnnouncementInfo_get_addresses(this.ptr);
+		const ret_conv_12_len: number = bindings.getArrayLength(ret);
+		const ret_conv_12_arr: NetAddress[] = new Array(ret_conv_12_len).fill(null);
+		for (var m = 0; m < ret_conv_12_len; m++) {
+			const ret_conv_12: number = bindings.getU32ArrayElem(ret, m);
+			const ret_conv_12_hu_conv: NetAddress = NetAddress.constr_from_ptr(ret_conv_12);
+			CommonBase.add_ref_from(ret_conv_12_hu_conv, this);
+			ret_conv_12_arr[m] = ret_conv_12_hu_conv;
+		}
+		bindings.freeWasmMemory(ret)
+		return ret_conv_12_arr;
+	}
+
 	/**
 	 * Internet-level addresses via which one can connect to the node
 	 */
diff --git a/ts/structs/NodeInfo.mts b/ts/structs/NodeInfo.mts
@@ -365,6 +365,17 @@ export class NodeInfo extends CommonBase {
 		super(ptr, bindings.NodeInfo_free);
 	}
 
+	/**
+	 * All valid channels a node has announced
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public get_channels(): bigint[] {
+		const ret: number = bindings.NodeInfo_get_channels(this.ptr);
+		const ret_conv: bigint[] = bindings.decodeUint64Array(ret);
+		return ret_conv;
+	}
+
 	/**
 	 * All valid channels a node has announced
 	 */
diff --git a/ts/structs/PaymentParameters.mts b/ts/structs/PaymentParameters.mts
@@ -526,6 +526,19 @@ export class PaymentParameters extends CommonBase {
 		bindings.PaymentParameters_set_max_channel_saturation_power_of_half(this.ptr, 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 get_previously_failed_channels(): bigint[] {
+		const ret: number = bindings.PaymentParameters_get_previously_failed_channels(this.ptr);
+		const ret_conv: bigint[] = bindings.decodeUint64Array(ret);
+		return ret_conv;
+	}
+
 	/**
 	 * 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
diff --git a/ts/structs/QueryShortChannelIds.mts b/ts/structs/QueryShortChannelIds.mts
@@ -388,6 +388,17 @@ export class QueryShortChannelIds extends CommonBase {
 		bindings.QueryShortChannelIds_set_chain_hash(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(val, 32)));
 	}
 
+	/**
+	 * The short_channel_ids that are being queried
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public get_short_channel_ids(): bigint[] {
+		const ret: number = bindings.QueryShortChannelIds_get_short_channel_ids(this.ptr);
+		const ret_conv: bigint[] = bindings.decodeUint64Array(ret);
+		return ret_conv;
+	}
+
 	/**
 	 * The short_channel_ids that are being queried
 	 */
diff --git a/ts/structs/ReadOnlyNetworkGraph.mts b/ts/structs/ReadOnlyNetworkGraph.mts
@@ -355,14 +355,20 @@ import { DefaultRouter } from '../structs/DefaultRouter.mjs';
 import { CommonBase, UInt5, WitnessVersion, UnqualifiedError } from './CommonBase.mjs';
 import * as bindings from '../bindings.mjs'
 
-/** XXX: DO NOT USE THIS - it remains locked until the GC runs (if that ever happens */
+
 /**
+ * This type represents a lock and MUST BE MANUALLY FREE'd!
  * A read-only view of [`NetworkGraph`].
  */
 export class ReadOnlyNetworkGraph extends CommonBase {
 	/* @internal */
 	public constructor(_dummy: object, ptr: number) {
-		super(ptr, bindings.ReadOnlyNetworkGraph_free);
+		super(ptr, () => { throw new Error("Locks must be manually freed with free()"); });
+	}
+	/** Releases this lock */
+	public free() {
+		bindings.ReadOnlyNetworkGraph_free(this.ptr);
+		CommonBase.set_null_skip_free(this);
 	}
 
 	/**
@@ -377,6 +383,15 @@ export class ReadOnlyNetworkGraph extends CommonBase {
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Returns the list of channels in the graph
+	 */
+	public list_channels(): bigint[] {
+		const ret: number = bindings.ReadOnlyNetworkGraph_list_channels(this.ptr);
+		const ret_conv: bigint[] = bindings.decodeUint64Array(ret);
+		return ret_conv;
+	}
+
 	/**
 	 * Returns information on a node with the given id.
 	 * 
@@ -390,6 +405,23 @@ export class ReadOnlyNetworkGraph extends CommonBase {
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Returns the list of nodes in the graph
+	 */
+	public list_nodes(): NodeId[] {
+		const ret: number = bindings.ReadOnlyNetworkGraph_list_nodes(this.ptr);
+		const ret_conv_8_len: number = bindings.getArrayLength(ret);
+		const ret_conv_8_arr: NodeId[] = new Array(ret_conv_8_len).fill(null);
+		for (var i = 0; i < ret_conv_8_len; i++) {
+			const ret_conv_8: number = bindings.getU32ArrayElem(ret, i);
+			const ret_conv_8_hu_conv: NodeId = new NodeId(null, ret_conv_8);
+			CommonBase.add_ref_from(ret_conv_8_hu_conv, this);
+			ret_conv_8_arr[i] = ret_conv_8_hu_conv;
+		}
+		bindings.freeWasmMemory(ret)
+		return ret_conv_8_arr;
+	}
+
 	/**
 	 * Get network addresses by node id.
 	 * Returns None if the requested node is completely unknown,
diff --git a/ts/structs/ReplyChannelRange.mts b/ts/structs/ReplyChannelRange.mts
@@ -432,6 +432,17 @@ export class ReplyChannelRange extends CommonBase {
 		bindings.ReplyChannelRange_set_sync_complete(this.ptr, val);
 	}
 
+	/**
+	 * The short_channel_ids in the channel range
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public get_short_channel_ids(): bigint[] {
+		const ret: number = bindings.ReplyChannelRange_get_short_channel_ids(this.ptr);
+		const ret_conv: bigint[] = bindings.decodeUint64Array(ret);
+		return ret_conv;
+	}
+
 	/**
 	 * The short_channel_ids in the channel range
 	 */
diff --git a/ts/structs/StaticPaymentOutputDescriptor.mts b/ts/structs/StaticPaymentOutputDescriptor.mts
@@ -383,6 +383,17 @@ export class StaticPaymentOutputDescriptor extends CommonBase {
 		bindings.StaticPaymentOutputDescriptor_set_outpoint(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1);
 	}
 
+	/**
+	 * The output which is referenced by the given outpoint
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public get_output(): TxOut {
+		const ret: number = bindings.StaticPaymentOutputDescriptor_get_output(this.ptr);
+		const ret_conv: TxOut = new TxOut(null, ret);
+		return ret_conv;
+	}
+
 	/**
 	 * The output which is referenced by the given outpoint
 	 */
diff --git a/ts/structs/TxOut.mts b/ts/structs/TxOut.mts
@@ -367,7 +367,7 @@ export class TxOut extends CommonBase {
 		this.script_pubkey = bindings.decodeUint8Array(bindings.TxOut_get_script_pubkey(ptr));
 		this.value = bindings.TxOut_get_value(ptr);
 	}
-	public constructor_new(value: bigint, script_pubkey: Uint8Array): TxOut {
+	public static constructor_new(value: bigint, script_pubkey: Uint8Array): TxOut {
 		return new TxOut(null, bindings.TxOut_new(bindings.encodeUint8Array(script_pubkey), value));
 	}
 }
diff --git a/ts/structs/UnsignedChannelUpdate.mts b/ts/structs/UnsignedChannelUpdate.mts
@@ -515,6 +515,19 @@ export class UnsignedChannelUpdate extends CommonBase {
 		bindings.UnsignedChannelUpdate_set_fee_proportional_millionths(this.ptr, val);
 	}
 
+	/**
+	 * Excess data which was signed as a part of the message which we do not (yet) understand how
+	 * to decode. This is stored to ensure forward-compatibility as new fields are added to the
+	 * lightning gossip
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public get_excess_data(): Uint8Array {
+		const ret: number = bindings.UnsignedChannelUpdate_get_excess_data(this.ptr);
+		const ret_conv: Uint8Array = bindings.decodeUint8Array(ret);
+		return ret_conv;
+	}
+
 	/**
 	 * Excess data which was signed as a part of the message which we do not (yet) understand how
 	 * to decode. This is stored to ensure forward-compatibility as new fields are added to the
diff --git a/ts/structs/UnsignedNodeAnnouncement.mts b/ts/structs/UnsignedNodeAnnouncement.mts
@@ -449,6 +449,25 @@ export class UnsignedNodeAnnouncement extends CommonBase {
 		bindings.UnsignedNodeAnnouncement_set_alias(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(val, 32)));
 	}
 
+	/**
+	 * List of addresses on which this node is reachable
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public get_addresses(): NetAddress[] {
+		const ret: number = bindings.UnsignedNodeAnnouncement_get_addresses(this.ptr);
+		const ret_conv_12_len: number = bindings.getArrayLength(ret);
+		const ret_conv_12_arr: NetAddress[] = new Array(ret_conv_12_len).fill(null);
+		for (var m = 0; m < ret_conv_12_len; m++) {
+			const ret_conv_12: number = bindings.getU32ArrayElem(ret, m);
+			const ret_conv_12_hu_conv: NetAddress = NetAddress.constr_from_ptr(ret_conv_12);
+			CommonBase.add_ref_from(ret_conv_12_hu_conv, this);
+			ret_conv_12_arr[m] = ret_conv_12_hu_conv;
+		}
+		bindings.freeWasmMemory(ret)
+		return ret_conv_12_arr;
+	}
+
 	/**
 	 * List of addresses on which this node is reachable
 	 */

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ export class CommonBase {`
`367`	`367`	`protected constructor(ptr: number, free_fn: (ptr: number) => void) {`
`368`	`368`	`this.ptr = ptr;`
`369`	`369`	`if (Number.isFinite(ptr) && ptr != 0){`
`370`		`- finalizer.register(this, get_freeer(ptr, free_fn));`
	`370`	`+ finalizer.register(this, get_freeer(ptr, free_fn), this);`
`371`	`371`	`}`
`372`	`372`	`}`
`373`	`373`	`// In Java, protected means "any subclass can access fields on any other subclass'"`
`@@ -381,7 +381,10 @@ export class CommonBase {`
`381`	`381`	`}`
`382`	`382`	`protected static set_null_skip_free(o: CommonBase) {`
`383`	`383`	`o.ptr = 0;`
`384`		`- finalizer.unregister(o);`
	`384`	`+ // @ts-ignore TypeScript is wrong about the returnvalue of unregister here!`
	`385`	`+ const did_unregister: boolean = finalizer.unregister(o);`
	`386`	`+ if (!did_unregister)`
	`387`	`+ throw new Error("FinalizationRegistry unregister should always unregister unless you double-free'd");`
`385`	`388`	`}`
`386`	`389`	`}`
`387`	`390`