Merge pull request #54 from TheBlueMatt/main

Support `no-std`

diff --combined genbindings.sh
index b6126b6e0cc8da633517aa060891109ea35a63d5,398f448d4df00f72a1a6e20075a358d6761a41bb..17522868857589700921f4d4a49fecae31b58a05
--- 1/genbindings.sh
--- 2/genbindings.sh
+++ b/genbindings.sh
@@@ -82,38 -82,35 +82,38 @@@ mv lightning-c-bindings/src/bitcoin .
  git checkout lightning-c-bindings/src
  git checkout lightning-c-bindings/include
  BINDINGS_GIT="$(git describe --tag --dirty --abbrev=16)"
 -echo -e "#ifndef _LDK_HEADER_VER" > lightning-c-bindings/include/ldk_ver.h
 -echo -e "static inline int _ldk_strncmp(const char *s1, const char *s2, uint64_t n) {" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\tif (n && *s1 != *s2) return 1;" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\twhile (n && *s1 != 0 && *s2 != 0) {" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\t\ts1++; s2++; n--;" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\t\tif (n && *s1 != *s2) return 1;" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\t}" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\treturn 0;" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "}" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "#define _LDK_HEADER_VER \"$LIGHTNING_GIT\"" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "#define _LDK_C_BINDINGS_HEADER_VER \"$BINDINGS_GIT\"" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "static inline const char* check_get_ldk_version() {" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\tLDKStr bin_ver = _ldk_get_compiled_version();" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\tif (_ldk_strncmp(_LDK_HEADER_VER, (const char*)bin_ver.chars, bin_ver.len) != 0) {" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\t// Version mismatch, we don't know what we're running!" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\t\treturn 0;" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\t}" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\treturn _LDK_HEADER_VER;" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "}" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "static inline const char* check_get_ldk_bindings_version() {" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\tLDKStr bin_ver = _ldk_c_bindings_get_compiled_version();" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\tif (_ldk_strncmp(_LDK_C_BINDINGS_HEADER_VER, (const char*)bin_ver.chars, bin_ver.len) != 0) {" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\t// Version mismatch, we don't know what we're running!" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\t\treturn 0;" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\t}" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "\treturn _LDK_C_BINDINGS_HEADER_VER;" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "}" >> lightning-c-bindings/include/ldk_ver.h
 -echo -e "#endif /* _LDK_HEADER_VER */" >> lightning-c-bindings/include/ldk_ver.h
 +echo "$(cat <<EOF
 +#ifndef _LDK_HEADER_VER
 +static inline int _ldk_strncmp(const char *s1, const char *s2, uint64_t n) {
 +      if (n && *s1 != *s2) return 1;
 +      while (n && *s1 != 0 && *s2 != 0) {
 +              s1++; s2++; n--;
 +              if (n && *s1 != *s2) return 1;
 +      }
 +      return 0;
 +}
 +
 +#define _LDK_HEADER_VER "${LIGHTNING_GIT}"
 +#define _LDK_C_BINDINGS_HEADER_VER "${BINDINGS_GIT}"
 +static inline const char* check_get_ldk_version() {
 +      LDKStr bin_ver = _ldk_get_compiled_version();
 +      if (_ldk_strncmp(_LDK_HEADER_VER, (const char*)bin_ver.chars, bin_ver.len) != 0) {
 +      // Version mismatch, we don't know what we're running!
 +              return 0;
 +      }
 +      return _LDK_HEADER_VER;
 +}
 +static inline const char* check_get_ldk_bindings_version() {
 +      LDKStr bin_ver = _ldk_c_bindings_get_compiled_version();
 +      if (_ldk_strncmp(_LDK_C_BINDINGS_HEADER_VER, (const char*)bin_ver.chars, bin_ver.len) != 0) {
 +      // Version mismatch, we don't know what we're running!
 +              return 0;
 +      }
 +      return _LDK_C_BINDINGS_HEADER_VER;
 +}
 +#endif /* _LDK_HEADER_VER */
 +EOF
 +)" >> lightning-c-bindings/include/ldk_ver.h
  
  rm -rf lightning-c-bindings/src
  
@@@ -130,7 -127,7 +130,7 @@@ BIN="$(pwd)/c-bindings-gen/target/relea
  
  function add_crate() {
        pushd "$LIGHTNING_PATH/$1"
-       RUSTC_BOOTSTRAP=1 cargo rustc --profile=check $3 -- --cfg=c_bindings -Zunpretty=expanded > /tmp/$1-crate-source.txt
+       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
                sed -i".original" "1i\\
@@@ -144,9 -141,9 +144,9 @@@ pub mod $2 
        rm /tmp/$1-crate-source.txt
        if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
                # OSX sed is for some reason not compatible with GNU sed
-               sed -E -i '' 's|#?'$1' = \{ .*|'$1' = \{ path = "'"$LIGHTNING_PATH"'/'$1'" '"$4"' }|' lightning-c-bindings/Cargo.toml
+               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'" '"$4"' }|' lightning-c-bindings/Cargo.toml
+               sed -E -i 's|#*'$1' = \{ .*|'$1' = \{ path = "'"$LIGHTNING_PATH"'/'$1'", default-features = false }|' lightning-c-bindings/Cargo.toml
        fi
  }
  
