From 8517665ce3a41e8243fa5c70129b28a729a001cb Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Mon, 9 Dec 2024 11:36:19 -0500 Subject: [PATCH 01/33] feat: add binary download to tangle::run --- Cargo.lock | 2 + Cargo.toml | 3 +- blueprint-test-utils/Cargo.toml | 2 + blueprint-test-utils/src/tangle/mod.rs | 72 +++++++++++++++++-- .../contracts/lib/forge-std | 2 +- .../contracts/lib/core | 2 +- .../contracts/lib/forge-std | 2 +- .../contracts/lib/forge-std | 2 +- .../contracts/lib/tnt-core | 2 +- 9 files changed, 76 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 75e66a36..40efcac0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2145,6 +2145,7 @@ dependencies = [ "cargo_metadata", "cargo_toml", "color-eyre", + "dirs", "futures", "gadget-io", "gadget-sdk", @@ -2152,6 +2153,7 @@ dependencies = [ "libp2p", "log", "parking_lot 0.12.3", + "reqwest 0.12.9", "serde", "sp-core", "sp-io", diff --git a/Cargo.toml b/Cargo.toml index 377adf7e..1fbef32e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -97,6 +97,7 @@ cargo-generate = { version = "0.21.3", default-features = false } cfg-if = "1.0.0" clap = "4.5.16" clap-cargo = "0.14" +dirs = "5.0.1" eyre = { version = "0.6.12" } color-eyre = { version = "0.6", features = ["tracing-error", "color-spantrace"] } ed25519-zebra = { version = "4" } @@ -126,7 +127,7 @@ proc-macro2 = "1.0" prometheus = { version = "0.13.4", default-features = false } quote = "1.0" rand = { version = "0.8.5", default-features = false } -reqwest = "0.12.7" +reqwest = "0.12.9" rustdoc-types = "0.31.0" schnorrkel = { version = "0.11.4", default-features = false, features = ["preaudit_deprecated", "getrandom"] } serde = { version = "1.0.208", default-features = false } diff --git a/blueprint-test-utils/Cargo.toml b/blueprint-test-utils/Cargo.toml index 9e28ea60..3259fdfe 100644 --- a/blueprint-test-utils/Cargo.toml +++ b/blueprint-test-utils/Cargo.toml @@ -55,10 +55,12 @@ alloy-sol-types = { workspace = true } alloy-transport = { workspace = true } # Utility +dirs = { workspace = true } testcontainers = { workspace = true } uuid = { workspace = true, features = ["v4"] } tempfile = { workspace = true } cargo_toml = { workspace = true } +reqwest = { workspace = true } [dev-dependencies] cargo_metadata = { workspace = true } diff --git a/blueprint-test-utils/src/tangle/mod.rs b/blueprint-test-utils/src/tangle/mod.rs index 2a0d0581..dbc9a82f 100644 --- a/blueprint-test-utils/src/tangle/mod.rs +++ b/blueprint-test-utils/src/tangle/mod.rs @@ -1,18 +1,76 @@ use crate::tangle::node::{Error, SubstrateNode, TANGLE_NODE_ENV}; +use reqwest; +use std::env; +use std::fs; +use std::io::Write; +use std::path::PathBuf; pub mod node; pub mod transactions; +const TANGLE_RELEASE_MAC: &str = "https://github.com/tangle-network/tangle/releases/download/83f587f/tangle-testnet-manual-seal-darwin-amd64"; +const TANGLE_RELEASE_LINUX: &str = "https://github.com/tangle-network/tangle/releases/download/83f587f/tangle-testnet-manual-seal-linux-amd64"; + +/// Downloads the appropriate Tangle binary for the current platform and returns the path +pub async fn download_tangle_binary() -> Result> { + let download_url = if cfg!(target_os = "macos") { + TANGLE_RELEASE_MAC + } else if cfg!(target_os = "linux") { + TANGLE_RELEASE_LINUX + } else { + return Err("Unsupported platform".into()); + }; + + // Create cache directory in user's home directory + let cache_dir = dirs::cache_dir() + .ok_or("Could not determine cache directory")? + .join("tangle-binary"); + fs::create_dir_all(&cache_dir)?; + + let binary_path = cache_dir.join("tangle"); + + let version_path = cache_dir.join("version.txt"); + let commit_hash = download_url.split('/').nth(7).unwrap_or_default(); + + let should_download = if binary_path.exists() && version_path.exists() { + // Check if version matches + let stored_version = fs::read_to_string(&version_path)?; + stored_version.trim() != commit_hash + } else { + true + }; + + if should_download { + let response = reqwest::get(download_url).await?; + let bytes = response.bytes().await?; + + let mut file = fs::File::create(&binary_path)?; + file.write_all(&bytes)?; + + // Make binary executable + #[cfg(unix)] + { + use std::os::unix::fs::PermissionsExt; + let mut perms = fs::metadata(&binary_path)?.permissions(); + perms.set_mode(0o755); + fs::set_permissions(&binary_path, perms)?; + } + + // Write version file + fs::write(&version_path, commit_hash)?; + } + + Ok(binary_path) +} + /// Run a Tangle node with the default settings. /// The node will shut down when the returned handle is dropped. -pub fn run() -> Result { - let tangle_from_env = std::env::var(TANGLE_NODE_ENV).unwrap_or_else(|_| "tangle".to_string()); +pub async fn run() -> Result { + let binary_path = download_tangle_binary() + .await + .map_err(|e| Error::Io(io::Error::new(io::ErrorKind::Other, e)))?; let builder = SubstrateNode::builder() - .binary_paths([ - &tangle_from_env, - "../tangle/target/release/tangle", - "../../tangle/target/release/tangle", - ]) + .binary_paths([binary_path]) .arg("validator") .arg_val("rpc-cors", "all") .arg_val("rpc-methods", "unsafe") diff --git a/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std b/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std index d3db4ef9..1de6eecf 160000 --- a/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std +++ b/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std @@ -1 +1 @@ -Subproject commit d3db4ef90a72b7d24aa5a2e5c649593eaef7801d +Subproject commit 1de6eecf821de7fe2c908cc48d3ab3dced20717f diff --git a/blueprints/incredible-squaring-symbiotic/contracts/lib/core b/blueprints/incredible-squaring-symbiotic/contracts/lib/core index 2a5f6f0f..f38f1b16 160000 --- a/blueprints/incredible-squaring-symbiotic/contracts/lib/core +++ b/blueprints/incredible-squaring-symbiotic/contracts/lib/core @@ -1 +1 @@ -Subproject commit 2a5f6f0fcee9a8d0ace03c38c77a352c5e5f95ae +Subproject commit f38f1b16b8207dcff55d681a0d5ba28c66e785c8 diff --git a/blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std b/blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std index d3db4ef9..1eea5bae 160000 --- a/blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std +++ b/blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std @@ -1 +1 @@ -Subproject commit d3db4ef90a72b7d24aa5a2e5c649593eaef7801d +Subproject commit 1eea5bae12ae557d589f9f0f0edae2faa47cb262 diff --git a/blueprints/incredible-squaring/contracts/lib/forge-std b/blueprints/incredible-squaring/contracts/lib/forge-std index d3db4ef9..1de6eecf 160000 --- a/blueprints/incredible-squaring/contracts/lib/forge-std +++ b/blueprints/incredible-squaring/contracts/lib/forge-std @@ -1 +1 @@ -Subproject commit d3db4ef90a72b7d24aa5a2e5c649593eaef7801d +Subproject commit 1de6eecf821de7fe2c908cc48d3ab3dced20717f diff --git a/blueprints/incredible-squaring/contracts/lib/tnt-core b/blueprints/incredible-squaring/contracts/lib/tnt-core index df6d5d6d..c1fa9c7c 160000 --- a/blueprints/incredible-squaring/contracts/lib/tnt-core +++ b/blueprints/incredible-squaring/contracts/lib/tnt-core @@ -1 +1 @@ -Subproject commit df6d5d6da3c82217405c408d3c0b11369bb3e5c2 +Subproject commit c1fa9c7c3c5891aab9bd25002a434d93c54942cd From 579e1aeca70a8865ea0d66921e2e4cad3769ace4 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Mon, 9 Dec 2024 11:45:04 -0500 Subject: [PATCH 02/33] chore: fix error --- blueprint-test-utils/src/tangle/mod.rs | 9 ++++++--- blueprint-test-utils/src/test_ext.rs | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/blueprint-test-utils/src/tangle/mod.rs b/blueprint-test-utils/src/tangle/mod.rs index dbc9a82f..81c715de 100644 --- a/blueprint-test-utils/src/tangle/mod.rs +++ b/blueprint-test-utils/src/tangle/mod.rs @@ -66,9 +66,12 @@ pub async fn download_tangle_binary() -> Result Result { - let binary_path = download_tangle_binary() - .await - .map_err(|e| Error::Io(io::Error::new(io::ErrorKind::Other, e)))?; + let binary_path = download_tangle_binary().await.map_err(|e| { + Error::Io(std::io::Error::new( + std::io::ErrorKind::Other, + e.to_string(), + )) + })?; let builder = SubstrateNode::builder() .binary_paths([binary_path]) .arg("validator") diff --git a/blueprint-test-utils/src/test_ext.rs b/blueprint-test-utils/src/test_ext.rs index 4ff7bc09..b738dcaf 100644 --- a/blueprint-test-utils/src/test_ext.rs +++ b/blueprint-test-utils/src/test_ext.rs @@ -82,7 +82,7 @@ pub async fn new_test_ext_blueprint_manager< let blueprint_name = manifest.package.as_ref().unwrap().name.clone(); tracing::info!("Starting Tangle node..."); - let tangle_node = crate::tangle::run().unwrap(); + let tangle_node = crate::tangle::run().await.unwrap(); tracing::info!("Tangle node running on port: {}", tangle_node.ws_port()); let mut opts = Opts { From 9e4d27f442959b847bfda291ba970f6e7ba6749f Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Mon, 9 Dec 2024 11:14:05 -0600 Subject: [PATCH 03/33] feat!(blueprint-test-utils): build tnt-core in test-utils with soldeer --- Cargo.lock | 1 + blueprint-build-utils/src/lib.rs | 2 +- blueprint-test-utils/Cargo.toml | 3 +++ blueprint-test-utils/build.rs | 5 +++++ blueprint-test-utils/foundry.toml | 14 ++++++++++++++ blueprint-test-utils/src/test_ext.rs | 1 + 6 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 blueprint-test-utils/build.rs create mode 100644 blueprint-test-utils/foundry.toml diff --git a/Cargo.lock b/Cargo.lock index 40efcac0..708ea8e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2140,6 +2140,7 @@ dependencies = [ "alloy-sol-types", "alloy-transport", "async-trait", + "blueprint-build-utils", "blueprint-manager", "cargo-tangle", "cargo_metadata", diff --git a/blueprint-build-utils/src/lib.rs b/blueprint-build-utils/src/lib.rs index 41d4d0b2..59905112 100644 --- a/blueprint-build-utils/src/lib.rs +++ b/blueprint-build-utils/src/lib.rs @@ -67,7 +67,7 @@ pub fn soldeer_update() { let status = Command::new(&forge_executable) .current_dir(&root) - .args(["soldeer", "update"]) + .args(["soldeer", "update", "-d"]) .status() .expect("Failed to execute 'forge soldeer update'"); diff --git a/blueprint-test-utils/Cargo.toml b/blueprint-test-utils/Cargo.toml index 3259fdfe..33725d48 100644 --- a/blueprint-test-utils/Cargo.toml +++ b/blueprint-test-utils/Cargo.toml @@ -64,3 +64,6 @@ reqwest = { workspace = true } [dev-dependencies] cargo_metadata = { workspace = true } + +[build-dependencies] +blueprint-build-utils = { workspace = true } diff --git a/blueprint-test-utils/build.rs b/blueprint-test-utils/build.rs new file mode 100644 index 00000000..f1440365 --- /dev/null +++ b/blueprint-test-utils/build.rs @@ -0,0 +1,5 @@ +fn main() { + let contract_dirs: Vec<&str> = vec!["."]; + blueprint_build_utils::soldeer_update(); + blueprint_build_utils::build_contracts(contract_dirs); +} diff --git a/blueprint-test-utils/foundry.toml b/blueprint-test-utils/foundry.toml new file mode 100644 index 00000000..402190f4 --- /dev/null +++ b/blueprint-test-utils/foundry.toml @@ -0,0 +1,14 @@ +[profile.default] +src = "contracts/src" +test = "contracts/test" +out = "contracts/out" +script = "contracts/script" +cache_path = "contracts/cache" +broadcast = "contracts/broadcast" +libs = ["dependencies"] +auto_detect_remappings = true + +[dependencies] +tnt-core = { version = "0.1.0", git = "https://github.com/tangle-network/tnt-core.git" } + +# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options diff --git a/blueprint-test-utils/src/test_ext.rs b/blueprint-test-utils/src/test_ext.rs index b738dcaf..d8b0f294 100644 --- a/blueprint-test-utils/src/test_ext.rs +++ b/blueprint-test-utils/src/test_ext.rs @@ -172,6 +172,7 @@ pub async fn new_test_ext_blueprint_manager< Some((rev, addr)) => debug!("MBSM is deployed at revision #{rev} at address {addr}"), None => { let bytecode_hex = include_str!("../tnt-core/MasterBlueprintServiceManager.hex"); + // let bytecode_hex = include_str!("../dependencies/tnt-core-0.1.0/"); let mut raw_hex = bytecode_hex.replace("0x", "").replace("\n", ""); // fix odd length if raw_hex.len() % 2 != 0 { From 379026eab5323248ff34b896e4cead9baba2aee2 Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Mon, 9 Dec 2024 11:27:52 -0600 Subject: [PATCH 04/33] feat!(blueprint-test-utils): dynamically get mbsm bytecode from installed tnt-core version --- Cargo.lock | 1 + blueprint-test-utils/Cargo.toml | 1 + blueprint-test-utils/src/test_ext.rs | 30 ++++++++++++++++++++++++++-- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 708ea8e4..ae7542d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2156,6 +2156,7 @@ dependencies = [ "parking_lot 0.12.3", "reqwest 0.12.9", "serde", + "serde_json", "sp-core", "sp-io", "subxt", diff --git a/blueprint-test-utils/Cargo.toml b/blueprint-test-utils/Cargo.toml index 33725d48..094a87cd 100644 --- a/blueprint-test-utils/Cargo.toml +++ b/blueprint-test-utils/Cargo.toml @@ -22,6 +22,7 @@ blueprint-manager = { workspace = true } futures = { workspace = true } parking_lot = { workspace = true } serde = { workspace = true } +serde_json = { workspace = true } tokio = { workspace = true, features = ["full"] } # Logging and error handling diff --git a/blueprint-test-utils/src/test_ext.rs b/blueprint-test-utils/src/test_ext.rs index d8b0f294..9f6e450f 100644 --- a/blueprint-test-utils/src/test_ext.rs +++ b/blueprint-test-utils/src/test_ext.rs @@ -171,8 +171,34 @@ pub async fn new_test_ext_blueprint_manager< match latest_revision { Some((rev, addr)) => debug!("MBSM is deployed at revision #{rev} at address {addr}"), None => { - let bytecode_hex = include_str!("../tnt-core/MasterBlueprintServiceManager.hex"); - // let bytecode_hex = include_str!("../dependencies/tnt-core-0.1.0/"); + // Find the JSON file dynamically + let json_path = std::fs::read_dir("../dependencies") + .expect("Failed to read dependencies directory") + .filter_map(Result::ok) + .find_map(|entry| { + let path = entry.path(); + if path.is_dir() && path.file_name().and_then(|n| n.to_str()).map_or(false, |s| s.starts_with("tnt-core")) { + let json_path = path.join("out").join("MasterBlueprintServiceManager.sol").join("MasterBlueprintServiceManager.json"); + if json_path.exists() { + Some(json_path) + } else { + None + } + } else { + None + } + }) + .ok_or_else(|| std::io::Error::new(std::io::ErrorKind::NotFound, "JSON file not found")).expect("Failed to find MBSM JSON file"); + // Read the JSON file + let contents = std::fs::read_to_string(json_path).expect("Failed to read MBSM JSON file"); + // Parse the JSON + let v: serde_json::Value = serde_json::from_str(&contents).expect("Failed to parse MBSM JSON file"); + // Extract the bytecode + let bytecode_hex = v["bytecode"] + .as_str() + .ok_or("Bytecode not found or not a string") + .expect("MBSM bytecode not found") + .to_string(); let mut raw_hex = bytecode_hex.replace("0x", "").replace("\n", ""); // fix odd length if raw_hex.len() % 2 != 0 { From 5505e36dab698acb1a1504006d5af25a6b142902 Mon Sep 17 00:00:00 2001 From: Serial <69764315+Serial-ATA@users.noreply.github.com> Date: Mon, 9 Dec 2024 17:18:11 -0500 Subject: [PATCH 05/33] chore: add incredible-squaring to CI --- .github/workflows/ci.yml | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9f58d58..a05cb654 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,6 +126,62 @@ jobs: - name: doc tests run: cargo test --package ${{ matrix.package }} --doc + incredible-squaring: + timeout-minutes: 90 + runs-on: ubuntu-latest + steps: + - name: checkout code + uses: actions/checkout@v2 + with: + path: gadget + + - name: Download Tangle node + uses: robinraju/release-downloader@v1 + with: + repository: tangle-network/tangle + latest: true + preRelease: true + fileName: tangle-testnet-manual-seal-linux-amd64 + tarBall: false + zipBall: false + out-file-path: tangle + + - name: Install Foundry + run: | + curl -L https://foundry.paradigm.xyz | bash + ${FOUNDRY_DIR:-"$HOME/.foundry"}/bin/foundryup + env: + FOUNDRY_DIR: ${{ runner.temp }}/foundry + shell: bash + + - name: Add Foundry to PATH + run: echo "${{ runner.temp }}/foundry/bin" >> $GITHUB_PATH + + - name: Forge build + working-directory: gadget/blueprints/incredible-squaring + run: forge update && forge build + + - name: install rust + uses: dtolnay/rust-toolchain@nightly + with: + toolchain: stable + + - uses: swatinem/rust-cache@v2 + with: + cache-on-failure: "true" + + - name: install protobuf and gmp + run: | + sudo apt-get update + sudo apt-get install -y protobuf-compiler libprotobuf-dev libgmp-dev + + - name: install cargo-nextest + run: cargo install cargo-nextest --locked + + - name: tests + working-directory: gadget + run: TANGLE_NODE="$(pwd)/../tangle" cargo nextest run --nocapture --package incredible-squaring-blueprint test_blueprint --retries 0 + eigenlayer-tests: timeout-minutes: 90 runs-on: ubuntu-latest From 24b9ab7f8ab449b13ac4efd1d1424c0be009d655 Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Mon, 9 Dec 2024 17:48:42 -0600 Subject: [PATCH 06/33] feat(blueprint-test-utils): utilize tnt-core bytecode crate --- Cargo.lock | 1303 ++++++++++++++------------ Cargo.toml | 3 +- blueprint-test-utils/Cargo.toml | 1 + blueprint-test-utils/src/test_ext.rs | 38 +- 4 files changed, 695 insertions(+), 650 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae7542d8..079a6501 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -122,9 +122,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy" @@ -154,9 +154,9 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.1.47" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c5c520273946ecf715c0010b4e3503d7eba9893cd9ce6b7fff5654c4a3c470" +checksum = "a0161082e0edd9013d23083465cc04b20e44b7a15646d36ba7b0cdb7cd6fe18f" dependencies = [ "alloy-primitives", "num_enum", @@ -197,14 +197,14 @@ dependencies = [ "alloy-transport", "futures", "futures-util", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "alloy-core" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d22df68fa7d9744be0b1a9be3260e9aa089fbf41903ab182328333061ed186" +checksum = "c618bd382f0bc2ac26a7e4bfae01c9b015ca8f21b37ca40059ae35a7e62b3dc6" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -215,9 +215,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cf633ae9a1f0c82fdb9e559ed2be1c8e415c3e48fc47e1feaf32c6078ec0cdd" +checksum = "41056bde53ae10ffbbf11618efbe1e0290859e5eab0fe9ef82ebdb62f12a866f" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -285,9 +285,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a500037938085feed8a20dbfc8fce58c599db68c948cfae711147175dee392c" +checksum = "c357da577dfb56998d01f574d81ad7a1958d248740a7981b205d69d65a7da404" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -305,7 +305,7 @@ dependencies = [ "alloy-sol-types", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -327,7 +327,7 @@ dependencies = [ "async-trait", "auto_impl", "futures-utils-wasm", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -355,16 +355,16 @@ dependencies = [ "rand", "serde_json", "tempfile", - "thiserror", + "thiserror 1.0.69", "tracing", "url", ] [[package]] name = "alloy-primitives" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aeeb5825c2fc8c2662167058347cd0cafc3cb15bcb5cdb1758a63c2dca0409e" +checksum = "6259a506ab13e1d658796c31e6e39d2e2ee89243bcc505ddc613b35732e0a430" dependencies = [ "alloy-rlp", "bytes", @@ -372,9 +372,9 @@ dependencies = [ "const-hex", "derive_more 1.0.0", "foldhash", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "hex-literal", - "indexmap 2.6.0", + "indexmap 2.7.0", "itoa", "k256", "keccak-asm", @@ -382,7 +382,7 @@ dependencies = [ "proptest", "rand", "ruint", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "serde", "sha3", "tiny-keccak", @@ -421,7 +421,7 @@ dependencies = [ "schnellru", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "url", @@ -449,9 +449,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0822426598f95e45dd1ea32a738dac057529a709ee645fcc516ffa4cbde08f" +checksum = "f542548a609dca89fcd72b3b9f355928cf844d4363c5eed9c5273a3dd225e097" dependencies = [ "alloy-rlp-derive", "arrayvec 0.7.6", @@ -460,13 +460,13 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f" +checksum = "5a833d97bf8a5f0f878daf2c8451fff7de7f9de38baa5a45d936ec718d81255a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -567,7 +567,7 @@ dependencies = [ "auto_impl", "elliptic-curve", "k256", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -584,7 +584,7 @@ dependencies = [ "aws-sdk-kms", "k256", "spki", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -601,47 +601,47 @@ dependencies = [ "async-trait", "k256", "rand", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "alloy-sol-macro" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0279d09463a4695788a3622fd95443625f7be307422deba4b55dd491a9c7a1" +checksum = "d9d64f851d95619233f74b310f12bcf16e0cbc27ee3762b6115c14a84809280a" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "alloy-sol-macro-expander" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feea540fc8233df2ad1156efd744b2075372f43a8f942a68b3b19c8a00e2c12" +checksum = "6bf7ed1574b699f48bf17caab4e6e54c6d12bc3c006ab33d58b1e227c1c3559f" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", "const-hex", "heck 0.5.0", - "indexmap 2.6.0", + "indexmap 2.7.0", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "syn-solidity", "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0ad281f3d1b613af814b66977ee698e443d4644a1510962d0241f26e0e53ae" +checksum = "8c02997ccef5f34f9c099277d4145f183b422938ed5322dc57a089fe9b9ad9ee" dependencies = [ "alloy-json-abi", "const-hex", @@ -650,15 +650,15 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.87", + "syn 2.0.90", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96eff16c797438add6c37bb335839d015b186c5421ee5626f5559a7bfeb38ef5" +checksum = "ce13ff37285b0870d0a0746992a4ae48efaf34b766ae4c2640fa15e5305f8e73" dependencies = [ "serde", "winnow", @@ -666,9 +666,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff34e0682d6665da243a3e81da96f07a2dd50f7e64073e382b1a141f5a2a2f6" +checksum = "1174cafd6c6d810711b4e00383037bdb458efc4fe3dbafafa16567e0320c54d8" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -689,7 +689,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tower 0.5.1", "tracing", @@ -706,7 +706,7 @@ dependencies = [ "alloy-json-rpc", "alloy-transport", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "reqwest 0.12.9", "serde_json", @@ -730,7 +730,7 @@ dependencies = [ "pin-project", "serde_json", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", ] @@ -743,8 +743,8 @@ dependencies = [ "alloy-pubsub", "alloy-transport", "futures", - "http 1.1.0", - "rustls 0.23.16", + "http 1.2.0", + "rustls 0.23.19", "serde_json", "tokio", "tokio-tungstenite 0.24.0", @@ -827,9 +827,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "anymap2" @@ -913,7 +913,7 @@ dependencies = [ "ark-std 0.5.0", "educe 0.6.0", "fnv", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "itertools 0.13.0", "num-bigint 0.4.6", "num-integer", @@ -1006,7 +1006,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1044,7 +1044,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1072,7 +1072,7 @@ dependencies = [ "ark-std 0.5.0", "educe 0.6.0", "fnv", - "hashbrown 0.15.1", + "hashbrown 0.15.2", ] [[package]] @@ -1158,7 +1158,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1248,7 +1248,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -1260,7 +1260,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "synstructure 0.13.1", ] @@ -1272,7 +1272,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1325,9 +1325,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ "async-lock", "cfg-if 1.0.0", @@ -1336,7 +1336,7 @@ dependencies = [ "futures-lite", "parking", "polling", - "rustix 0.38.39", + "rustix 0.38.42", "slab", "tracing", "windows-sys 0.59.0", @@ -1379,7 +1379,7 @@ dependencies = [ "cfg-if 1.0.0", "event-listener 5.3.1", "futures-lite", - "rustix 0.38.39", + "rustix 0.38.42", "tracing", ] @@ -1395,7 +1395,7 @@ dependencies = [ "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.39", + "rustix 0.38.42", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -1420,7 +1420,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1437,7 +1437,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1525,7 +1525,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1548,21 +1548,20 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.10.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd82dba44d209fddb11c190e0a94b78651f95299598e472215667417a03ff1d" +checksum = "f47bb8cc16b669d267eeccf585aea077d0882f4777b1c1f740217885d6e6e5a3" dependencies = [ "aws-lc-sys", - "mirai-annotations", "paste", "zeroize", ] [[package]] name = "aws-lc-sys" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972" +checksum = "a2101df3813227bbaaaa0b04cd61c534c7954b22bd68d399b440be937dc63ff7" dependencies = [ "bindgen", "cc", @@ -1575,9 +1574,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.4.3" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468" +checksum = "b5ac934720fbb46206292d2c75b57e67acfc56fe7dfd34fb9a02334af08409ea" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -1600,9 +1599,9 @@ dependencies = [ [[package]] name = "aws-sdk-kms" -version = "1.49.0" +version = "1.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4c89f1d2e0df99ccd21f98598c1e587ad78bd87ae22a74aba392b5566bb038" +checksum = "3c30f6fd5646b99d9b45ec3a0c22e67112c175b2383100c960d7ee39d96c8d96" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1622,9 +1621,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.5" +version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1" +checksum = "7d3820e0c08d0737872ff3c7c1f21ebbb6693d832312d6152bf18ef50a5471c2" dependencies = [ "aws-credential-types", "aws-smithy-http", @@ -1635,7 +1634,7 @@ dependencies = [ "hex", "hmac 0.12.1", "http 0.2.12", - "http 1.1.0", + "http 1.2.0", "once_cell", "percent-encoding", "sha2 0.10.8", @@ -1676,18 +1675,18 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.60.7" +version = "0.61.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" +checksum = "ee4e69cc50921eb913c6b662f8d909131bb3e6ad6cb6090d3a39b66fc5c52095" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-runtime" -version = "1.7.3" +version = "1.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2" +checksum = "9f20685047ca9d6f17b994a07f629c813f08b5bce65523e47124879e60103d45" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -1720,7 +1719,7 @@ dependencies = [ "aws-smithy-types", "bytes", "http 0.2.12", - "http 1.1.0", + "http 1.2.0", "pin-project-lite", "tokio", "tracing", @@ -1738,7 +1737,7 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.12", - "http 1.1.0", + "http 1.2.0", "http-body 0.4.6", "http-body 1.0.1", "http-body-util", @@ -1750,7 +1749,7 @@ dependencies = [ "serde", "time", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", ] [[package]] @@ -1769,9 +1768,9 @@ dependencies = [ [[package]] name = "backon" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4fa97bb310c33c811334143cf64c5bb2b7b3c06e453db6b095d7061eff8f113" +checksum = "ba5289ec98f68f28dd809fd601059e6aa908bb8f6108620930828283d4ee23d7" dependencies = [ "fastrand", "gloo-timers 0.3.0", @@ -1900,7 +1899,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.87", + "syn 2.0.90", "which", ] @@ -2083,7 +2082,7 @@ dependencies = [ "serde_json", "tempfile", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", "uuid 1.11.0", ] @@ -2112,7 +2111,7 @@ dependencies = [ "tokio", "toml", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -2162,7 +2161,8 @@ dependencies = [ "subxt", "tempfile", "testcontainers", - "thiserror", + "thiserror 1.0.69", + "tnt-core-bytecode", "tokio", "tracing", "url", @@ -2182,16 +2182,16 @@ dependencies = [ "futures-util", "hex", "home", - "http 1.1.0", + "http 1.2.0", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-named-pipe", "hyper-rustls 0.27.3", "hyper-util", "hyperlocal", "log", "pin-project-lite", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-native-certs 0.7.3", "rustls-pemfile 2.2.0", "rustls-pki-types", @@ -2200,9 +2200,9 @@ dependencies = [ "serde_json", "serde_repr", "serde_urlencoded", - "thiserror", + "thiserror 1.0.69", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tower-service", "url", "winapi", @@ -2221,9 +2221,9 @@ dependencies = [ [[package]] name = "bounded-collections" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db436177db0d505b1507f03aca56a41442ae6efdf8b6eaa855d73e52c5b078dc" +checksum = "3d077619e9c237a5d1875166f5e8033e8f6bff0c96f8caf81e1c2d7738c431bf" dependencies = [ "log", "parity-scale-codec", @@ -2243,12 +2243,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" dependencies = [ "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "serde", ] @@ -2272,9 +2272,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" dependencies = [ "serde", ] @@ -2353,7 +2353,7 @@ dependencies = [ "heck 0.5.0", "home", "ignore", - "indexmap 2.6.0", + "indexmap 2.7.0", "indicatif", "liquid", "liquid-core", @@ -2371,7 +2371,7 @@ dependencies = [ "semver 1.0.23", "serde", "tempfile", - "thiserror", + "thiserror 1.0.69", "time", "toml", "walkdir", @@ -2379,9 +2379,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" dependencies = [ "serde", ] @@ -2410,9 +2410,9 @@ dependencies = [ "subxt", "tangle-subxt", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", "w3f-bls", ] @@ -2427,7 +2427,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2451,9 +2451,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.35" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57c4b4da2a9d619dd035f27316d7a426305b75be93d09e92f2b9229c34feaf" +checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d" dependencies = [ "jobserver", "libc", @@ -2525,9 +2525,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -2576,9 +2576,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", "clap_derive", @@ -2596,9 +2596,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", @@ -2616,20 +2616,20 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "cmake" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" dependencies = [ "cc", ] @@ -2647,7 +2647,7 @@ dependencies = [ "k256", "serde", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2663,7 +2663,7 @@ dependencies = [ "pbkdf2 0.12.2", "rand", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2683,7 +2683,7 @@ dependencies = [ "serde_derive", "sha2 0.10.8", "sha3", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2754,15 +2754,15 @@ dependencies = [ "encode_unicode", "lazy_static", "libc", - "unicode-width", + "unicode-width 0.1.14", "windows-sys 0.52.0", ] [[package]] name = "const-hex" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586" +checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -2831,6 +2831,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -2857,9 +2867,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -2972,12 +2982,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3036,7 +3046,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3093,7 +3103,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3115,7 +3125,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3212,7 +3222,7 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3223,7 +3233,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3236,7 +3246,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3256,7 +3266,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "unicode-xid", ] @@ -3269,7 +3279,7 @@ dependencies = [ "console", "shell-words", "tempfile", - "thiserror", + "thiserror 1.0.69", "zeroize", ] @@ -3344,7 +3354,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3374,7 +3384,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.87", + "syn 2.0.90", "termcolor", "toml", "walkdir", @@ -3542,7 +3552,7 @@ dependencies = [ "enum-ordinalize 4.3.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3556,7 +3566,7 @@ dependencies = [ "eigen-logging", "eigen-signer", "reqwest 0.12.9", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -3578,7 +3588,7 @@ dependencies = [ "eigen-types", "eigen-utils", "num-bigint 0.4.6", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -3593,7 +3603,7 @@ dependencies = [ "eigen-logging", "eigen-types", "eigen-utils", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -3611,7 +3621,7 @@ dependencies = [ "eigen-logging", "eigen-metrics-collectors-rpc-calls", "hex", - "thiserror", + "thiserror 1.0.69", "url", ] @@ -3633,7 +3643,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "uuid 1.11.0", ] @@ -3652,7 +3662,7 @@ dependencies = [ "eigen-crypto-bn254", "eigen-utils", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3677,7 +3687,7 @@ dependencies = [ "ctor", "once_cell", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -3711,7 +3721,7 @@ dependencies = [ "ntex", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -3750,7 +3760,7 @@ dependencies = [ "parking_lot 0.12.3", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -3771,9 +3781,9 @@ dependencies = [ "eyre", "futures", "futures-util", - "thiserror", + "thiserror 1.0.69", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", ] [[package]] @@ -3793,7 +3803,7 @@ dependencies = [ "aws-sdk-kms", "eth-keystore", "serde", - "thiserror", + "thiserror 1.0.69", "url", ] @@ -3824,7 +3834,7 @@ dependencies = [ "eigen-crypto-bls", "ethers", "num-bigint 0.4.6", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -3949,7 +3959,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3962,7 +3972,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3982,7 +3992,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4022,12 +4032,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4071,7 +4081,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "sha3", - "thiserror", + "thiserror 1.0.69", "uuid 0.8.2", ] @@ -4088,7 +4098,7 @@ dependencies = [ "serde", "serde_json", "sha3", - "thiserror", + "thiserror 1.0.69", "uint", ] @@ -4167,7 +4177,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4189,7 +4199,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "syn 2.0.87", + "syn 2.0.90", "toml", "walkdir", ] @@ -4207,7 +4217,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4233,9 +4243,9 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.87", + "syn 2.0.90", "tempfile", - "thiserror", + "thiserror 1.0.69", "tiny-keccak", "unicode-xid", ] @@ -4252,7 +4262,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -4276,7 +4286,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "tracing-futures", @@ -4308,7 +4318,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-tungstenite 0.20.1", "tracing", @@ -4335,7 +4345,7 @@ dependencies = [ "ethers-core", "rand", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -4363,7 +4373,7 @@ dependencies = [ "serde_json", "solang-parser", "svm-rs", - "thiserror", + "thiserror 1.0.69", "tiny-keccak", "tokio", "tracing", @@ -4400,9 +4410,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ "event-listener 5.3.1", "pin-project-lite", @@ -4420,7 +4430,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4469,9 +4479,9 @@ checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" [[package]] name = "fastrand" -version = "2.1.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fastrlp" @@ -4552,9 +4562,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -4747,9 +4757,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1fa2f9765705486b33fd2acf1577f8ec449c2ba1f318ae5447697b7c08d210" +checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" dependencies = [ "fastrand", "futures-core", @@ -4776,7 +4786,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4786,7 +4796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" dependencies = [ "futures-io", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-pki-types", ] @@ -4863,12 +4873,12 @@ dependencies = [ "async-trait", "gadget-blueprint-proc-macro-core", "gadget-sdk", - "indexmap 2.6.0", + "indexmap 2.7.0", "itertools 0.13.0", "proc-macro2", "quote", "serde_json", - "syn 2.0.87", + "syn 2.0.90", "tracing", "trybuild", ] @@ -4920,7 +4930,7 @@ dependencies = [ "quote", "round-based", "serde", - "syn 2.0.87", + "syn 2.0.90", "trybuild", ] @@ -4941,7 +4951,7 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-keystore", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "tsify", @@ -4991,7 +5001,7 @@ dependencies = [ "getrandom", "hex", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "itertools 0.13.0", "k256", @@ -5019,12 +5029,12 @@ dependencies = [ "symbiotic-rs", "sysinfo", "tangle-subxt", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-retry", "tokio-stream", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", "url", "uuid 1.11.0", "w3f-bls", @@ -5116,7 +5126,7 @@ dependencies = [ "gix-date", "gix-utils", "itoa", - "thiserror", + "thiserror 1.0.69", "winnow", ] @@ -5136,22 +5146,22 @@ dependencies = [ "memchr", "once_cell", "smallvec", - "thiserror", + "thiserror 1.0.69", "unicode-bom", "winnow", ] [[package]] name = "gix-config-value" -version = "0.14.9" +version = "0.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3de3fdca9c75fa4b83a76583d265fa49b1de6b088ebcd210749c24ceeb74660" +checksum = "49aaeef5d98390a3bcf9dbc6440b520b793d1bf3ed99317dc407b02be995b28e" dependencies = [ "bitflags 2.6.0", "bstr", "gix-path", "libc", - "thiserror", + "thiserror 2.0.6", ] [[package]] @@ -5162,7 +5172,7 @@ checksum = "9eed6931f21491ee0aeb922751bd7ec97b4b2fe8fbfedcb678e2a2dce5f3b8c0" dependencies = [ "bstr", "itoa", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -5211,7 +5221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e" dependencies = [ "faster-hex", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5222,7 +5232,7 @@ checksum = "e3bc7fe297f1f4614774989c00ec8b1add59571dc9b024b4c00acb7dedd4e19d" dependencies = [ "gix-tempfile", "gix-utils", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5240,21 +5250,21 @@ dependencies = [ "gix-validate", "itoa", "smallvec", - "thiserror", + "thiserror 1.0.69", "winnow", ] [[package]] name = "gix-path" -version = "0.10.12" +version = "0.10.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c04e5a94fdb56b1e91eb7df2658ad16832428b8eeda24ff1a0f0288de2bce554" +checksum = "afc292ef1a51e340aeb0e720800338c805975724c1dfbd243185452efd8645b7" dependencies = [ "bstr", "gix-trace", "home", "once_cell", - "thiserror", + "thiserror 2.0.6", ] [[package]] @@ -5275,15 +5285,15 @@ dependencies = [ "gix-utils", "gix-validate", "memmap2", - "thiserror", + "thiserror 1.0.69", "winnow", ] [[package]] name = "gix-sec" -version = "0.10.9" +version = "0.10.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2007538eda296445c07949cf04f4a767307d887184d6b3e83e2d636533ddc6e" +checksum = "a8b876ef997a955397809a2ec398d6a45b7a55b4918f2446344330f778d14fd6" dependencies = [ "bitflags 2.6.0", "gix-path", @@ -5327,7 +5337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82c27dd34a49b1addf193c92070bcbf3beaf6e10f16a78544de6372e146a0acf" dependencies = [ "bstr", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5345,7 +5355,7 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -5364,7 +5374,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -5443,29 +5453,29 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.6.0", + "indexmap 2.7.0", "slab", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", ] [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "http 1.1.0", - "indexmap 2.6.0", + "http 1.2.0", + "indexmap 2.7.0", "slab", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", ] @@ -5515,9 +5525,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "allocator-api2", "equivalent", @@ -5615,7 +5625,7 @@ dependencies = [ "once_cell", "rand", "socket2", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tokio", "tracing", @@ -5638,7 +5648,7 @@ dependencies = [ "rand", "resolv-conf", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -5715,9 +5725,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -5742,7 +5752,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http 1.2.0", ] [[package]] @@ -5753,7 +5763,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "pin-project-lite", ] @@ -5802,15 +5812,15 @@ dependencies = [ [[package]] name = "hyper" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", - "http 1.1.0", + "h2 0.4.7", + "http 1.2.0", "http-body 1.0.1", "httparse", "httpdate", @@ -5828,7 +5838,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" dependencies = [ "hex", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "pin-project-lite", "tokio", @@ -5859,14 +5869,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.1.0", - "hyper 1.5.0", + "http 1.2.0", + "hyper 1.5.1", "hyper-util", - "rustls 0.23.16", - "rustls-native-certs 0.8.0", + "rustls 0.23.19", + "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls 0.26.1", "tower-service", ] @@ -5891,7 +5901,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "native-tls", "tokio", @@ -5908,9 +5918,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", - "hyper 1.5.0", + "hyper 1.5.1", "pin-project-lite", "socket2", "tokio", @@ -5926,7 +5936,7 @@ checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" dependencies = [ "hex", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "pin-project-lite", "tokio", @@ -6071,7 +6081,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -6123,21 +6133,25 @@ dependencies = [ [[package]] name = "if-watch" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e" +checksum = "cdf9d64cfcf380606e64f9a0bcf493616b65331199f984151a6fa11a7b3cde38" dependencies = [ "async-io", - "core-foundation", + "core-foundation 0.9.4", "fnv", "futures", "if-addrs", "ipnet", "log", + "netlink-packet-core", + "netlink-packet-route", + "netlink-proto", + "netlink-sys", "rtnetlink", - "system-configuration 0.5.1", + "system-configuration 0.6.1", "tokio", - "windows 0.51.1", + "windows 0.53.0", ] [[package]] @@ -6169,7 +6183,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "same-file", "walkdir", "winapi-util", @@ -6204,13 +6218,13 @@ dependencies = [ [[package]] name = "impl-trait-for-tuples" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" +checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.90", ] [[package]] @@ -6270,9 +6284,9 @@ dependencies = [ "sp-core", "subxt-signer", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", "uuid 1.11.0", ] @@ -6317,7 +6331,7 @@ dependencies = [ "sp-core", "subxt-signer", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", ] @@ -6340,12 +6354,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "serde", ] @@ -6357,15 +6371,15 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] name = "indicatif" -version = "0.17.8" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" dependencies = [ "console", - "instant", "number_prefix", "portable-atomic", - "unicode-width", + "unicode-width 0.2.0", + "web-time", ] [[package]] @@ -6486,9 +6500,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jni" @@ -6500,7 +6514,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror", + "thiserror 1.0.69", "walkdir", ] @@ -6521,10 +6535,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -6616,10 +6631,10 @@ dependencies = [ "rustls-native-certs 0.7.3", "rustls-pki-types", "soketto 0.7.1", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-rustls 0.25.0", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", "url", ] @@ -6634,17 +6649,17 @@ dependencies = [ "futures-channel", "futures-util", "gloo-net", - "http 1.1.0", + "http 1.2.0", "jsonrpsee-core 0.23.2", "pin-project", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-pki-types", "rustls-platform-verifier", - "soketto 0.8.0", - "thiserror", + "soketto 0.8.1", + "thiserror 1.0.69", "tokio", - "tokio-rustls 0.26.0", - "tokio-util 0.7.12", + "tokio-rustls 0.26.1", + "tokio-util 0.7.13", "tracing", "url", ] @@ -6666,7 +6681,7 @@ dependencies = [ "rustc-hash 1.1.0", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -6689,7 +6704,7 @@ dependencies = [ "rustc-hash 1.1.0", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -6709,7 +6724,7 @@ dependencies = [ "jsonrpsee-types 0.22.5", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tower 0.4.13", "tracing", @@ -6726,7 +6741,7 @@ dependencies = [ "beef", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6736,10 +6751,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af" dependencies = [ "beef", - "http 1.1.0", + "http 1.2.0", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6759,7 +6774,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c28759775f5cb2f1ea9667672d3fe2b0e701d1f4b7b67954e60afe7fd058b5e" dependencies = [ - "http 1.1.0", + "http 1.2.0", "jsonrpsee-client-transport 0.23.2", "jsonrpsee-core 0.23.2", "jsonrpsee-types 0.23.2", @@ -6880,7 +6895,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" dependencies = [ - "regex-automata 0.4.8", + "regex-automata 0.4.9", ] [[package]] @@ -6900,9 +6915,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.161" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libgit2-sys" @@ -6920,9 +6935,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if 1.0.0", "windows-targets 0.52.6", @@ -6969,7 +6984,7 @@ dependencies = [ "multiaddr", "pin-project", "rw-stream-sink", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -7005,7 +7020,7 @@ dependencies = [ "quick-protobuf-codec", "rand", "rand_core 0.6.4", - "thiserror", + "thiserror 1.0.69", "tracing", "void", "web-time", @@ -7044,7 +7059,7 @@ dependencies = [ "rand", "rw-stream-sink", "smallvec", - "thiserror", + "thiserror 1.0.69", "tracing", "unsigned-varint 0.8.0", "void", @@ -7068,7 +7083,7 @@ dependencies = [ "lru", "quick-protobuf", "quick-protobuf-codec", - "thiserror", + "thiserror 1.0.69", "tracing", "void", "web-time", @@ -7139,16 +7154,16 @@ dependencies = [ "quick-protobuf", "quick-protobuf-codec", "smallvec", - "thiserror", + "thiserror 1.0.69", "tracing", "void", ] [[package]] name = "libp2p-identity" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" +checksum = "257b5621d159b32282eac446bed6670c39c7dc68a200a992d8f056afa0066f6d" dependencies = [ "bs58", "ed25519-dalek", @@ -7157,7 +7172,7 @@ dependencies = [ "quick-protobuf", "rand", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "tracing", "zeroize", ] @@ -7184,7 +7199,7 @@ dependencies = [ "rand", "sha2 0.10.8", "smallvec", - "thiserror", + "thiserror 1.0.69", "tracing", "uint", "void", @@ -7253,7 +7268,7 @@ dependencies = [ "sha2 0.10.8", "snow", "static_assertions", - "thiserror", + "thiserror 1.0.69", "tracing", "x25519-dalek", "zeroize", @@ -7294,9 +7309,9 @@ dependencies = [ "quinn", "rand", "ring 0.17.8", - "rustls 0.23.16", + "rustls 0.23.19", "socket2", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -7320,7 +7335,7 @@ dependencies = [ "quick-protobuf-codec", "rand", "static_assertions", - "thiserror", + "thiserror 1.0.69", "tracing", "void", "web-time", @@ -7381,7 +7396,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -7413,9 +7428,9 @@ dependencies = [ "libp2p-identity", "rcgen", "ring 0.17.8", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-webpki 0.101.7", - "thiserror", + "thiserror 1.0.69", "x509-parser", "yasna", ] @@ -7445,10 +7460,10 @@ dependencies = [ "either", "futures", "libp2p-core", - "thiserror", + "thiserror 1.0.69", "tracing", "yamux 0.12.1", - "yamux 0.13.3", + "yamux 0.13.4", ] [[package]] @@ -7604,7 +7619,7 @@ checksum = "3b51f1d220e3fa869e24cfd75915efe3164bd09bb11b3165db3f37f57bf673e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -7624,9 +7639,9 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" @@ -7650,7 +7665,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.1", + "hashbrown 0.15.2", ] [[package]] @@ -7726,7 +7741,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.39", + "rustix 0.38.42", ] [[package]] @@ -7786,15 +7801,15 @@ checksum = "85b6f8152da6d7892ff1b7a1c0fa3f435e92b5918ad67035c3bb432111d9a29b" dependencies = [ "base64 0.22.1", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-rustls 0.27.3", "hyper-util", - "indexmap 2.6.0", + "indexmap 2.7.0", "ipnet", "metrics", "metrics-util", "quanta", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -7808,8 +7823,8 @@ dependencies = [ "aho-corasick", "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.15.1", - "indexmap 2.6.0", + "hashbrown 0.15.2", + "indexmap 2.7.0", "metrics", "ordered-float", "quanta", @@ -7849,22 +7864,15 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "wasi", "windows-sys 0.52.0", ] -[[package]] -name = "mirai-annotations" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" - [[package]] name = "multiaddr" version = "0.18.2" @@ -7897,9 +7905,9 @@ dependencies = [ [[package]] name = "multihash" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc41f430805af9d1cf4adae4ed2149c759b877b01d909a1f40256188d09345d2" +checksum = "6b430e7953c29dd6a09afc29ff0bb69c6e306329ee6794700aee27b76a1aea8d" dependencies = [ "core2", "serde", @@ -7947,7 +7955,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] @@ -7965,21 +7973,20 @@ dependencies = [ [[package]] name = "netlink-packet-core" -version = "0.4.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297" +checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4" dependencies = [ "anyhow", "byteorder", - "libc", "netlink-packet-utils", ] [[package]] name = "netlink-packet-route" -version = "0.12.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" +checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66" dependencies = [ "anyhow", "bitflags 1.3.2", @@ -7998,21 +8005,21 @@ dependencies = [ "anyhow", "byteorder", "paste", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "netlink-proto" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" +checksum = "86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21" dependencies = [ "bytes", "futures", "log", "netlink-packet-core", "netlink-sys", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -8046,9 +8053,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", @@ -8160,7 +8167,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sha-1 0.10.1", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -8186,9 +8193,9 @@ dependencies = [ [[package]] name = "ntex-h2" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f96f9a837c794ccf047438a1bbbf3d93fdcf2bfce42eb2a777595d1393ec7e" +checksum = "5b235208bb51db69da394f3c77361bed9b62dc50b424842952ff636b1b36f800" dependencies = [ "bitflags 2.6.0", "fxhash", @@ -8199,20 +8206,22 @@ dependencies = [ "ntex-http", "ntex-io", "ntex-net", + "ntex-rt", "ntex-service", "ntex-util", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "ntex-http" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81e205c980c693cb426f55669078bc311973f7e27a34f7ea4d0ce4069dedd05" +checksum = "aa914d2065138de8d3439a6221259fa810c04ded06ddbcc7e46accc52f6365de" dependencies = [ + "futures-core", "fxhash", - "http 1.1.0", + "http 1.2.0", "itoa", "log", "ntex-bytes", @@ -8221,9 +8230,9 @@ dependencies = [ [[package]] name = "ntex-io" -version = "2.8.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab41a7f7a96c6d1f9736d71efae9eb91c59274cb35757986eae9bd1fd76b052" +checksum = "857063bbe358ab1d9b49ce3fdcdaf39394aea018818d0bdae3add00ad6dc27c1" dependencies = [ "bitflags 2.6.0", "log", @@ -8260,7 +8269,7 @@ dependencies = [ "ntex-service", "ntex-tokio", "ntex-util", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -8269,7 +8278,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb9c68c26a87ffca54339be5f95223339db3e7bcc5d64733fef20812970a746f" dependencies = [ - "http 1.1.0", + "http 1.2.0", "log", "ntex-bytes", "regex", @@ -8278,9 +8287,9 @@ dependencies = [ [[package]] name = "ntex-rt" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f86c83f89053c29dcf5f1e9663c53726eea337a3221fa243e61e0410a40ad7" +checksum = "733a898a4bf210dbf417bdee328f98feccdc40a183e4f8f4a08fff4bca352054" dependencies = [ "async-channel", "futures-core", @@ -8291,9 +8300,9 @@ dependencies = [ [[package]] name = "ntex-server" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300921ed1f8626d7bfb06813ff839945eed08f763fbc1296590f878b8ee7f9e3" +checksum = "36cc0ec66ac03f7a76637a1264a57e3234bd95c478fc282ace88c3bde908dc5f" dependencies = [ "async-broadcast", "async-channel", @@ -8312,9 +8321,9 @@ dependencies = [ [[package]] name = "ntex-service" -version = "3.3.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62351b99deeb128baafbd71fc22e8ef93bef643fc60fbb51db8a45006f03cda1" +checksum = "07867c1db27ae44cc6c796a0995c08d76aac32dffde961677a3b1950a0008a54" dependencies = [ "slab", ] @@ -8349,9 +8358,9 @@ dependencies = [ [[package]] name = "ntex-util" -version = "2.5.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10fc97836b6bf4044897370725b7fbcfecef9a8be29c352c35f8c0a587e2e721" +checksum = "73a7a68f2b6508ac7da46cc5b78cd9c997580473b3673a308c0f1e27c643a402" dependencies = [ "bitflags 2.6.0", "futures-core", @@ -8499,7 +8508,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -8613,7 +8622,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -8624,9 +8633,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.4.0+3.4.0" +version = "300.4.1+3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" dependencies = [ "cc", ] @@ -8793,7 +8802,7 @@ dependencies = [ "regex", "regex-syntax 0.8.5", "structmeta", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -8918,20 +8927,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" +checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror", + "thiserror 2.0.6", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" +checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" dependencies = [ "pest", "pest_generator", @@ -8939,22 +8948,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" +checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "pest_meta" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" +checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" dependencies = [ "once_cell", "pest", @@ -8968,7 +8977,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.6.0", + "indexmap 2.7.0", ] [[package]] @@ -9020,7 +9029,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9058,7 +9067,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9150,7 +9159,7 @@ dependencies = [ "polkavm-common 0.8.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9162,7 +9171,7 @@ dependencies = [ "polkavm-common 0.9.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9172,7 +9181,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15e85319a0d5129dc9f021c62607e0804f5fb777a05cdda44d750ac0732def66" dependencies = [ "polkavm-derive-impl 0.8.0", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9182,20 +9191,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429" dependencies = [ "polkavm-derive-impl 0.9.0", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "polling" -version = "3.7.3" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.39", + "rustix 0.38.42", "tracing", "windows-sys 0.59.0", ] @@ -9225,9 +9234,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "powerfmt" @@ -9257,7 +9266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9326,14 +9335,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -9355,7 +9364,7 @@ dependencies = [ "lazy_static", "memchr", "parking_lot 0.12.3", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -9378,7 +9387,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9403,9 +9412,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" +checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" dependencies = [ "cc", ] @@ -9449,51 +9458,54 @@ dependencies = [ "asynchronous-codec", "bytes", "quick-protobuf", - "thiserror", + "thiserror 1.0.69", "unsigned-varint 0.8.0", ] [[package]] name = "quinn" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" dependencies = [ "bytes", "futures-io", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.0.0", - "rustls 0.23.16", + "rustc-hash 2.1.0", + "rustls 0.23.19", "socket2", - "thiserror", + "thiserror 2.0.6", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", + "getrandom", "rand", "ring 0.17.8", - "rustc-hash 2.0.0", - "rustls 0.23.16", + "rustc-hash 2.1.0", + "rustls 0.23.19", + "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.6", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" +checksum = "52cd4b1eff68bf27940dd39811292c49e007f4d0b4c357358dc9b0197be6b527" dependencies = [ "cfg_aliases 0.2.1", "libc", @@ -9626,7 +9638,7 @@ dependencies = [ "futures", "jsonrpsee 0.23.2", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "wasm-bindgen-futures", @@ -9673,7 +9685,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -9693,7 +9705,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9704,7 +9716,7 @@ checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -9719,9 +9731,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -9815,11 +9827,11 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.4.6", - "http 1.1.0", + "h2 0.4.7", + "http 1.2.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-rustls 0.27.3", "hyper-tls 0.6.0", "hyper-util", @@ -9835,7 +9847,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "system-configuration 0.6.1", "tokio", "tokio-native-tls", @@ -9892,7 +9904,7 @@ checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9966,7 +9978,7 @@ dependencies = [ "futures-util", "phantom-type", "round-based-derive", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -9983,9 +9995,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" dependencies = [ "const-oid", "digest 0.10.7", @@ -10003,16 +10015,19 @@ dependencies = [ [[package]] name = "rtnetlink" -version = "0.10.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" +checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0" dependencies = [ "futures", "log", + "netlink-packet-core", "netlink-packet-route", + "netlink-packet-utils", "netlink-proto", - "nix 0.24.3", - "thiserror", + "netlink-sys", + "nix 0.26.4", + "thiserror 1.0.69", "tokio", ] @@ -10069,7 +10084,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "unicode-normalization", "uuid 0.8.2", ] @@ -10088,9 +10103,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustc-hex" @@ -10150,15 +10165,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.39" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys 0.4.14", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -10189,9 +10204,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.16" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "aws-lc-rs", "log", @@ -10212,7 +10227,7 @@ dependencies = [ "openssl-probe", "rustls-pemfile 1.0.4", "schannel", - "security-framework", + "security-framework 2.11.1", ] [[package]] @@ -10225,20 +10240,19 @@ dependencies = [ "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 2.11.1", ] [[package]] name = "rustls-native-certs" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" dependencies = [ "openssl-probe", - "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 3.0.1", ] [[package]] @@ -10264,6 +10278,9 @@ name = "rustls-pki-types" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +dependencies = [ + "web-time", +] [[package]] name = "rustls-platform-verifier" @@ -10271,18 +10288,18 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" dependencies = [ - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "jni", "log", "once_cell", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-native-certs 0.7.3", "rustls-platform-verifier-android", "rustls-webpki 0.102.8", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", - "webpki-roots 0.26.6", + "webpki-roots 0.26.7", "winapi", ] @@ -10400,7 +10417,7 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-keystore", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -10467,14 +10484,14 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "scale-info" -version = "2.11.5" +version = "2.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa7ffc1c0ef49b0452c6e2986abf2b07743320641ffd5fc63d552458e3b779b" +checksum = "346a3b32eba2640d17a9cb5927056b08f3de90f65b72fe09402c2ad07d684d0b" dependencies = [ "bitvec", "cfg-if 1.0.0", @@ -10486,14 +10503,14 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.11.5" +version = "2.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46385cc24172cf615450267463f937c10072516359b3ff1cb24228a4a08bf951" +checksum = "c6630024bf739e2179b91fb424b28898baf819414262c5d376677dbff1fe7ebf" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -10515,8 +10532,8 @@ dependencies = [ "proc-macro2", "quote", "scale-info", - "syn 2.0.87", - "thiserror", + "syn 2.0.90", + "thiserror 1.0.69", ] [[package]] @@ -10542,9 +10559,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -10668,18 +10685,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "libc", "num-bigint 0.4.6", "security-framework-sys", ] +[[package]] +name = "security-framework" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -10705,9 +10735,9 @@ dependencies = [ [[package]] name = "semver-parser" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2" dependencies = [ "pest", ] @@ -10726,9 +10756,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -10755,13 +10785,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -10772,14 +10802,14 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -10795,7 +10825,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -10838,7 +10868,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_derive", "serde_json", @@ -10855,7 +10885,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -11028,7 +11058,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint 0.4.6", "num-traits", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -11203,9 +11233,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -11228,9 +11258,9 @@ dependencies = [ [[package]] name = "soketto" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" +checksum = "2e859df029d160cb88608f5d7df7fb4753fd20fdfb4de5644f3d8b8440841721" dependencies = [ "base64 0.22.1", "bytes", @@ -11251,7 +11281,7 @@ dependencies = [ "lalrpop", "lalrpop-util", "phf", - "thiserror", + "thiserror 1.0.69", "unicode-xid", ] @@ -11325,7 +11355,7 @@ dependencies = [ "sp-storage", "ss58-registry", "substrate-bip39", - "thiserror", + "thiserror 1.0.69", "tracing", "w3f-bls", "zeroize", @@ -11353,7 +11383,7 @@ checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -11474,7 +11504,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -11494,7 +11524,7 @@ dependencies = [ "sp-panic-handler", "sp-std", "sp-trie", - "thiserror", + "thiserror 1.0.69", "tracing", "trie-db", ] @@ -11551,7 +11581,7 @@ dependencies = [ "sp-core", "sp-externalities", "sp-std", - "thiserror", + "thiserror 1.0.69", "tracing", "trie-db", "trie-root", @@ -11657,7 +11687,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.6.0", + "indexmap 2.7.0", "log", "memchr", "once_cell", @@ -11670,7 +11700,7 @@ dependencies = [ "sha2 0.10.8", "smallvec", "sqlformat", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -11754,7 +11784,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.69", "tracing", "whoami", ] @@ -11793,7 +11823,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.69", "tracing", "whoami", ] @@ -11893,7 +11923,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -11904,7 +11934,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -11926,7 +11956,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -11979,8 +12009,8 @@ dependencies = [ "subxt-lightclient", "subxt-macro", "subxt-metadata", - "thiserror", - "tokio-util 0.7.12", + "thiserror 1.0.69", + "tokio-util 0.7.13", "tracing", "url", ] @@ -12002,8 +12032,8 @@ dependencies = [ "scale-info", "scale-typegen", "subxt-metadata", - "syn 2.0.87", - "thiserror", + "syn 2.0.90", + "thiserror 1.0.69", "tokio", ] @@ -12054,7 +12084,7 @@ dependencies = [ "serde_json", "smoldot", "smoldot-light", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -12075,7 +12105,7 @@ dependencies = [ "quote", "scale-typegen", "subxt-codegen", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -12129,7 +12159,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "url", "zip", ] @@ -12158,9 +12188,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -12169,14 +12199,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdaa7b9e815582ba343a20c66627437cf45f1c6fba7f69772cbfd1358c7e197" +checksum = "219389c1ebe89f8333df8bdfb871f6631c552ff399c23cac02480b6088aad8f0" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -12187,9 +12217,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] @@ -12214,7 +12244,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -12238,7 +12268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys 0.5.0", ] @@ -12249,7 +12279,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys 0.6.0", ] @@ -12275,9 +12305,8 @@ dependencies = [ [[package]] name = "tangle-subxt" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cad370e154d2297ed658b566b3ed5320362dfebdcc0f1f38f5194d85bf85f02" +version = "0.7.1" +source = "git+https://github.com/tangle-network/tangle.git#a1dfdccab0d5dc2d9b4dfb7e937b0f1467f5c7d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -12313,7 +12342,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", "fastrand", - "rustix 0.38.39", + "rustix 0.38.42", "windows-sys 0.52.0", ] @@ -12349,11 +12378,11 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" dependencies = [ - "rustix 0.38.39", + "rustix 0.38.42", "windows-sys 0.59.0", ] @@ -12378,11 +12407,11 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-tar", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "url", ] @@ -12394,22 +12423,42 @@ checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" [[package]] name = "thiserror" -version = "1.0.68" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" +dependencies = [ + "thiserror-impl 2.0.6", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn 2.0.90", ] [[package]] name = "thiserror-impl" -version = "1.0.68" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -12433,9 +12482,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -12456,9 +12505,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -12498,11 +12547,19 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tnt-core-bytecode" +version = "0.1.0" +source = "git+https://github.com/tangle-network/tnt-core.git?branch=donovan%2Fbytecode#28e6d19977a3a036e139fc4bb2a9f2cd07d0939a" +dependencies = [ + "serde_json", +] + [[package]] name = "tokio" -version = "1.41.0" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -12524,7 +12581,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -12571,25 +12628,24 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ - "rustls 0.23.16", - "rustls-pki-types", + "rustls 0.23.19", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", ] [[package]] @@ -12630,12 +12686,12 @@ checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" dependencies = [ "futures-util", "log", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls 0.26.1", "tungstenite 0.24.0", - "webpki-roots 0.26.6", + "webpki-roots 0.26.7", ] [[package]] @@ -12654,9 +12710,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -12672,7 +12728,7 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -12694,7 +12750,7 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -12744,9 +12800,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -12756,20 +12812,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -12777,12 +12833,12 @@ dependencies = [ [[package]] name = "tracing-error" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db" dependencies = [ "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -12827,6 +12883,16 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-serde" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" +dependencies = [ + "serde", + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.2.25" @@ -12846,14 +12912,14 @@ dependencies = [ "tracing", "tracing-core", "tracing-log 0.1.4", - "tracing-serde", + "tracing-serde 0.1.3", ] [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers 0.1.0", "nu-ansi-term", @@ -12867,7 +12933,7 @@ dependencies = [ "tracing", "tracing-core", "tracing-log 0.2.0", - "tracing-serde", + "tracing-serde 0.2.0", ] [[package]] @@ -12935,7 +13001,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -12953,7 +13019,7 @@ dependencies = [ "rand", "rustls 0.21.12", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", ] @@ -12967,14 +13033,14 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.1.0", + "http 1.2.0", "httparse", "log", "rand", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-pki-types", "sha1", - "thiserror", + "thiserror 1.0.69", "utf-8", ] @@ -13007,7 +13073,7 @@ checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -13060,9 +13126,9 @@ checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -13091,6 +13157,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "unicode-xid" version = "0.2.6" @@ -13139,9 +13211,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna 1.0.3", @@ -13248,7 +13320,7 @@ dependencies = [ "rand_core 0.6.4", "sha2 0.10.8", "sha3", - "thiserror", + "thiserror 1.0.69", "zeroize", ] @@ -13294,9 +13366,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -13305,36 +13377,36 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ "cfg-if 1.0.0", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -13342,22 +13414,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "wasmi" @@ -13457,7 +13529,7 @@ dependencies = [ "object 0.30.4", "serde", "target-lexicon", - "thiserror", + "thiserror 1.0.69", "wasmparser", "wasmtime-types", ] @@ -13537,7 +13609,7 @@ checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" dependencies = [ "cranelift-entity", "serde", - "thiserror", + "thiserror 1.0.69", "wasmparser", ] @@ -13557,9 +13629,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", @@ -13583,9 +13655,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.6" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -13599,7 +13671,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.39", + "rustix 0.38.42", ] [[package]] @@ -13651,12 +13723,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.51.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "efc5cf48f83140dcaab716eeaea345f9e93d0018fb81162753a3f76c3397b538" dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", + "windows-core 0.53.0", + "windows-targets 0.52.6", ] [[package]] @@ -13671,19 +13743,20 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.52.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "9dcc5b895a6377f1ab9fa55acedab1fd5ac0db66ad1e6c7f47e28a22e446a5dd" dependencies = [ + "windows-result 0.1.2", "windows-targets 0.52.6", ] @@ -13707,7 +13780,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -13718,7 +13791,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -14018,7 +14091,7 @@ dependencies = [ "pharos", "rustc_version 0.4.1", "send_wrapper 0.6.0", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -14058,7 +14131,7 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -14070,14 +14143,14 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.14", - "rustix 0.38.39", + "rustix 0.38.42", ] [[package]] name = "xml-rs" -version = "0.8.22" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" +checksum = "ea8b391c9a790b496184c29f7f93b9ed5b16abb306c05415b68bcc16e4d06432" [[package]] name = "xmltree" @@ -14105,9 +14178,9 @@ dependencies = [ [[package]] name = "yamux" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31b5e376a8b012bee9c423acdbb835fc34d45001cfa3106236a624e4b738028" +checksum = "17610762a1207ee816c6fadc29220904753648aba0a9ed61c7b8336e80a559c4" dependencies = [ "futures", "log", @@ -14142,9 +14215,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -14154,13 +14227,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "synstructure 0.13.1", ] @@ -14182,27 +14255,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "synstructure 0.13.1", ] @@ -14223,7 +14296,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -14245,7 +14318,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1fbef32e..148b639f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,11 +63,12 @@ cargo-tangle = { path = "./cli", version = "0.3.2" } cargo_metadata = { version = "0.18.1" } # Tangle-related dependencies -tangle-subxt = { version = "0.7.0", default-features = false } +tangle-subxt = { git = "https://github.com/tangle-network/tangle.git", default-features = false } subxt-signer = { version = "0.37.0", default-features = false } subxt = { version = "0.37.0", default-features = false } subxt-core = { version = "0.37.0", default-features = false } round-based = "0.3.0" +tnt-core-bytecode = { git = "https://github.com/tangle-network/tnt-core.git", default-features = false, branch = "donovan/bytecode" } sp-core = { version = "31.0.0", default-features = false } sp-io = { version = "33.0.0", default-features = false } diff --git a/blueprint-test-utils/Cargo.toml b/blueprint-test-utils/Cargo.toml index 094a87cd..dc5ce8d7 100644 --- a/blueprint-test-utils/Cargo.toml +++ b/blueprint-test-utils/Cargo.toml @@ -45,6 +45,7 @@ url = { workspace = true } cargo-tangle = { workspace = true, default-features = true } gadget-io = { workspace = true, default-features = false } gadget-sdk = { workspace = true } +tnt-core-bytecode = { workspace = true } # Alloy-related alloy-contract = { workspace = true } diff --git a/blueprint-test-utils/src/test_ext.rs b/blueprint-test-utils/src/test_ext.rs index 9f6e450f..12512f84 100644 --- a/blueprint-test-utils/src/test_ext.rs +++ b/blueprint-test-utils/src/test_ext.rs @@ -43,6 +43,7 @@ use gadget_sdk::subxt_core::config::Header; use gadget_sdk::utils::test_utils::get_client; use crate::tangle::node::SubstrateNode; use crate::tangle::transactions; +use tnt_core_bytecode::bytecode::MASTER_BLUEPRINT_SERVICE_MANAGER; const LOCAL_BIND_ADDR: &str = "127.0.0.1"; pub const NAME_IDS: [&str; 5] = ["Alice", "Bob", "Charlie", "Dave", "Eve"]; @@ -171,40 +172,9 @@ pub async fn new_test_ext_blueprint_manager< match latest_revision { Some((rev, addr)) => debug!("MBSM is deployed at revision #{rev} at address {addr}"), None => { - // Find the JSON file dynamically - let json_path = std::fs::read_dir("../dependencies") - .expect("Failed to read dependencies directory") - .filter_map(Result::ok) - .find_map(|entry| { - let path = entry.path(); - if path.is_dir() && path.file_name().and_then(|n| n.to_str()).map_or(false, |s| s.starts_with("tnt-core")) { - let json_path = path.join("out").join("MasterBlueprintServiceManager.sol").join("MasterBlueprintServiceManager.json"); - if json_path.exists() { - Some(json_path) - } else { - None - } - } else { - None - } - }) - .ok_or_else(|| std::io::Error::new(std::io::ErrorKind::NotFound, "JSON file not found")).expect("Failed to find MBSM JSON file"); - // Read the JSON file - let contents = std::fs::read_to_string(json_path).expect("Failed to read MBSM JSON file"); - // Parse the JSON - let v: serde_json::Value = serde_json::from_str(&contents).expect("Failed to parse MBSM JSON file"); - // Extract the bytecode - let bytecode_hex = v["bytecode"] - .as_str() - .ok_or("Bytecode not found or not a string") - .expect("MBSM bytecode not found") - .to_string(); - let mut raw_hex = bytecode_hex.replace("0x", "").replace("\n", ""); - // fix odd length - if raw_hex.len() % 2 != 0 { - raw_hex = format!("0{}", raw_hex); - } - let bytecode = hex::decode(&raw_hex).expect("valid bytecode in hex format"); + let bytecode = MASTER_BLUEPRINT_SERVICE_MANAGER.to_vec(); + debug!("Using MBSM bytecode of length: {}", bytecode.len()); + let ev = transactions::deploy_new_mbsm_revision( &local_tangle_node_ws, &client, From 18e57580f903f912c00e3b7116529c4a6e73aef1 Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Mon, 9 Dec 2024 18:17:40 -0600 Subject: [PATCH 07/33] chore(clippy): cleanup and fmt --- Cargo.lock | 1306 ++++++++++++++++--------------- blueprint-test-utils/Cargo.toml | 2 +- 2 files changed, 693 insertions(+), 615 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index edee5219..21261121 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -122,9 +122,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy" @@ -154,9 +154,9 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.1.47" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c5c520273946ecf715c0010b4e3503d7eba9893cd9ce6b7fff5654c4a3c470" +checksum = "a0161082e0edd9013d23083465cc04b20e44b7a15646d36ba7b0cdb7cd6fe18f" dependencies = [ "alloy-primitives", "num_enum", @@ -197,14 +197,14 @@ dependencies = [ "alloy-transport", "futures", "futures-util", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "alloy-core" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d22df68fa7d9744be0b1a9be3260e9aa089fbf41903ab182328333061ed186" +checksum = "c618bd382f0bc2ac26a7e4bfae01c9b015ca8f21b37ca40059ae35a7e62b3dc6" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -215,9 +215,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cf633ae9a1f0c82fdb9e559ed2be1c8e415c3e48fc47e1feaf32c6078ec0cdd" +checksum = "41056bde53ae10ffbbf11618efbe1e0290859e5eab0fe9ef82ebdb62f12a866f" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -285,9 +285,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a500037938085feed8a20dbfc8fce58c599db68c948cfae711147175dee392c" +checksum = "c357da577dfb56998d01f574d81ad7a1958d248740a7981b205d69d65a7da404" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -305,7 +305,7 @@ dependencies = [ "alloy-sol-types", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -327,7 +327,7 @@ dependencies = [ "async-trait", "auto_impl", "futures-utils-wasm", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -355,16 +355,16 @@ dependencies = [ "rand", "serde_json", "tempfile", - "thiserror", + "thiserror 1.0.69", "tracing", "url", ] [[package]] name = "alloy-primitives" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aeeb5825c2fc8c2662167058347cd0cafc3cb15bcb5cdb1758a63c2dca0409e" +checksum = "6259a506ab13e1d658796c31e6e39d2e2ee89243bcc505ddc613b35732e0a430" dependencies = [ "alloy-rlp", "bytes", @@ -372,9 +372,9 @@ dependencies = [ "const-hex", "derive_more 1.0.0", "foldhash", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "hex-literal", - "indexmap 2.6.0", + "indexmap 2.7.0", "itoa", "k256", "keccak-asm", @@ -382,7 +382,7 @@ dependencies = [ "proptest", "rand", "ruint", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "serde", "sha3", "tiny-keccak", @@ -421,7 +421,7 @@ dependencies = [ "schnellru", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "url", @@ -449,9 +449,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0822426598f95e45dd1ea32a738dac057529a709ee645fcc516ffa4cbde08f" +checksum = "f542548a609dca89fcd72b3b9f355928cf844d4363c5eed9c5273a3dd225e097" dependencies = [ "alloy-rlp-derive", "arrayvec 0.7.6", @@ -460,13 +460,13 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f" +checksum = "5a833d97bf8a5f0f878daf2c8451fff7de7f9de38baa5a45d936ec718d81255a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -567,7 +567,7 @@ dependencies = [ "auto_impl", "elliptic-curve", "k256", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -584,7 +584,7 @@ dependencies = [ "aws-sdk-kms", "k256", "spki", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -601,47 +601,47 @@ dependencies = [ "async-trait", "k256", "rand", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "alloy-sol-macro" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0279d09463a4695788a3622fd95443625f7be307422deba4b55dd491a9c7a1" +checksum = "d9d64f851d95619233f74b310f12bcf16e0cbc27ee3762b6115c14a84809280a" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "alloy-sol-macro-expander" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feea540fc8233df2ad1156efd744b2075372f43a8f942a68b3b19c8a00e2c12" +checksum = "6bf7ed1574b699f48bf17caab4e6e54c6d12bc3c006ab33d58b1e227c1c3559f" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", "const-hex", "heck 0.5.0", - "indexmap 2.6.0", + "indexmap 2.7.0", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "syn-solidity", "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0ad281f3d1b613af814b66977ee698e443d4644a1510962d0241f26e0e53ae" +checksum = "8c02997ccef5f34f9c099277d4145f183b422938ed5322dc57a089fe9b9ad9ee" dependencies = [ "alloy-json-abi", "const-hex", @@ -650,15 +650,15 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.87", + "syn 2.0.90", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96eff16c797438add6c37bb335839d015b186c5421ee5626f5559a7bfeb38ef5" +checksum = "ce13ff37285b0870d0a0746992a4ae48efaf34b766ae4c2640fa15e5305f8e73" dependencies = [ "serde", "winnow", @@ -666,9 +666,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff34e0682d6665da243a3e81da96f07a2dd50f7e64073e382b1a141f5a2a2f6" +checksum = "1174cafd6c6d810711b4e00383037bdb458efc4fe3dbafafa16567e0320c54d8" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -689,7 +689,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tower 0.5.1", "tracing", @@ -706,7 +706,7 @@ dependencies = [ "alloy-json-rpc", "alloy-transport", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "reqwest 0.12.9", "serde_json", @@ -730,7 +730,7 @@ dependencies = [ "pin-project", "serde_json", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", ] @@ -743,8 +743,8 @@ dependencies = [ "alloy-pubsub", "alloy-transport", "futures", - "http 1.1.0", - "rustls 0.23.16", + "http 1.2.0", + "rustls 0.23.19", "serde_json", "tokio", "tokio-tungstenite 0.24.0", @@ -827,9 +827,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "anymap2" @@ -913,7 +913,7 @@ dependencies = [ "ark-std 0.5.0", "educe 0.6.0", "fnv", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "itertools 0.13.0", "num-bigint 0.4.6", "num-integer", @@ -1006,7 +1006,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1044,7 +1044,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1072,7 +1072,7 @@ dependencies = [ "ark-std 0.5.0", "educe 0.6.0", "fnv", - "hashbrown 0.15.1", + "hashbrown 0.15.2", ] [[package]] @@ -1158,7 +1158,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1248,7 +1248,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -1260,7 +1260,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "synstructure 0.13.1", ] @@ -1272,7 +1272,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1325,9 +1325,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ "async-lock", "cfg-if 1.0.0", @@ -1336,7 +1336,7 @@ dependencies = [ "futures-lite", "parking", "polling", - "rustix 0.38.39", + "rustix 0.38.42", "slab", "tracing", "windows-sys 0.59.0", @@ -1379,7 +1379,7 @@ dependencies = [ "cfg-if 1.0.0", "event-listener 5.3.1", "futures-lite", - "rustix 0.38.39", + "rustix 0.38.42", "tracing", ] @@ -1395,7 +1395,7 @@ dependencies = [ "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.39", + "rustix 0.38.42", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -1420,7 +1420,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1437,7 +1437,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1525,7 +1525,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1548,21 +1548,20 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.10.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd82dba44d209fddb11c190e0a94b78651f95299598e472215667417a03ff1d" +checksum = "f47bb8cc16b669d267eeccf585aea077d0882f4777b1c1f740217885d6e6e5a3" dependencies = [ "aws-lc-sys", - "mirai-annotations", "paste", "zeroize", ] [[package]] name = "aws-lc-sys" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972" +checksum = "a2101df3813227bbaaaa0b04cd61c534c7954b22bd68d399b440be937dc63ff7" dependencies = [ "bindgen", "cc", @@ -1575,9 +1574,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.4.3" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468" +checksum = "b5ac934720fbb46206292d2c75b57e67acfc56fe7dfd34fb9a02334af08409ea" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -1600,9 +1599,9 @@ dependencies = [ [[package]] name = "aws-sdk-kms" -version = "1.49.0" +version = "1.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4c89f1d2e0df99ccd21f98598c1e587ad78bd87ae22a74aba392b5566bb038" +checksum = "3c30f6fd5646b99d9b45ec3a0c22e67112c175b2383100c960d7ee39d96c8d96" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1622,9 +1621,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.5" +version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1" +checksum = "7d3820e0c08d0737872ff3c7c1f21ebbb6693d832312d6152bf18ef50a5471c2" dependencies = [ "aws-credential-types", "aws-smithy-http", @@ -1635,7 +1634,7 @@ dependencies = [ "hex", "hmac 0.12.1", "http 0.2.12", - "http 1.1.0", + "http 1.2.0", "once_cell", "percent-encoding", "sha2 0.10.8", @@ -1676,18 +1675,18 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.60.7" +version = "0.61.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" +checksum = "ee4e69cc50921eb913c6b662f8d909131bb3e6ad6cb6090d3a39b66fc5c52095" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-runtime" -version = "1.7.3" +version = "1.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2" +checksum = "9f20685047ca9d6f17b994a07f629c813f08b5bce65523e47124879e60103d45" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -1720,7 +1719,7 @@ dependencies = [ "aws-smithy-types", "bytes", "http 0.2.12", - "http 1.1.0", + "http 1.2.0", "pin-project-lite", "tokio", "tracing", @@ -1738,7 +1737,7 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.12", - "http 1.1.0", + "http 1.2.0", "http-body 0.4.6", "http-body 1.0.1", "http-body-util", @@ -1750,7 +1749,7 @@ dependencies = [ "serde", "time", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", ] [[package]] @@ -1769,9 +1768,9 @@ dependencies = [ [[package]] name = "backon" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4fa97bb310c33c811334143cf64c5bb2b7b3c06e453db6b095d7061eff8f113" +checksum = "ba5289ec98f68f28dd809fd601059e6aa908bb8f6108620930828283d4ee23d7" dependencies = [ "fastrand", "gloo-timers 0.3.0", @@ -1900,7 +1899,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.87", + "syn 2.0.90", "which", ] @@ -2083,7 +2082,7 @@ dependencies = [ "serde_json", "tempfile", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", "uuid 1.11.0", ] @@ -2112,7 +2111,7 @@ dependencies = [ "tokio", "toml", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -2140,11 +2139,13 @@ dependencies = [ "alloy-sol-types", "alloy-transport", "async-trait", + "blueprint-build-utils", "blueprint-manager", "cargo-tangle", "cargo_metadata", "cargo_toml", "color-eyre", + "dirs", "futures", "gadget-io", "gadget-sdk", @@ -2152,13 +2153,16 @@ dependencies = [ "libp2p", "log", "parking_lot 0.12.3", + "reqwest 0.12.9", "serde", + "serde_json", "sp-core", "sp-io", "subxt", "tempfile", "testcontainers", - "thiserror", + "thiserror 1.0.69", + "tnt-core-bytecode", "tokio", "tracing", "url", @@ -2178,16 +2182,16 @@ dependencies = [ "futures-util", "hex", "home", - "http 1.1.0", + "http 1.2.0", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-named-pipe", "hyper-rustls 0.27.3", "hyper-util", "hyperlocal", "log", "pin-project-lite", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-native-certs 0.7.3", "rustls-pemfile 2.2.0", "rustls-pki-types", @@ -2196,9 +2200,9 @@ dependencies = [ "serde_json", "serde_repr", "serde_urlencoded", - "thiserror", + "thiserror 1.0.69", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tower-service", "url", "winapi", @@ -2217,9 +2221,9 @@ dependencies = [ [[package]] name = "bounded-collections" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db436177db0d505b1507f03aca56a41442ae6efdf8b6eaa855d73e52c5b078dc" +checksum = "3d077619e9c237a5d1875166f5e8033e8f6bff0c96f8caf81e1c2d7738c431bf" dependencies = [ "log", "parity-scale-codec", @@ -2239,12 +2243,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" dependencies = [ "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "serde", ] @@ -2268,9 +2272,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" dependencies = [ "serde", ] @@ -2349,7 +2353,7 @@ dependencies = [ "heck 0.5.0", "home", "ignore", - "indexmap 2.6.0", + "indexmap 2.7.0", "indicatif", "liquid", "liquid-core", @@ -2367,7 +2371,7 @@ dependencies = [ "semver 1.0.23", "serde", "tempfile", - "thiserror", + "thiserror 1.0.69", "time", "toml", "walkdir", @@ -2375,9 +2379,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" dependencies = [ "serde", ] @@ -2406,9 +2410,9 @@ dependencies = [ "subxt", "tangle-subxt", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", "w3f-bls", ] @@ -2423,7 +2427,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2447,9 +2451,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.35" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57c4b4da2a9d619dd035f27316d7a426305b75be93d09e92f2b9229c34feaf" +checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d" dependencies = [ "jobserver", "libc", @@ -2521,9 +2525,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -2572,9 +2576,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", "clap_derive", @@ -2592,9 +2596,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", @@ -2612,20 +2616,20 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "cmake" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" dependencies = [ "cc", ] @@ -2643,7 +2647,7 @@ dependencies = [ "k256", "serde", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2659,7 +2663,7 @@ dependencies = [ "pbkdf2 0.12.2", "rand", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2679,7 +2683,7 @@ dependencies = [ "serde_derive", "sha2 0.10.8", "sha3", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2750,15 +2754,15 @@ dependencies = [ "encode_unicode", "lazy_static", "libc", - "unicode-width", + "unicode-width 0.1.14", "windows-sys 0.52.0", ] [[package]] name = "const-hex" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586" +checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -2827,6 +2831,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -2853,9 +2867,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -2968,12 +2982,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3032,7 +3046,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3089,7 +3103,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3111,7 +3125,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3208,7 +3222,7 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3219,7 +3233,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3232,7 +3246,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3252,7 +3266,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "unicode-xid", ] @@ -3265,7 +3279,7 @@ dependencies = [ "console", "shell-words", "tempfile", - "thiserror", + "thiserror 1.0.69", "zeroize", ] @@ -3340,7 +3354,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3370,7 +3384,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.87", + "syn 2.0.90", "termcolor", "toml", "walkdir", @@ -3538,7 +3552,7 @@ dependencies = [ "enum-ordinalize 4.3.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3552,7 +3566,7 @@ dependencies = [ "eigen-logging", "eigen-signer", "reqwest 0.12.9", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -3574,7 +3588,7 @@ dependencies = [ "eigen-types", "eigen-utils", "num-bigint 0.4.6", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -3589,7 +3603,7 @@ dependencies = [ "eigen-logging", "eigen-types", "eigen-utils", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -3607,7 +3621,7 @@ dependencies = [ "eigen-logging", "eigen-metrics-collectors-rpc-calls", "hex", - "thiserror", + "thiserror 1.0.69", "url", ] @@ -3629,7 +3643,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "uuid 1.11.0", ] @@ -3648,7 +3662,7 @@ dependencies = [ "eigen-crypto-bn254", "eigen-utils", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3673,7 +3687,7 @@ dependencies = [ "ctor", "once_cell", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -3707,7 +3721,7 @@ dependencies = [ "ntex", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -3746,7 +3760,7 @@ dependencies = [ "parking_lot 0.12.3", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -3767,9 +3781,9 @@ dependencies = [ "eyre", "futures", "futures-util", - "thiserror", + "thiserror 1.0.69", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", ] [[package]] @@ -3789,7 +3803,7 @@ dependencies = [ "aws-sdk-kms", "eth-keystore", "serde", - "thiserror", + "thiserror 1.0.69", "url", ] @@ -3820,7 +3834,7 @@ dependencies = [ "eigen-crypto-bls", "ethers", "num-bigint 0.4.6", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -3945,7 +3959,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3958,7 +3972,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3978,7 +3992,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4018,12 +4032,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4067,7 +4081,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "sha3", - "thiserror", + "thiserror 1.0.69", "uuid 0.8.2", ] @@ -4084,7 +4098,7 @@ dependencies = [ "serde", "serde_json", "sha3", - "thiserror", + "thiserror 1.0.69", "uint", ] @@ -4163,7 +4177,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4185,7 +4199,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "syn 2.0.87", + "syn 2.0.90", "toml", "walkdir", ] @@ -4203,7 +4217,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4229,9 +4243,9 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.87", + "syn 2.0.90", "tempfile", - "thiserror", + "thiserror 1.0.69", "tiny-keccak", "unicode-xid", ] @@ -4248,7 +4262,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -4272,7 +4286,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "tracing-futures", @@ -4304,7 +4318,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-tungstenite 0.20.1", "tracing", @@ -4331,7 +4345,7 @@ dependencies = [ "ethers-core", "rand", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -4359,7 +4373,7 @@ dependencies = [ "serde_json", "solang-parser", "svm-rs", - "thiserror", + "thiserror 1.0.69", "tiny-keccak", "tokio", "tracing", @@ -4396,9 +4410,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ "event-listener 5.3.1", "pin-project-lite", @@ -4416,7 +4430,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4465,9 +4479,9 @@ checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" [[package]] name = "fastrand" -version = "2.1.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fastrlp" @@ -4548,9 +4562,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -4743,9 +4757,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1fa2f9765705486b33fd2acf1577f8ec449c2ba1f318ae5447697b7c08d210" +checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" dependencies = [ "fastrand", "futures-core", @@ -4772,7 +4786,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4782,7 +4796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" dependencies = [ "futures-io", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-pki-types", ] @@ -4859,13 +4873,13 @@ dependencies = [ "async-trait", "gadget-blueprint-proc-macro-core", "gadget-sdk", - "indexmap 2.6.0", + "indexmap 2.7.0", "itertools 0.13.0", "parking_lot 0.12.3", "proc-macro2", "quote", "serde_json", - "syn 2.0.87", + "syn 2.0.90", "tracing", "trybuild", ] @@ -4917,7 +4931,7 @@ dependencies = [ "quote", "round-based", "serde", - "syn 2.0.87", + "syn 2.0.90", "trybuild", ] @@ -4938,7 +4952,7 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-keystore", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "tsify", @@ -4988,7 +5002,7 @@ dependencies = [ "getrandom", "hex", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "itertools 0.13.0", "k256", @@ -5016,12 +5030,12 @@ dependencies = [ "symbiotic-rs", "sysinfo", "tangle-subxt", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-retry", "tokio-stream", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", "url", "uuid 1.11.0", "w3f-bls", @@ -5113,7 +5127,7 @@ dependencies = [ "gix-date", "gix-utils", "itoa", - "thiserror", + "thiserror 1.0.69", "winnow", ] @@ -5133,22 +5147,22 @@ dependencies = [ "memchr", "once_cell", "smallvec", - "thiserror", + "thiserror 1.0.69", "unicode-bom", "winnow", ] [[package]] name = "gix-config-value" -version = "0.14.9" +version = "0.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3de3fdca9c75fa4b83a76583d265fa49b1de6b088ebcd210749c24ceeb74660" +checksum = "49aaeef5d98390a3bcf9dbc6440b520b793d1bf3ed99317dc407b02be995b28e" dependencies = [ "bitflags 2.6.0", "bstr", "gix-path", "libc", - "thiserror", + "thiserror 2.0.6", ] [[package]] @@ -5159,7 +5173,7 @@ checksum = "9eed6931f21491ee0aeb922751bd7ec97b4b2fe8fbfedcb678e2a2dce5f3b8c0" dependencies = [ "bstr", "itoa", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -5208,7 +5222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e" dependencies = [ "faster-hex", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5219,7 +5233,7 @@ checksum = "e3bc7fe297f1f4614774989c00ec8b1add59571dc9b024b4c00acb7dedd4e19d" dependencies = [ "gix-tempfile", "gix-utils", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5237,21 +5251,21 @@ dependencies = [ "gix-validate", "itoa", "smallvec", - "thiserror", + "thiserror 1.0.69", "winnow", ] [[package]] name = "gix-path" -version = "0.10.12" +version = "0.10.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c04e5a94fdb56b1e91eb7df2658ad16832428b8eeda24ff1a0f0288de2bce554" +checksum = "afc292ef1a51e340aeb0e720800338c805975724c1dfbd243185452efd8645b7" dependencies = [ "bstr", "gix-trace", "home", "once_cell", - "thiserror", + "thiserror 2.0.6", ] [[package]] @@ -5272,15 +5286,15 @@ dependencies = [ "gix-utils", "gix-validate", "memmap2", - "thiserror", + "thiserror 1.0.69", "winnow", ] [[package]] name = "gix-sec" -version = "0.10.9" +version = "0.10.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2007538eda296445c07949cf04f4a767307d887184d6b3e83e2d636533ddc6e" +checksum = "a8b876ef997a955397809a2ec398d6a45b7a55b4918f2446344330f778d14fd6" dependencies = [ "bitflags 2.6.0", "gix-path", @@ -5324,7 +5338,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82c27dd34a49b1addf193c92070bcbf3beaf6e10f16a78544de6372e146a0acf" dependencies = [ "bstr", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5342,7 +5356,7 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -5361,7 +5375,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -5440,29 +5454,29 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.6.0", + "indexmap 2.7.0", "slab", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", ] [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "http 1.1.0", - "indexmap 2.6.0", + "http 1.2.0", + "indexmap 2.7.0", "slab", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", ] @@ -5512,9 +5526,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "allocator-api2", "equivalent", @@ -5612,7 +5626,7 @@ dependencies = [ "once_cell", "rand", "socket2", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tokio", "tracing", @@ -5635,7 +5649,7 @@ dependencies = [ "rand", "resolv-conf", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -5712,9 +5726,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -5739,7 +5753,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http 1.2.0", ] [[package]] @@ -5750,7 +5764,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "pin-project-lite", ] @@ -5799,15 +5813,15 @@ dependencies = [ [[package]] name = "hyper" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", - "http 1.1.0", + "h2 0.4.7", + "http 1.2.0", "http-body 1.0.1", "httparse", "httpdate", @@ -5825,7 +5839,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" dependencies = [ "hex", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "pin-project-lite", "tokio", @@ -5856,14 +5870,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.1.0", - "hyper 1.5.0", + "http 1.2.0", + "hyper 1.5.1", "hyper-util", - "rustls 0.23.16", - "rustls-native-certs 0.8.0", + "rustls 0.23.19", + "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls 0.26.1", "tower-service", ] @@ -5888,7 +5902,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "native-tls", "tokio", @@ -5905,9 +5919,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", - "hyper 1.5.0", + "hyper 1.5.1", "pin-project-lite", "socket2", "tokio", @@ -5923,7 +5937,7 @@ checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" dependencies = [ "hex", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "pin-project-lite", "tokio", @@ -6068,7 +6082,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -6120,21 +6134,25 @@ dependencies = [ [[package]] name = "if-watch" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e" +checksum = "cdf9d64cfcf380606e64f9a0bcf493616b65331199f984151a6fa11a7b3cde38" dependencies = [ "async-io", - "core-foundation", + "core-foundation 0.9.4", "fnv", "futures", "if-addrs", "ipnet", "log", + "netlink-packet-core", + "netlink-packet-route", + "netlink-proto", + "netlink-sys", "rtnetlink", - "system-configuration 0.5.1", + "system-configuration 0.6.1", "tokio", - "windows 0.51.1", + "windows 0.53.0", ] [[package]] @@ -6166,7 +6184,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "same-file", "walkdir", "winapi-util", @@ -6201,13 +6219,13 @@ dependencies = [ [[package]] name = "impl-trait-for-tuples" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" +checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.90", ] [[package]] @@ -6267,9 +6285,9 @@ dependencies = [ "sp-core", "subxt-signer", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", "uuid 1.11.0", ] @@ -6314,7 +6332,7 @@ dependencies = [ "sp-core", "subxt-signer", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", ] @@ -6337,12 +6355,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "serde", ] @@ -6354,15 +6372,15 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] name = "indicatif" -version = "0.17.8" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" dependencies = [ "console", - "instant", "number_prefix", "portable-atomic", - "unicode-width", + "unicode-width 0.2.0", + "web-time", ] [[package]] @@ -6483,9 +6501,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jni" @@ -6497,7 +6515,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror", + "thiserror 1.0.69", "walkdir", ] @@ -6518,10 +6536,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -6613,10 +6632,10 @@ dependencies = [ "rustls-native-certs 0.7.3", "rustls-pki-types", "soketto 0.7.1", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-rustls 0.25.0", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", "url", ] @@ -6631,17 +6650,17 @@ dependencies = [ "futures-channel", "futures-util", "gloo-net", - "http 1.1.0", + "http 1.2.0", "jsonrpsee-core 0.23.2", "pin-project", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-pki-types", "rustls-platform-verifier", - "soketto 0.8.0", - "thiserror", + "soketto 0.8.1", + "thiserror 1.0.69", "tokio", - "tokio-rustls 0.26.0", - "tokio-util 0.7.12", + "tokio-rustls 0.26.1", + "tokio-util 0.7.13", "tracing", "url", ] @@ -6663,7 +6682,7 @@ dependencies = [ "rustc-hash 1.1.0", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -6686,7 +6705,7 @@ dependencies = [ "rustc-hash 1.1.0", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -6706,7 +6725,7 @@ dependencies = [ "jsonrpsee-types 0.22.5", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tower 0.4.13", "tracing", @@ -6723,7 +6742,7 @@ dependencies = [ "beef", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6733,10 +6752,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af" dependencies = [ "beef", - "http 1.1.0", + "http 1.2.0", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6756,7 +6775,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c28759775f5cb2f1ea9667672d3fe2b0e701d1f4b7b67954e60afe7fd058b5e" dependencies = [ - "http 1.1.0", + "http 1.2.0", "jsonrpsee-client-transport 0.23.2", "jsonrpsee-core 0.23.2", "jsonrpsee-types 0.23.2", @@ -6877,7 +6896,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" dependencies = [ - "regex-automata 0.4.8", + "regex-automata 0.4.9", ] [[package]] @@ -6897,9 +6916,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.161" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libgit2-sys" @@ -6917,9 +6936,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if 1.0.0", "windows-targets 0.52.6", @@ -6966,7 +6985,7 @@ dependencies = [ "multiaddr", "pin-project", "rw-stream-sink", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -7002,7 +7021,7 @@ dependencies = [ "quick-protobuf-codec", "rand", "rand_core 0.6.4", - "thiserror", + "thiserror 1.0.69", "tracing", "void", "web-time", @@ -7041,7 +7060,7 @@ dependencies = [ "rand", "rw-stream-sink", "smallvec", - "thiserror", + "thiserror 1.0.69", "tracing", "unsigned-varint 0.8.0", "void", @@ -7065,7 +7084,7 @@ dependencies = [ "lru", "quick-protobuf", "quick-protobuf-codec", - "thiserror", + "thiserror 1.0.69", "tracing", "void", "web-time", @@ -7136,16 +7155,16 @@ dependencies = [ "quick-protobuf", "quick-protobuf-codec", "smallvec", - "thiserror", + "thiserror 1.0.69", "tracing", "void", ] [[package]] name = "libp2p-identity" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" +checksum = "257b5621d159b32282eac446bed6670c39c7dc68a200a992d8f056afa0066f6d" dependencies = [ "bs58", "ed25519-dalek", @@ -7154,7 +7173,7 @@ dependencies = [ "quick-protobuf", "rand", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "tracing", "zeroize", ] @@ -7181,7 +7200,7 @@ dependencies = [ "rand", "sha2 0.10.8", "smallvec", - "thiserror", + "thiserror 1.0.69", "tracing", "uint", "void", @@ -7250,7 +7269,7 @@ dependencies = [ "sha2 0.10.8", "snow", "static_assertions", - "thiserror", + "thiserror 1.0.69", "tracing", "x25519-dalek", "zeroize", @@ -7291,9 +7310,9 @@ dependencies = [ "quinn", "rand", "ring 0.17.8", - "rustls 0.23.16", + "rustls 0.23.19", "socket2", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -7317,7 +7336,7 @@ dependencies = [ "quick-protobuf-codec", "rand", "static_assertions", - "thiserror", + "thiserror 1.0.69", "tracing", "void", "web-time", @@ -7378,7 +7397,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -7410,9 +7429,9 @@ dependencies = [ "libp2p-identity", "rcgen", "ring 0.17.8", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-webpki 0.101.7", - "thiserror", + "thiserror 1.0.69", "x509-parser", "yasna", ] @@ -7442,10 +7461,10 @@ dependencies = [ "either", "futures", "libp2p-core", - "thiserror", + "thiserror 1.0.69", "tracing", "yamux 0.12.1", - "yamux 0.13.3", + "yamux 0.13.4", ] [[package]] @@ -7601,7 +7620,7 @@ checksum = "3b51f1d220e3fa869e24cfd75915efe3164bd09bb11b3165db3f37f57bf673e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -7621,9 +7640,9 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" @@ -7647,7 +7666,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.1", + "hashbrown 0.15.2", ] [[package]] @@ -7723,7 +7742,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.39", + "rustix 0.38.42", ] [[package]] @@ -7783,15 +7802,15 @@ checksum = "85b6f8152da6d7892ff1b7a1c0fa3f435e92b5918ad67035c3bb432111d9a29b" dependencies = [ "base64 0.22.1", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-rustls 0.27.3", "hyper-util", - "indexmap 2.6.0", + "indexmap 2.7.0", "ipnet", "metrics", "metrics-util", "quanta", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -7805,8 +7824,8 @@ dependencies = [ "aho-corasick", "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.15.1", - "indexmap 2.6.0", + "hashbrown 0.15.2", + "indexmap 2.7.0", "metrics", "ordered-float", "quanta", @@ -7846,22 +7865,15 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "wasi", "windows-sys 0.52.0", ] -[[package]] -name = "mirai-annotations" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" - [[package]] name = "multiaddr" version = "0.18.2" @@ -7894,9 +7906,9 @@ dependencies = [ [[package]] name = "multihash" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc41f430805af9d1cf4adae4ed2149c759b877b01d909a1f40256188d09345d2" +checksum = "6b430e7953c29dd6a09afc29ff0bb69c6e306329ee6794700aee27b76a1aea8d" dependencies = [ "core2", "serde", @@ -7944,7 +7956,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] @@ -7962,21 +7974,20 @@ dependencies = [ [[package]] name = "netlink-packet-core" -version = "0.4.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297" +checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4" dependencies = [ "anyhow", "byteorder", - "libc", "netlink-packet-utils", ] [[package]] name = "netlink-packet-route" -version = "0.12.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" +checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66" dependencies = [ "anyhow", "bitflags 1.3.2", @@ -7995,21 +8006,21 @@ dependencies = [ "anyhow", "byteorder", "paste", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "netlink-proto" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" +checksum = "86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21" dependencies = [ "bytes", "futures", "log", "netlink-packet-core", "netlink-sys", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -8043,9 +8054,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", @@ -8157,7 +8168,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sha-1 0.10.1", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -8183,9 +8194,9 @@ dependencies = [ [[package]] name = "ntex-h2" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f96f9a837c794ccf047438a1bbbf3d93fdcf2bfce42eb2a777595d1393ec7e" +checksum = "5b235208bb51db69da394f3c77361bed9b62dc50b424842952ff636b1b36f800" dependencies = [ "bitflags 2.6.0", "fxhash", @@ -8196,20 +8207,22 @@ dependencies = [ "ntex-http", "ntex-io", "ntex-net", + "ntex-rt", "ntex-service", "ntex-util", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "ntex-http" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81e205c980c693cb426f55669078bc311973f7e27a34f7ea4d0ce4069dedd05" +checksum = "aa914d2065138de8d3439a6221259fa810c04ded06ddbcc7e46accc52f6365de" dependencies = [ + "futures-core", "fxhash", - "http 1.1.0", + "http 1.2.0", "itoa", "log", "ntex-bytes", @@ -8218,9 +8231,9 @@ dependencies = [ [[package]] name = "ntex-io" -version = "2.8.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab41a7f7a96c6d1f9736d71efae9eb91c59274cb35757986eae9bd1fd76b052" +checksum = "857063bbe358ab1d9b49ce3fdcdaf39394aea018818d0bdae3add00ad6dc27c1" dependencies = [ "bitflags 2.6.0", "log", @@ -8257,7 +8270,7 @@ dependencies = [ "ntex-service", "ntex-tokio", "ntex-util", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -8266,7 +8279,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb9c68c26a87ffca54339be5f95223339db3e7bcc5d64733fef20812970a746f" dependencies = [ - "http 1.1.0", + "http 1.2.0", "log", "ntex-bytes", "regex", @@ -8275,9 +8288,9 @@ dependencies = [ [[package]] name = "ntex-rt" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f86c83f89053c29dcf5f1e9663c53726eea337a3221fa243e61e0410a40ad7" +checksum = "733a898a4bf210dbf417bdee328f98feccdc40a183e4f8f4a08fff4bca352054" dependencies = [ "async-channel", "futures-core", @@ -8288,9 +8301,9 @@ dependencies = [ [[package]] name = "ntex-server" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300921ed1f8626d7bfb06813ff839945eed08f763fbc1296590f878b8ee7f9e3" +checksum = "36cc0ec66ac03f7a76637a1264a57e3234bd95c478fc282ace88c3bde908dc5f" dependencies = [ "async-broadcast", "async-channel", @@ -8309,9 +8322,9 @@ dependencies = [ [[package]] name = "ntex-service" -version = "3.3.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62351b99deeb128baafbd71fc22e8ef93bef643fc60fbb51db8a45006f03cda1" +checksum = "07867c1db27ae44cc6c796a0995c08d76aac32dffde961677a3b1950a0008a54" dependencies = [ "slab", ] @@ -8346,9 +8359,9 @@ dependencies = [ [[package]] name = "ntex-util" -version = "2.5.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10fc97836b6bf4044897370725b7fbcfecef9a8be29c352c35f8c0a587e2e721" +checksum = "73a7a68f2b6508ac7da46cc5b78cd9c997580473b3673a308c0f1e27c643a402" dependencies = [ "bitflags 2.6.0", "futures-core", @@ -8496,7 +8509,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -8610,7 +8623,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -8621,9 +8634,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.4.0+3.4.0" +version = "300.4.1+3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" dependencies = [ "cc", ] @@ -8790,7 +8803,7 @@ dependencies = [ "regex", "regex-syntax 0.8.5", "structmeta", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -8915,20 +8928,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" +checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror", + "thiserror 2.0.6", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" +checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" dependencies = [ "pest", "pest_generator", @@ -8936,22 +8949,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" +checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "pest_meta" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" +checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" dependencies = [ "once_cell", "pest", @@ -8965,7 +8978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.6.0", + "indexmap 2.7.0", ] [[package]] @@ -9017,7 +9030,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9055,7 +9068,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9147,7 +9160,7 @@ dependencies = [ "polkavm-common 0.8.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9159,7 +9172,7 @@ dependencies = [ "polkavm-common 0.9.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9169,7 +9182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15e85319a0d5129dc9f021c62607e0804f5fb777a05cdda44d750ac0732def66" dependencies = [ "polkavm-derive-impl 0.8.0", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9179,20 +9192,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429" dependencies = [ "polkavm-derive-impl 0.9.0", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "polling" -version = "3.7.3" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.39", + "rustix 0.38.42", "tracing", "windows-sys 0.59.0", ] @@ -9222,9 +9235,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "powerfmt" @@ -9254,7 +9267,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9323,14 +9336,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -9352,7 +9365,7 @@ dependencies = [ "lazy_static", "memchr", "parking_lot 0.12.3", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -9375,7 +9388,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9400,9 +9413,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" +checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" dependencies = [ "cc", ] @@ -9446,51 +9459,54 @@ dependencies = [ "asynchronous-codec", "bytes", "quick-protobuf", - "thiserror", + "thiserror 1.0.69", "unsigned-varint 0.8.0", ] [[package]] name = "quinn" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" dependencies = [ "bytes", "futures-io", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.0.0", - "rustls 0.23.16", + "rustc-hash 2.1.0", + "rustls 0.23.19", "socket2", - "thiserror", + "thiserror 2.0.6", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", + "getrandom", "rand", "ring 0.17.8", - "rustc-hash 2.0.0", - "rustls 0.23.16", + "rustc-hash 2.1.0", + "rustls 0.23.19", + "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.6", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" +checksum = "52cd4b1eff68bf27940dd39811292c49e007f4d0b4c357358dc9b0197be6b527" dependencies = [ "cfg_aliases 0.2.1", "libc", @@ -9623,7 +9639,7 @@ dependencies = [ "futures", "jsonrpsee 0.23.2", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "wasm-bindgen-futures", @@ -9670,7 +9686,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -9690,7 +9706,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9701,7 +9717,7 @@ checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -9716,9 +9732,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -9812,11 +9828,11 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.4.6", - "http 1.1.0", + "h2 0.4.7", + "http 1.2.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-rustls 0.27.3", "hyper-tls 0.6.0", "hyper-util", @@ -9832,7 +9848,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "system-configuration 0.6.1", "tokio", "tokio-native-tls", @@ -9889,7 +9905,7 @@ checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -9963,7 +9979,7 @@ dependencies = [ "futures-util", "phantom-type", "round-based-derive", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -9980,9 +9996,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" dependencies = [ "const-oid", "digest 0.10.7", @@ -10000,16 +10016,19 @@ dependencies = [ [[package]] name = "rtnetlink" -version = "0.10.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" +checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0" dependencies = [ "futures", "log", + "netlink-packet-core", "netlink-packet-route", + "netlink-packet-utils", "netlink-proto", - "nix 0.24.3", - "thiserror", + "netlink-sys", + "nix 0.26.4", + "thiserror 1.0.69", "tokio", ] @@ -10066,7 +10085,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "unicode-normalization", "uuid 0.8.2", ] @@ -10085,9 +10104,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustc-hex" @@ -10147,15 +10166,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.39" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys 0.4.14", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -10186,9 +10205,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.16" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "aws-lc-rs", "log", @@ -10209,7 +10228,7 @@ dependencies = [ "openssl-probe", "rustls-pemfile 1.0.4", "schannel", - "security-framework", + "security-framework 2.11.1", ] [[package]] @@ -10222,20 +10241,19 @@ dependencies = [ "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 2.11.1", ] [[package]] name = "rustls-native-certs" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" dependencies = [ "openssl-probe", - "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 3.0.1", ] [[package]] @@ -10261,6 +10279,9 @@ name = "rustls-pki-types" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +dependencies = [ + "web-time", +] [[package]] name = "rustls-platform-verifier" @@ -10268,18 +10289,18 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" dependencies = [ - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "jni", "log", "once_cell", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-native-certs 0.7.3", "rustls-platform-verifier-android", "rustls-webpki 0.102.8", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", - "webpki-roots 0.26.6", + "webpki-roots 0.26.7", "winapi", ] @@ -10397,7 +10418,7 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-keystore", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -10464,14 +10485,14 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "scale-info" -version = "2.11.5" +version = "2.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa7ffc1c0ef49b0452c6e2986abf2b07743320641ffd5fc63d552458e3b779b" +checksum = "346a3b32eba2640d17a9cb5927056b08f3de90f65b72fe09402c2ad07d684d0b" dependencies = [ "bitvec", "cfg-if 1.0.0", @@ -10483,14 +10504,14 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.11.5" +version = "2.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46385cc24172cf615450267463f937c10072516359b3ff1cb24228a4a08bf951" +checksum = "c6630024bf739e2179b91fb424b28898baf819414262c5d376677dbff1fe7ebf" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -10512,8 +10533,8 @@ dependencies = [ "proc-macro2", "quote", "scale-info", - "syn 2.0.87", - "thiserror", + "syn 2.0.90", + "thiserror 1.0.69", ] [[package]] @@ -10539,9 +10560,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -10665,18 +10686,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "libc", "num-bigint 0.4.6", "security-framework-sys", ] +[[package]] +name = "security-framework" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -10702,9 +10736,9 @@ dependencies = [ [[package]] name = "semver-parser" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2" dependencies = [ "pest", ] @@ -10723,9 +10757,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -10752,13 +10786,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -10769,14 +10803,14 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -10792,7 +10826,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -10835,7 +10869,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_derive", "serde_json", @@ -10852,7 +10886,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -11025,7 +11059,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint 0.4.6", "num-traits", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -11200,9 +11234,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -11225,9 +11259,9 @@ dependencies = [ [[package]] name = "soketto" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" +checksum = "2e859df029d160cb88608f5d7df7fb4753fd20fdfb4de5644f3d8b8440841721" dependencies = [ "base64 0.22.1", "bytes", @@ -11248,7 +11282,7 @@ dependencies = [ "lalrpop", "lalrpop-util", "phf", - "thiserror", + "thiserror 1.0.69", "unicode-xid", ] @@ -11322,7 +11356,7 @@ dependencies = [ "sp-storage", "ss58-registry", "substrate-bip39", - "thiserror", + "thiserror 1.0.69", "tracing", "w3f-bls", "zeroize", @@ -11350,7 +11384,7 @@ checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -11471,7 +11505,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -11491,7 +11525,7 @@ dependencies = [ "sp-panic-handler", "sp-std", "sp-trie", - "thiserror", + "thiserror 1.0.69", "tracing", "trie-db", ] @@ -11548,7 +11582,7 @@ dependencies = [ "sp-core", "sp-externalities", "sp-std", - "thiserror", + "thiserror 1.0.69", "tracing", "trie-db", "trie-root", @@ -11654,7 +11688,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.6.0", + "indexmap 2.7.0", "log", "memchr", "once_cell", @@ -11667,7 +11701,7 @@ dependencies = [ "sha2 0.10.8", "smallvec", "sqlformat", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -11751,7 +11785,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.69", "tracing", "whoami", ] @@ -11790,7 +11824,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.69", "tracing", "whoami", ] @@ -11890,7 +11924,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -11901,7 +11935,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -11923,7 +11957,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -11976,8 +12010,8 @@ dependencies = [ "subxt-lightclient", "subxt-macro", "subxt-metadata", - "thiserror", - "tokio-util 0.7.12", + "thiserror 1.0.69", + "tokio-util 0.7.13", "tracing", "url", ] @@ -11999,8 +12033,8 @@ dependencies = [ "scale-info", "scale-typegen", "subxt-metadata", - "syn 2.0.87", - "thiserror", + "syn 2.0.90", + "thiserror 1.0.69", "tokio", ] @@ -12051,7 +12085,7 @@ dependencies = [ "serde_json", "smoldot", "smoldot-light", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -12072,7 +12106,7 @@ dependencies = [ "quote", "scale-typegen", "subxt-codegen", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -12126,7 +12160,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "url", "zip", ] @@ -12155,9 +12189,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -12166,14 +12200,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdaa7b9e815582ba343a20c66627437cf45f1c6fba7f69772cbfd1358c7e197" +checksum = "219389c1ebe89f8333df8bdfb871f6631c552ff399c23cac02480b6088aad8f0" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -12184,9 +12218,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] @@ -12211,7 +12245,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -12235,7 +12269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys 0.5.0", ] @@ -12246,7 +12280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys 0.6.0", ] @@ -12272,8 +12306,8 @@ dependencies = [ [[package]] name = "tangle-subxt" -version = "0.7.0" -source = "git+https://github.com/tangle-network/tangle#83f587fb4a720ac3936200abb568a346e5045277" +version = "0.7.1" +source = "git+https://github.com/tangle-network/tangle#a1dfdccab0d5dc2d9b4dfb7e937b0f1467f5c7d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -12309,7 +12343,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", "fastrand", - "rustix 0.38.39", + "rustix 0.38.42", "windows-sys 0.52.0", ] @@ -12345,11 +12379,11 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" dependencies = [ - "rustix 0.38.39", + "rustix 0.38.42", "windows-sys 0.59.0", ] @@ -12374,11 +12408,11 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-tar", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "url", ] @@ -12390,22 +12424,42 @@ checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" [[package]] name = "thiserror" -version = "1.0.68" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" +dependencies = [ + "thiserror-impl 2.0.6", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn 2.0.90", ] [[package]] name = "thiserror-impl" -version = "1.0.68" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -12429,9 +12483,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -12452,9 +12506,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -12494,11 +12548,19 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tnt-core-bytecode" +version = "0.1.0" +source = "git+https://github.com/tangle-network/tnt-core.git?branch=donovan%2Fbytecode#b85cc4f149edf48de413184334dcea5514e064de" +dependencies = [ + "serde_json", +] + [[package]] name = "tokio" -version = "1.41.0" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -12520,7 +12582,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -12567,25 +12629,24 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ - "rustls 0.23.16", - "rustls-pki-types", + "rustls 0.23.19", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", ] [[package]] @@ -12626,12 +12687,12 @@ checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" dependencies = [ "futures-util", "log", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls 0.26.1", "tungstenite 0.24.0", - "webpki-roots 0.26.6", + "webpki-roots 0.26.7", ] [[package]] @@ -12650,9 +12711,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -12668,7 +12729,7 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -12690,7 +12751,7 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -12740,9 +12801,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -12752,20 +12813,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -12773,12 +12834,12 @@ dependencies = [ [[package]] name = "tracing-error" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db" dependencies = [ "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -12823,6 +12884,16 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-serde" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" +dependencies = [ + "serde", + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.2.25" @@ -12842,14 +12913,14 @@ dependencies = [ "tracing", "tracing-core", "tracing-log 0.1.4", - "tracing-serde", + "tracing-serde 0.1.3", ] [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers 0.1.0", "nu-ansi-term", @@ -12863,7 +12934,7 @@ dependencies = [ "tracing", "tracing-core", "tracing-log 0.2.0", - "tracing-serde", + "tracing-serde 0.2.0", ] [[package]] @@ -12931,7 +13002,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -12949,7 +13020,7 @@ dependencies = [ "rand", "rustls 0.21.12", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", ] @@ -12963,14 +13034,14 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.1.0", + "http 1.2.0", "httparse", "log", "rand", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-pki-types", "sha1", - "thiserror", + "thiserror 1.0.69", "utf-8", ] @@ -13003,7 +13074,7 @@ checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -13056,9 +13127,9 @@ checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -13087,6 +13158,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "unicode-xid" version = "0.2.6" @@ -13135,9 +13212,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna 1.0.3", @@ -13244,7 +13321,7 @@ dependencies = [ "rand_core 0.6.4", "sha2 0.10.8", "sha3", - "thiserror", + "thiserror 1.0.69", "zeroize", ] @@ -13290,9 +13367,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -13301,36 +13378,36 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ "cfg-if 1.0.0", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -13338,22 +13415,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "wasmi" @@ -13453,7 +13530,7 @@ dependencies = [ "object 0.30.4", "serde", "target-lexicon", - "thiserror", + "thiserror 1.0.69", "wasmparser", "wasmtime-types", ] @@ -13533,7 +13610,7 @@ checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" dependencies = [ "cranelift-entity", "serde", - "thiserror", + "thiserror 1.0.69", "wasmparser", ] @@ -13553,9 +13630,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", @@ -13579,9 +13656,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.6" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -13595,7 +13672,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.39", + "rustix 0.38.42", ] [[package]] @@ -13647,12 +13724,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.51.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "efc5cf48f83140dcaab716eeaea345f9e93d0018fb81162753a3f76c3397b538" dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", + "windows-core 0.53.0", + "windows-targets 0.52.6", ] [[package]] @@ -13667,19 +13744,20 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.52.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "9dcc5b895a6377f1ab9fa55acedab1fd5ac0db66ad1e6c7f47e28a22e446a5dd" dependencies = [ + "windows-result 0.1.2", "windows-targets 0.52.6", ] @@ -13703,7 +13781,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -13714,7 +13792,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -14014,7 +14092,7 @@ dependencies = [ "pharos", "rustc_version 0.4.1", "send_wrapper 0.6.0", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -14054,7 +14132,7 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -14066,14 +14144,14 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.14", - "rustix 0.38.39", + "rustix 0.38.42", ] [[package]] name = "xml-rs" -version = "0.8.22" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" +checksum = "ea8b391c9a790b496184c29f7f93b9ed5b16abb306c05415b68bcc16e4d06432" [[package]] name = "xmltree" @@ -14101,9 +14179,9 @@ dependencies = [ [[package]] name = "yamux" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31b5e376a8b012bee9c423acdbb835fc34d45001cfa3106236a624e4b738028" +checksum = "17610762a1207ee816c6fadc29220904753648aba0a9ed61c7b8336e80a559c4" dependencies = [ "futures", "log", @@ -14138,9 +14216,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -14150,13 +14228,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "synstructure 0.13.1", ] @@ -14178,27 +14256,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "synstructure 0.13.1", ] @@ -14219,7 +14297,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -14241,7 +14319,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] diff --git a/blueprint-test-utils/Cargo.toml b/blueprint-test-utils/Cargo.toml index dc5ce8d7..3824cd47 100644 --- a/blueprint-test-utils/Cargo.toml +++ b/blueprint-test-utils/Cargo.toml @@ -45,7 +45,7 @@ url = { workspace = true } cargo-tangle = { workspace = true, default-features = true } gadget-io = { workspace = true, default-features = false } gadget-sdk = { workspace = true } -tnt-core-bytecode = { workspace = true } +tnt-core-bytecode = { workspace = true, default-features = false } # Alloy-related alloy-contract = { workspace = true } From 6ed5dfdf87cfe98ba96c1b3dd72309d491bd3a2b Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Mon, 9 Dec 2024 19:00:24 -0600 Subject: [PATCH 08/33] fix(blueprint-test-utils): remove tnt-core from lib --- blueprint-test-utils/build.rs | 5 ----- blueprint-test-utils/foundry.toml | 14 -------------- .../tnt-core/MasterBlueprintServiceManager.hex | 1 - 3 files changed, 20 deletions(-) delete mode 100644 blueprint-test-utils/build.rs delete mode 100644 blueprint-test-utils/foundry.toml delete mode 100644 blueprint-test-utils/tnt-core/MasterBlueprintServiceManager.hex diff --git a/blueprint-test-utils/build.rs b/blueprint-test-utils/build.rs deleted file mode 100644 index f1440365..00000000 --- a/blueprint-test-utils/build.rs +++ /dev/null @@ -1,5 +0,0 @@ -fn main() { - let contract_dirs: Vec<&str> = vec!["."]; - blueprint_build_utils::soldeer_update(); - blueprint_build_utils::build_contracts(contract_dirs); -} diff --git a/blueprint-test-utils/foundry.toml b/blueprint-test-utils/foundry.toml deleted file mode 100644 index 402190f4..00000000 --- a/blueprint-test-utils/foundry.toml +++ /dev/null @@ -1,14 +0,0 @@ -[profile.default] -src = "contracts/src" -test = "contracts/test" -out = "contracts/out" -script = "contracts/script" -cache_path = "contracts/cache" -broadcast = "contracts/broadcast" -libs = ["dependencies"] -auto_detect_remappings = true - -[dependencies] -tnt-core = { version = "0.1.0", git = "https://github.com/tangle-network/tnt-core.git" } - -# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options diff --git a/blueprint-test-utils/tnt-core/MasterBlueprintServiceManager.hex b/blueprint-test-utils/tnt-core/MasterBlueprintServiceManager.hex deleted file mode 100644 index 5af0510e..00000000 --- a/blueprint-test-utils/tnt-core/MasterBlueprintServiceManager.hex +++ /dev/null @@ -1 +0,0 @@ -0x608060405234801561001057600080fd5b506002805460ff191690556125968061002a6000396000f3fe60806040526004361061019c5760003560e01c806382a1ece4116100ec578063a6a785381161008a578063b9315d3a11610064578063b9315d3a1461047c578063c97008e01461048f578063d547741f146104af578063f9e13845146104cf57600080fd5b8063a6a7853814610443578063a8f7c5ed14610456578063b89af9041461046957600080fd5b806391d14854116100c657806391d14854146103cf578063987ab9db146103ef578063a217fddf14610410578063a4d91fe91461042557600080fd5b806382a1ece41461036d578063884673ac1461038d5780638e6f8c60146103af57600080fd5b80632f2ff15d11610159578063410fdec811610133578063410fdec81461030f5780634984ee6b1461032f5780635c975abb14610342578063727391f21461035a57600080fd5b80632f2ff15d146102af57806333db3920146102cf57806336568abe146102ef57600080fd5b806301ffc9a7146101a15780630633da77146101d65780630d0dd399146101f85780631fb27b3414610230578063248a9ca314610250578063274ef0151461028f575b600080fd5b3480156101ad57600080fd5b506101c16101bc366004611707565b6104e2565b60405190151581526020015b60405180910390f35b3480156101e257600080fd5b506101f66101f136600461176d565b610519565b005b34801561020457600080fd5b50600054610218906001600160a01b031681565b6040516001600160a01b0390911681526020016101cd565b34801561023c57600080fd5b506101f661024b3660046117cc565b610640565b34801561025c57600080fd5b5061028161026b366004611819565b6000908152600160208190526040909120015490565b6040519081526020016101cd565b34801561029b57600080fd5b506102186102aa366004611832565b610745565b3480156102bb57600080fd5b506101f66102ca366004611865565b6107d9565b3480156102db57600080fd5b506101f66102ea3660046118ee565b610805565b3480156102fb57600080fd5b506101f661030a366004611865565b610926565b34801561031b57600080fd5b506101f661032a36600461196b565b61095e565b6101f661033d3660046119c8565b610a62565b34801561034e57600080fd5b5060025460ff166101c1565b6101f6610368366004611a4d565b610b72565b34801561037957600080fd5b506101f6610388366004611ac3565b610c7d565b34801561039957600080fd5b5061021860008051602061256a83398151915281565b3480156103bb57600080fd5b506102186103ca366004611832565b610da6565b3480156103db57600080fd5b506101c16103ea366004611865565b610df5565b3480156103fb57600080fd5b5060008051602061256a833981519152610218565b34801561041c57600080fd5b50610281600081565b34801561043157600080fd5b506000546001600160a01b0316610218565b6101f66104513660046117cc565b610e20565b6101f6610464366004611b8d565b610f18565b6101f6610477366004611c65565b611040565b6101f661048a366004611cc0565b611115565b34801561049b57600080fd5b506101f66104aa3660046118ee565b61122c565b3480156104bb57600080fd5b506101f66104ca366004611865565b61133c565b6101f66104dd366004611d2e565b611362565b60006001600160e01b03198216637965db0b60e01b148061051357506301ffc9a760e01b6001600160e01b03198316145b92915050565b3360008051602061256a83398151915214610562573360008051602061256a8339815191526040516359afe8af60e11b8152600401610559929190611d78565b60405180910390fd5b61056a6114ad565b600061058060036001600160401b0386166114d3565b604051630a24e8a960e41b81526001600160401b03851660048201526001600160a01b0384811660248301529192509082169063a24e8a9090604401600060405180830381600087803b1580156105d657600080fd5b505af11580156105ea573d6000803e3d6000fd5b50506040516001600160a01b03851681526001600160401b038087169350871691507f5267932e6c1b678e74efba1e4d6c8b3fd7504cf0fa8eea462efac2c590a21d56906020015b60405180910390a350505050565b3360008051602061256a83398151915214610680573360008051602061256a8339815191526040516359afe8af60e11b8152600401610559929190611d78565b6106886114ad565b600061069e60036001600160401b0385166114d3565b60405163434698bb60e01b81529091506001600160a01b0382169063434698bb906106cd908590600401611e93565b600060405180830381600087803b1580156106e757600080fd5b505af11580156106fb573d6000803e3d6000fd5b50505050826001600160401b03167fde25c2b146db36cbc91715fdf29cb0eb556eed7678e0bf13563bf7050e8f0bbd836040516107389190611e93565b60405180910390a2505050565b60008061075c60036001600160401b0386166114d3565b6040516374ceeb5560e01b81526001600160401b03851660048201529091506001600160a01b038216906374ceeb55906024015b602060405180830381865afa1580156107ad573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107d19190611ea6565b949350505050565b600082815260016020819052604090912001546107f5816114e6565b6107ff83836114f3565b50505050565b3360008051602061256a83398151915214610845573360008051602061256a8339815191526040516359afe8af60e11b8152600401610559929190611d78565b61084d6114ad565b600061086360036001600160401b0389166114d3565b604051630af7d74360e01b81529091506001600160a01b03821690630af7d7439061089a9089908990899089908990600401611ec3565b600060405180830381600087803b1580156108b457600080fd5b505af11580156108c8573d6000803e3d6000fd5b50505050856001600160401b0316876001600160401b03167f7d2ac4c1544e07516def74ce3ada12ff791868ed07d6da82694ae2c0342c8371878787876040516109159493929190611efd565b60405180910390a350505050505050565b6001600160a01b038116331461094f5760405163334bd91960e11b815260040160405180910390fd5b610959828261156c565b505050565b3360008051602061256a8339815191521461099e573360008051602061256a8339815191526040516359afe8af60e11b8152600401610559929190611d78565b6109a66114ad565b60006109bc60036001600160401b0386166114d3565b60405163410e3df160e11b81529091506001600160a01b0382169063821c7be2906109ed9086908690600401611f27565b600060405180830381600087803b158015610a0757600080fd5b505af1158015610a1b573d6000803e3d6000fd5b50505050816001600160401b0316846001600160401b03167f4ca48d7cb411035a931da7a686ea77bc413069de12d844c47daf9242b765cba4856040516106329190611e93565b3360008051602061256a83398151915214610aa2573360008051602061256a8339815191526040516359afe8af60e11b8152600401610559929190611d78565b610aaa6114ad565b6000610ac060036001600160401b0389166114d3565b604051639838caa360e01b81529091506001600160a01b03821690639838caa390610af79089908990899089908990600401611f52565b600060405180830381600087803b158015610b1157600080fd5b505af1158015610b25573d6000803e3d6000fd5b50506040805160ff891681526001600160401b038881166020830152808b1694508b1692507fa9aaaef624d196d961d053fc29d4331e5cb45d62195d99814d29a94f46fa9d4b9101610915565b3360008051602061256a83398151915214610bb2573360008051602061256a8339815191526040516359afe8af60e11b8152600401610559929190611d78565b610bba6114ad565b6000610bd060036001600160401b0387166114d3565b604051634e82087760e11b81529091506001600160a01b03821690639d0410ee90610c0390879087908790600401611f93565b600060405180830381600087803b158015610c1d57600080fd5b505af1158015610c31573d6000803e3d6000fd5b50505050846001600160401b03167f7814301100cb38a35027dd63a29aa14c3f73188f15cf9f027655257c45016e8785604051610c6e9190611e93565b60405180910390a25050505050565b3360008051602061256a83398151915214610cbd573360008051602061256a8339815191526040516359afe8af60e11b8152600401610559929190611d78565b610cc56114ad565b6000610cdb60036001600160401b038a166114d3565b604051636bef5a4160e11b81529091506001600160a01b0382169063d7deb48290610d14908a908a908a908a908a908a90600401611fc3565b600060405180830381600087803b158015610d2e57600080fd5b505af1158015610d42573d6000803e3d6000fd5b5050604080516001600160a01b03891681526001600160401b038681166020830152808b1694508b811693508c16917f93927390d124732c66289c6e22370514ddd612a9cc6bff5671cbf2cbc15ddfe3910160405180910390a45050505050505050565b600080610dbd60036001600160401b0386166114d3565b60405163052d37d360e21b81526001600160401b03851660048201529091506001600160a01b038216906314b4df4c90602401610790565b60009182526001602090815260408084206001600160a01b0393909316845291905290205460ff1690565b3360008051602061256a83398151915214610e60573360008051602061256a8339815191526040516359afe8af60e11b8152600401610559929190611d78565b610e686114ad565b6000610e7e60036001600160401b0385166114d3565b60405163fe0dd37160e01b81529091506001600160a01b0382169063fe0dd37190610ead908590600401611e93565b600060405180830381600087803b158015610ec757600080fd5b505af1158015610edb573d6000803e3d6000fd5b50505050826001600160401b03167febc442018e78570634a88dbac83d4677ae1a5cf8491fb0fc166a7306ba1ff051836040516107389190611e93565b3360008051602061256a83398151915214610f58573360008051602061256a8339815191526040516359afe8af60e11b8152600401610559929190611d78565b610f606114ad565b6000610f7660036001600160401b038c166114d3565b604051631be14b3160e11b81529091506001600160a01b038216906337c2966290610fb3908c908c908c908c908c908c908c908c9060040161204a565b600060405180830381600087803b158015610fcd57600080fd5b505af1158015610fe1573d6000803e3d6000fd5b50505050886001600160401b03168a6001600160401b03167f08e18861659838cad8b04f4687aca1dfb93336e750acf5c3699637ed8ca4c27a8a8a8a60405161102c939291906120b6565b60405180910390a350505050505050505050565b3360008051602061256a83398151915214611080573360008051602061256a8339815191526040516359afe8af60e11b8152600401610559929190611d78565b6110886114ad565b6110ae6001600160401b0384166110a560408401602085016120ea565b600391906115d9565b506110c460066001600160401b038516846115d9565b50826001600160401b0316826001600160a01b03167f278018182b7c51e2da72c1f465c26c12d9606099af0f08db420378344b35222383604051611108919061211b565b60405180910390a3505050565b3360008051602061256a83398151915214611155573360008051602061256a8339815191526040516359afe8af60e11b8152600401610559929190611d78565b61115d6114ad565b600061117360036001600160401b0387166114d3565b60405163bb43abd960e01b81529091506001600160a01b0382169063bb43abd9906111a6908790879087906004016122be565b600060405180830381600087803b1580156111c057600080fd5b505af11580156111d4573d6000803e3d6000fd5b50505050826001600160401b0316856001600160401b03167f219c2fdfbe4f111dda584eefbcb4eb2370cec850e2a79e4fed3a8f708006e7a9868560405161121d9291906122f3565b60405180910390a35050505050565b3360008051602061256a8339815191521461126c573360008051602061256a8339815191526040516359afe8af60e11b8152600401610559929190611d78565b6112746114ad565b600061128a60036001600160401b0389166114d3565b60405163e926cbd160e01b81529091506001600160a01b0382169063e926cbd1906112c19089908990899089908990600401611ec3565b600060405180830381600087803b1580156112db57600080fd5b505af11580156112ef573d6000803e3d6000fd5b50505050856001600160401b0316876001600160401b03167f0145a8acdb5e19e431ea924e2c8997b01f0869cad2a2c6927c8645a5938cf0c3878787876040516109159493929190611efd565b60008281526001602081905260409091200154611358816114e6565b6107ff838361156c565b3360008051602061256a833981519152146113a2573360008051602061256a8339815191526040516359afe8af60e11b8152600401610559929190611d78565b6113aa6114ad565b60006113c060036001600160401b0385166114d3565b604051638b24806560e01b81529091506001600160a01b03821690638b248065906113ef90859060040161242d565b600060405180830381600087803b15801561140957600080fd5b505af115801561141d573d6000803e3d6000fd5b506114329250505060408301602084016120ea565b6001600160a01b03166114486020840184612523565b6001600160401b039081169085167f4def5362750954077cbc9dad1ab88058dd6d0ed894ba05f8f147a7a2fe204b2261148760c0870160a08801612523565b8660c0018761010001356040516114a09392919061253e565b60405180910390a4505050565b60025460ff16156114d15760405163d93c066560e01b815260040160405180910390fd5b565b60006114df83836115ef565b9392505050565b6114f08133611636565b50565b60006114ff8383610df5565b6115645760008381526001602081815260408084206001600160a01b0387168086529252808420805460ff19169093179092559051339286917f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d9190a4506001610513565b506000610513565b60006115788383610df5565b156115645760008381526001602090815260408083206001600160a01b0386168085529252808320805460ff1916905551339286917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a4506001610513565b60006107d184846001600160a01b038516611673565b60008181526002830160205260408120548015801561161557506116138484611690565b155b156114df5760405163015ab34360e11b815260048101849052602401610559565b6116408282610df5565b61166f5760405163e2517d3f60e01b81526001600160a01b038216600482015260248101839052604401610559565b5050565b600082815260028401602052604081208290556107d1848461169c565b60006114df83836116a8565b60006114df83836116c0565b600081815260018301602052604081205415156114df565b600081815260018301602052604081205461156457508154600181810184556000848152602080822090930184905584548482528286019093526040902091909155610513565b60006020828403121561171957600080fd5b81356001600160e01b0319811681146114df57600080fd5b80356001600160401b038116811461174857600080fd5b919050565b6001600160a01b03811681146114f057600080fd5b80356117488161174d565b60008060006060848603121561178257600080fd5b61178b84611731565b925061179960208501611731565b915060408401356117a98161174d565b809150509250925092565b600060c082840312156117c657600080fd5b50919050565b600080604083850312156117df57600080fd5b6117e883611731565b915060208301356001600160401b0381111561180357600080fd5b61180f858286016117b4565b9150509250929050565b60006020828403121561182b57600080fd5b5035919050565b6000806040838503121561184557600080fd5b61184e83611731565b915061185c60208401611731565b90509250929050565b6000806040838503121561187857600080fd5b82359150602083013561188a8161174d565b809150509250929050565b60008083601f8401126118a757600080fd5b5081356001600160401b038111156118be57600080fd5b6020830191508360208285010111156118d657600080fd5b9250929050565b803560ff8116811461174857600080fd5b60008060008060008060a0878903121561190757600080fd5b61191087611731565b955061191e60208801611731565b945060408701356001600160401b0381111561193957600080fd5b61194589828a01611895565b90955093506119589050606088016118dd565b9150608087013590509295509295509295565b60008060006060848603121561198057600080fd5b61198984611731565b925060208401356001600160401b038111156119a457600080fd5b6119b0868287016117b4565b9250506119bf60408501611731565b90509250925092565b60008060008060008060a087890312156119e157600080fd5b6119ea87611731565b95506119f860208801611731565b9450611a06604088016118dd565b9350611a1460608801611731565b925060808701356001600160401b03811115611a2f57600080fd5b611a3b89828a01611895565b979a9699509497509295939492505050565b60008060008060608587031215611a6357600080fd5b611a6c85611731565b935060208501356001600160401b0380821115611a8857600080fd5b611a94888389016117b4565b94506040870135915080821115611aaa57600080fd5b50611ab787828801611895565b95989497509550505050565b600080600080600080600060c0888a031215611ade57600080fd5b611ae788611731565b9650611af560208901611731565b9550611b0360408901611731565b94506060880135611b138161174d565b935060808801356001600160401b0380821115611b2f57600080fd5b818a0191508a601f830112611b4357600080fd5b813581811115611b5257600080fd5b8b60208260051b8501011115611b6757600080fd5b602083019550809450505050611b7f60a08901611731565b905092959891949750929550565b600080600080600080600080600060e08a8c031215611bab57600080fd5b611bb48a611731565b9850611bc260208b01611731565b9750611bd060408b016118dd565b9650611bde60608b01611731565b955060808a01356001600160401b0380821115611bfa57600080fd5b611c068d838e016117b4565b965060a08c0135915080821115611c1c57600080fd5b611c288d838e01611895565b909650945060c08c0135915080821115611c4157600080fd5b50611c4e8c828d01611895565b915080935050809150509295985092959850929598565b600080600060608486031215611c7a57600080fd5b611c8384611731565b92506020840135611c938161174d565b915060408401356001600160401b03811115611cae57600080fd5b8401606081870312156117a957600080fd5b60008060008060808587031215611cd657600080fd5b611cdf85611731565b935060208501356001600160401b03811115611cfa57600080fd5b611d06878288016117b4565b935050611d1560408601611731565b9150611d23606086016118dd565b905092959194509250565b60008060408385031215611d4157600080fd5b611d4a83611731565b915060208301356001600160401b03811115611d6557600080fd5b8301610120818603121561188a57600080fd5b6001600160a01b0392831681529116602082015260400190565b6000808335601e19843603018112611da957600080fd5b83016020810192503590506001600160401b03811115611dc857600080fd5b8036038213156118d657600080fd5b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6000611e0c8283611d92565b60c08552611e1e60c086018284611dd7565b9150506001600160401b0380611e3660208601611731565b16602086015280611e4960408601611731565b16604086015280611e5c60608601611731565b16606086015280611e6f60808601611731565b16608086015280611e8260a08601611731565b1660a0860152508091505092915050565b6020815260006114df6020830184611e00565b600060208284031215611eb857600080fd5b81516114df8161174d565b6001600160401b0386168152608060208201526000611ee6608083018688611dd7565b60ff94909416604083015250606001529392505050565b606081526000611f11606083018688611dd7565b60ff949094166020830152506040015292915050565b604081526000611f3a6040830185611e00565b90506001600160401b03831660208301529392505050565b60006001600160401b03808816835260ff8716602084015280861660408401525060806060830152611f88608083018486611dd7565b979650505050505050565b604081526000611fa66040830186611e00565b8281036020840152611fb9818587611dd7565b9695505050505050565b6001600160401b0387811682528681166020808401919091526001600160a01b03878116604085015260a06060850181905284018690526000928792909160c08601855b8981101561202e57853561201a8161174d565b831682529483019490830190600101612007565b5080955050505080851660808501525050979650505050505050565b60006001600160401b03808b16835260ff8a16602084015280891660408401525060c0606083015261207f60c0830188611e00565b8281036080840152612092818789611dd7565b905082810360a08401526120a7818587611dd7565b9b9a5050505050505050505050565b60ff841681526001600160401b03831660208201526060604082015260006120e16060830184611e00565b95945050505050565b6000602082840312156120fc57600080fd5b81356114df8161174d565b803563ffffffff8116811461174857600080fd5b602081526000823560fe1984360301811261213557600080fd5b6060602084015283016121488180611d92565b61010080608087015261216061018087018385611dd7565b925061216f6020850185611d92565b9250607f19808886030160a0890152612189858584611dd7565b94506121986040870187611d92565b94509150808886030160c08901526121b1858584611dd7565b94506121c06060870187611d92565b94509150808886030160e08901526121d9858584611dd7565b94506121e86080870187611d92565b94509150808886030183890152612200858584611dd7565b945061220f60a0870187611d92565b945092508088860301610120890152612229858585611dd7565b945061223860c0870187611d92565b945092508088860301610140890152612252858585611dd7565b945061226160e0870187611d92565b96509350808886030161016089015250505061227e828483611dd7565b9250505061228e60208501611762565b6001600160a01b0381166040850152506122aa60408501612107565b63ffffffff81166060850152509392505050565b6060815260006122d16060830186611e00565b90506001600160401b038416602083015260ff83166040830152949350505050565b6040815260006123066040830185611e00565b905060ff831660208301529392505050565b6000808335601e1984360301811261232f57600080fd5b83016020810192503590506001600160401b0381111561234e57600080fd5b8060051b36038213156118d657600080fd5b81835260006020808501808196508560051b81019150846000805b888110156123ba578385038a52823560be1989360301811261239b578283fd5b6123a7868a8301611e00565b9a87019a9550509185019160010161237b565b509298975050505050505050565b8183526000602080850194508260005b858110156124065781356123eb8161174d565b6001600160a01b0316875295820195908201906001016123d8565b509495945050505050565b80356002811061242057600080fd5b8252602090810135910152565b602081526001600160401b0361244283611731565b166020820152600061245660208401611762565b6001600160a01b0381166040840152506124736040840184612318565b61012080606086015261248b61014086018385612360565b925061249a6060870187611d92565b9250601f19808786030160808801526124b4858584611dd7565b94506124c36080890189612318565b94509150808786030160a0880152506124dd8484836123c8565b9350506124ec60a08701611731565b6001600160401b03811660c0870152915061250d60e0860160c08801612411565b6101008601358186015250508091505092915050565b60006020828403121561253557600080fd5b6114df82611731565b6001600160401b03841681526080810161255b6020830185612411565b82606083015294935050505056fe0000000000000000000000001111111111111111111111111111111111111111a164736f6c6343000814000a \ No newline at end of file From 2cc295e94acde8bf9448abee8035c2153c75fd60 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Mon, 9 Dec 2024 20:44:30 -0500 Subject: [PATCH 09/33] chore: expose opts through --- blueprint-test-utils/src/test_ext.rs | 5 ++++- blueprints/incredible-squaring/tests/call_id.rs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/blueprint-test-utils/src/test_ext.rs b/blueprint-test-utils/src/test_ext.rs index 12512f84..e28ea6c6 100644 --- a/blueprint-test-utils/src/test_ext.rs +++ b/blueprint-test-utils/src/test_ext.rs @@ -350,6 +350,7 @@ pub async fn new_test_ext_blueprint_manager< handles, span, blueprint, + opts, } } @@ -371,6 +372,7 @@ pub struct LocalhostTestExt { handles: Vec, span: tracing::Span, blueprint: RpcServicesWithBlueprint, + opts: Opts, } impl LocalhostTestExt { @@ -396,6 +398,7 @@ impl LocalhostTestExt { &'a TangleClient, &'a Vec, &'a RpcServicesWithBlueprint, + &'a Opts, ) -> R + Send + 'a, @@ -405,7 +408,7 @@ impl LocalhostTestExt { &'a self, function: T, ) -> Out { - function(&self.client, &self.handles, &self.blueprint) + function(&self.client, &self.handles, &self.blueprint, &self.opts) .instrument(self.span.clone()) .await } diff --git a/blueprints/incredible-squaring/tests/call_id.rs b/blueprints/incredible-squaring/tests/call_id.rs index ff2e257a..31801a0b 100644 --- a/blueprints/incredible-squaring/tests/call_id.rs +++ b/blueprints/incredible-squaring/tests/call_id.rs @@ -21,7 +21,7 @@ async fn call_id_valid() { new_test_ext_blueprint_manager::(String::new(), run_test_blueprint_manager) .await - .execute_with_async(|client, handles, blueprint| async move { + .execute_with_async(|client, handles, blueprint, _| async move { let keypair = handles[0].sr25519_id().clone(); let selected_service = &blueprint.services[0]; let service_id = selected_service.id; From 850541c7df0a69ee9995cba280a2081a7f724b40 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Mon, 9 Dec 2024 20:47:18 -0500 Subject: [PATCH 10/33] chore: merge ISQ CI branch --- .github/workflows/ci.yml | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a05cb654..93005a69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: CI on: pull_request: - branches: [ main ] + branches: [main] push: - branches: [ main ] + branches: [main] workflow_dispatch: concurrency: @@ -77,12 +77,13 @@ jobs: runs-on: macos-14 strategy: matrix: - package: [ - gadget-sdk, - gadget-context-derive, - gadget-blueprint-proc-macro, - gadget-blueprint-proc-macro-playground - ] + package: + [ + gadget-sdk, + gadget-context-derive, + gadget-blueprint-proc-macro, + gadget-blueprint-proc-macro-playground, + ] steps: - name: checkout code uses: actions/checkout@v2 @@ -135,17 +136,6 @@ jobs: with: path: gadget - - name: Download Tangle node - uses: robinraju/release-downloader@v1 - with: - repository: tangle-network/tangle - latest: true - preRelease: true - fileName: tangle-testnet-manual-seal-linux-amd64 - tarBall: false - zipBall: false - out-file-path: tangle - - name: Install Foundry run: | curl -L https://foundry.paradigm.xyz | bash @@ -180,7 +170,7 @@ jobs: - name: tests working-directory: gadget - run: TANGLE_NODE="$(pwd)/../tangle" cargo nextest run --nocapture --package incredible-squaring-blueprint test_blueprint --retries 0 + run: cargo nextest run --nocapture --package incredible-squaring-blueprint test_blueprint --retries 0 eigenlayer-tests: timeout-minutes: 90 @@ -200,7 +190,6 @@ jobs: - name: Add Foundry to PATH run: echo "${{ runner.temp }}/foundry/bin" >> $GITHUB_PATH - - name: Forge build run: forge update && cd blueprints/incredible-squaring-eigenlayer && forge build --root ./contracts && cd ../../ From c97d3942fb0849b315420acdf5f79de6cbec15fc Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Mon, 9 Dec 2024 21:23:11 -0500 Subject: [PATCH 11/33] chore: fix --- blueprint-test-utils/src/tangle/mod.rs | 2 +- cli/src/deploy.rs | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/blueprint-test-utils/src/tangle/mod.rs b/blueprint-test-utils/src/tangle/mod.rs index 8a1edc03..28f7242f 100644 --- a/blueprint-test-utils/src/tangle/mod.rs +++ b/blueprint-test-utils/src/tangle/mod.rs @@ -122,7 +122,7 @@ macro_rules! test_tangle_blueprint { ) => { ::blueprint_test_utils::tangle_blueprint_test_template!( $N, - |client, handles, blueprint| async move { + |client, handles, blueprint, _| async move { let keypair = handles[0].sr25519_id().clone(); let selected_service = &blueprint.services[0]; let service_id = selected_service.id; diff --git a/cli/src/deploy.rs b/cli/src/deploy.rs index ed5962c4..73bfc0e7 100644 --- a/cli/src/deploy.rs +++ b/cli/src/deploy.rs @@ -107,18 +107,20 @@ pub async fn deploy_to_tangle( }; let my_account_id = signer.account_id(); - let client = subxt::OnlineClient::from_url(ws_rpc_url).await?; - + let client = subxt::OnlineClient::from_url(ws_rpc_url.clone()).await?; + println!("Connected to Tangle Network at: {}", ws_rpc_url); let create_blueprint_tx = TangleApi::tx().services().create_blueprint(blueprint); - + println!("Created blueprint..."); let progress = client .tx() .sign_and_submit_then_watch_default(&create_blueprint_tx, &signer) .await?; #[cfg(test)] let result = progress.wait_for_in_block_success().await?; + println!("Waiting for the transaction to be finalized..."); #[cfg(not(test))] let result = progress.wait_for_finalized_success().await?; + println!("Transaction finalized..."); let event = result .find::() .flatten() From 7a5177b8628ab78a1a962b544d44ac02d1bd1c07 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Tue, 10 Dec 2024 00:29:11 -0500 Subject: [PATCH 12/33] feat: add logging of the node to stdout/stderr, make running local tangle possible --- .github/workflows/ci.yml | 3 +- blueprint-test-utils/src/tangle/mod.rs | 31 +++- blueprint-test-utils/src/tangle/node.rs | 156 ++++++++++++++++-- blueprint-test-utils/src/test_ext.rs | 8 +- .../incredible-squaring/tests/call_id.rs | 130 ++++++++------- 5 files changed, 237 insertions(+), 91 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93005a69..d5628519 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -148,8 +148,7 @@ jobs: run: echo "${{ runner.temp }}/foundry/bin" >> $GITHUB_PATH - name: Forge build - working-directory: gadget/blueprints/incredible-squaring - run: forge update && forge build + run: forge update && cd blueprints/incredible-squaring && forge build --root ./contracts && cd ../../ - name: install rust uses: dtolnay/rust-toolchain@nightly diff --git a/blueprint-test-utils/src/tangle/mod.rs b/blueprint-test-utils/src/tangle/mod.rs index 28f7242f..72660c18 100644 --- a/blueprint-test-utils/src/tangle/mod.rs +++ b/blueprint-test-utils/src/tangle/mod.rs @@ -65,15 +65,26 @@ pub async fn download_tangle_binary() -> Result Result { - let binary_path = download_tangle_binary().await.map_err(|e| { - Error::Io(std::io::Error::new( - std::io::ErrorKind::Other, - e.to_string(), - )) - })?; +pub async fn run(use_local_tangle: bool) -> Result { let builder = SubstrateNode::builder() - .binary_paths([binary_path]) + .binary_paths(if use_local_tangle { + let tangle_from_env = + std::env::var(TANGLE_NODE_ENV).unwrap_or_else(|_| "tangle".to_string()); + vec![ + tangle_from_env, + "../tangle/target/release/tangle".to_string(), + "../../tangle/target/release/tangle".to_string(), + "../../../tangle/target/release/tangle".to_string(), + ] + } else { + let binary_path = download_tangle_binary().await.map_err(|e| { + Error::Io(std::io::Error::new( + std::io::ErrorKind::Other, + e.to_string(), + )) + })?; + vec![binary_path.to_string_lossy().into_owned()] + }) .arg("validator") .arg_val("rpc-cors", "all") .arg_val("rpc-methods", "unsafe") @@ -89,6 +100,7 @@ macro_rules! tangle_blueprint_test_template { ( $N:tt, $test_logic:expr, + $use_local_tangle:expr, ) => { use $crate::test_ext::new_test_ext_blueprint_manager; @@ -102,6 +114,7 @@ macro_rules! tangle_blueprint_test_template { ::blueprint_test_utils::test_ext::new_test_ext_blueprint_manager::<$N, 1, String, _, _>( tmp_dir_path, ::blueprint_test_utils::run_test_blueprint_manager, + $use_local_tangle, ) .await .execute_with_async($test_logic) @@ -119,6 +132,7 @@ macro_rules! test_tangle_blueprint { [$($inputs:expr),*], [$($expected_output:expr),*], $call_id:expr, + $use_local_tangle:expr, ) => { ::blueprint_test_utils::tangle_blueprint_test_template!( $N, @@ -169,6 +183,7 @@ macro_rules! test_tangle_blueprint { assert_eq!(result, expected); } }, + $use_local_tangle, ); }; ( diff --git a/blueprint-test-utils/src/tangle/node.rs b/blueprint-test-utils/src/tangle/node.rs index 4fa8e71a..5d877e50 100644 --- a/blueprint-test-utils/src/tangle/node.rs +++ b/blueprint-test-utils/src/tangle/node.rs @@ -6,6 +6,8 @@ use std::collections::HashMap; use std::ffi::OsString; use std::io::{self, BufRead, BufReader, Read}; use std::process::{self, Child, Command}; +use std::sync::mpsc; +use std::thread; /// Environment variable to set the path to the binary. pub const TANGLE_NODE_ENV: &str = "TANGLE_NODE"; @@ -127,9 +129,40 @@ impl SubstrateNodeBuilder { Err(e) => return Err(Error::Io(e)), }; - // Wait for RPC port to be logged (it's logged to stderr). + // Create channels for log capturing + let (init_tx, init_rx) = mpsc::channel(); + let (log_tx, log_rx) = mpsc::channel(); + + // Take stderr for port detection and logging let stderr = proc.stderr.take().unwrap(); - let running_node = try_find_substrate_port_from_output(stderr); + let init_tx_clone = init_tx.clone(); + let log_tx_clone = log_tx.clone(); + + // Spawn thread to handle stderr + let stderr_handle = thread::spawn(move || { + let reader = BufReader::new(stderr); + for line in reader.lines().flatten() { + log::debug!(target: "node-stderr", "{}", line); + let _ = init_tx_clone.send(line.clone()); + let _ = log_tx_clone.send(line); + } + }); + + // Take stdout for logging + let stdout = proc.stdout.take().unwrap(); + let log_tx_stdout = log_tx.clone(); + + // Spawn thread to handle stdout + let stdout_handle = thread::spawn(move || { + let reader = BufReader::new(stdout); + for line in reader.lines().flatten() { + log::debug!(target: "node-stdout", "{}", line); + let _ = log_tx_stdout.send(line); + } + }); + + // Process initialization logs with timeout + let running_node = try_find_substrate_port_from_output(init_rx); let ws_port = running_node.ws_port()?; let p2p_address = running_node.p2p_address()?; @@ -143,6 +176,9 @@ impl SubstrateNodeBuilder { p2p_address, p2p_port, base_path: path, + stdout_handle: Some(stdout_handle), + stderr_handle: Some(stderr_handle), + log_capture_tx: Some(log_tx), }) } @@ -167,6 +203,7 @@ impl SubstrateNodeBuilder { cmd.arg(arg); } + log::debug!(target: "gadget", "Spawning node with command: {:?}", cmd); cmd.spawn() } } @@ -179,6 +216,9 @@ pub struct SubstrateNode { p2p_address: String, p2p_port: u32, base_path: String, + stdout_handle: Option>, + stderr_handle: Option>, + log_capture_tx: Option>, } impl SubstrateNode { @@ -214,20 +254,52 @@ impl SubstrateNode { /// restart the node, handing back an object which, when dropped, will stop it. pub fn restart(&mut self) -> Result<(), std::io::Error> { - let res: Result<(), io::Error> = self.kill(); + // First kill the existing process + self.kill()?; - match res { - Ok(_) => (), - Err(e) => { - self.cleanup(); - return Err(e); - } + // Drop existing log channels and handles + self.log_capture_tx.take(); + if let Some(handle) = self.stdout_handle.take() { + let _ = handle.join(); + } + if let Some(handle) = self.stderr_handle.take() { + let _ = handle.join(); } - let proc = self.try_spawn()?; + // Create new channels for logging + let (log_tx, _log_rx) = mpsc::channel(); + + // Spawn new process + let mut proc = self.try_spawn()?; + + // Setup new logging for stdout + if let Some(stdout) = proc.stdout.take() { + let log_tx_clone = log_tx.clone(); + let handle = thread::spawn(move || { + let reader = BufReader::new(stdout); + for line in reader.lines().flatten() { + log::debug!(target: "node-stdout", "{}", line); + let _ = log_tx_clone.send(line); + } + }); + self.stdout_handle = Some(handle); + } + + // Setup new logging for stderr + if let Some(stderr) = proc.stderr.take() { + let log_tx_clone = log_tx.clone(); + let handle = thread::spawn(move || { + let reader = BufReader::new(stderr); + for line in reader.lines().flatten() { + log::debug!(target: "node-stderr", "{}", line); + let _ = log_tx_clone.send(line); + } + }); + self.stderr_handle = Some(handle); + } self.proc = proc; - // Wait for RPC port to be logged (it's logged to stderr). + self.log_capture_tx = Some(log_tx); Ok(()) } @@ -251,9 +323,41 @@ impl SubstrateNode { cmd.arg(format!("--rpc-port={}", self.ws_port)); cmd.arg(format!("--port={}", self.p2p_port)); + + log::debug!(target: "gadget", "Restarting node with command: {:?}", cmd); cmd.spawn() } + fn setup_log_handling(&mut self) { + if let Some(stdout) = self.proc.stdout.take() { + let log_tx = self.log_capture_tx.clone(); + let handle = thread::spawn(move || { + let reader = BufReader::new(stdout); + for line in reader.lines().flatten() { + log::debug!(target: "node-stdout", "{}", line); + if let Some(tx) = &log_tx { + let _ = tx.send(line); + } + } + }); + self.stdout_handle = Some(handle); + } + + if let Some(stderr) = self.proc.stderr.take() { + let log_tx = self.log_capture_tx.clone(); + let handle = thread::spawn(move || { + let reader = BufReader::new(stderr); + for line in reader.lines().flatten() { + log::debug!(target: "node-stderr", "{}", line); + if let Some(tx) = &log_tx { + let _ = tx.send(line); + } + } + }); + self.stderr_handle = Some(handle); + } + } + fn cleanup(&self) { let _ = Command::new("rm") .args(["-rf", &self.base_path]) @@ -264,23 +368,45 @@ impl SubstrateNode { impl Drop for SubstrateNode { fn drop(&mut self) { + // First drop the log capture channel to signal threads to exit + self.log_capture_tx.take(); + + // Kill the process let _ = self.kill(); + + // Wait for log handling threads to finish with timeout + let timeout = std::time::Duration::from_secs(5); + if let Some(handle) = self.stdout_handle.take() { + let _ = handle.join(); + } + if let Some(handle) = self.stderr_handle.take() { + let _ = handle.join(); + } + self.cleanup() } } // Consume a stderr reader from a spawned substrate command and // locate the port number that is logged out to it. -fn try_find_substrate_port_from_output(r: impl Read + Send + 'static) -> SubstrateNodeInfo { +fn try_find_substrate_port_from_output(rx: mpsc::Receiver) -> SubstrateNodeInfo { let mut port = None; let mut p2p_address = None; let mut p2p_port = None; - let mut log = String::new(); - for line in BufReader::new(r).lines().take(100) { - let line = line.expect("failed to obtain next line from stdout for port discovery"); + let timeout = std::time::Duration::from_secs(30); + let start = std::time::Instant::now(); + + while start.elapsed() < timeout { + // Try to receive with a small timeout to avoid blocking forever + let line = match rx.recv_timeout(std::time::Duration::from_millis(100)) { + Ok(line) => line, + Err(mpsc::RecvTimeoutError::Timeout) => continue, + Err(mpsc::RecvTimeoutError::Disconnected) => break, + }; + log::debug!(target: "gadget-init", "{}", line); log.push_str(&line); log.push('\n'); diff --git a/blueprint-test-utils/src/test_ext.rs b/blueprint-test-utils/src/test_ext.rs index e28ea6c6..412c5ed4 100644 --- a/blueprint-test-utils/src/test_ext.rs +++ b/blueprint-test-utils/src/test_ext.rs @@ -25,6 +25,7 @@ use gadget_sdk::tangle_subxt::tangle_testnet_runtime::api::runtime_types::tangle use gadget_sdk::tangle_subxt::tangle_testnet_runtime::api::services::calls::types::register::{Preferences, RegistrationArgs}; use libp2p::Multiaddr; use log::debug; +use sp_core::crypto::Ss58AddressFormat; use std::collections::HashSet; use std::future::Future; use std::net::IpAddr; @@ -63,6 +64,7 @@ pub async fn new_test_ext_blueprint_manager< >( additional_params: D, f: F, + use_local_tangle: bool, ) -> LocalhostTestExt { assert!(N > 0, "At least one node is required"); assert!(N <= NAME_IDS.len(), "Only up to 5 nodes are supported"); @@ -83,7 +85,7 @@ pub async fn new_test_ext_blueprint_manager< let blueprint_name = manifest.package.as_ref().unwrap().name.clone(); tracing::info!("Starting Tangle node..."); - let tangle_node = crate::tangle::run().await.unwrap(); + let tangle_node = crate::tangle::run(use_local_tangle).await.unwrap(); tracing::info!("Tangle node running on port: {}", tangle_node.ws_port()); let mut opts = Opts { @@ -145,8 +147,8 @@ pub async fn new_test_ext_blueprint_manager< let tg_addr = handle.sr25519_id().account_id(); let evm_addr = handle.ecdsa_id().account_id(); - info!("Signer TG address: {tg_addr}"); - info!("Signer EVM address: {evm_addr}"); + info!("Signer TG account: {tg_addr}"); + info!("Signer EVM public key: 0x{}", hex::encode(evm_addr.0)); info!("Signer EVM(alloy) address: {}", priv_key.address()); if node_index == 0 { diff --git a/blueprints/incredible-squaring/tests/call_id.rs b/blueprints/incredible-squaring/tests/call_id.rs index 31801a0b..74d641ee 100644 --- a/blueprints/incredible-squaring/tests/call_id.rs +++ b/blueprints/incredible-squaring/tests/call_id.rs @@ -19,69 +19,73 @@ async fn call_id_valid() { const N: usize = 1; const JOB_ID: usize = 1; - new_test_ext_blueprint_manager::(String::new(), run_test_blueprint_manager) - .await - .execute_with_async(|client, handles, blueprint, _| async move { - let keypair = handles[0].sr25519_id().clone(); - let selected_service = &blueprint.services[0]; - let service_id = selected_service.id; - - for _ in 0..ITERATIONS { - gadget_sdk::info!("Submitting job {JOB_ID} with service ID {service_id}"); - - let expected_call_id = CALL_ID.load(Ordering::Relaxed); - let job_args = vec![InputValue::Uint64(expected_call_id)]; - - let job = submit_job( - client, - &keypair, - service_id, - Job::from(JOB_ID as u8), - job_args, - expected_call_id, - ) + new_test_ext_blueprint_manager::( + String::new(), + run_test_blueprint_manager, + false, + ) + .await + .execute_with_async(|client, handles, blueprint, _| async move { + let keypair = handles[0].sr25519_id().clone(); + let selected_service = &blueprint.services[0]; + let service_id = selected_service.id; + + for _ in 0..ITERATIONS { + gadget_sdk::info!("Submitting job {JOB_ID} with service ID {service_id}"); + + let expected_call_id = CALL_ID.load(Ordering::Relaxed); + let job_args = vec![InputValue::Uint64(expected_call_id)]; + + let job = submit_job( + client, + &keypair, + service_id, + Job::from(JOB_ID as u8), + job_args, + expected_call_id, + ) + .await + .expect("Failed to submit job"); + + let call_id = job.call_id; + + gadget_sdk::info!( + "Submitted job {JOB_ID} with service ID {service_id} has call id {call_id}" + ); + + let job_results = wait_for_completion_of_tangle_job(client, service_id, call_id, N) .await - .expect("Failed to submit job"); - - let call_id = job.call_id; - - gadget_sdk::info!( - "Submitted job {JOB_ID} with service ID {service_id} has call id {call_id}" - ); - - let job_results = wait_for_completion_of_tangle_job(client, service_id, call_id, N) - .await - .expect("Failed to wait for job completion"); - - assert_eq!(job_results.service_id, service_id); - assert_eq!(job_results.call_id, call_id); - - let expected_outputs = vec![OutputValue::Uint64(0)]; - if expected_outputs.is_empty() { - gadget_sdk::info!("No expected outputs specified, skipping verification"); - return; - } - - assert_eq!( - job_results.result.len(), - expected_outputs.len(), - "Number of outputs doesn't match expected" - ); - - for (result, expected) in job_results - .result - .into_iter() - .zip(expected_outputs.into_iter()) - { - assert_eq!(result, expected); - } - - gadget_sdk::info!( - "*** Finished iteration {} ***", - CALL_ID.load(Ordering::Relaxed) - ); - CALL_ID.fetch_add(1, Ordering::Relaxed); + .expect("Failed to wait for job completion"); + + assert_eq!(job_results.service_id, service_id); + assert_eq!(job_results.call_id, call_id); + + let expected_outputs = vec![OutputValue::Uint64(0)]; + if expected_outputs.is_empty() { + gadget_sdk::info!("No expected outputs specified, skipping verification"); + return; } - }) - .await + + assert_eq!( + job_results.result.len(), + expected_outputs.len(), + "Number of outputs doesn't match expected" + ); + + for (result, expected) in job_results + .result + .into_iter() + .zip(expected_outputs.into_iter()) + { + assert_eq!(result, expected); + } + + gadget_sdk::info!( + "*** Finished iteration {} ***", + CALL_ID.load(Ordering::Relaxed) + ); + CALL_ID.fetch_add(1, Ordering::Relaxed); + } + }) + .await } From f44bfd6cb5f6107c48f2f71443fdb7937f83fd69 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Tue, 10 Dec 2024 00:33:42 -0500 Subject: [PATCH 13/33] chore: revert CI change --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5628519..93005a69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -148,7 +148,8 @@ jobs: run: echo "${{ runner.temp }}/foundry/bin" >> $GITHUB_PATH - name: Forge build - run: forge update && cd blueprints/incredible-squaring && forge build --root ./contracts && cd ../../ + working-directory: gadget/blueprints/incredible-squaring + run: forge update && forge build - name: install rust uses: dtolnay/rust-toolchain@nightly From 67e8c5eb265c272b106860aac2b0bfdc1d05568c Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Tue, 10 Dec 2024 01:11:04 -0500 Subject: [PATCH 14/33] chore: clippy --- blueprint-test-utils/src/tangle/node.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/blueprint-test-utils/src/tangle/node.rs b/blueprint-test-utils/src/tangle/node.rs index 5d877e50..d7fe2766 100644 --- a/blueprint-test-utils/src/tangle/node.rs +++ b/blueprint-test-utils/src/tangle/node.rs @@ -141,7 +141,7 @@ impl SubstrateNodeBuilder { // Spawn thread to handle stderr let stderr_handle = thread::spawn(move || { let reader = BufReader::new(stderr); - for line in reader.lines().flatten() { + for line in reader.lines().map_while(Result::ok) { log::debug!(target: "node-stderr", "{}", line); let _ = init_tx_clone.send(line.clone()); let _ = log_tx_clone.send(line); @@ -155,7 +155,7 @@ impl SubstrateNodeBuilder { // Spawn thread to handle stdout let stdout_handle = thread::spawn(move || { let reader = BufReader::new(stdout); - for line in reader.lines().flatten() { + for line in reader.lines().map_while(Result::ok) { log::debug!(target: "node-stdout", "{}", line); let _ = log_tx_stdout.send(line); } @@ -277,7 +277,7 @@ impl SubstrateNode { let log_tx_clone = log_tx.clone(); let handle = thread::spawn(move || { let reader = BufReader::new(stdout); - for line in reader.lines().flatten() { + for line in reader.lines().map_while(Result::ok) { log::debug!(target: "node-stdout", "{}", line); let _ = log_tx_clone.send(line); } @@ -290,7 +290,7 @@ impl SubstrateNode { let log_tx_clone = log_tx.clone(); let handle = thread::spawn(move || { let reader = BufReader::new(stderr); - for line in reader.lines().flatten() { + for line in reader.lines().map_while(Result::ok) { log::debug!(target: "node-stderr", "{}", line); let _ = log_tx_clone.send(line); } @@ -333,7 +333,7 @@ impl SubstrateNode { let log_tx = self.log_capture_tx.clone(); let handle = thread::spawn(move || { let reader = BufReader::new(stdout); - for line in reader.lines().flatten() { + for line in reader.lines().map_while(Result::ok) { log::debug!(target: "node-stdout", "{}", line); if let Some(tx) = &log_tx { let _ = tx.send(line); @@ -347,7 +347,7 @@ impl SubstrateNode { let log_tx = self.log_capture_tx.clone(); let handle = thread::spawn(move || { let reader = BufReader::new(stderr); - for line in reader.lines().flatten() { + for line in reader.lines().map_while(Result::ok) { log::debug!(target: "node-stderr", "{}", line); if let Some(tx) = &log_tx { let _ = tx.send(line); From 1077b40c20b5fd299beffcde2f133cc86a692d65 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Tue, 10 Dec 2024 01:11:44 -0500 Subject: [PATCH 15/33] chore: clippy --- blueprints/incredible-squaring/tests/e2e.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/blueprints/incredible-squaring/tests/e2e.rs b/blueprints/incredible-squaring/tests/e2e.rs index 3c5ce5f0..f916def3 100644 --- a/blueprints/incredible-squaring/tests/e2e.rs +++ b/blueprints/incredible-squaring/tests/e2e.rs @@ -10,4 +10,5 @@ test_tangle_blueprint!( [InputValue::Uint64(5)], // Inputs [OutputValue::Uint64(25)], // Expected output: input squared 0, + true, ); From 9472de9f7e19893bcc9560926b87b4b1a16112e3 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Tue, 10 Dec 2024 10:11:07 -0500 Subject: [PATCH 16/33] chore: Add in place of bool --- blueprint-test-utils/src/tangle/mod.rs | 62 ++++++++++++--------- blueprint-test-utils/src/tangle/node.rs | 59 ++++++++++++++++++-- blueprint-test-utils/src/test_ext.rs | 6 +- blueprints/incredible-squaring/tests/e2e.rs | 4 +- 4 files changed, 96 insertions(+), 35 deletions(-) diff --git a/blueprint-test-utils/src/tangle/mod.rs b/blueprint-test-utils/src/tangle/mod.rs index 72660c18..a8b27a64 100644 --- a/blueprint-test-utils/src/tangle/mod.rs +++ b/blueprint-test-utils/src/tangle/mod.rs @@ -8,6 +8,8 @@ use std::path::PathBuf; pub mod node; pub mod transactions; +pub use node::NodeConfig; + const TANGLE_RELEASE_MAC: &str = "https://github.com/tangle-network/tangle/releases/download/83f587f/tangle-testnet-manual-seal-darwin-amd64"; const TANGLE_RELEASE_LINUX: &str = "https://github.com/tangle-network/tangle/releases/download/83f587f/tangle-testnet-manual-seal-linux-amd64"; @@ -63,34 +65,44 @@ pub async fn download_tangle_binary() -> Result Result { - let builder = SubstrateNode::builder() - .binary_paths(if use_local_tangle { - let tangle_from_env = - std::env::var(TANGLE_NODE_ENV).unwrap_or_else(|_| "tangle".to_string()); - vec![ - tangle_from_env, - "../tangle/target/release/tangle".to_string(), - "../../tangle/target/release/tangle".to_string(), - "../../../tangle/target/release/tangle".to_string(), - ] - } else { - let binary_path = download_tangle_binary().await.map_err(|e| { - Error::Io(std::io::Error::new( - std::io::ErrorKind::Other, - e.to_string(), - )) - })?; - vec![binary_path.to_string_lossy().into_owned()] - }) +pub async fn run(config: NodeConfig) -> Result { + let mut builder = SubstrateNode::builder(); + + // Add binary paths + if config.use_local_tangle { + let tangle_from_env = + std::env::var(TANGLE_NODE_ENV).unwrap_or_else(|_| "tangle".to_string()); + builder + .add_binary_path(tangle_from_env) + .add_binary_path("../tangle/target/release/tangle") + .add_binary_path("../../tangle/target/release/tangle") + .add_binary_path("../../../tangle/target/release/tangle"); + } else { + let binary_path = download_tangle_binary().await.map_err(|e| { + Error::Io(std::io::Error::new( + std::io::ErrorKind::Other, + e.to_string(), + )) + })?; + builder.add_binary_path(binary_path.to_string_lossy().to_string()); + } + + // Add standard arguments + builder .arg("validator") .arg_val("rpc-cors", "all") .arg_val("rpc-methods", "unsafe") .arg("rpc-external") - .arg_val("sealing", "manual") - .clone(); + .arg_val("sealing", "manual"); + + // Add log configuration + let log_string = config.to_log_string(); + if !log_string.is_empty() { + builder.arg_val("log", log_string); + } + builder.spawn() } @@ -132,7 +144,7 @@ macro_rules! test_tangle_blueprint { [$($inputs:expr),*], [$($expected_output:expr),*], $call_id:expr, - $use_local_tangle:expr, + $node_config:expr, ) => { ::blueprint_test_utils::tangle_blueprint_test_template!( $N, @@ -183,7 +195,7 @@ macro_rules! test_tangle_blueprint { assert_eq!(result, expected); } }, - $use_local_tangle, + $node_config, ); }; ( diff --git a/blueprint-test-utils/src/tangle/node.rs b/blueprint-test-utils/src/tangle/node.rs index d7fe2766..29f9fbed 100644 --- a/blueprint-test-utils/src/tangle/node.rs +++ b/blueprint-test-utils/src/tangle/node.rs @@ -46,7 +46,7 @@ type CowStr = Cow<'static, str>; #[derive(Debug, Clone)] pub struct SubstrateNodeBuilder { - binary_paths: Vec, + binary_paths: Vec, custom_flags: HashMap>, } @@ -73,12 +73,18 @@ impl SubstrateNodeBuilder { /// Set the path to the `substrate` binary; defaults to "substrate-node" /// or "substrate". - pub fn binary_paths(&mut self, paths: Paths) -> &mut Self + pub fn binary_paths(&mut self, paths: I) -> &mut Self where - Paths: IntoIterator, - S: Into, + I: IntoIterator, + S: Into, { - self.binary_paths = paths.into_iter().map(|p| p.into()).collect(); + self.binary_paths = paths.into_iter().map(Into::into).collect(); + self + } + + /// Add a single binary path. + pub fn add_binary_path>(&mut self, path: S) -> &mut Self { + self.binary_paths.push(path.into()); self } @@ -499,3 +505,46 @@ impl SubstrateNodeInfo { .ok_or_else(|| Error::CouldNotExtractP2pPort(self.log.clone())) } } + +#[derive(Debug, Clone, Default)] +pub struct NodeConfig { + pub use_local_tangle: bool, + pub log_level: Option, + pub log_targets: Vec<(String, String)>, +} + +impl NodeConfig { + pub fn new(use_local_tangle: bool) -> Self { + Self { + use_local_tangle, + log_level: None, + log_targets: Vec::new(), + } + } + + pub fn with_log_level(mut self, level: impl Into) -> Self { + self.log_level = Some(level.into()); + self + } + + pub fn with_log_target(mut self, target: impl Into, level: impl Into) -> Self { + self.log_targets.push((target.into(), level.into())); + self + } + + pub fn to_log_string(&self) -> String { + let mut parts = Vec::new(); + + // Add global level if set + if let Some(level) = &self.log_level { + parts.push(level.clone()); + } + + // Add target-specific levels + for (target, level) in &self.log_targets { + parts.push(format!("{}={}", target, level)); + } + + parts.join(",") + } +} diff --git a/blueprint-test-utils/src/test_ext.rs b/blueprint-test-utils/src/test_ext.rs index 412c5ed4..9da19fc7 100644 --- a/blueprint-test-utils/src/test_ext.rs +++ b/blueprint-test-utils/src/test_ext.rs @@ -43,7 +43,7 @@ use gadget_sdk::clients::tangle::services::{RpcServicesWithBlueprint, ServicesCl use gadget_sdk::subxt_core::config::Header; use gadget_sdk::utils::test_utils::get_client; use crate::tangle::node::SubstrateNode; -use crate::tangle::transactions; +use crate::tangle::{transactions, NodeConfig}; use tnt_core_bytecode::bytecode::MASTER_BLUEPRINT_SERVICE_MANAGER; const LOCAL_BIND_ADDR: &str = "127.0.0.1"; @@ -64,7 +64,7 @@ pub async fn new_test_ext_blueprint_manager< >( additional_params: D, f: F, - use_local_tangle: bool, + node_config: NodeConfig, ) -> LocalhostTestExt { assert!(N > 0, "At least one node is required"); assert!(N <= NAME_IDS.len(), "Only up to 5 nodes are supported"); @@ -85,7 +85,7 @@ pub async fn new_test_ext_blueprint_manager< let blueprint_name = manifest.package.as_ref().unwrap().name.clone(); tracing::info!("Starting Tangle node..."); - let tangle_node = crate::tangle::run(use_local_tangle).await.unwrap(); + let tangle_node = crate::tangle::run(node_config).await.unwrap(); tracing::info!("Tangle node running on port: {}", tangle_node.ws_port()); let mut opts = Opts { diff --git a/blueprints/incredible-squaring/tests/e2e.rs b/blueprints/incredible-squaring/tests/e2e.rs index f916def3..d4ec359a 100644 --- a/blueprints/incredible-squaring/tests/e2e.rs +++ b/blueprints/incredible-squaring/tests/e2e.rs @@ -1,4 +1,4 @@ -use blueprint_test_utils::{test_tangle_blueprint, InputValue, OutputValue}; +use blueprint_test_utils::{tangle::NodeConfig, test_tangle_blueprint, InputValue, OutputValue}; const SQUARING_JOB_ID: usize = 0; const N: usize = 5; @@ -10,5 +10,5 @@ test_tangle_blueprint!( [InputValue::Uint64(5)], // Inputs [OutputValue::Uint64(25)], // Expected output: input squared 0, - true, + NodeConfig::new(false), ); From 97addac459c3fcd83eb55f2b554548fb1c561a78 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Tue, 10 Dec 2024 10:14:23 -0500 Subject: [PATCH 17/33] chore: fix --- Cargo.lock | 3 ++- blueprint-test-utils/src/tangle/mod.rs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 317053ae..55ab3bf4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12307,7 +12307,8 @@ dependencies = [ [[package]] name = "tangle-subxt" version = "0.7.1" -source = "git+https://github.com/tangle-network/tangle#a1dfdccab0d5dc2d9b4dfb7e937b0f1467f5c7d6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16af9ac9fa28eadfded616693fcb19a61055bcf5c42fda07a03b572996bb10e8" dependencies = [ "parity-scale-codec", "scale-info", diff --git a/blueprint-test-utils/src/tangle/mod.rs b/blueprint-test-utils/src/tangle/mod.rs index a8b27a64..f39a587b 100644 --- a/blueprint-test-utils/src/tangle/mod.rs +++ b/blueprint-test-utils/src/tangle/mod.rs @@ -112,7 +112,7 @@ macro_rules! tangle_blueprint_test_template { ( $N:tt, $test_logic:expr, - $use_local_tangle:expr, + $node_config:expr, ) => { use $crate::test_ext::new_test_ext_blueprint_manager; @@ -126,7 +126,7 @@ macro_rules! tangle_blueprint_test_template { ::blueprint_test_utils::test_ext::new_test_ext_blueprint_manager::<$N, 1, String, _, _>( tmp_dir_path, ::blueprint_test_utils::run_test_blueprint_manager, - $use_local_tangle, + $node_config, ) .await .execute_with_async($test_logic) From d59834355f02f4323f1ffd36b891ffcff8a0c229 Mon Sep 17 00:00:00 2001 From: drewstone Date: Tue, 10 Dec 2024 10:18:13 -0500 Subject: [PATCH 18/33] Update cli/src/deploy.rs Co-authored-by: shekohex --- cli/src/deploy.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cli/src/deploy.rs b/cli/src/deploy.rs index 73bfc0e7..289c7ec1 100644 --- a/cli/src/deploy.rs +++ b/cli/src/deploy.rs @@ -117,10 +117,12 @@ pub async fn deploy_to_tangle( .await?; #[cfg(test)] let result = progress.wait_for_in_block_success().await?; - println!("Waiting for the transaction to be finalized..."); #[cfg(not(test))] - let result = progress.wait_for_finalized_success().await?; - println!("Transaction finalized..."); + { + println!("Waiting for the transaction to be finalized..."); + let result = progress.wait_for_finalized_success().await?; + println!("Transaction finalized..."); + } let event = result .find::() .flatten() From 02847d764536507055ba978267474abcba716661 Mon Sep 17 00:00:00 2001 From: drewstone Date: Tue, 10 Dec 2024 10:18:29 -0500 Subject: [PATCH 19/33] Update blueprint-test-utils/src/test_ext.rs Co-authored-by: shekohex --- blueprint-test-utils/src/test_ext.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blueprint-test-utils/src/test_ext.rs b/blueprint-test-utils/src/test_ext.rs index 9da19fc7..7ed5b29f 100644 --- a/blueprint-test-utils/src/test_ext.rs +++ b/blueprint-test-utils/src/test_ext.rs @@ -175,7 +175,7 @@ pub async fn new_test_ext_blueprint_manager< Some((rev, addr)) => debug!("MBSM is deployed at revision #{rev} at address {addr}"), None => { let bytecode = MASTER_BLUEPRINT_SERVICE_MANAGER.to_vec(); - debug!("Using MBSM bytecode of length: {}", bytecode.len()); + trace!("Using MBSM bytecode of length: {}", bytecode.len()); let ev = transactions::deploy_new_mbsm_revision( &local_tangle_node_ws, From d43f70a835e4b6599d4677b44d256e29977f405a Mon Sep 17 00:00:00 2001 From: drewstone Date: Tue, 10 Dec 2024 10:18:42 -0500 Subject: [PATCH 20/33] Update blueprint-test-utils/src/tangle/node.rs Co-authored-by: shekohex --- blueprint-test-utils/src/tangle/node.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blueprint-test-utils/src/tangle/node.rs b/blueprint-test-utils/src/tangle/node.rs index 29f9fbed..bc7db2cb 100644 --- a/blueprint-test-utils/src/tangle/node.rs +++ b/blueprint-test-utils/src/tangle/node.rs @@ -209,7 +209,7 @@ impl SubstrateNodeBuilder { cmd.arg(arg); } - log::debug!(target: "gadget", "Spawning node with command: {:?}", cmd); + gadget_sdk::trace!("Spawning node with command: {cmd:?}"); cmd.spawn() } } From 9ed95909b8dfc1db652b56dd2ce39b7a4a94d62d Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Tue, 10 Dec 2024 10:19:23 -0500 Subject: [PATCH 21/33] chore: remove timeout --- blueprint-test-utils/src/tangle/node.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/blueprint-test-utils/src/tangle/node.rs b/blueprint-test-utils/src/tangle/node.rs index bc7db2cb..b39fd3d6 100644 --- a/blueprint-test-utils/src/tangle/node.rs +++ b/blueprint-test-utils/src/tangle/node.rs @@ -379,9 +379,6 @@ impl Drop for SubstrateNode { // Kill the process let _ = self.kill(); - - // Wait for log handling threads to finish with timeout - let timeout = std::time::Duration::from_secs(5); if let Some(handle) = self.stdout_handle.take() { let _ = handle.join(); } From 4e61000c005d1169cc5aeb58ce17a38ed3b838ca Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Tue, 10 Dec 2024 10:51:45 -0500 Subject: [PATCH 22/33] chore: more changes --- blueprint-test-utils/src/test_ext.rs | 2 +- cli/src/deploy.rs | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/blueprint-test-utils/src/test_ext.rs b/blueprint-test-utils/src/test_ext.rs index 7ed5b29f..752aa052 100644 --- a/blueprint-test-utils/src/test_ext.rs +++ b/blueprint-test-utils/src/test_ext.rs @@ -175,7 +175,7 @@ pub async fn new_test_ext_blueprint_manager< Some((rev, addr)) => debug!("MBSM is deployed at revision #{rev} at address {addr}"), None => { let bytecode = MASTER_BLUEPRINT_SERVICE_MANAGER.to_vec(); - trace!("Using MBSM bytecode of length: {}", bytecode.len()); + gadget_sdk::trace!("Using MBSM bytecode of length: {}", bytecode.len()); let ev = transactions::deploy_new_mbsm_revision( &local_tangle_node_ws, diff --git a/cli/src/deploy.rs b/cli/src/deploy.rs index 289c7ec1..4da98b43 100644 --- a/cli/src/deploy.rs +++ b/cli/src/deploy.rs @@ -115,14 +115,15 @@ pub async fn deploy_to_tangle( .tx() .sign_and_submit_then_watch_default(&create_blueprint_tx, &signer) .await?; - #[cfg(test)] - let result = progress.wait_for_in_block_success().await?; - #[cfg(not(test))] - { + let result = if cfg!(test) { + use gadget_sdk::tx::tangle::TxProgressExt; + progress.wait_for_in_block_success().await? + } else { println!("Waiting for the transaction to be finalized..."); let result = progress.wait_for_finalized_success().await?; println!("Transaction finalized..."); - } + result + }; let event = result .find::() .flatten() From 63e54cd8feb3f708af5cd7e44ec2607be508f58a Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Tue, 10 Dec 2024 10:57:01 -0500 Subject: [PATCH 23/33] chore: use downloaded tangle --- blueprints/incredible-squaring/tests/e2e.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blueprints/incredible-squaring/tests/e2e.rs b/blueprints/incredible-squaring/tests/e2e.rs index d4ec359a..757abff6 100644 --- a/blueprints/incredible-squaring/tests/e2e.rs +++ b/blueprints/incredible-squaring/tests/e2e.rs @@ -10,5 +10,5 @@ test_tangle_blueprint!( [InputValue::Uint64(5)], // Inputs [OutputValue::Uint64(25)], // Expected output: input squared 0, - NodeConfig::new(false), + NodeConfig::new(true), ); From 06cdc37a767970337b5bef06287ec878edc0bd24 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Tue, 10 Dec 2024 10:57:22 -0500 Subject: [PATCH 24/33] chore: revert --- blueprints/incredible-squaring/tests/e2e.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blueprints/incredible-squaring/tests/e2e.rs b/blueprints/incredible-squaring/tests/e2e.rs index 757abff6..d4ec359a 100644 --- a/blueprints/incredible-squaring/tests/e2e.rs +++ b/blueprints/incredible-squaring/tests/e2e.rs @@ -10,5 +10,5 @@ test_tangle_blueprint!( [InputValue::Uint64(5)], // Inputs [OutputValue::Uint64(25)], // Expected output: input squared 0, - NodeConfig::new(true), + NodeConfig::new(false), ); From 07226effb935457f1bae32a1cc8969bd05f21ea0 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Tue, 10 Dec 2024 11:50:40 -0500 Subject: [PATCH 25/33] chore: setup sending balance --- .../src/tangle/transactions.rs | 8 ++++++ blueprint-test-utils/src/test_ext.rs | 26 ++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/blueprint-test-utils/src/tangle/transactions.rs b/blueprint-test-utils/src/tangle/transactions.rs index 76a710c1..6415c022 100644 --- a/blueprint-test-utils/src/tangle/transactions.rs +++ b/blueprint-test-utils/src/tangle/transactions.rs @@ -184,6 +184,14 @@ pub async fn request_service( PaymentAsset::from(Asset::Custom(0)), value, ); + let balance_call = api::storage().balances().account(user.account_id()); + let balance = client + .storage() + .at_latest() + .await? + .fetch_or_default(&balance_call) + .await?; + println!("XXX | Balance: {:?}", balance); let res = client .tx() .sign_and_submit_then_watch_default(&call, user) diff --git a/blueprint-test-utils/src/test_ext.rs b/blueprint-test-utils/src/test_ext.rs index 752aa052..daf4e76b 100644 --- a/blueprint-test-utils/src/test_ext.rs +++ b/blueprint-test-utils/src/test_ext.rs @@ -21,11 +21,15 @@ use blueprint_manager::executor::BlueprintManagerHandle; use blueprint_manager::sdk::entry::SendFuture; use cargo_tangle::deploy::Opts; use gadget_sdk::clients::tangle::runtime::TangleClient; +use gadget_sdk::tangle_subxt::tangle_testnet_runtime::api; use gadget_sdk::tangle_subxt::tangle_testnet_runtime::api::runtime_types::tangle_primitives::services::PriceTargets; use gadget_sdk::tangle_subxt::tangle_testnet_runtime::api::services::calls::types::register::{Preferences, RegistrationArgs}; +use subxt::ext::sp_runtime::traits::IdentifyAccount; use libp2p::Multiaddr; use log::debug; use sp_core::crypto::Ss58AddressFormat; +use subxt::ext::sp_runtime::traits::Verify; +use subxt::ext::sp_runtime::MultiSignature; use std::collections::HashSet; use std::future::Future; use std::net::IpAddr; @@ -36,7 +40,7 @@ use url::Url; use std::path::PathBuf; use subxt::tx::Signer; use gadget_sdk::keystore::KeystoreUriSanitizer; -use sp_core::Pair; +use sp_core::{sr25519, Pair, Public}; use tracing::Instrument; use gadget_sdk::{error, info, warn}; use gadget_sdk::clients::tangle::services::{RpcServicesWithBlueprint, ServicesClient}; @@ -49,6 +53,11 @@ use tnt_core_bytecode::bytecode::MASTER_BLUEPRINT_SERVICE_MANAGER; const LOCAL_BIND_ADDR: &str = "127.0.0.1"; pub const NAME_IDS: [&str; 5] = ["Alice", "Bob", "Charlie", "Dave", "Eve"]; +/// Generate a crypto pair from seed. +pub fn get_from_seed(seed: &str) -> TPublic::Pair { + TPublic::Pair::from_string(&format!("//{seed}"), None).expect("static values are valid; qed") +} + /// - `N`: number of nodes /// - `K`: Number of networks accessible per node (should be equal to the number of services in a given blueprint) /// - `D`: Any data that you want to pass with NodeInput. @@ -157,6 +166,21 @@ pub async fn new_test_ext_blueprint_manager< opts.signer = Some(handle.sr25519_id().clone().into_inner()); } + // Give the accounts balances + let client = get_client(&opts.ws_rpc_url, &opts.http_rpc_url) + .await + .expect("Failed to create an account-based localhost client"); + + let alice = get_from_seed::("Alice"); + let transfer_call = api::tx() + .balances() + .transfer_allow_death(tg_addr.into(), 1_000_000_000_000_000_000_000_000); + let res = client + .tx() + .sign_and_submit_then_watch_default(&transfer_call, alice) + .await + .expect("Failed to transfer funds to Alice"); + handles.push(handle); } From 3acd87de75e40c98b6c8780f0cf990626c731a39 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Tue, 10 Dec 2024 12:39:04 -0500 Subject: [PATCH 26/33] fix: pass context from job to post-processor without changing post-processor signature --- .../contracts/lib/forge-std | 2 +- .../contracts/lib/core | 2 +- .../contracts/lib/forge-std | 2 +- .../contracts/lib/forge-std | 2 +- .../contracts/lib/tnt-core | 2 +- .../incredible-squaring/tests/call_id.rs | 3 ++- macros/blueprint-proc-macro/src/job.rs | 19 ++++--------------- macros/blueprint-proc-macro/src/report.rs | 5 +---- macros/blueprint-proc-macro/src/shared.rs | 16 ++++++++++++---- .../src/special_impls/evm.rs | 2 +- .../src/special_impls/tangle.rs | 15 +++++++++------ macros/context-derive/src/subxt.rs | 4 ++-- sdk/src/contexts/tangle_client.rs | 6 +++++- 13 files changed, 41 insertions(+), 39 deletions(-) diff --git a/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std b/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std index 1de6eecf..d3db4ef9 160000 --- a/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std +++ b/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std @@ -1 +1 @@ -Subproject commit 1de6eecf821de7fe2c908cc48d3ab3dced20717f +Subproject commit d3db4ef90a72b7d24aa5a2e5c649593eaef7801d diff --git a/blueprints/incredible-squaring-symbiotic/contracts/lib/core b/blueprints/incredible-squaring-symbiotic/contracts/lib/core index f38f1b16..2a5f6f0f 160000 --- a/blueprints/incredible-squaring-symbiotic/contracts/lib/core +++ b/blueprints/incredible-squaring-symbiotic/contracts/lib/core @@ -1 +1 @@ -Subproject commit f38f1b16b8207dcff55d681a0d5ba28c66e785c8 +Subproject commit 2a5f6f0fcee9a8d0ace03c38c77a352c5e5f95ae diff --git a/blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std b/blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std index 1eea5bae..d3db4ef9 160000 --- a/blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std +++ b/blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std @@ -1 +1 @@ -Subproject commit 1eea5bae12ae557d589f9f0f0edae2faa47cb262 +Subproject commit d3db4ef90a72b7d24aa5a2e5c649593eaef7801d diff --git a/blueprints/incredible-squaring/contracts/lib/forge-std b/blueprints/incredible-squaring/contracts/lib/forge-std index 1de6eecf..d3db4ef9 160000 --- a/blueprints/incredible-squaring/contracts/lib/forge-std +++ b/blueprints/incredible-squaring/contracts/lib/forge-std @@ -1 +1 @@ -Subproject commit 1de6eecf821de7fe2c908cc48d3ab3dced20717f +Subproject commit d3db4ef90a72b7d24aa5a2e5c649593eaef7801d diff --git a/blueprints/incredible-squaring/contracts/lib/tnt-core b/blueprints/incredible-squaring/contracts/lib/tnt-core index c1fa9c7c..df6d5d6d 160000 --- a/blueprints/incredible-squaring/contracts/lib/tnt-core +++ b/blueprints/incredible-squaring/contracts/lib/tnt-core @@ -1 +1 @@ -Subproject commit c1fa9c7c3c5891aab9bd25002a434d93c54942cd +Subproject commit df6d5d6da3c82217405c408d3c0b11369bb3e5c2 diff --git a/blueprints/incredible-squaring/tests/call_id.rs b/blueprints/incredible-squaring/tests/call_id.rs index 74d641ee..60a106ef 100644 --- a/blueprints/incredible-squaring/tests/call_id.rs +++ b/blueprints/incredible-squaring/tests/call_id.rs @@ -8,6 +8,7 @@ pub use blueprint_test_utils::{ use blueprint_test_utils::test_ext::new_test_ext_blueprint_manager; use blueprint_test_utils::{InputValue, OutputValue}; +use blueprint_test_utils::tangle::NodeConfig; #[gadget_sdk::tokio::test(crate = "::gadget_sdk::tokio")] async fn call_id_valid() { @@ -22,7 +23,7 @@ async fn call_id_valid() { new_test_ext_blueprint_manager::( String::new(), run_test_blueprint_manager, - false, + NodeConfig::new(false), ) .await .execute_with_async(|client, handles, blueprint, _| async move { diff --git a/macros/blueprint-proc-macro/src/job.rs b/macros/blueprint-proc-macro/src/job.rs index 9454ca4d..0907dcab 100644 --- a/macros/blueprint-proc-macro/src/job.rs +++ b/macros/blueprint-proc-macro/src/job.rs @@ -45,14 +45,6 @@ pub fn get_job_id_field_name(input: &ItemFn) -> (String, Ident, Ident) { (fn_name_string, job_def_name, job_id_name) } -pub fn get_current_call_id_field_name(input: &ItemFn) -> Ident { - let fn_name = &input.sig.ident; - format_ident!( - "{}_ACTIVE_CALL_ID", - fn_name.to_string().to_ascii_uppercase() - ) -} - /// Job Macro implementation pub(crate) fn job_impl(args: &JobArgs, input: &ItemFn) -> syn::Result { // Extract function name and arguments @@ -177,7 +169,6 @@ pub fn generate_job_const_block( ) })?; - let call_id_static_name = get_current_call_id_field_name(input); Ok(quote! { #[doc = "Job definition for the function "] #[doc = "[`"] @@ -193,8 +184,6 @@ pub fn generate_job_const_block( #[doc = "`]"] #[automatically_derived] pub const #job_id_name: u8 = #job_id; - - static #call_id_static_name: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0); }) } @@ -243,7 +232,6 @@ pub(crate) fn generate_event_workflow_tokenstream( get_fn_call_ordered(param_types, params, Some(static_ctx_get_override), is_raw)?; let asyncness = get_asyncness(input); - let call_id_static_name = get_current_call_id_field_name(input); // TODO: task 001: find better way to identify which ident is the raw event // for now, we assume the raw event is always listed first @@ -313,7 +301,7 @@ pub(crate) fn generate_event_workflow_tokenstream( )?, ListenerType::Custom => { - let job_processor_call_return = get_return_type_wrapper(&return_type); + let job_processor_call_return = get_return_type_wrapper(&return_type, None); quote! { move |param0| async move { @@ -329,12 +317,13 @@ pub(crate) fn generate_event_workflow_tokenstream( match listener_meta.listener_type { ListenerType::Tangle => { quote! { - |job_result| async move { + |(mut client_context, job_result)| async move { let ctx = CTX.get().unwrap(); + let call_id = gadget_sdk::contexts::TangleClientContext::get_call_id(&mut client_context).expect("Tangle call ID was not injected into context"); let tangle_job_result = gadget_sdk::event_listener::tangle::TangleResult::<_> { results: job_result, service_id: ctx.service_id, - call_id: #call_id_static_name.fetch_add(1, std::sync::atomic::Ordering::Relaxed), + call_id, client: ctx.client.clone(), signer: ctx.signer.clone(), }; diff --git a/macros/blueprint-proc-macro/src/report.rs b/macros/blueprint-proc-macro/src/report.rs index 97f70af1..729adb6b 100644 --- a/macros/blueprint-proc-macro/src/report.rs +++ b/macros/blueprint-proc-macro/src/report.rs @@ -1,6 +1,6 @@ use crate::job::{ declared_params_to_field_types, generate_autogen_struct, generate_specialized_logic, - get_current_call_id_field_name, get_job_id_field_name, get_return_type, EventListenerArgs, + get_job_id_field_name, get_return_type, EventListenerArgs, ParameterType, ResultsKind, }; use crate::shared::{pascal_case, MacroExt}; @@ -146,7 +146,6 @@ pub(crate) fn report_impl(args: &ReportArgs, input: &ItemFn) -> syn::Result syn::Result syn::Result> Ok(param_types) } -pub fn get_return_type_wrapper(return_type: &Type) -> proc_macro2::TokenStream { - if return_type.is_result_type() { - quote! { res.map_err(|err| gadget_sdk::Error::Other(err.to_string())) } +pub fn get_return_type_wrapper(return_type: &Type, injected_context_var_name: Option) -> proc_macro2::TokenStream { + if let Some(context_var_name) = injected_context_var_name { + if return_type.is_result_type() { + quote! { res.map_err(|err| gadget_sdk::Error::Other(err.to_string())).map(|res| (#context_var_name, res)) } + } else { + quote! { Ok((#context_var_name, res)) } + } } else { - quote! { Ok(res) } + if return_type.is_result_type() { + quote! { res.map_err(|err| gadget_sdk::Error::Other(err.to_string())) } + } else { + quote! { Ok(res) } + } } } diff --git a/macros/blueprint-proc-macro/src/special_impls/evm.rs b/macros/blueprint-proc-macro/src/special_impls/evm.rs index 1f34992f..37c48ba3 100644 --- a/macros/blueprint-proc-macro/src/special_impls/evm.rs +++ b/macros/blueprint-proc-macro/src/special_impls/evm.rs @@ -128,7 +128,7 @@ pub(crate) fn get_evm_job_processor_wrapper( } }; - let job_processor_call_return = get_return_type_wrapper(return_type); + let job_processor_call_return = get_return_type_wrapper(return_type, None); // We must type annotate param0 below as such: (_, _, _, ... ) using underscores for each input to // allow the rust type inferencer to count the number of inputs and correctly index them in the function call diff --git a/macros/blueprint-proc-macro/src/special_impls/tangle.rs b/macros/blueprint-proc-macro/src/special_impls/tangle.rs index 4782f026..f960ed47 100644 --- a/macros/blueprint-proc-macro/src/special_impls/tangle.rs +++ b/macros/blueprint-proc-macro/src/special_impls/tangle.rs @@ -81,7 +81,7 @@ pub(crate) fn get_tangle_job_processor_wrapper( fn_name_ident: &Ident, asyncness: &TokenStream, return_type: &Type, - ctx_post_in_ordered_inputs: usize, + ctx_pos_in_ordered_inputs: usize, ) -> syn::Result { let params = declared_params_to_field_types(job_params, param_map)?; let params_tokens = event_listeners.get_param_name_tokenstream(¶ms); @@ -91,15 +91,18 @@ pub(crate) fn get_tangle_job_processor_wrapper( const PARAMETER_COUNT: usize = #parameter_count; }; - let injected_context = ordered_inputs[ctx_post_in_ordered_inputs].clone(); + let injected_context_var_name = quote! { injected_context }; + + let injected_context = ordered_inputs[ctx_pos_in_ordered_inputs].clone(); let call_id_injector = quote! { - let mut injected_context = #injected_context; + let mut #injected_context_var_name = #injected_context; if let Some(call_id) = tangle_event.call_id { - gadget_sdk::contexts::TangleClientContext::set_call_id(&mut injected_context, call_id); + gadget_sdk::contexts::TangleClientContext::set_call_id(&mut #injected_context_var_name, call_id); } }; - ordered_inputs[ctx_post_in_ordered_inputs] = quote! { injected_context }; + // Clone to allow passing to the post-processor closure + ordered_inputs[ctx_pos_in_ordered_inputs] = quote! { injected_context.clone() }; let job_processor_call = if params_tokens.is_empty() { let second_param = ordered_inputs @@ -129,7 +132,7 @@ pub(crate) fn get_tangle_job_processor_wrapper( } }; - let job_processor_call_return = get_return_type_wrapper(return_type); + let job_processor_call_return = get_return_type_wrapper(return_type, Some(injected_context_var_name)); Ok(quote! { move |tangle_event: gadget_sdk::event_listener::tangle::TangleEvent<_, _>| async move { diff --git a/macros/context-derive/src/subxt.rs b/macros/context-derive/src/subxt.rs index 75309302..ffbc1e2f 100644 --- a/macros/context-derive/src/subxt.rs +++ b/macros/context-derive/src/subxt.rs @@ -29,8 +29,8 @@ pub fn generate_context_impl( impl #impl_generics gadget_sdk::contexts::TangleClientContext for #name #ty_generics #where_clause { type Config = gadget_sdk::ext::subxt::PolkadotConfig; - fn set_call_id(&mut self, call_id: u64) { - #field_access_call_id = Some(call_id); + fn get_call_id(&mut self) -> &mut Option { + &mut #field_access_call_id } fn tangle_client(&self) -> impl core::future::Future, gadget_sdk::ext::subxt::Error>> { diff --git a/sdk/src/contexts/tangle_client.rs b/sdk/src/contexts/tangle_client.rs index 3c24c3c3..9f1f888b 100644 --- a/sdk/src/contexts/tangle_client.rs +++ b/sdk/src/contexts/tangle_client.rs @@ -8,5 +8,9 @@ pub trait TangleClientContext { &self, ) -> impl Future, subxt::Error>>; - fn set_call_id(&mut self, call_id: u64); + fn get_call_id(&mut self) -> &mut Option; + + fn set_call_id(&mut self, call_id: u64) { + *self.get_call_id() = Some(call_id); + } } From 69f482d1fbf903a4aed6d48ffa1d60f371bda149 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Tue, 10 Dec 2024 12:42:08 -0500 Subject: [PATCH 27/33] chore: fixes --- blueprint-test-utils/src/lib.rs | 1 + blueprint-test-utils/src/tangle/transactions.rs | 8 -------- blueprint-test-utils/src/test_ext.rs | 15 --------------- blueprints/incredible-squaring/tests/call_id.rs | 4 ++-- 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/blueprint-test-utils/src/lib.rs b/blueprint-test-utils/src/lib.rs index d4008b07..6437f6d9 100644 --- a/blueprint-test-utils/src/lib.rs +++ b/blueprint-test-utils/src/lib.rs @@ -267,6 +267,7 @@ fn inject_tangle_key>(keystore_path: P, name: &str) -> color_eyre let suri = format!("//{name}"); let sr = sp_core::sr25519::Pair::from_string(&suri, None).expect("Should be valid SR keypair"); + let sr_seed = &sr.as_ref().secret.to_bytes(); let ed = sp_core::ed25519::Pair::from_string(&suri, None).expect("Should be valid ED keypair"); diff --git a/blueprint-test-utils/src/tangle/transactions.rs b/blueprint-test-utils/src/tangle/transactions.rs index 6415c022..76a710c1 100644 --- a/blueprint-test-utils/src/tangle/transactions.rs +++ b/blueprint-test-utils/src/tangle/transactions.rs @@ -184,14 +184,6 @@ pub async fn request_service( PaymentAsset::from(Asset::Custom(0)), value, ); - let balance_call = api::storage().balances().account(user.account_id()); - let balance = client - .storage() - .at_latest() - .await? - .fetch_or_default(&balance_call) - .await?; - println!("XXX | Balance: {:?}", balance); let res = client .tx() .sign_and_submit_then_watch_default(&call, user) diff --git a/blueprint-test-utils/src/test_ext.rs b/blueprint-test-utils/src/test_ext.rs index daf4e76b..1ff17b65 100644 --- a/blueprint-test-utils/src/test_ext.rs +++ b/blueprint-test-utils/src/test_ext.rs @@ -166,21 +166,6 @@ pub async fn new_test_ext_blueprint_manager< opts.signer = Some(handle.sr25519_id().clone().into_inner()); } - // Give the accounts balances - let client = get_client(&opts.ws_rpc_url, &opts.http_rpc_url) - .await - .expect("Failed to create an account-based localhost client"); - - let alice = get_from_seed::("Alice"); - let transfer_call = api::tx() - .balances() - .transfer_allow_death(tg_addr.into(), 1_000_000_000_000_000_000_000_000); - let res = client - .tx() - .sign_and_submit_then_watch_default(&transfer_call, alice) - .await - .expect("Failed to transfer funds to Alice"); - handles.push(handle); } diff --git a/blueprints/incredible-squaring/tests/call_id.rs b/blueprints/incredible-squaring/tests/call_id.rs index 74d641ee..f32b0338 100644 --- a/blueprints/incredible-squaring/tests/call_id.rs +++ b/blueprints/incredible-squaring/tests/call_id.rs @@ -1,6 +1,7 @@ use std::sync::atomic::AtomicU64; use std::sync::atomic::Ordering; +use blueprint_test_utils::tangle::NodeConfig; pub use blueprint_test_utils::{ get_blueprint_base_dir, read_cargo_toml_file, run_test_blueprint_manager, setup_log, submit_job, tangle, wait_for_completion_of_tangle_job, Args, Job, Opts, @@ -18,11 +19,10 @@ async fn call_id_valid() { const N: usize = 1; const JOB_ID: usize = 1; - new_test_ext_blueprint_manager::( String::new(), run_test_blueprint_manager, - false, + NodeConfig::new(false), ) .await .execute_with_async(|client, handles, blueprint, _| async move { From c3c96403b956ef3cdd54c70d94d248b643755090 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Tue, 10 Dec 2024 12:43:03 -0500 Subject: [PATCH 28/33] chore: pull in origin HEAD --- blueprints/incredible-squaring/tests/call_id.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/blueprints/incredible-squaring/tests/call_id.rs b/blueprints/incredible-squaring/tests/call_id.rs index 470faa03..f32b0338 100644 --- a/blueprints/incredible-squaring/tests/call_id.rs +++ b/blueprints/incredible-squaring/tests/call_id.rs @@ -9,7 +9,6 @@ pub use blueprint_test_utils::{ use blueprint_test_utils::test_ext::new_test_ext_blueprint_manager; use blueprint_test_utils::{InputValue, OutputValue}; -use blueprint_test_utils::tangle::NodeConfig; #[gadget_sdk::tokio::test(crate = "::gadget_sdk::tokio")] async fn call_id_valid() { From c1ad6f0176d81355f4740cc1d5c43975b5f5c557 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Tue, 10 Dec 2024 12:45:23 -0500 Subject: [PATCH 29/33] chore: fmt --- macros/blueprint-proc-macro/src/report.rs | 3 +-- macros/blueprint-proc-macro/src/shared.rs | 5 ++++- macros/blueprint-proc-macro/src/special_impls/tangle.rs | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/macros/blueprint-proc-macro/src/report.rs b/macros/blueprint-proc-macro/src/report.rs index 729adb6b..9d4b1e69 100644 --- a/macros/blueprint-proc-macro/src/report.rs +++ b/macros/blueprint-proc-macro/src/report.rs @@ -1,7 +1,6 @@ use crate::job::{ declared_params_to_field_types, generate_autogen_struct, generate_specialized_logic, - get_job_id_field_name, get_return_type, EventListenerArgs, - ParameterType, ResultsKind, + get_job_id_field_name, get_return_type, EventListenerArgs, ParameterType, ResultsKind, }; use crate::shared::{pascal_case, MacroExt}; use gadget_blueprint_proc_macro_core::{ diff --git a/macros/blueprint-proc-macro/src/shared.rs b/macros/blueprint-proc-macro/src/shared.rs index 3d2680fe..09e36deb 100644 --- a/macros/blueprint-proc-macro/src/shared.rs +++ b/macros/blueprint-proc-macro/src/shared.rs @@ -225,7 +225,10 @@ pub(crate) fn param_types(sig: &Signature) -> syn::Result> Ok(param_types) } -pub fn get_return_type_wrapper(return_type: &Type, injected_context_var_name: Option) -> proc_macro2::TokenStream { +pub fn get_return_type_wrapper( + return_type: &Type, + injected_context_var_name: Option, +) -> proc_macro2::TokenStream { if let Some(context_var_name) = injected_context_var_name { if return_type.is_result_type() { quote! { res.map_err(|err| gadget_sdk::Error::Other(err.to_string())).map(|res| (#context_var_name, res)) } diff --git a/macros/blueprint-proc-macro/src/special_impls/tangle.rs b/macros/blueprint-proc-macro/src/special_impls/tangle.rs index f960ed47..4244a325 100644 --- a/macros/blueprint-proc-macro/src/special_impls/tangle.rs +++ b/macros/blueprint-proc-macro/src/special_impls/tangle.rs @@ -132,7 +132,8 @@ pub(crate) fn get_tangle_job_processor_wrapper( } }; - let job_processor_call_return = get_return_type_wrapper(return_type, Some(injected_context_var_name)); + let job_processor_call_return = + get_return_type_wrapper(return_type, Some(injected_context_var_name)); Ok(quote! { move |tangle_event: gadget_sdk::event_listener::tangle::TangleEvent<_, _>| async move { From c92529e9902bf93b19ab2081647a5b507462fafa Mon Sep 17 00:00:00 2001 From: Serial <69764315+Serial-ATA@users.noreply.github.com> Date: Tue, 10 Dec 2024 13:08:01 -0500 Subject: [PATCH 30/33] fix: change working dir in incredible-squaring CI --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93005a69..3fb90eef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: CI on: pull_request: - branches: [main] + branches: [ main ] push: - branches: [main] + branches: [ main ] workflow_dispatch: concurrency: @@ -148,7 +148,7 @@ jobs: run: echo "${{ runner.temp }}/foundry/bin" >> $GITHUB_PATH - name: Forge build - working-directory: gadget/blueprints/incredible-squaring + working-directory: gadget/blueprints/incredible-squaring/contracts run: forge update && forge build - name: install rust From 9ac5d9f7f0c894892dfbdb9b20623464cb8018c1 Mon Sep 17 00:00:00 2001 From: Serial <69764315+Serial-ATA@users.noreply.github.com> Date: Tue, 10 Dec 2024 14:28:05 -0500 Subject: [PATCH 31/33] chore: expand incredible-squaring e2e test --- blueprint-test-utils/src/test_ext.rs | 4 +- blueprints/incredible-squaring/tests/e2e.rs | 82 ++++++++++++++++++--- 2 files changed, 74 insertions(+), 12 deletions(-) diff --git a/blueprint-test-utils/src/test_ext.rs b/blueprint-test-utils/src/test_ext.rs index 1ff17b65..c11f141d 100644 --- a/blueprint-test-utils/src/test_ext.rs +++ b/blueprint-test-utils/src/test_ext.rs @@ -183,7 +183,7 @@ pub async fn new_test_ext_blueprint_manager< match latest_revision { Some((rev, addr)) => debug!("MBSM is deployed at revision #{rev} at address {addr}"), None => { - let bytecode = MASTER_BLUEPRINT_SERVICE_MANAGER.to_vec(); + let bytecode = MASTER_BLUEPRINT_SERVICE_MANAGER; gadget_sdk::trace!("Using MBSM bytecode of length: {}", bytecode.len()); let ev = transactions::deploy_new_mbsm_revision( @@ -191,7 +191,7 @@ pub async fn new_test_ext_blueprint_manager< &client, handles[0].sr25519_id(), opts.signer_evm.clone().expect("Signer EVM is set"), - &bytecode, + bytecode, ) .await .expect("deploy new MBSM revision"); diff --git a/blueprints/incredible-squaring/tests/e2e.rs b/blueprints/incredible-squaring/tests/e2e.rs index d4ec359a..bf20e07b 100644 --- a/blueprints/incredible-squaring/tests/e2e.rs +++ b/blueprints/incredible-squaring/tests/e2e.rs @@ -1,14 +1,76 @@ -use blueprint_test_utils::{tangle::NodeConfig, test_tangle_blueprint, InputValue, OutputValue}; +use blueprint_test_utils::test_ext::new_test_ext_blueprint_manager; +use blueprint_test_utils::{ + tangle::NodeConfig, tempfile, wait_for_completion_of_tangle_job, InputValue, Job, OutputValue, +}; const SQUARING_JOB_ID: usize = 0; const N: usize = 5; -test_tangle_blueprint!( - N, // Number of nodes - N, - SQUARING_JOB_ID, // Job ID - [InputValue::Uint64(5)], // Inputs - [OutputValue::Uint64(25)], // Expected output: input squared - 0, - NodeConfig::new(false), -); +#[gadget_sdk::tokio::test(flavor = "multi_thread", crate = "::gadget_sdk::tokio")] +async fn test_blueprint() { + blueprint_test_utils::setup_log(); + + let tmp_dir = tempfile::TempDir::new().unwrap(); + let tmp_dir_path = tmp_dir.path().to_string_lossy().into_owned(); + + new_test_ext_blueprint_manager::( + tmp_dir_path, + blueprint_test_utils::run_test_blueprint_manager, + NodeConfig::new(false), + ) + .await + .execute_with_async(|client, handles, blueprint, _| async move { + let keypair = handles[0].sr25519_id().clone(); + let selected_service = &blueprint.services[0]; + let service_id = selected_service.id; + + gadget_sdk::info!("Submitting job {SQUARING_JOB_ID} with service ID {service_id}"); + + let job_args = vec![(InputValue::Uint64(5))]; + + let job = blueprint_test_utils::submit_job( + client, + &keypair, + service_id, + Job::from(SQUARING_JOB_ID as u8), + job_args, + 0, + ) + .await + .expect("Failed to submit job"); + + let call_id = job.call_id; + + gadget_sdk::info!( + "Submitted job {SQUARING_JOB_ID} with service ID {service_id} has call id {call_id}" + ); + + let job_results = wait_for_completion_of_tangle_job(client, service_id, call_id, N) + .await + .expect("Failed to wait for job completion"); + + assert_eq!(job_results.service_id, service_id); + assert_eq!(job_results.call_id, call_id); + + let expected_outputs = vec![OutputValue::Uint64(25)]; + if expected_outputs.is_empty() { + gadget_sdk::info!("No expected outputs specified, skipping verification"); + return; + } + + assert_eq!( + job_results.result.len(), + expected_outputs.len(), + "Number of outputs doesn't match expected" + ); + + for (result, expected) in job_results + .result + .into_iter() + .zip(expected_outputs.into_iter()) + { + assert_eq!(result, expected); + } + }) + .await +} From 0ebddbfa9a33753952e640f348d5553935567259 Mon Sep 17 00:00:00 2001 From: Serial <69764315+Serial-ATA@users.noreply.github.com> Date: Tue, 10 Dec 2024 15:20:46 -0500 Subject: [PATCH 32/33] fix: remove file from build.rs --- blueprints/incredible-squaring/build.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/blueprints/incredible-squaring/build.rs b/blueprints/incredible-squaring/build.rs index 0bfcf614..acb638b3 100644 --- a/blueprints/incredible-squaring/build.rs +++ b/blueprints/incredible-squaring/build.rs @@ -1,5 +1,4 @@ fn main() { - println!("cargo:rerun-if-changed=src/cli"); println!("cargo:rerun-if-changed=src/lib.rs"); println!("cargo:rerun-if-changed=src/main.rs"); blueprint_metadata::generate_json(); From 97d924e4019e4131cb84eab1a48204d8dfd8e75d Mon Sep 17 00:00:00 2001 From: Serial <69764315+Serial-ATA@users.noreply.github.com> Date: Tue, 10 Dec 2024 15:57:37 -0500 Subject: [PATCH 33/33] chore: clippy --- cli/src/deploy.rs | 2 -- macros/blueprint-proc-macro/src/shared.rs | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cli/src/deploy.rs b/cli/src/deploy.rs index 4da98b43..dbe62b25 100644 --- a/cli/src/deploy.rs +++ b/cli/src/deploy.rs @@ -4,8 +4,6 @@ pub use alloy_signer_local::PrivateKeySigner; use color_eyre::eyre::{self, Context, ContextCompat, Result}; use gadget_blueprint_proc_macro_core::{BlueprintManager, ServiceBlueprint}; use gadget_sdk::clients::tangle::runtime::TangleConfig; -#[cfg(test)] -use gadget_sdk::tx::tangle::TxProgressExt; pub use k256; use std::fmt::Debug; use std::path::PathBuf; diff --git a/macros/blueprint-proc-macro/src/shared.rs b/macros/blueprint-proc-macro/src/shared.rs index 09e36deb..29b5b087 100644 --- a/macros/blueprint-proc-macro/src/shared.rs +++ b/macros/blueprint-proc-macro/src/shared.rs @@ -235,12 +235,10 @@ pub fn get_return_type_wrapper( } else { quote! { Ok((#context_var_name, res)) } } + } else if return_type.is_result_type() { + quote! { res.map_err(|err| gadget_sdk::Error::Other(err.to_string())) } } else { - if return_type.is_result_type() { - quote! { res.map_err(|err| gadget_sdk::Error::Other(err.to_string())) } - } else { - quote! { Ok(res) } - } + quote! { Ok(res) } } }