From 27d607a64ed4f53fa2a17bd8b06189d24d22ee31 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 26 Aug 2024 19:48:55 +0000 Subject: [PATCH] New crates/features and upgrade dependencies (removing `core2`!) --- genbindings.sh | 12 +++++++----- lightning-c-bindings/Cargo.toml | 12 ++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/genbindings.sh b/genbindings.sh index 1d86ac0..258f666 100755 --- a/genbindings.sh +++ b/genbindings.sh @@ -200,17 +200,19 @@ function drop_crate() { echo > /tmp/crate-source.txt if [ "$2" = "true" ]; then add_crate lightning lightning --features=std + add_crate lightning-types lightning_types add_crate "lightning-persister" "lightning_persister" - add_crate "lightning-background-processor" "lightning_background_processor" --features=std + add_crate "lightning-background-processor" "lightning_background_processor" --features=std,lightning/std add_crate "lightning-invoice" "lightning_invoice" --features=std - add_crate "lightning-rapid-gossip-sync" "lightning_rapid_gossip_sync" --features=std + add_crate "lightning-rapid-gossip-sync" "lightning_rapid_gossip_sync" --features=std,lightning/std CARGO_BUILD_ARGS="--features=std" else add_crate lightning lightning --features=no-std + add_crate lightning-types lightning_types drop_crate "lightning-persister" - 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 + add_crate "lightning-background-processor" "lightning_background_processor" --features=lightning/no-std + add_crate "lightning-rapid-gossip-sync" "lightning_rapid_gossip_sync" --features=lightning/no-std + add_crate "lightning-invoice" "lightning_invoice" CARGO_BUILD_ARGS="--features=no-std" fi diff --git a/lightning-c-bindings/Cargo.toml b/lightning-c-bindings/Cargo.toml index a927988..aaf64db 100644 --- a/lightning-c-bindings/Cargo.toml +++ b/lightning-c-bindings/Cargo.toml @@ -15,21 +15,21 @@ crate-type = ["staticlib" ,"cdylib"] [features] -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"] +no-std = ["lightning/no-std"] +std = ["bitcoin/std", "lightning/std", "lightning-invoice/std", "lightning-background-processor/std", "lightning-rapid-gossip-sync/std"] [dependencies] -bitcoin = { version = "0.30", default-features = false } -secp256k1 = { version = "0.27", features = ["global-context", "recovery"] } +bitcoin = { version = "0.32", default-features = false } +bech32 = { version = "0.9", default-features = false } +secp256k1 = { version = "0.29", 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.123-bindings", default-features = false } +lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.123-bindings", default-features = false } lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.123-bindings", default-features = false } lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.123-bindings", default-features = false } lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.123-bindings", default-features = false } lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.123-bindings", default-features = false } -core2 = { version = "0.3.0", optional = true, default-features = false } - # Always force panic=abort, further options are set in the genbindings.sh build script [profile.dev] panic = "abort" -- 2.39.5