@@@ -161,36 -158,36 +161,39 @@@ function drop_crate() 
  
  echo > /tmp/crate-source.txt
  if [ "$2" = "true" ]; then
-       add_crate lightning lightning --features=std ', features = ["std"]'
+       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"
+       CARGO_BUILD_ARGS="--features=std"
  else
-       add_crate lightning lightning --features=no-std ', features = ["no-std"]'
+       add_crate lightning lightning --features=no-std
        drop_crate "lightning-persister"
        drop_crate "lightning-background-processor"
+       drop_crate "lightning-invoice"
+       CARGO_BUILD_ARGS="--features=no-std"
  fi
- add_crate "lightning-invoice" "lightning_invoice"
  
  cat /tmp/crate-source.txt | RUST_BACKTRACE=1 "$BIN" "$OUT/" "$OUT_TEMPL" "$OUT_F" "$OUT_CPP"
  
 -echo -e '#[no_mangle]' >> lightning-c-bindings/src/version.rs
 -echo -e 'pub extern "C" fn _ldk_get_compiled_version() -> crate::c_types::Str {' >> lightning-c-bindings/src/version.rs
 -echo -e '\t"'"$LIGHTNING_GIT"'".into()' >> lightning-c-bindings/src/version.rs
 -echo -e '}' >> lightning-c-bindings/src/version.rs
 -echo -e '#[no_mangle]' >> lightning-c-bindings/src/version.rs
 -echo -e 'pub extern "C" fn _ldk_c_bindings_get_compiled_version() -> crate::c_types::Str {' >> lightning-c-bindings/src/version.rs
 -echo -e '\t"'"$BINDINGS_GIT"'".into()' >> lightning-c-bindings/src/version.rs
 -echo -e '}' >> lightning-c-bindings/src/version.rs
 +echo "$(cat <<EOF
 +#[no_mangle]
 +pub extern "C" fn _ldk_get_compiled_version() -> crate::c_types::Str {
 +      "${LIGHTNING_GIT}".into()
 +}
 +#[no_mangle]
 +pub extern "C" fn _ldk_c_bindings_get_compiled_version() -> crate::c_types::Str {
 +      "${BINDINGS_GIT}".into()
 +}
 +EOF
 +)" >> lightning-c-bindings/src/version.rs
  
  # Now cd to lightning-c-bindings, build the generated bindings, and call cbindgen to build a C header file
  cd lightning-c-bindings
  
- RUSTFLAGS="$RUSTFLAGS --cfg=test_mod_pointers" cargo build
+ RUSTFLAGS="$RUSTFLAGS --cfg=test_mod_pointers" cargo build $CARGO_BUILD_ARGS
  if [ "$CFLAGS_aarch64_apple_darwin" != "" ]; then
-       RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=apple-a14" cargo build --target aarch64-apple-darwin
+       RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=apple-a14" cargo build $CARGO_BUILD_ARGS --target aarch64-apple-darwin
  fi
  cbindgen -v --config cbindgen.toml -o include/lightning.h >/dev/null 2>&1
  
