X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-java;a=blobdiff_plain;f=genbindings.sh;h=e2a6ca7c75ec107ae403709410504ced37738932;hp=6c7f6501210dd816317a58b0150488c48680b791;hb=1ef2dc8b8a3e0e244ad82ac08e286df489eca4b7;hpb=0fee03a8095f5599f8eccd920c1b1af6b3a20260

diff --git a/genbindings.sh b/genbindings.sh
index 6c7f6501..e2a6ca7c 100755
--- a/genbindings.sh
+++ b/genbindings.sh
@@ -6,6 +6,7 @@ usage() {
 	echo "debug should either be true, false, or leaks"
 	echo "debug of leaks turns on leak tracking on an optimized release bianry"
 	echo "android_web should either be true or false and indicates if we build for android (Java) or web (WASM)"
+	echo "Note that web currently generates the same results as !web (ie Node.JS)"
 	exit 1
 }
 [ "$1" = "" ] && usage
@@ -35,6 +36,14 @@ else
 	sed -i "s/TransactionOutputs/C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ/g" ./lightning.h
 fi
 
+if [ "$LDK_GARBAGECOLLECTED_GIT_OVERRIDE" = "" ]; then
+	export LDK_GARBAGECOLLECTED_GIT_OVERRIDE=$(git describe --tag --dirty)
+fi
+if [ "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:0:1}" != "v" ]; then
+	echo "Version tag should start with a v" > /dev/stderr
+	exit 1
+fi
+
 if [ "$2" != "wasm" ]; then
 	TARGET_STRING="$LDK_TARGET"
 	if [ "$TARGET_STRING" = "" ]; then
@@ -61,14 +70,6 @@ if [ "$2" != "wasm" ]; then
 		LDK_TARGET_CPU="sandybridge"
 	fi
 
-	if [ "$LDK_GARBAGECOLLECTED_GIT_OVERRIDE" = "" ]; then
-		export LDK_GARBAGECOLLECTED_GIT_OVERRIDE=$(git describe --tag --dirty)
-	fi
-	if [ "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:0:1}" != "v" ]; then
-		echo "Version tag should start with a v" > /dev/stderr
-		exit 1
-	fi
-
 	if [ "$(rustc --version --verbose | grep "host:")" = "host: x86_64-apple-darwin" ]; then
 		# OSX sed is for some reason not compatible with GNU sed
 		sed -i '' "s/^    <version>.*<\/version>/    <version>${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}<\/version>/g" pom.xml
@@ -157,7 +158,7 @@ if [ "$2" != "wasm" ]; then
 			popd
 			LDK_LIB="tmp/libldk.bc tmp/libldk.a"
 		fi
-		$COMPILE -o liblightningjni_release$LDK_TARGET_SUFFIX.so -flto -O3 -I"$1"/lightning-c-bindings/include/ $2 src/main/jni/bindings.c $LDK_LIB
+		$COMPILE -o liblightningjni_release$LDK_TARGET_SUFFIX.so -flto -O3 -I"$1"/lightning-c-bindings/include/ $2 src/main/jni/bindings.c $LDK_LIB -lm
 		if [ "$IS_MAC" = "false" -a "$4" = "false" ]; then
 			GLIBC_SYMBS="$(objdump -T liblightningjni_release$LDK_TARGET_SUFFIX.so | grep GLIBC_ | grep -v "GLIBC_2\.2\." | grep -v "GLIBC_2\.3\(\.\| \)" | grep -v "GLIBC_2.\(14\|17\) " || echo)"
 			if [ "$GLIBC_SYMBS" != "" ]; then
@@ -180,7 +181,7 @@ if [ "$2" != "wasm" ]; then
 else
 	echo "Creating TS bindings..."
 	mkdir -p ts/{enums,structs}
