X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FSpendableOutputDescriptor.ts;h=3746a1abf22653b40691aed6c89103c9513be795;hb=22f5f4208b1f3b5542292250f1612b944f5cd7fd;hp=e1edf64f7e8a16c765d387a0cadc6ae3fbbaae29;hpb=56e9910ffaa7fccf2cb777dc9cf55e01a9681543;p=ldk-java

diff --git a/ts/structs/SpendableOutputDescriptor.ts b/ts/structs/SpendableOutputDescriptor.ts
index e1edf64f..3746a1ab 100644
--- a/ts/structs/SpendableOutputDescriptor.ts
+++ b/ts/structs/SpendableOutputDescriptor.ts
@@ -28,35 +28,35 @@ export class StaticOutput extends SpendableOutputDescriptor {
 	public output: TxOut;
 	private constructor(ptr: number, obj: bindings.LDKSpendableOutputDescriptor.StaticOutput) {
 		super(null, ptr);
-		const outpoint: uint32_t = obj.outpoint;
-		OutPoint outpoint_hu_conv = new OutPoint(null, outpoint);
+		const outpoint: number = obj.outpoint;
+		const outpoint_hu_conv: OutPoint = new OutPoint(null, outpoint);
 		this.outpoint = outpoint_hu_conv;
-		const output: uint32_t = obj.output;
+		const output: number = obj.output;
 		TxOut output_conv = new TxOut(null, output);
 		this.output = output_conv;
 	}
 }
 export class DynamicOutputP2WSH extends SpendableOutputDescriptor {
 	public outpoint: OutPoint;
-	public per_commitment_point: byte[];
-	public to_self_delay: short;
+	public per_commitment_point: Uint8Array;
+	public to_self_delay: number;
 	public output: TxOut;
-	public key_derivation_params: TwoTuple<Long, Long>;
-	public revocation_pubkey: byte[];
+	public key_derivation_params: TwoTuple<Number, Number>;
+	public revocation_pubkey: Uint8Array;
 	private constructor(ptr: number, obj: bindings.LDKSpendableOutputDescriptor.DynamicOutputP2WSH) {
 		super(null, ptr);
-		const outpoint: uint32_t = obj.outpoint;
-		OutPoint outpoint_hu_conv = new OutPoint(null, outpoint);
+		const outpoint: number = obj.outpoint;
+		const outpoint_hu_conv: OutPoint = new OutPoint(null, outpoint);
 		this.outpoint = outpoint_hu_conv;
 		this.per_commitment_point = obj.per_commitment_point;
 		this.to_self_delay = obj.to_self_delay;
-		const output: uint32_t = obj.output;
+		const output: number = obj.output;
 		TxOut output_conv = new TxOut(null, output);
 		this.output = output_conv;
-		const key_derivation_params: uint32_t = obj.key_derivation_params;
-		long key_derivation_params_a = bindings.LDKC2Tuple_u64u64Z_get_a(key_derivation_params);
-			long key_derivation_params_b = bindings.LDKC2Tuple_u64u64Z_get_b(key_derivation_params);
-			TwoTuple<Long, Long> key_derivation_params_conv = new TwoTuple<Long, Long>(key_derivation_params_a, key_derivation_params_b);
+		const key_derivation_params: number = obj.key_derivation_params;
+		number key_derivation_params_a = bindings.LDKC2Tuple_u64u64Z_get_a(key_derivation_params);
+			number key_derivation_params_b = bindings.LDKC2Tuple_u64u64Z_get_b(key_derivation_params);
+			TwoTuple<Number, Number> key_derivation_params_conv = new TwoTuple<Number, Number>(key_derivation_params_a, key_derivation_params_b);
 		this.key_derivation_params = key_derivation_params_conv;
 		this.revocation_pubkey = obj.revocation_pubkey;
 	}
@@ -64,19 +64,19 @@ export class DynamicOutputP2WSH extends SpendableOutputDescriptor {
 export class StaticOutputCounterpartyPayment extends SpendableOutputDescriptor {
 	public outpoint: OutPoint;
 	public output: TxOut;
-	public key_derivation_params: TwoTuple<Long, Long>;
+	public key_derivation_params: TwoTuple<Number, Number>;
 	private constructor(ptr: number, obj: bindings.LDKSpendableOutputDescriptor.StaticOutputCounterpartyPayment) {
 		super(null, ptr);
-		const outpoint: uint32_t = obj.outpoint;
-		OutPoint outpoint_hu_conv = new OutPoint(null, outpoint);
+		const outpoint: number = obj.outpoint;
+		const outpoint_hu_conv: OutPoint = new OutPoint(null, outpoint);
 		this.outpoint = outpoint_hu_conv;
-		const output: uint32_t = obj.output;
+		const output: number = obj.output;
 		TxOut output_conv = new TxOut(null, output);
 		this.output = output_conv;
-		const key_derivation_params: uint32_t = obj.key_derivation_params;
-		long key_derivation_params_a = bindings.LDKC2Tuple_u64u64Z_get_a(key_derivation_params);
-			long key_derivation_params_b = bindings.LDKC2Tuple_u64u64Z_get_b(key_derivation_params);
-			TwoTuple<Long, Long> key_derivation_params_conv = new TwoTuple<Long, Long>(key_derivation_params_a, key_derivation_params_b);
+		const key_derivation_params: number = obj.key_derivation_params;
+		number key_derivation_params_a = bindings.LDKC2Tuple_u64u64Z_get_a(key_derivation_params);
+			number key_derivation_params_b = bindings.LDKC2Tuple_u64u64Z_get_b(key_derivation_params);
+			TwoTuple<Number, Number> key_derivation_params_conv = new TwoTuple<Number, Number>(key_derivation_params_a, key_derivation_params_b);
 		this.key_derivation_params = key_derivation_params_conv;
 	}
 }