Merge pull request #34 from LayerTwo-Labs/2026-05-16-backport-thunder-0.14.1

Backport Thunder 0.14.1

Author: Ash-L2L

Cargo.lock

@@ -10,59 +10,102 @@ publish = false
 version = "0.14.0"
 
 [workspace.dependencies]
+addr = "0.15.6"
 anyhow = "1.0.72"
+async-lock = "3.4.0"
+bech32 = "0.11.0"
 bincode = "1.3.3"
 bitcoin = "0.32.5"
 blake3 = "1.4.1"
 borsh = "1.3.1"
+byteorder = "1.4.3"
+bytes = "1.9.0"
 clap = "4.5.4"
+dirs = "6.0.0"
+dotenvy = "0.15.7"
 ed25519-bip32 = "0.4.1"
 ed25519-dalek = "2.1.1"
+educe = { version = "0.6.0", default-features = false }
+eframe = "0.31.0"
+either = "1.13.0"
+error-fatality = "0.1.2"
 fallible-iterator = "0.3.0"
+fatality = "0.1.1"
 futures = { version = "0.3.30", default-features = false }
+generic-array = "1.3.3"
+governor = { version = "0.8.1", default-features = false }
+hashlink = "0.10.0"
 heed = "0.21.0"
 hex = "0.4.3"
+hex-literal = "0.4.1"
+human-size = "0.4.3"
 http = "1.2.0"
+include_path = "0.1.1"
+itertools = "0.14.0"
 jsonrpsee = { version = "0.25.1", features = ["tracing"] }
+libes = "0.9.1"
+libtest-mimic = "0.8.1"
+merkle-cbt = "0.3.2"
+mimalloc = "0.1.48"
 nonempty = "0.11.0"
 parking_lot = "0.12.1"
+poll-promise = "0.3.0"
 prost = "0.14.3"
+prost-build = "0.14.3"
+prost-types = "0.14.3"
+protox = "0.9.1"
+quinn = "0.11.6"
 rayon = "1.7.0"
+rcgen = "0.13.2"
+reserve-port = "2.0.1"
+rustls = { version = "0.23.21", default-features = false }
 semver = "1.0.2"
 serde = "1.0.179"
 serde_json = "1.0.113"
+serde_json_canonicalizer = "0.3.0"
 serde_with = { version = "3.4.0", default-features = false }
+shlex = "1.3.0"
+smallvec = "1.13.2"
+sneed = "0.0.19"
 strum = { version = "0.27.2", default-features = false }
-thiserror = "=2.0.16"
+thiserror = "2.0.16"
 tiny-bip39 = "2.0.0"
-tokio = { version = "1.48.0", default-features = false }
+tokio = { version = "1.50.0", default-features = false }
+tokio-stream = "0.1.15"
 tokio-util = "0.7.18"
 tonic = "0.14.3"
+tonic-health = "0.14.3"
+tonic-prost = "0.14.3"
+tonic-prost-build = "0.14.3"
+# needs to line up with jsonrpsee tower version...
+tower = "0.5.2"
+tower-http = "0.6.2"
 tracing = "0.1.40"
+tracing-appender = "0.2.3"
+tracing-indicatif = "0.3.8"
 tracing-subscriber = "0.3.20"
+transitive = "1.2.0"
+typenum = "1.18.0"
 url = "2.5.4"
 utoipa = { version = "5.2.0", default-features = false }
 uuid = "1.13.1"
 x25519-dalek = "2.0.0"
+zeromq = "0.5.0"
 
 [workspace.dependencies.bip300301_enforcer_lib]
 default-features = false
 git = "https://github.com/LayerTwo-Labs/bip300301_enforcer"
-rev = "9c3eb0bdcb5b9a458e6f92cafb8bdbf76a860f74"
+rev = "57bf4f8ace4454eddaec83dbc634dc706fc71516"
 
 [workspace.dependencies.bip300301_enforcer_integration_tests]
 default-features = false
 git = "https://github.com/LayerTwo-Labs/bip300301_enforcer"
-rev = "9c3eb0bdcb5b9a458e6f92cafb8bdbf76a860f74"
+rev = "57bf4f8ace4454eddaec83dbc634dc706fc71516"
 
 [workspace.dependencies.l2l-openapi]
 git = "https://github.com/Ash-L2L/l2l-openapi"
 rev = "5f8fb2237c95725731d5fb10542098303d82e215"
 
