Update lightning-c-bindings Cargo.toml & CI to point to 0.0.116

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 25b7a603a5de04a1b2928df4a7e447489f8d6e65..b9a7287eeb5e79d1d2ba98b8639eb681bfc42189 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
         run: |
           git clone https://github.com/rust-bitcoin/rust-lightning
           cd rust-lightning
-          git checkout 0.0.115-bindings
+          git checkout 0.0.116-bindings
       - name: Fix Github Actions to not be broken
         run: git config --global --add safe.directory /__w/ldk-c-bindings/ldk-c-bindings
       - name: Pin proc-macro and quote to meet MSRV
@@ -97,7 +97,7 @@ jobs:
         run: |
           git clone https://github.com/rust-bitcoin/rust-lightning
           cd rust-lightning
-          git checkout 0.0.115-bindings
+          git checkout 0.0.116-bindings
       - name: Fix Github Actions to not be broken
         run: git config --global --add safe.directory /__w/ldk-c-bindings/ldk-c-bindings
       - name: Fetch MacOS SDK
@@ -144,7 +144,7 @@ jobs:
         run: |
           git clone https://github.com/rust-bitcoin/rust-lightning
           cd rust-lightning
-          git checkout 0.0.115-bindings
+          git checkout 0.0.116-bindings
       - name: Rebuild bindings using Apple clang, and check the sample app builds + links
         run: ./genbindings.sh ./rust-lightning true
       - name: Rebuild bindings using upstream clang, and check the sample app builds + links

diff --git a/genbindings.sh b/genbindings.sh
index f1058161f9c9cf232af1c17c40df20e57af122a8..34982335a58067de41476b736a71f40aa3248c62 100755 (executable)
--- a/genbindings.sh
+++ b/genbindings.sh
@@ -156,7 +156,7 @@ function is_gnu_sed(){
 
 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
+       RUSTC_BOOTSTRAP=1 cargo rustc --profile=check -Z avoid-dev-deps --no-default-features $3 -- --cfg=c_bindings -Zunpretty=expanded > /tmp/$1-crate-source.txt
        popd
        if [ "$HOST_OSX" = "true" ]; then
                sed -i".original" "1i\\
@@ -191,12 +191,12 @@ if [ "$2" = "true" ]; then
        add_crate "lightning-persister" "lightning_persister"
        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"
+       add_crate "lightning-rapid-gossip-sync" "lightning_rapid_gossip_sync" --features=std
        CARGO_BUILD_ARGS="--features=std"
 else
        add_crate lightning lightning --features=no-std
        drop_crate "lightning-persister"
-       add_crate "lightning-background-processor" "lightning_background_processor"
+       add_crate "lightning-background-processor" "lightning_background_processor" --features=no-std
        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"

diff --git a/lightning-c-bindings/Cargo.toml b/lightning-c-bindings/Cargo.toml
index 43021a14cad7336896e4dbb6d6d10ce095caf01f..409c66dd6bcdb2a057acc116e5b5cee19f99aa83 100644 (file)
--- a/lightning-c-bindings/Cargo.toml
+++ b/lightning-c-bindings/Cargo.toml
@@ -15,18 +15,18 @@ crate-type = ["staticlib"
 ,"cdylib"]
 
 [features]
-no-std = ["bitcoin/no-std", "lightning/no-std", "lightning-invoice/no-std", "core2"]
+no-std = ["bitcoin/no-std", "lightning/no-std", "lightning-invoice/no-std", "lightning-background-processor/no-std", "core2"]
 std = ["bitcoin/std", "lightning/std", "lightning-invoice/std", "lightning-background-processor/std"]
 
 [dependencies]
 bitcoin = { version = "0.29", default-features = false }
 secp256k1 = { version = "0.24", features = ["global-context", "recovery"] }
 # Note that the following line is matched by genbindings to update the path
-lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.115-bindings", default-features = false }
-lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.115-bindings", default-features = false }
-lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.115-bindings", default-features = false }
-lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.115-bindings", default-features = false }
-lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.115-bindings", default-features = false }
+lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.116-bindings", default-features = false }
+lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.116-bindings", default-features = false }
+lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.116-bindings", default-features = false }
+lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.116-bindings", default-features = false }
+lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.116-bindings", default-features = false }
 
 core2 = { version = "0.3.0", optional = true, default-features = false }