@@@ -321,7 -318,7 +324,7 @@@ if [ "$HOST_PLATFORM" = "host: x86_64-u
                LLVM_V=$(rustc +nightly --version --verbose | grep "LLVM version" | awk '{ print substr($3, 0, 2); }')
                if [ -x "$(which clang-$LLVM_V)" ]; then
                        cargo +nightly clean
-                       cargo +nightly rustc -Zbuild-std=std,panic_abort --target x86_64-unknown-linux-gnu -v -- -Zsanitizer=memory -Zsanitizer-memory-track-origins -Cforce-frame-pointers=yes
+                       cargo +nightly rustc $CARGO_BUILD_ARGS -Zbuild-std=std,panic_abort --target x86_64-unknown-linux-gnu -v -- -Zsanitizer=memory -Zsanitizer-memory-track-origins -Cforce-frame-pointers=yes
                        mv target/x86_64-unknown-linux-gnu/debug/libldk.* target/debug/
  
                        # Sadly, std doesn't seem to compile into something that is memsan-safe as of Aug 2020,
@@@ -428,9 -425,9 +431,9 @@@ if [ "$HOST_PLATFORM" = "host: x86_64-u
                        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 --target aarch64-apple-darwin -v -- -Zsanitizer=address -Cforce-frame-pointers=yes || ( mv Cargo.toml.bk Cargo.toml; exit 1)
+                       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
-               RUSTFLAGS="$RUSTFLAGS --cfg=test_mod_pointers" RUSTC_BOOTSTRAP=1 cargo rustc -v -- -Zsanitizer=address -Cforce-frame-pointers=yes || ( mv Cargo.toml.bk Cargo.toml; exit 1)
+               RUSTFLAGS="$RUSTFLAGS --cfg=test_mod_pointers" RUSTC_BOOTSTRAP=1 cargo rustc $CARGO_BUILD_ARGS -v -- -Zsanitizer=address -Cforce-frame-pointers=yes || ( mv Cargo.toml.bk Cargo.toml; exit 1)
                mv Cargo.toml.bk Cargo.toml
  
                # First the C demo app...
@@@ -457,7 -454,7 +460,7 @@@ f
  # Now build with LTO on on both C++ and rust, but without cross-language LTO:
  # Clear stale release build artifacts from previous runs
  cargo clean --release
- CARGO_PROFILE_RELEASE_LTO=true cargo rustc -v --release -- -C lto
+ CARGO_PROFILE_RELEASE_LTO=true cargo rustc $CARGO_BUILD_ARGS -v --release -- -C lto
  if [ "$2" = "true" ]; then
        clang++ $LOCAL_CFLAGS -std=c++11 -O2 demo.cpp target/release/libldk.a -ldl
  fi
@@@ -483,9 -480,9 +486,9 @@@ if [ "$2" = "false" -a "$(rustc --prin
        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"
-               cargo rustc -v --target=wasm32-wasi
+               RUSTFLAGS="$RUSTFLAGS --cfg=test_mod_pointers" cargo rustc $CARGO_BUILD_ARGS -v --target=wasm32-wasi
                export CFLAGS_wasm32_wasi="$BASE_CFLAGS -target wasm32 -Os"
-               CARGO_PROFILE_RELEASE_LTO=true cargo rustc -v --release --target=wasm32-wasi -- -C embed-bitcode=yes -C opt-level=s -C linker-plugin-lto -C lto
+               CARGO_PROFILE_RELEASE_LTO=true cargo rustc $CARGO_BUILD_ARGS -v --release --target=wasm32-wasi -- -C embed-bitcode=yes -C opt-level=s -C linker-plugin-lto -C lto
        else
                echo "Cannot build WASM lib as clang does not seem to support the wasm32-wasi target"
        fi
@@@ -504,7 -501,7 +507,7 @@@ for IDX in ${!EXTRA_TARGETS[@]}; d
        EXTRA_ENV_TARGET=$(echo "${EXTRA_TARGETS[$IDX]}" | sed 's/-/_/g')
        export CFLAGS_$EXTRA_ENV_TARGET="$BASE_CFLAGS"
        export CC_$EXTRA_ENV_TARGET=${EXTRA_CCS[$IDX]}
-       RUSTFLAGS="$BASE_RUSTFLAGS -C linker=${EXTRA_CCS[$IDX]}" CARGO_PROFILE_RELEASE_LTO=true cargo rustc -v --release --target "${EXTRA_TARGETS[$IDX]}" -- -C lto
+       RUSTFLAGS="$BASE_RUSTFLAGS -C linker=${EXTRA_CCS[$IDX]}" CARGO_PROFILE_RELEASE_LTO=true cargo rustc $CARGO_BUILD_ARGS -v --release --target "${EXTRA_TARGETS[$IDX]}" -- -C lto
  done
  
  if [ "$CLANGPP" != "" -a "$LLD" != "" ]; then
@@@ -522,12 -519,12 +525,12 @@@
                done
                export CFLAGS_aarch64_apple_darwin="$CFLAGS_aarch64_apple_darwin -O3 -fPIC -fembed-bitcode"
                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" CARGO_PROFILE_RELEASE_LTO=true cargo rustc -v --release --target aarch64-apple-darwin -- -C linker-plugin-lto -C lto -C linker=$CLANG $LINK_ARG_FLAGS -C link-arg=-mcpu=apple-a14
+               RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=apple-a14" CARGO_PROFILE_RELEASE_LTO=true cargo rustc $CARGO_BUILD_ARGS -v --release --target aarch64-apple-darwin -- -C linker-plugin-lto -C lto -C linker=$CLANG $LINK_ARG_FLAGS -C link-arg=-mcpu=apple-a14
        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 cargo rustc -v --release -- -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_PROFILE_RELEASE_LTO=true cargo rustc $CARGO_BUILD_ARGS -v --release -- -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
  
        if [ "$2" = "true" ]; then
                $CLANGPP $LOCAL_CFLAGS -flto -fuse-ld=$LLD -O2 demo.cpp target/release/libldk.a -ldl
@@@ -538,7 -535,7 +541,7 @@@
        fi
  else
        if [ "$CFLAGS_aarch64_apple_darwin" != "" ]; then
-               RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=apple-a14" CARGO_PROFILE_RELEASE_LTO=true cargo rustc -v --release --target aarch64-apple-darwin -- -C lto
+               RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=apple-a14" CARGO_PROFILE_RELEASE_LTO=true cargo rustc $CARGO_BUILD_ARGS -v --release --target aarch64-apple-darwin -- -C lto
        fi
        echo "WARNING: Building with cross-language LTO is not avilable without clang-$RUSTC_LLVM_V"
  fi