From 422f112970f26c2a45f3b097ffb8e13b5e0e56b6 Mon Sep 17 00:00:00 2001 From: Kurdistan Tech Ministry Date: Tue, 23 Dec 2025 06:07:40 +0300 Subject: [PATCH] fix: address multiple compilation issues - Revert thiserror to 1.0.69 (fatality 0.1.1 incompatible with 2.x) - Fix MerkleProofError format string (Rust 2024 compatibility) - Fix deprecated websocket::framed::WsConfig -> Config in telemetry - Fix zombienet-sdk import: sc_chain_spec -> pezsc_chain_spec --- Cargo.lock | 186 +++++++++--------- Cargo.toml | 2 +- bizinikiwi/client/telemetry/src/transport.rs | 2 +- pezkuwi/node/primitives/src/lib.rs | 4 +- .../crates/sdk/src/lib.rs | 2 +- 5 files changed, 98 insertions(+), 98 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e5e3aa7b..e041eece 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2138,7 +2138,7 @@ dependencies = [ "hyper-util", "log", "prometheus", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -2180,7 +2180,7 @@ dependencies = [ "scale-info", "strum 0.26.3", "teyrchains-relay", - "thiserror 2.0.17", + "thiserror 1.0.69", "tracing", ] @@ -2324,7 +2324,7 @@ dependencies = [ "pezsc-transaction-pool-api", "pezsp-blockchain", "pezsp-runtime", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -2355,7 +2355,7 @@ dependencies = [ "serde", "serde_json", "termplot", - "thiserror 2.0.17", + "thiserror 1.0.69", "time", "tokio", "tokio-util", @@ -11097,7 +11097,7 @@ dependencies = [ "pezsp-inherents", "pezsp-runtime", "pezsp-state-machine", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -11616,7 +11616,7 @@ dependencies = [ "pezsp-blockchain", "pezsp-state-machine", "pezsp-version", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -11997,7 +11997,7 @@ dependencies = [ "rand_pcg", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "thousands", "zagros-runtime", ] @@ -12435,7 +12435,7 @@ dependencies = [ "rand 0.8.5", "rstest", "schnellru", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -12465,7 +12465,7 @@ dependencies = [ "rand 0.8.5", "rstest", "schnellru", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -12502,7 +12502,7 @@ dependencies = [ "pezsp-runtime", "pyroscope", "pyroscope_pprofrs", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -12534,7 +12534,7 @@ dependencies = [ "pezsp-tracing", "rstest", "schnellru", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tokio-util", ] @@ -12575,7 +12575,7 @@ dependencies = [ "pezsp-keyring", "pezsp-keystore", "pezsp-tracing", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -12590,7 +12590,7 @@ dependencies = [ "pezsp-trie", "quickcheck", "reed-solomon-novelpoly", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -12648,7 +12648,7 @@ dependencies = [ "pezsp-consensus", "pezsp-core", "pezsp-keyring", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -12670,7 +12670,7 @@ dependencies = [ "pezsp-keyring", "rstest", "schnellru", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -12712,7 +12712,7 @@ dependencies = [ "rand_core 0.6.4", "schnellru", "schnorrkel 0.11.5", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -12769,7 +12769,7 @@ dependencies = [ "pezsp-core", "pezsp-keyring", "pezsp-tracing", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -12797,7 +12797,7 @@ dependencies = [ "pezsp-keystore", "pezsp-tracing", "schnellru", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -12812,7 +12812,7 @@ dependencies = [ "pezkuwi-primitives", "pezkuwi-primitives-test-helpers", "pezsp-keystore", - "thiserror 2.0.17", + "thiserror 1.0.69", "wasm-timer", ] @@ -12881,7 +12881,7 @@ dependencies = [ "pezkuwi-pez-node-primitives", "pezkuwi-primitives", "pezsp-core", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -12909,7 +12909,7 @@ dependencies = [ "pezsp-keystore", "pezsp-tracing", "schnellru", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -12929,7 +12929,7 @@ dependencies = [ "pezsp-tracing", "rand 0.8.5", "rstest", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -12951,7 +12951,7 @@ dependencies = [ "pezsp-application-crypto", "pezsp-keystore", "schnellru", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -12992,7 +12992,7 @@ dependencies = [ "tempfile", "test-teyrchain-adder", "test-teyrchain-halt", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -13041,7 +13041,7 @@ dependencies = [ "pezsp-tracing", "seccompiler", "tempfile", - "thiserror 2.0.17", + "thiserror 1.0.69", "wat", ] @@ -13115,7 +13115,7 @@ dependencies = [ "pezkuwi-primitives", "pezsp-blockchain", "pezsp-inherents", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -13163,7 +13163,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "strum 0.26.3", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -13219,7 +13219,7 @@ dependencies = [ "pezsp-consensus-babe", "pezsp-runtime", "smallvec", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -13253,7 +13253,7 @@ dependencies = [ "rand 0.8.5", "schnellru", "tempfile", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -13401,7 +13401,7 @@ dependencies = [ "pezsp-maybe-compressed-blob", "schnorrkel 0.11.5", "serde", - "thiserror 2.0.17", + "thiserror 1.0.69", "zstd 0.12.4", ] @@ -13430,7 +13430,7 @@ dependencies = [ "pezsp-std", "scale-info", "serde", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -14271,7 +14271,7 @@ dependencies = [ "serde", "serde_json", "tempfile", - "thiserror 2.0.17", + "thiserror 1.0.69", "xcm-runtime-pezapis", "zagros-runtime", "zagros-runtime-constants", @@ -14320,7 +14320,7 @@ dependencies = [ "pezsp-tracing", "rand_chacha 0.3.1", "rstest", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -14433,7 +14433,7 @@ dependencies = [ "scale-value", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tokio-util", "tower 0.4.13", @@ -14458,7 +14458,7 @@ dependencies = [ "scale-info", "scale-typegen", "syn 2.0.111", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -14491,7 +14491,7 @@ dependencies = [ "scale-value", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "tracing", ] @@ -14510,7 +14510,7 @@ dependencies = [ "serde_json", "smoldot", "smoldot-light", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -14555,7 +14555,7 @@ dependencies = [ "scale-info", "scale-info-legacy", "scale-type-resolver", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -14578,7 +14578,7 @@ dependencies = [ "primitive-types 0.13.1", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tokio-util", "tower 0.4.13", @@ -14616,7 +14616,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.9", - "thiserror 2.0.17", + "thiserror 1.0.69", "zeroize", ] @@ -14628,7 +14628,7 @@ dependencies = [ "hex", "jsonrpsee", "parity-scale-codec", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "url", ] @@ -17232,7 +17232,7 @@ dependencies = [ "serde", "serde_json", "sqlx", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -18384,7 +18384,7 @@ dependencies = [ "log", "pezsp-core", "pezsp-wasm-interface", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -18419,7 +18419,7 @@ dependencies = [ "serde", "serde_json", "tempfile", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -18546,7 +18546,7 @@ dependencies = [ "serde", "serde_json", "tempfile", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -18630,7 +18630,7 @@ dependencies = [ "pezsp-state-machine", "pezsp-test-primitives", "serde", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -18668,7 +18668,7 @@ dependencies = [ "pezsp-timestamp", "pezsp-tracing", "tempfile", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -18710,7 +18710,7 @@ dependencies = [ "pezsp-runtime", "pezsp-timestamp", "pezsp-tracing", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -18736,7 +18736,7 @@ dependencies = [ "pezsp-keystore", "pezsp-runtime", "serde", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -18774,7 +18774,7 @@ dependencies = [ "pezsp-runtime", "pezsp-tracing", "serde", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "wasm-timer", ] @@ -18796,7 +18796,7 @@ dependencies = [ "pezsp-core", "pezsp-runtime", "serde", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -18857,7 +18857,7 @@ dependencies = [ "pezsp-tracing", "rand 0.8.5", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -18881,7 +18881,7 @@ dependencies = [ "pezsp-keyring", "pezsp-runtime", "serde", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -18919,7 +18919,7 @@ dependencies = [ "pezsp-runtime", "pezsp-timestamp", "serde", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -18944,7 +18944,7 @@ dependencies = [ "pezsp-core", "pezsp-inherents", "pezsp-runtime", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -19016,7 +19016,7 @@ dependencies = [ "pezsp-maybe-compressed-blob", "pezsp-wasm-interface", "polkavm 0.26.0", - "thiserror 2.0.17", + "thiserror 1.0.69", "wasm-instrument", ] @@ -19078,7 +19078,7 @@ dependencies = [ "pezsp-keystore", "serde_json", "tempfile", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -19105,7 +19105,7 @@ dependencies = [ "pezsp-keystore", "pezsp-mixnet", "pezsp-runtime", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -19158,7 +19158,7 @@ dependencies = [ "serde_json", "smallvec", "tempfile", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -19217,7 +19217,7 @@ dependencies = [ "pezsp-runtime", "prost 0.12.6", "prost-build 0.13.5", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -19275,7 +19275,7 @@ dependencies = [ "quickcheck", "schnellru", "smallvec", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tokio-stream", ] @@ -19347,7 +19347,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_with", - "thiserror 2.0.17", + "thiserror 1.0.69", "zeroize", ] @@ -19454,7 +19454,7 @@ dependencies = [ "scale-info", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -19521,7 +19521,7 @@ dependencies = [ "schnellru", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tokio-stream", ] @@ -19553,7 +19553,7 @@ dependencies = [ "pezsp-state-machine", "pezsp-version", "pezsp-wasm-interface", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -19615,7 +19615,7 @@ dependencies = [ "serde_json", "static_init", "tempfile", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tracing", "tracing-futures", @@ -19696,7 +19696,7 @@ dependencies = [ "fs4", "log", "pezsp-core", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", ] @@ -19715,7 +19715,7 @@ dependencies = [ "pezsp-runtime", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -19752,7 +19752,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "wasm-timer", ] @@ -19779,7 +19779,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "serde", - "thiserror 2.0.17", + "thiserror 1.0.69", "tracing", "tracing-log", "tracing-subscriber 0.3.22", @@ -19833,7 +19833,7 @@ dependencies = [ "rstest", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -19856,7 +19856,7 @@ dependencies = [ "pezsp-runtime", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -20380,7 +20380,7 @@ dependencies = [ "pezsp-trie", "pezsp-version", "scale-info", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -20507,7 +20507,7 @@ dependencies = [ "pezsp-runtime", "pezsp-state-machine", "schnellru", - "thiserror 2.0.17", + "thiserror 1.0.69", "tracing", ] @@ -20521,7 +20521,7 @@ dependencies = [ "pezsp-inherents", "pezsp-runtime", "pezsp-state-machine", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -20670,7 +20670,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.9", - "thiserror 2.0.17", + "thiserror 1.0.69", "tracing", "w3f-bls", "zeroize", @@ -20788,7 +20788,7 @@ dependencies = [ "parity-scale-codec", "pezsp-runtime", "scale-info", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -20839,7 +20839,7 @@ dependencies = [ name = "pezsp-maybe-compressed-blob" version = "11.0.0" dependencies = [ - "thiserror 2.0.17", + "thiserror 1.0.69", "zstd 0.12.4", ] @@ -20876,7 +20876,7 @@ dependencies = [ "pezsp-runtime", "scale-info", "serde", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -21080,7 +21080,7 @@ dependencies = [ "pretty_assertions", "rand 0.8.5", "smallvec", - "thiserror 2.0.17", + "thiserror 1.0.69", "tracing", "trie-db", ] @@ -21104,7 +21104,7 @@ dependencies = [ "rand 0.8.5", "scale-info", "sha2 0.10.9", - "thiserror 2.0.17", + "thiserror 1.0.69", "x25519-dalek", ] @@ -21143,7 +21143,7 @@ dependencies = [ "parity-scale-codec", "pezsp-inherents", "pezsp-runtime", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -21199,7 +21199,7 @@ dependencies = [ "rand 0.8.5", "scale-info", "schnellru", - "thiserror 2.0.17", + "thiserror 1.0.69", "tracing", "trie-bench", "trie-db", @@ -21220,7 +21220,7 @@ dependencies = [ "pezsp-version-proc-macro", "scale-info", "serde", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -21327,7 +21327,7 @@ dependencies = [ "pezsp-io", "pezsp-runtime", "pezsp-statement-store", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -22862,7 +22862,7 @@ dependencies = [ "relay-utils", "scale-info", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -22886,7 +22886,7 @@ dependencies = [ "pezsp-tracing", "serde_json", "sysinfo", - "thiserror 2.0.17", + "thiserror 1.0.69", "time", "tokio", "tracing", @@ -28545,7 +28545,7 @@ dependencies = [ "pez-tracing-gum", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tokio-tungstenite 0.26.2", ] @@ -28561,7 +28561,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "toml 0.8.23", "tracing", @@ -28594,7 +28594,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.9", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "toml 0.8.23", "tracing", @@ -28611,7 +28611,7 @@ version = "0.44.0" dependencies = [ "pest", "pest_derive", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] @@ -28634,7 +28634,7 @@ dependencies = [ "serde_yaml", "sha2 0.10.9", "tar", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tokio-util", "tracing", @@ -28677,7 +28677,7 @@ dependencies = [ "regex", "reqwest", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tracing", "uuid", diff --git a/Cargo.toml b/Cargo.toml index 35b016ac..a2cd5f15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1537,7 +1537,7 @@ test-teyrchain-adder = { path = "pezkuwi/teyrchain/test-teyrchains/adder" } test-teyrchain-halt = { path = "pezkuwi/teyrchain/test-teyrchains/halt" } test-teyrchain-undying = { path = "pezkuwi/teyrchain/test-teyrchains/undying" } testnet-teyrchains-constants = { path = "pezcumulus/teyrchains/runtimes/constants", default-features = false } -thiserror = { version = "2.0.17", default-features = true } +thiserror = { version = "1.0.69" } thousands = { version = "0.2.0" } threadpool = { version = "1.7" } tikv-jemalloc-ctl = { version = "0.6.0", features = ["stats"] } diff --git a/bizinikiwi/client/telemetry/src/transport.rs b/bizinikiwi/client/telemetry/src/transport.rs index e075c395..19a84edf 100644 --- a/bizinikiwi/client/telemetry/src/transport.rs +++ b/bizinikiwi/client/telemetry/src/transport.rs @@ -32,7 +32,7 @@ pub(crate) fn initialize_transport() -> Result { let transport = { let tcp_transport = libp2p::tcp::tokio::Transport::new(libp2p::tcp::Config::new()); let inner = libp2p::dns::tokio::Transport::system(tcp_transport)?; - libp2p::websocket::framed::WsConfig::new(inner).and_then(|connec, _| { + libp2p::websocket::framed::Config::new(inner).and_then(|connec, _| { let connec = connec .with(|item| { let item = libp2p::websocket::framed::OutgoingData::Binary(item); diff --git a/pezkuwi/node/primitives/src/lib.rs b/pezkuwi/node/primitives/src/lib.rs index 6026ce2b..c7c69c87 100644 --- a/pezkuwi/node/primitives/src/lib.rs +++ b/pezkuwi/node/primitives/src/lib.rs @@ -567,12 +567,12 @@ impl Proof { /// Possible errors when converting from `Vec>` into [`Proof`]. #[derive(thiserror::Error, Debug)] pub enum MerkleProofError { - #[error("Merkle max proof depth exceeded {0} > {} .", MERKLE_PROOF_MAX_DEPTH)] /// This error signifies that the Proof length exceeds the trie's max depth + #[error("Merkle max proof depth exceeded {0} > {MERKLE_PROOF_MAX_DEPTH}.")] MerkleProofDepthExceeded(usize), - #[error("Merkle node max size exceeded {0} > {} .", MERKLE_NODE_MAX_SIZE)] /// This error signifies that a Proof node exceeds the 16-ary max node size + #[error("Merkle node max size exceeded {0} > {MERKLE_NODE_MAX_SIZE}.")] MerkleProofNodeSizeExceeded(usize), } diff --git a/vendor/pezkuwi-zombienet-sdk/crates/sdk/src/lib.rs b/vendor/pezkuwi-zombienet-sdk/crates/sdk/src/lib.rs index ce0cb212..6797a1b0 100644 --- a/vendor/pezkuwi-zombienet-sdk/crates/sdk/src/lib.rs +++ b/vendor/pezkuwi-zombienet-sdk/crates/sdk/src/lib.rs @@ -8,7 +8,7 @@ pub use configuration::{ pub use orchestrator::{ errors::OrchestratorError, network::{node::NetworkNode, Network}, - sc_chain_spec, AddCollatorOptions, AddNodeOptions, Orchestrator, + pezsc_chain_spec, AddCollatorOptions, AddNodeOptions, Orchestrator, }; // Helpers used for interact with the network