-[workspace.dependencies.libes]
-version = "0.9.1"
-features = ["AES256-GCM", "ECIES-MAC", "HMAC-SHA256", "x25519"]
-
 [workspace.lints.clippy]
 all = { level = "deny", priority = -1 }
 assertions_on_result_states = "allow"

Cargo.toml

@@ -13,44 +13,43 @@ bitcoin = { workspace = true, features = ["serde"] }
 blake3 = { workspace = true }
 borsh = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
-dirs = "6.0.0"
-eframe = "0.31.0"
-either = "1.13.0"
+dirs = { workspace = true }
+eframe = { workspace = true }
+either = { workspace = true }
 fallible-iterator = { workspace = true }
 futures = { workspace = true }
 hex = { workspace = true }
 http = { workspace = true }
-human-size = "0.4.3"
-itertools = "0.14.0"
-include_path = "0.1.1"
+human-size = { workspace = true }
+include_path = { workspace = true }
+itertools = { workspace = true }
 jsonrpsee = { workspace = true, features = ["server"] }
-mimalloc = { version = "0.1.48", features = ["v3"] }
+mimalloc = { workspace = true, features = ["v3"] }
 parking_lot = { workspace = true }
 plain_bitnames = { path = "../lib", features = ["clap"] }
 plain_bitnames_app_cli = { path = "../cli" }
 plain_bitnames_app_rpc_api = { path = "../rpc-api" }
-poll-promise = { version = "0.3.0", features = ["tokio"] }
+poll-promise = { workspace = true, features = ["tokio"] }
 serde = { workspace = true, features = ["derive"] }
-shlex = "1.3.0"
+shlex = { workspace = true }
 strum = {  workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
 tiny-bip39 = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal"] }
 tokio-util = { workspace = true, features = ["rt"] }
 tonic = { workspace = true }
-tonic-health = "0.14.3"
-# needs to line up with jsonrpsee tower version...
-tower = "0.5.2"
-tower-http = { version = "0.6.2", features = ["request-id", "trace"] }
+tonic-health = { workspace = true }
+tower = { workspace = true }
+tower-http = { workspace = true, features = ["request-id", "trace"] }
 tracing = { workspace = true }
-tracing-appender = "0.2.3"
+tracing-appender = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter", "json"] }
 url = { workspace = true }
 utoipa = { workspace = true }
 uuid = { workspace = true, features = ["v4"] }
 
 [dependencies.libes]
-version = "0.9.1"
+workspace = true
 features = ["AES256-GCM", "ECIES-MAC", "HMAC-SHA256", "x25519"]
 
 [features]

app/Cargo.toml

@@ -17,7 +17,7 @@ jsonrpsee = { workspace = true, features = ["http-client"] }
 plain_bitnames = { path = "../lib", features = ["clap"] }
 plain_bitnames_app_rpc_api = { path = "../rpc-api" }
 serde_json = { workspace = true }
-serde_json_canonicalizer = "0.3.0"
+serde_json_canonicalizer = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }

cli/Cargo.toml

@@ -103,7 +103,6 @@ allow = [
     "ISC",
     "MIT",
     "MITNFA",
-    "OpenSSL",
     "Unicode-3.0",
     "Unlicense",
 ]
