X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=typescript_strings.py;h=0453a79aae2c4661b37709a9fcb9d2b3a12ee2f4;hb=caf86199f09538269930ee679d2852a73671d46f;hp=ad5b1d8c5c4434183693094d1f2bd323b1d2c050;hpb=271f5c2d87e62896da5d27b5b9b81d898df90038;p=ldk-java

diff --git a/typescript_strings.py b/typescript_strings.py
index ad5b1d8c..0453a79a 100644
--- a/typescript_strings.py
+++ b/typescript_strings.py
@@ -20,7 +20,7 @@ class Consts:
             uint8_t = ['number', 'Uint8Array'],
             uint16_t = ['number', 'Uint16Array'],
             uint32_t = ['number', 'Uint32Array'],
-            uint64_t = ['number'],
+            uint64_t = ['BigInt'],
         )
 
         self.wasm_decoding_map = dict(
@@ -36,43 +36,7 @@ class Consts:
             default = 'const {var_name}_hu_conv: {human_type} = new {human_type}(null, {var_name});',
         )
 
-        self.bindings_header = self.wasm_import_header(target) + """
-export class VecOrSliceDef {
-    public dataptr: number;
-    public datalen: number;
-    public stride: number;
-    public constructor(dataptr: number, datalen: number, stride: number) {
-        this.dataptr = dataptr;
-        this.datalen = datalen;
-        this.stride = stride;
-    }
-}
-
-/*
-TODO: load WASM file
-static {
-    System.loadLibrary(\"lightningjni\");
-    init(java.lang.Enum.class, VecOrSliceDef.class);
-    init_class_cache();
-}
-
-static native void init(java.lang.Class c, java.lang.Class slicedef);
-static native void init_class_cache();
-
-public static native boolean deref_bool(long ptr);
-public static native long deref_long(long ptr);
-public static native void free_heap_ptr(long ptr);
-public static native byte[] read_bytes(long ptr, long len);
-public static native byte[] get_u8_slice_bytes(long slice_ptr);
-public static native long bytes_to_u8_vec(byte[] bytes);
-public static native long new_txpointer_copy_data(byte[] txdata);
-public static native void txpointer_free(long ptr);
-public static native byte[] txpointer_get_buffer(long ptr);
-public static native long vec_slice_len(long vec);
-public static native long new_empty_slice_vec();
-*/
-
-"""
+        self.bindings_header = self.wasm_import_header(target)
 
         self.bindings_version_file = ""
 
@@ -116,7 +80,7 @@ export default class CommonBase {
 	/** The script_pubkey in this output */
 	public script_pubkey: Uint8Array;
 	/** The value, in satoshis, of this output */
-	public value: number;
+	public value: BigInt;
 
 	/* @internal */
 	public constructor(_dummy: object, ptr: number) {
@@ -124,7 +88,7 @@ export default class CommonBase {
 		this.script_pubkey = bindings.TxOut_get_script_pubkey(ptr);
 		this.value = bindings.TxOut_get_value(ptr);
 	}
-	public constructor_new(value: number, script_pubkey: Uint8Array): TxOut {
+	public constructor_new(value: BigInt, script_pubkey: Uint8Array): TxOut {
 		return new TxOut(null, bindings.TxOut_new(script_pubkey, value));
 	}
 }"""
@@ -139,10 +103,15 @@ void *memset(void *s, int c, size_t n);
 void *memcpy(void *dest, const void *src, size_t n);
 int memcmp(const void *s1, const void *s2, size_t n);
 
-void __attribute__((noreturn)) abort(void);
+extern void __attribute__((noreturn)) abort(void);
 static inline void assert(bool expression) {
 	if (!expression) { abort(); }
 }
+
+uint32_t __attribute__((export_name("test_bigint_pass_deadbeef0badf00d"))) test_bigint_pass_deadbeef0badf00d(uint64_t val) {
+	return val == 0xdeadbeef0badf00dULL;
+}
+
 """
 
         if not DEBUG:
@@ -310,10 +279,10 @@ static inline LDKStr str_ref_to_owned_c(const jstring str) {
 
 typedef bool jboolean;
 
-uint32_t __attribute__((visibility("default"))) TS_malloc(uint32_t size) {
+uint32_t __attribute__((export_name("TS_malloc"))) TS_malloc(uint32_t size) {
 	return (uint32_t)MALLOC(size, "JS-Called malloc");
 }
-void __attribute__((visibility("default"))) TS_free(uint32_t ptr) {
+void __attribute__((export_name("TS_free"))) TS_free(uint32_t ptr) {
 	FREE((void*)ptr);
 }
 """
@@ -367,8 +336,8 @@ import * as InternalUtils from '../InternalUtils.mjs'
         assert False # Only called if above is None
     def get_native_arr_ptr_call(self, ty_info):
         if ty_info.subty is not None:
-            return "(" + ty_info.subty.c_ty + "*)(", " + 4)"
-        return "(" + ty_info.c_ty + "*)(", " + 4)"
+            return "(" + ty_info.subty.c_ty + "*)(((uint8_t*)", ") + 4)"
+        return "(" + ty_info.c_ty + "*)(((uint8_t*)", ") + 4)"
     def get_native_arr_entry_call(self, ty_info, arr_name, idxc, entry_access):
         return None
     def cleanup_native_arr_ref_contents(self, arr_name, dest_name, arr_len, ty_info):
@@ -386,7 +355,7 @@ import * as InternalUtils from '../InternalUtils.mjs'
         return "str_ref_to_owned_c(" + var_name + ")"
 
     def c_fn_name_define_pfx(self, fn_name, have_args):
-        return " __attribute__((visibility(\"default\"))) TS_" + fn_name + "("
+        return " __attribute__((export_name(\"TS_" + fn_name + "\"))) TS_" + fn_name + "("
 
     def wasm_import_header(self, target):
         res = """
@@ -395,9 +364,6 @@ imports.env = {};
 
 var js_objs: Array<WeakRef<object>> = [];
 var js_invoke: Function;
-imports.env["abort"] = function () {
-	console.error("ABORT");
-};
 
 imports.wasi_snapshot_preview1 = {
 	"fd_write" : () => {
@@ -428,6 +394,9 @@ export async function initializeWasm(path: string) {
 	imports.env["js_invoke_function"] = js_invoke;
 	const { instance: wasmInstance } = await WebAssembly.instantiate(source, imports);
 	wasm = wasmInstance.exports;
+	if (!wasm.test_bigint_pass_deadbeef0badf00d(BigInt("0xdeadbeef0badf00d"))) {
+		throw new Error(\"Currently need BigInt-as-u64 support, try ----experimental-wasm-bigint");
+	}
 	isWasmInitialized = true;
 };
 """
@@ -438,6 +407,9 @@ export async function initializeWasm(uri: string) {
 	imports.env["js_invoke_function"] = js_invoke;
 	const { instance: wasmInstance } = await WebAssembly.instantiateStreaming(stream, imports);
 	wasm = wasmInstance.exports;
+	if (!wasm.test_bigint_pass_deadbeef0badf00d(BigInt("0xdeadbeef0badf00d"))) {
+		throw new Error(\"Currently need BigInt-as-u64 support, try ----experimental-wasm-bigint");
+	}
 	isWasmInitialized = true;
 };