X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-c-bindings;a=blobdiff_plain;f=genbindings.sh;h=5f2c26f13566d06d6953cd6095de950e07cbb466;hp=533ee7c1722f13fe405f53790a45203bab22b471;hb=c2700a649b5c6a1f9fb2c3f705b7dc4b647aecfb;hpb=0c741fd5ecfb2371388b9b0da4730b93a91a521d

diff --git a/genbindings.sh b/genbindings.sh
index 533ee7c..5f2c26f 100755
--- a/genbindings.sh
+++ b/genbindings.sh
@@ -21,7 +21,8 @@ cd "$ORIG_PWD"
 # Generate (and reasonably test) C bindings
 
 # First we set various compiler flags...
-HOST_PLATFORM="$(rustc --version --verbose | grep "host:")"
+HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"
+ENV_TARGET=$(echo $HOST_PLATFORM | sed 's/-/_/g')
 
 # Set path to include our rustc wrapper as well as cbindgen
 export LDK_RUSTC_PATH="$(which rustc)"
@@ -43,28 +44,43 @@ export BASE_CFLAGS="-ffile-prefix-map=$HOME/.cargo="
 BASE_CFLAGS="$BASE_CFLAGS -frandom-seed=42"
 LOCAL_CFLAGS="-Wall -Wno-nullability-completeness -pthread -Iinclude/"
 
-if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+HOST_OSX=false
+if [ "$HOST_PLATFORM" = "x86_64-apple-darwin" ]; then
+	HOST_OSX=true
+elif [ "$HOST_PLATFORM" = "aarch64-apple-darwin" ]; then
+	HOST_OSX=true
+fi
+
+BASE_HOST_CFLAGS="$BASE_CFLAGS"
+
+if [ "$HOST_OSX" = "true" ]; then
 	export MACOSX_DEPLOYMENT_TARGET=10.9
-	LOCAL_CFLAGS="$LOCAL_CFLAGS -isysroot$(xcrun --show-sdk-path) -mmacosx-version-min=10.9"
-	BASE_CFLAGS="$BASE_CFLAGS -isysroot$(xcrun --show-sdk-path) -mmacosx-version-min=10.9"
+	LOCAL_CFLAGS="$LOCAL_CFLAGS --target=$HOST_PLATFORM -isysroot$(xcrun --show-sdk-path) -mmacosx-version-min=10.9"
+	BASE_HOST_CFLAGS="$BASE_HOST_CFLAGS --target=$HOST_PLATFORM -isysroot$(xcrun --show-sdk-path) -mmacosx-version-min=10.9"
 	# Targeting aarch64 appears to be supported only starting with Big Sur, so check it before use
-	clang -o /dev/null $BASE_CFLAGS --target=aarch64-apple-darwin -mcpu=apple-a14 genbindings_path_map_test_file.c &&
-	export CFLAGS_aarch64_apple_darwin="$BASE_CFLAGS --target=aarch64-apple-darwin -mcpu=apple-a14" ||
+	clang -o /dev/null $BASE_HOST_CFLAGS --target=aarch64-apple-darwin -mcpu=apple-a14 genbindings_path_map_test_file.c &&
+	export CFLAGS_aarch64_apple_darwin="$BASE_HOST_CFLAGS --target=aarch64-apple-darwin -mcpu=apple-a14" ||
 	echo "WARNING: Can not build targeting aarch64-apple-darin. Upgrade to Big Sur or try upstream clang"
 fi
 
 rm genbindings_path_map_test_file.c
 
-ENV_TARGET=$(rustc --version --verbose | grep host | awk '{ print $2 }' | sed 's/-/_/g')
 case "$ENV_TARGET" in
 	"x86_64"*)
 		export RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=sandybridge"
-		export CFLAGS_$ENV_TARGET="$BASE_CFLAGS -march=sandybridge -mcpu=sandybridge -mtune=sandybridge"
+		export BASE_HOST_CFLAGS="$BASE_HOST_CFLAGS -march=sandybridge -mcpu=sandybridge -mtune=sandybridge"
+		export CFLAGS_$ENV_TARGET="$BASE_HOST_CFLAGS"
+		;;
+	"aarch64_apple_darwin")
+		export RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=apple-a14"
+		export BASE_HOST_CFLAGS="$BASE_HOST_CFLAGS -mcpu=apple-a14"
+		export CFLAGS_$ENV_TARGET="$BASE_HOST_CFLAGS"
 		;;
 	*)
 		# Assume this isn't targeted at another host and build for the host's CPU.
 		export RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=native"