-	rm -f ts/{enums,structs,}/*.{mjs,mts}
+	rm -f ts/{enums,structs,}/*.{mjs,mts,mts.part}
 	if [ "$4" = "false" ]; then
 		./genbindings.py "./lightning.h" ts ts ts $DEBUG_ARG typescript node
 	else
@@ -199,34 +200,34 @@ else
 	cat ts/bindings.c.body >> ts/bindings.c
 
 	echo "Building TS bindings..."
-	COMPILE="$COMMON_COMPILE -flto -Wl,--no-entry -Wl,--export-dynamic -Wl,-allow-undefined -nostdlib --target=wasm32-wasi"
+	COMPILE="$COMMON_COMPILE -flto -Wl,--no-entry -nostdlib --target=wasm32-wasi -Wl,-z -Wl,stack-size=$((8*1024*1024)) -Wl,--initial-memory=$((16*1024*1024)) -Wl,--max-memory=$((1024*1024*1024)) -Wl,--global-base=4096"
 	# We only need malloc and assert/abort, but for now just use WASI for those:
 	#EXTRA_LINK=/usr/lib/wasm32-wasi/libc.a
 	EXTRA_LINK=
-	[ "$3" != "false" ] && COMPILE="$COMPILE -Wl,-wrap,calloc -Wl,-wrap,realloc -Wl,-wrap,reallocarray -Wl,-wrap,malloc -Wl,-wrap,free"
+	[ "$3" != "false" ] && COMPILE="$COMPILE -Wl,-wrap,calloc -Wl,-wrap,realloc -Wl,-wrap,reallocarray -Wl,-wrap,malloc -Wl,-wrap,aligned_alloc -Wl,-wrap,free"
 	if [ "$3" = "true" ]; then
 		WASM_FILE=liblightningjs_debug.wasm
-		$COMPILE -o liblightningjs_debug.wasm -g -I"$1"/lightning-c-bindings/include/ ts/bindings.c "$1"/lightning-c-bindings/target/wasm32-wasi/debug/libldk.a $EXTRA_LINK
+		$COMPILE -o liblightningjs_debug.wasm -g -O1 -I"$1"/lightning-c-bindings/include/ ts/bindings.c "$1"/lightning-c-bindings/target/wasm32-wasi/debug/libldk.a $EXTRA_LINK
 	else
 		WASM_FILE=liblightningjs_release.wasm
-		$COMPILE -o liblightningjs_release.wasm -s -Os -I"$1"/lightning-c-bindings/include/ ts/bindings.c "$1"/lightning-c-bindings/target/wasm32-wasi/release/libldk.a $EXTRA_LINK
+		$COMPILE -o liblightningjs_release.wasm -s -Oz -I"$1"/lightning-c-bindings/include/ ts/bindings.c "$1"/lightning-c-bindings/target/wasm32-wasi/release/libldk.a $EXTRA_LINK
 	fi
 
 	if [ -x "$(which tsc)" ]; then
 		cd ts
-	rm -r structs # TODO: Make the human-types compile
-		if [ "$4" = "true" ]; then
-			tsc
-		else
-			tsc --types node --typeRoots .
-			cd ..
-			if [ -x "$(which node)" ]; then
-				NODE_V="$(node --version)"
-				if [ "${NODE_V:1:2}" -gt 14 ]; then
-					rm -f liblightningjs.wasm
-					ln -s $WASM_FILE liblightningjs.wasm
-					node ts/test/node.mjs
-				fi
+		for F in structs/*; do
+			cat imports.mts.part | grep -v " $(basename -s .mts $F)[ ,]" | cat - $F > $F.tmp
+			mv $F.tmp $F
+		done
+		rm imports.mts.part
+		tsc --types node --typeRoots .
+		cp ../$WASM_FILE liblightningjs.wasm
+		cp ../README.md README.md
+		echo Ready to publish!
+		if [ -x "$(which node)" ]; then
+			NODE_V="$(node --version)"
+			if [ "${NODE_V:1:2}" -gt 14 ]; then
+				node test/node.mjs
 			fi
 		fi
 	fi