X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-java;a=blobdiff_plain;f=typescript_strings.py;h=625716806f5f15c516286d0ac8ac7a9389151ca8;hp=a7035633cdabd5dcda86a8fa638235e19d397630;hb=HEAD;hpb=49be9f346217a25fc099abfaac392d4b6236f22f

diff --git a/typescript_strings.py b/typescript_strings.py
index a7035633..9704a48f 100644
--- a/typescript_strings.py
+++ b/typescript_strings.py
@@ -129,7 +129,7 @@ async function finishInitializeWasm(wasmInstance: WebAssembly.Instance) {
 }
 
 const fn_list = ["uuuuuu", "buuuuu", "bbuuuu", "bbbuuu", "bbbbuu", "bbbbbu",
-	"bbbbbb", "ubuubu", "ubuuuu", "ubbuuu", "uubuuu", "uubbuu", "uububu", "ububuu"];
+	"bbbbbb", "ubuubu", "ubuuuu", "ubbuuu", "uubuuu", "uubbuu", "uububu", "ububuu", "uuuubu"];
 
 /* @internal */
 export async function initializeWasmFromUint8Array(wasmBinary: Uint8Array) {
@@ -489,6 +489,28 @@ export class UnqualifiedError {
 }"""
         self.obj_defined(["BigEndianScalar"], "structs")
 
+        self.witness_program_defn = """export class WitnessProgram extends CommonBase {
+	/** The witness program bytes themselves */
+	public program: Uint8Array;
+	/** The witness program version */
+	public version: WitnessVersion;
+
+	/* @internal */
+	public constructor(_dummy: null, ptr: bigint) {
+		super(ptr, bindings.WitnessProgram_free);
+		this.program = bindings.decodeUint8Array(bindings.WitnessProgram_get_program(ptr));
+		this.version = new WitnessVersion(bindings.WitnessProgram_get_version(ptr));
+	}
+	public static constructor_new(program: Uint8Array, version: WitnessVersion): WitnessProgram {
+		if (program.length < 2 || program.length > 40)
+			throw new Error("WitnessProgram must be between 2 and 40 bytes long");
+		if (version.getVal() == 0 && program.length != 20 && program.length != 32)
+			throw new Error("WitnessProgram for version 0 must be between either 20 or 30 bytes");
+		return new WitnessProgram(null, bindings.WitnessProgram_new(version.getVal(), bindings.encodeUint8Array(program)));
+	}
+}"""
+        self.obj_defined(["WitnessProgram"], "structs")
+
         self.c_file_pfx = """#include "js-wasm.h"
 #include <stdatomic.h>
 #include <lightning.h>
@@ -1387,7 +1409,7 @@ export class {struct_name.replace("LDK","")} extends CommonBase {{
     def map_opaque_struct(self, struct_name, struct_doc_comment):
         method_header = ""
 
-        hu_name = struct_name.replace("LDKC2Tuple", "TwoTuple").replace("LDKC3Tuple", "ThreeTuple").replace("LDK", "")
+        hu_name = struct_name.replace("LDKC2Tuple", "TwoTuple").replace("LDKC3Tuple", "ThreeTuple").replace("LDKC4Tuple", "FourTuple").replace("LDK", "")
         out_opaque_struct_human = f"{self.hu_struct_file_prefix}"
         constructor_body = "super(ptr, bindings." + struct_name.replace("LDK","") + "_free);"
         extra_docs = ""