-		export CFLAGS_$ENV_TARGET="$BASE_CFLAGS -mcpu=native"
+		export BASE_HOST_CFLAGS="$BASE_HOST_CFLAGS -mcpu=native"
+		export CFLAGS_$ENV_TARGET="$BASE_HOST_CFLAGS"
 		;;
 esac
 
@@ -128,11 +144,15 @@ OUT_F="$(pwd)/lightning-c-bindings/include/ldk_rust_types.h"
 OUT_CPP="$(pwd)/lightning-c-bindings/include/lightningpp.hpp"
 BIN="$(pwd)/c-bindings-gen/target/release/c-bindings-gen"
 
+function is_gnu_sed(){
+  sed --version >/dev/null 2>&1
+}
+
 function add_crate() {
 	pushd "$LIGHTNING_PATH/$1"
 	RUSTC_BOOTSTRAP=1 cargo rustc --profile=check --no-default-features $3 -- --cfg=c_bindings -Zunpretty=expanded > /tmp/$1-crate-source.txt
 	popd
-	if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+	if [ "$HOST_OSX" = "true" ]; then
 		sed -i".original" "1i\\
 pub mod $2 {
 " /tmp/$1-crate-source.txt
@@ -142,20 +162,20 @@ pub mod $2 {
 	echo "}" >> /tmp/$1-crate-source.txt
 	cat /tmp/$1-crate-source.txt >> /tmp/crate-source.txt
 	rm /tmp/$1-crate-source.txt
-	if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+	if is_gnu_sed; then
+		sed -E -i 's|#*'$1' = \{ .*|'$1' = \{ path = "'"$LIGHTNING_PATH"'/'$1'", default-features = false }|' lightning-c-bindings/Cargo.toml
+	else
 		# OSX sed is for some reason not compatible with GNU sed
 		sed -E -i '' 's|#*'$1' = \{ .*|'$1' = \{ path = "'"$LIGHTNING_PATH"'/'$1'", default-features = false }|' lightning-c-bindings/Cargo.toml
-	else
-		sed -E -i 's|#*'$1' = \{ .*|'$1' = \{ path = "'"$LIGHTNING_PATH"'/'$1'", default-features = false }|' lightning-c-bindings/Cargo.toml
 	fi
 }
 
 function drop_crate() {
-	if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+	if is_gnu_sed; then
+		sed -E -i 's|'$1' = \{ (.*)|#'$1' = \{ \1|' lightning-c-bindings/Cargo.toml
+	else
 		# OSX sed is for some reason not compatible with GNU sed
 		sed -E -i '' 's|'$1' = \{ (.*)|#'$1' = \{ \1|' lightning-c-bindings/Cargo.toml
-	else
-		sed -E -i 's|'$1' = \{ (.*)|#'$1' = \{ \1|' lightning-c-bindings/Cargo.toml
 	fi
 }
 
@@ -163,14 +183,16 @@ echo > /tmp/crate-source.txt
 if [ "$2" = "true" ]; then
 	add_crate lightning lightning --features=std
 	add_crate "lightning-persister" "lightning_persister"
-	add_crate "lightning-background-processor" "lightning_background_processor"
-	add_crate "lightning-invoice" "lightning_invoice"
+	add_crate "lightning-background-processor" "lightning_background_processor" --features=std
+	add_crate "lightning-invoice" "lightning_invoice" --features=std
+	add_crate "lightning-rapid-gossip-sync" "lightning_rapid_gossip_sync"
 	CARGO_BUILD_ARGS="--features=std"
 else
 	add_crate lightning lightning --features=no-std
 	drop_crate "lightning-persister"
-	drop_crate "lightning-background-processor"
-	drop_crate "lightning-invoice"
+	add_crate "lightning-background-processor" "lightning_background_processor"
+	add_crate "lightning-rapid-gossip-sync" "lightning_rapid_gossip_sync" --features=no-std
+	add_crate "lightning-invoice" "lightning_invoice" --features=no-std
 	CARGO_BUILD_ARGS="--features=no-std"
 fi
 
@@ -200,22 +222,23 @@ cbindgen -v --config cbindgen.toml -o include/lightning.h >/dev/null 2>&1
 # cbindgen is relatively braindead when exporting typedefs -
 # it happily exports all our typedefs for private types, even with the
 # generics we specified in C mode! So we drop all those types manually here.
-if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
-	# OSX sed is for some reason not compatible with GNU sed
-	sed -i '' 's/typedef LDKnative.*Import.*LDKnative.*;//g' include/lightning.h
+if is_gnu_sed; then
+	sed -i 's/typedef LDKnative.*Import.*LDKnative.*;//g' include/lightning.h
 
 	# stdlib.h doesn't exist in clang's wasm sysroot, and cbindgen
 	# doesn't actually use it anyway, so drop the import.
-	sed -i '' 's/#include <stdlib.h>/#include "ldk_rust_types.h"/g' include/lightning.h
+	sed -i 's/#include <stdlib.h>/#include "ldk_rust_types.h"/g' include/lightning.h
 else
-	sed -i 's/typedef LDKnative.*Import.*LDKnative.*;//g' include/lightning.h
+	# OSX sed is for some reason not compatible with GNU sed
+	sed -i '' 's/typedef LDKnative.*Import.*LDKnative.*;//g' include/lightning.h
 
 	# stdlib.h doesn't exist in clang's wasm sysroot, and cbindgen
 	# doesn't actually use it anyway, so drop the import.
-	sed -i 's/#include <stdlib.h>/#include "ldk_rust_types.h"/g' include/lightning.h
+	sed -i '' 's/#include <stdlib.h>/#include "ldk_rust_types.h"/g' include/lightning.h
 fi
 
 # Build C++ class methods which call trait methods
+echo "Updating C++ header, this may take some time, especially on macOS"
 set +x # Echoing every command is very verbose here
 OLD_IFS="$IFS"
 export IFS=''
@@ -249,7 +272,7 @@ while read LINE; do
 				echo "Unable to find method declaration for $LINE"
 				exit 1
 			fi
-			RETVAL="$(echo "$METHOD" | sed 's/[ ]*\([A-Za-z0-9 _]*\)(\*\(.*\)).*/\1/' | sed 's/^struct LDK/LDK::/g' | tr -d ' ')"
+			RETVAL="$(echo "$METHOD" | sed 's/[ ]*\([A-Za-z0-9 _]*\)(\*\(.*\)).*/\1/' | sed -E 's/^(struct|enum) LDK/LDK::/g' | tr -d ' ')"
 			[ "$RETVAL" = "LDK::SecretKey" ] && RETVAL="LDKSecretKey"
 			[ "$RETVAL" = "LDK::PublicKey" ] && RETVAL="LDKPublicKey"
 			[ "$RETVAL" = "LDK::ThirtyTwoBytes" ] && RETVAL="LDKThirtyTwoBytes"
@@ -298,7 +321,7 @@ fi
 gcc $LOCAL_CFLAGS -fPIC -std=c99 -Wall -g -pthread -I../ldk-net ../ldk-net/ldk_net.c -c -o ldk_net.o
 if [ "$2" = "true" ]; then
 	g++ $LOCAL_CFLAGS -std=c++11 -Wall -g -pthread -DREAL_NET -I../ldk-net ldk_net.o demo.cpp target/debug/libldk.a -ldl -lm
-	if [ -x "`which valgrind`" ]; then
+	if [ -x "`which valgrind`" -a "$(uname -m)" != "ppc64le" ]; then
 		valgrind --error-exitcode=4 --memcheck:leak-check=full --show-leak-kinds=all ./a.out
 		echo
 	else
@@ -313,13 +336,13 @@ fi
 if [ "$2" = "true" ]; then
 	clang++ $LOCAL_CFLAGS -std=c++11 demo.cpp target/debug/libldk.a -ldl
 	strip ./a.out
+	time ./a.out
 	echo " C++ Bin size and runtime w/o optimization:"
 	ls -lha a.out
-	time ./a.out > /dev/null
 fi
 
 # Then, check with memory sanitizer, if we're on Linux and have rustc nightly
-if [ "$HOST_PLATFORM" = "host: x86_64-unknown-linux-gnu" ]; then
+if [ "$HOST_PLATFORM" = "x86_64-unknown-linux-gnu" ]; then
 	if cargo +nightly --version >/dev/null 2>&1; then
 		LLVM_V=$(rustc +nightly --version --verbose | grep "LLVM version" | awk '{ print substr($3, 0, 2); }')
 		if [ -x "$(which clang-$LLVM_V)" ]; then
@@ -361,7 +384,7 @@ fi
 
 RUSTC_LLVM_V=$(rustc --version --verbose | grep "LLVM version" | awk '{ print substr($3, 0, 2); }')
 
-if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+if [ "$HOST_OSX" = "true" ]; then
 	# Apple is special, as always, and their versions of clang aren't
 	# compatible with upstream LLVM.
 	if [ "$(clang --version | grep 'Apple clang')" != "" ]; then
@@ -422,14 +445,15 @@ if [ "$CLANG" != "" -a "$CLANGPP" = "" ]; then
 fi
 
 # Finally, if we're on OSX or on Linux, build the final debug binary with address sanitizer (and leave it there)
-if [ "$HOST_PLATFORM" = "host: x86_64-unknown-linux-gnu" -o "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+if [ "$HOST_PLATFORM" = "x86_64-unknown-linux-gnu" -o "$HOST_PLATFORM" = "x86_64-apple-darwin" ]; then
 	if [ "$CLANGPP" != "" ]; then
-		if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+		if is_gnu_sed; then
+			sed -i.bk 's/,"cdylib"]/]/g' Cargo.toml
+		else
 			# OSX sed is for some reason not compatible with GNU sed
 			sed -i .bk 's/,"cdylib"]/]/g' Cargo.toml
-		else
-			sed -i.bk 's/,"cdylib"]/]/g' Cargo.toml
 		fi
+
 		if [ "$CFLAGS_aarch64_apple_darwin" != "" ]; then
 			RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=apple-a14" RUSTC_BOOTSTRAP=1 cargo rustc $CARGO_BUILD_ARGS --target aarch64-apple-darwin -v -- -Zsanitizer=address -Cforce-frame-pointers=yes || ( mv Cargo.toml.bk Cargo.toml; exit 1)
 		fi
@@ -466,9 +490,9 @@ if [ "$2" = "true" ]; then
 fi
 
 strip ./a.out
+time ./a.out
 echo "C++ Bin size and runtime with only RL (LTO) optimized:"
 ls -lha a.out
-time ./a.out > /dev/null
 
 if [ "$CLANGPP" != "" ]; then
 	# If we can use cross-language LTO, use it for building C dependencies (i.e. libsecp256k1) as well
@@ -476,7 +500,7 @@ if [ "$CLANGPP" != "" ]; then
 	# The cc-rs crate tries to force -fdata-sections and -ffunction-sections on, which
 	# breaks -fembed-bitcode, so we turn off cc-rs' default flags and specify exactly
 	# what we want here.
-	export CFLAGS_$ENV_TARGET="$BASE_CFLAGS -fPIC -fembed-bitcode -march=sandybridge -mcpu=sandybridge -mtune=sandybridge"
+	export CFLAGS_$ENV_TARGET="$BASE_HOST_CFLAGS -fPIC -fembed-bitcode"
 	export CRATE_CC_NO_DEFAULTS=true
 fi
 
@@ -485,9 +509,9 @@ if [ "$2" = "false" -a "$(rustc --print target-list | grep wasm32-wasi)" != "" ]
 	echo "int main() {}" > genbindings_wasm_test_file.c
 	if clang -nostdlib -o /dev/null --target=wasm32-wasi -Wl,--no-entry genbindings_wasm_test_file.c > /dev/null 2>&1; then
 		# And if it does, build a WASM binary without capturing errors
-		export CFLAGS_wasm32_wasi="$BASE_CFLAGS -target wasm32 -O1"
+		export CFLAGS_wasm32_wasi="$BASE_CFLAGS -target wasm32-wasi -O1"
 		RUSTFLAGS="$BASE_RUSTFLAGS -C opt-level=1 --cfg=test_mod_pointers" cargo build $CARGO_BUILD_ARGS -v --target=wasm32-wasi
-		export CFLAGS_wasm32_wasi="$BASE_CFLAGS -fembed-bitcode -target wasm32 -Oz"
+		export CFLAGS_wasm32_wasi="$BASE_CFLAGS -fembed-bitcode -target wasm32-wasi -Oz"
 		RUSTFLAGS="$BASE_RUSTFLAGS -C embed-bitcode=yes -C opt-level=z -C linker-plugin-lto -C lto" CARGO_PROFILE_RELEASE_LTO=true cargo build $CARGO_BUILD_ARGS -v --release --target=wasm32-wasi
 	else
 		echo "Cannot build WASM lib as clang does not seem to support the wasm32-wasi target"
@@ -517,7 +541,7 @@ if [ "$CLANGPP" != "" -a "$LLD" != "" ]; then
 	# packaging than simply shipping the rustup binaries (eg Debian should Just Work
 	# here).
 	LINK_ARG_FLAGS="-C link-arg=-fuse-ld=$LLD"
-	if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+	if [ "$HOST_OSX" = "true" ]; then
 		export LDK_CLANG_PATH=$(which $CLANG)
 		export CLANG="$(pwd)/../deterministic-build-wrappers/clang-lto-link-osx"
 		for ARG in "CFLAGS_aarch64_apple_darwin"; do
@@ -527,17 +551,21 @@ if [ "$CLANGPP" != "" -a "$LLD" != "" ]; then
 		LINK_ARG_FLAGS="$LINK_ARG_FLAGS -C link-arg="-isysroot$(xcrun --show-sdk-path)" -C link-arg=-mmacosx-version-min=10.9"
 		RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=apple-a14 -C embed-bitcode=yes -C linker-plugin-lto -C lto -C linker=$CLANG $LINK_ARG_FLAGS -C link-arg=-mcpu=apple-a14" CARGO_PROFILE_RELEASE_LTO=true cargo build $CARGO_BUILD_ARGS -v --release --target aarch64-apple-darwin
 	fi
-	export CFLAGS_$ENV_TARGET="$BASE_CFLAGS -O3 -fPIC -fembed-bitcode -march=sandybridge -mcpu=sandybridge -mtune=sandybridge"
-	# Rust doesn't recognize CFLAGS changes, so we need to clean build artifacts
-	cargo clean --release
-	CARGO_PROFILE_RELEASE_LTO=true RUSTFLAGS="$RUSTFLAGS -C embed-bitcode=yes -C linker-plugin-lto -C lto -C linker=$CLANG $LINK_ARG_FLAGS -C link-arg=-march=sandybridge -C link-arg=-mcpu=sandybridge -C link-arg=-mtune=sandybridge" cargo build $CARGO_BUILD_ARGS -v --release
-
-	if [ "$2" = "true" ]; then
-		$CLANGPP $LOCAL_CFLAGS -flto -fuse-ld=$LLD -O2 demo.cpp target/release/libldk.a -ldl
-		strip ./a.out
-		echo "C++ Bin size and runtime with cross-language LTO:"
-		ls -lha a.out
-		time ./a.out > /dev/null
+	# If we're on an M1 don't bother building X86 binaries
+	if [ "$HOST_PLATFORM" != "aarch64-apple-darwin" ]; then
+		export CFLAGS_$ENV_TARGET="$BASE_HOST_CFLAGS -O3 -fPIC -fembed-bitcode"
+		# Rust doesn't recognize CFLAGS changes, so we need to clean build artifacts
+		cargo clean --release
+		CARGO_PROFILE_RELEASE_LTO=true RUSTFLAGS="$RUSTFLAGS -C embed-bitcode=yes -C linker-plugin-lto -C lto -C linker=$CLANG $LINK_ARG_FLAGS -C link-arg=-march=sandybridge -C link-arg=-mcpu=sandybridge -C link-arg=-mtune=sandybridge" cargo build $CARGO_BUILD_ARGS -v --release
+
+		if [ "$2" = "true" ]; then
+			$CLANGPP $LOCAL_CFLAGS -flto -fuse-ld=$LLD -O2 -c demo.cpp -o demo.o
+			$CLANGPP $LOCAL_CFLAGS -flto -fuse-ld=$LLD -Wl,--lto-O2 -Wl,-O2 -O2 demo.o target/release/libldk.a -ldl
+			strip ./a.out
+			time ./a.out
+			echo "C++ Bin size and runtime with cross-language LTO:"
+			ls -lha a.out
+		fi
 	fi
 else
 	if [ "$CFLAGS_aarch64_apple_darwin" != "" ]; then