@@ -122,7 +121,7 @@ exceptions = [
     { allow = ["CDLA-Permissive-2.0"], name = "webpki-roots", version = "1.0.5" },
     { allow = ["LicenseRef-UFL-1.0", "OFL-1.1", "Ubuntu-font-1.0"], name = "epaint_default_fonts", version = "0.31.0" },
     { allow = ["MPL-2.0"], name = "bitmaps", version = "3.2.1" },
-    { allow = ["MPL-2.0"], name = "imbl", version = "3.0.0" },
+    { allow = ["MPL-2.0"], name = "imbl", version = "7.0.0" },
     { allow = ["MPL-2.0"], name = "imbl-sized-chunks", version = "0.1.3" },
     { allow = ["MPL-2.0"], name = "option-ext", version = "0.2.0" },
     { allow = ["MPL-2.0"], name = "webpki-roots", version = "0.25.4" },

deny.toml

@@ -13,16 +13,16 @@ bip300301_enforcer_integration_tests = { workspace = true }
 bitcoin = { workspace = true }
 blake3 = { workspace = true }
 clap = { workspace = true }
-dotenvy = "0.15.7"
+dotenvy = { workspace = true }
 futures = { workspace = true }
 jsonrpsee = { workspace = true }
-libtest-mimic = "0.8.1"
+libtest-mimic = { workspace = true }
 plain_bitnames = { path = "../lib", features = ["clap"] }
 plain_bitnames_app_rpc_api = { path = "../rpc-api" }
-reserve-port = "2.0.1"
+reserve-port = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
-tracing-indicatif = "0.3.8"
+tracing-indicatif = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 

integration_tests/Cargo.toml

@@ -35,7 +35,7 @@ async fn setup(
     res_tx: mpsc::UnboundedSender<anyhow::Result<()>>,
 ) -> anyhow::Result<(EnforcerPostSetup, BitNamesNodes)> {
     let enforcer_pre_setup =
-        EnforcerPreSetup::new(bin_paths.others, Network::Regtest)?;
+        EnforcerPreSetup::new(&bin_paths.others, Network::Regtest)?;
     let mut enforcer_post_setup = {
         let setup_opts: EnforcerSetupOpts = Default::default();
         enforcer_pre_setup
@@ -44,7 +44,7 @@ async fn setup(
     };
     let sidechain_sender = PostSetup::setup(
         Init {
-            bitnames_app: bin_paths.bitnames.clone(),
+            bitnames_app: bin_paths.bitnames()?.clone(),
             data_dir_suffix: Some("sender".to_owned()),
         },
         &enforcer_post_setup,
@@ -54,7 +54,7 @@ async fn setup(
     tracing::info!("Setup BitNames send node successfully");
     let sidechain_syncer = PostSetup::setup(
         Init {
-            bitnames_app: bin_paths.bitnames.clone(),
+            bitnames_app: bin_paths.bitnames()?.clone(),
             data_dir_suffix: Some("syncer".to_owned()),
         },
         &enforcer_post_setup,

integration_tests/ibd.rs

@@ -134,7 +134,7 @@ fn deposit_withdraw_roundtrip_trial(
         async move {
             let (res_tx, _) = futures::channel::mpsc::unbounded();
             let pre_setup =
-                EnforcerPreSetup::new(bin_paths.others, Network::Regtest)?;
+                EnforcerPreSetup::new(&bin_paths.others, Network::Regtest)?;
             let post_setup = {
                 let setup_opts: EnforcerSetupOpts = Default::default();
                 pre_setup
@@ -144,7 +144,7 @@ fn deposit_withdraw_roundtrip_trial(
             deposit_withdraw_roundtrip(
                 post_setup,
                 Init {
-                    bitnames_app: bin_paths.bitnames,
+                    bitnames_app: bin_paths.bitnames()?.clone(),
                     data_dir_suffix: None,
                 },
                 res_tx,

integration_tests/integration_test.rs

@@ -101,7 +101,7 @@ async fn main() -> anyhow::Result<std::process::ExitCode> {
     let failure_collector = TestFailureCollector::new();
     tests.extend(
         integration_test::tests(
-            util::BinPaths::from_env()?,
+            util::BinPaths::default(),
             file_registry,
             failure_collector,
         )

integration_tests/main.rs

@@ -33,7 +33,7 @@ async fn setup(
     res_tx: mpsc::UnboundedSender<anyhow::Result<()>>,
 ) -> anyhow::Result<(EnforcerPostSetup, PostSetup)> {
     let enforcer_pre_setup =
-        EnforcerPreSetup::new(bin_paths.others, Network::Regtest)?;
+        EnforcerPreSetup::new(&bin_paths.others, Network::Regtest)?;
     let mut enforcer_post_setup = {
         let setup_opts: EnforcerSetupOpts = Default::default();
         enforcer_pre_setup
@@ -47,7 +47,7 @@ async fn setup(
     let () = fund_enforcer::<PostSetup>(&mut enforcer_post_setup).await?;
     let mut post_setup = PostSetup::setup(
         Init {
-            bitnames_app: bin_paths.bitnames,
+            bitnames_app: bin_paths.bitnames()?.clone(),
             data_dir_suffix: None,
         },
         &enforcer_post_setup,