From f80e3347d08a40acd8499b7c5e39fabacfd62d45 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Fri, 25 Oct 2024 13:34:14 -0400 Subject: [PATCH 01/22] update to substrate 1.7.0 --- Cargo.lock | 2757 ++++++-------------------- node/cli/Cargo.toml | 106 +- pallets/attestation/Cargo.toml | 34 +- pallets/oracle/Cargo.toml | 14 +- pallets/parameters/Cargo.toml | 18 +- pallets/programs/Cargo.toml | 18 +- pallets/propagation/Cargo.toml | 38 +- pallets/registry/Cargo.toml | 34 +- pallets/slashing/Cargo.toml | 34 +- pallets/staking/Cargo.toml | 34 +- pallets/transaction-pause/Cargo.toml | 16 +- runtime/Cargo.toml | 128 +- 12 files changed, 804 insertions(+), 2427 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 23fa0e60a..371233b34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2000,19 +2000,6 @@ dependencies = [ "syn 2.0.82", ] -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.3", - "lock_api", - "once_cell", - "parking_lot_core 0.9.9", -] - [[package]] name = "data-encoding" version = "2.5.0" @@ -2447,48 +2434,48 @@ dependencies = [ "rand", "sc-authority-discovery", "sc-basic-authorship", - "sc-chain-spec 28.0.0", - "sc-cli 0.37.0", - "sc-client-api 29.0.0", - "sc-consensus 0.34.0", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-consensus", "sc-consensus-babe", "sc-consensus-babe-rpc", "sc-consensus-epochs", "sc-consensus-grandpa", "sc-consensus-grandpa-rpc", "sc-consensus-slots", - "sc-executor 0.33.0", - "sc-network 0.35.0", - "sc-network-common 0.34.0", - "sc-network-sync 0.34.0", + "sc-executor", + "sc-network", + "sc-network-common", + "sc-network-sync", "sc-offchain", - "sc-rpc 30.0.0", - "sc-rpc-api 0.34.0", - "sc-rpc-spec-v2 0.35.0", - "sc-service 0.36.0", + "sc-rpc", + "sc-rpc-api", + "sc-rpc-spec-v2", + "sc-service", "sc-storage-monitor", "sc-sync-state-rpc", - "sc-sysinfo 28.0.0", - "sc-telemetry 16.0.0", - "sc-transaction-pool 29.0.0", - "sc-transaction-pool-api 29.0.0", + "sc-sysinfo", + "sc-telemetry", + "sc-transaction-pool", + "sc-transaction-pool-api", "serde", "serde_json", - "sp-api 27.0.0", + "sp-api", "sp-authority-discovery", - "sp-block-builder 27.0.0", - "sp-blockchain 29.0.0", - "sp-consensus 0.33.0", - "sp-consensus-babe 0.33.0", - "sp-consensus-grandpa 14.0.0", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-consensus-grandpa", "sp-core 29.0.0", - "sp-inherents 27.0.0", + "sp-inherents", "sp-keyring 32.0.0", "sp-keystore 0.35.0", "sp-runtime 32.0.0", - "sp-timestamp 27.0.0", - "sp-tracing 16.0.0", - "sp-transaction-storage-proof 27.0.0", + "sp-timestamp", + "sp-tracing", + "sp-transaction-storage-proof", "substrate-build-script-utils", "substrate-frame-rpc-system", "tempfile", @@ -2634,11 +2621,11 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-executive", - "frame-support 29.0.2", + "frame-support", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", - "frame-try-runtime 0.35.0", + "frame-try-runtime", "hex-literal", "log", "pallet-attestation", @@ -2690,23 +2677,23 @@ dependencies = [ "pallet-vesting", "parity-scale-codec", "scale-info", - "sp-api 27.0.0", + "sp-api", "sp-authority-discovery", - "sp-block-builder 27.0.0", - "sp-consensus-babe 0.33.0", + "sp-block-builder", + "sp-consensus-babe", "sp-core 29.0.0", - "sp-genesis-builder 0.8.0", - "sp-inherents 27.0.0", + "sp-genesis-builder", + "sp-inherents", "sp-io 31.0.0", "sp-npos-elections", - "sp-offchain 27.0.0", + "sp-offchain", "sp-runtime 32.0.0", - "sp-session 28.0.0", - "sp-staking 27.0.0", + "sp-session", + "sp-staking", "sp-std 14.0.0", - "sp-storage 20.0.0", - "sp-transaction-pool 27.0.0", - "sp-version 30.0.0", + "sp-storage", + "sp-transaction-pool", + "sp-version", "static_assertions", "substrate-wasm-builder", ] @@ -3220,15 +3207,6 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "fork-tree" -version = "13.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad4cc2314d3be8b49c555f6a7e550f5559e73ffd6ef9690ffbd9a706774452e0" -dependencies = [ - "parity-scale-codec", -] - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -3250,8 +3228,8 @@ version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4090659c6aaa3c4d5b6c6ec909b4b0a25dec10ad92aad5f729efa8d5bd4d806a" dependencies = [ - "frame-support 29.0.2", - "frame-support-procedural 24.0.0", + "frame-support", + "frame-support-procedural", "frame-system", "linregress", "log", @@ -3259,14 +3237,14 @@ dependencies = [ "paste", "scale-info", "serde", - "sp-api 27.0.0", + "sp-api", "sp-application-crypto 31.0.0", "sp-core 29.0.0", "sp-io 31.0.0", "sp-runtime 32.0.0", "sp-runtime-interface 25.0.0", "sp-std 14.0.0", - "sp-storage 20.0.0", + "sp-storage", "static_assertions", ] @@ -3282,7 +3260,7 @@ dependencies = [ "clap", "comfy-table", "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "gethostname", "handlebars", @@ -3293,28 +3271,28 @@ dependencies = [ "parity-scale-codec", "rand", "rand_pcg", - "sc-block-builder 0.34.0", - "sc-cli 0.37.0", - "sc-client-api 29.0.0", - "sc-client-db 0.36.0", - "sc-executor 0.33.0", - "sc-service 0.36.0", - "sc-sysinfo 28.0.0", + "sc-block-builder", + "sc-cli", + "sc-client-api", + "sc-client-db", + "sc-executor", + "sc-service", + "sc-sysinfo", "serde", "serde_json", - "sp-api 27.0.0", - "sp-blockchain 29.0.0", + "sp-api", + "sp-blockchain", "sp-core 29.0.0", "sp-database", "sp-externalities 0.26.0", - "sp-inherents 27.0.0", + "sp-inherents", "sp-io 31.0.0", "sp-keystore 0.35.0", "sp-runtime 32.0.0", "sp-state-machine 0.36.0", - "sp-storage 20.0.0", + "sp-storage", "sp-trie 30.0.0", - "sp-wasm-interface 20.0.0", + "sp-wasm-interface", "thiserror", "thousands", ] @@ -3338,7 +3316,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87da19ee99e6473cd057ead84337d20011fe5e299c6750e88e43b8b7963b8852" dependencies = [ "frame-election-provider-solution-type", - "frame-support 29.0.2", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", @@ -3355,9 +3333,9 @@ version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09bff9574ee2dcc349f646e1d2faadf76afd688c2ea1bbac5e4a0e19a0c19c59" dependencies = [ - "frame-support 29.0.2", + "frame-support", "frame-system", - "frame-try-runtime 0.35.0", + "frame-try-runtime", "log", "parity-scale-codec", "scale-info", @@ -3365,7 +3343,7 @@ dependencies = [ "sp-io 31.0.0", "sp-runtime 32.0.0", "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] @@ -3393,21 +3371,21 @@ dependencies = [ [[package]] name = "frame-remote-externalities" -version = "0.39.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4afeb0769c0ef010c0dcc681a60167692a1cd52f0c0729b327a4415facddc5" +checksum = "360bfdb6821372164a65933d9a6d5998f38c722360b59b69d2bf78a87ef58b2a" dependencies = [ "futures", "indicatif", - "jsonrpsee 0.22.4", + "jsonrpsee 0.20.3", "log", "parity-scale-codec", "serde", - "sp-core 32.0.0", + "sp-core 29.0.0", "sp-crypto-hashing", - "sp-io 34.0.0", - "sp-runtime 35.0.0", - "sp-state-machine 0.39.0", + "sp-io 31.0.0", + "sp-runtime 32.0.0", + "sp-state-machine 0.36.0", "spinners", "substrate-rpc-client", "tokio", @@ -3426,7 +3404,7 @@ dependencies = [ "docify", "environmental", "frame-metadata 16.0.0", - "frame-support-procedural 24.0.0", + "frame-support-procedural", "impl-trait-for-tuples", "k256", "log", @@ -3437,67 +3415,25 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-api 27.0.0", + "sp-api", "sp-arithmetic 24.0.0", "sp-core 29.0.0", "sp-crypto-hashing-proc-macro", "sp-debug-derive", - "sp-genesis-builder 0.8.0", - "sp-inherents 27.0.0", + "sp-genesis-builder", + "sp-inherents", "sp-io 31.0.0", - "sp-metadata-ir 0.6.0", + "sp-metadata-ir", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-state-machine 0.36.0", "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "sp-weights 28.0.0", "static_assertions", "tt-call", ] -[[package]] -name = "frame-support" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97100a956a2cd152ad4e63a5ec7b5e58503653223a73fff6e916b910b37f12ed" -dependencies = [ - "aquamarine", - "array-bytes 6.2.2", - "bitflags 1.3.2", - "docify", - "environmental", - "frame-metadata 16.0.0", - "frame-support-procedural 27.0.0", - "impl-trait-for-tuples", - "k256", - "log", - "macro_magic", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "serde_json", - "smallvec", - "sp-api 30.0.0", - "sp-arithmetic 26.0.0", - "sp-core 32.0.0", - "sp-crypto-hashing-proc-macro", - "sp-debug-derive", - "sp-genesis-builder 0.11.0", - "sp-inherents 30.0.0", - "sp-io 34.0.0", - "sp-metadata-ir 0.7.0", - "sp-runtime 35.0.0", - "sp-staking 30.0.0", - "sp-state-machine 0.39.0", - "sp-std 14.0.0", - "sp-tracing 17.0.0", - "sp-weights 31.0.0", - "static_assertions", - "tt-call", -] - [[package]] name = "frame-support-procedural" version = "24.0.0" @@ -3508,27 +3444,7 @@ dependencies = [ "cfg-expr", "derive-syn-parse 0.1.5", "expander", - "frame-support-procedural-tools 10.0.0", - "itertools 0.10.5", - "macro_magic", - "proc-macro-warning", - "proc-macro2", - "quote", - "sp-crypto-hashing", - "syn 2.0.82", -] - -[[package]] -name = "frame-support-procedural" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a74eda80052082e8acd36c7fa232569ce1f968c7ae2adc56d082039ac9d6ba4" -dependencies = [ - "Inflector", - "cfg-expr", - "derive-syn-parse 0.2.0", - "expander", - "frame-support-procedural-tools 11.0.1", + "frame-support-procedural-tools", "itertools 0.10.5", "macro_magic", "proc-macro-warning", @@ -3544,20 +3460,7 @@ version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3363df38464c47a73eb521a4f648bfcc7537a82d70347ef8af3f73b6d019e910" dependencies = [ - "frame-support-procedural-tools-derive 11.0.0", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.82", -] - -[[package]] -name = "frame-support-procedural-tools" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b482a1d18fa63aed1ff3fe3fcfb3bc23d92cb3903d6b9774f75dc2c4e1001c3a" -dependencies = [ - "frame-support-procedural-tools-derive 12.0.0", + "frame-support-procedural-tools-derive", "proc-macro-crate 3.1.0", "proc-macro2", "quote", @@ -3575,17 +3478,6 @@ dependencies = [ "syn 2.0.82", ] -[[package]] -name = "frame-support-procedural-tools-derive" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed971c6435503a099bdac99fe4c5bea08981709e5b5a0a8535a1856f48561191" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.82", -] - [[package]] name = "frame-system" version = "29.0.0" @@ -3594,7 +3486,7 @@ checksum = "5bc20a793c3cec0b11165c1075fe11a255b2491f3eef8230bb3073cb296e7383" dependencies = [ "cfg-if", "docify", - "frame-support 29.0.2", + "frame-support", "log", "parity-scale-codec", "scale-info", @@ -3603,7 +3495,7 @@ dependencies = [ "sp-io 31.0.0", "sp-runtime 32.0.0", "sp-std 14.0.0", - "sp-version 30.0.0", + "sp-version", "sp-weights 28.0.0", ] @@ -3614,7 +3506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac47ee48fee3a0b49c9ab9ee68997dee3733776a355f780cf2858449cf495d69" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", @@ -3630,7 +3522,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c1b20433c3c76b56ce905ed971631ec8c34fa64cf6c20e590afe46455fc0cc8" dependencies = [ "parity-scale-codec", - "sp-api 27.0.0", + "sp-api", ] [[package]] @@ -3639,26 +3531,13 @@ version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eab87d07bc2f9a2160b818d1b7506c303b3b28b6a8a5f01dc5e2641390450b5" dependencies = [ - "frame-support 29.0.2", + "frame-support", "parity-scale-codec", - "sp-api 27.0.0", + "sp-api", "sp-runtime 32.0.0", "sp-std 14.0.0", ] -[[package]] -name = "frame-try-runtime" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "883f2a531ab7857e8b4bb09997f1333635da1b5e627ac1651c16b5e5152d8fa3" -dependencies = [ - "frame-support 32.0.0", - "parity-scale-codec", - "sp-api 30.0.0", - "sp-runtime 35.0.0", - "sp-std 14.0.0", -] - [[package]] name = "fs-err" version = "2.11.0" @@ -4002,26 +3881,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "governor" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" -dependencies = [ - "cfg-if", - "dashmap", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot 0.12.3", - "portable-atomic", - "quanta", - "rand", - "smallvec", - "spinning_top", -] - [[package]] name = "group" version = "0.13.0" @@ -4850,9 +4709,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" dependencies = [ "jsonrpsee-core 0.20.3", - "jsonrpsee-proc-macros 0.20.3", - "jsonrpsee-server 0.20.3", + "jsonrpsee-http-client 0.20.3", + "jsonrpsee-proc-macros", + "jsonrpsee-server", "jsonrpsee-types 0.20.3", + "jsonrpsee-ws-client", "tokio", "tracing", ] @@ -4863,15 +4724,30 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4b0e68d9af1f066c06d6e2397583795b912d78537d7d907c561e82c13d69fa1" dependencies = [ - "jsonrpsee-client-transport", + "jsonrpsee-client-transport 0.22.4", "jsonrpsee-core 0.22.4", - "jsonrpsee-http-client", - "jsonrpsee-proc-macros 0.22.4", - "jsonrpsee-server 0.22.4", + "jsonrpsee-http-client 0.22.4", "jsonrpsee-types 0.22.4", - "jsonrpsee-ws-client", +] + +[[package]] +name = "jsonrpsee-client-transport" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" +dependencies = [ + "futures-util", + "http 0.2.12", + "jsonrpsee-core 0.20.3", + "pin-project", + "rustls-native-certs 0.6.3", + "soketto", + "thiserror", "tokio", + "tokio-rustls 0.24.1", + "tokio-util", "tracing", + "url", ] [[package]] @@ -4904,8 +4780,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b" dependencies = [ "anyhow", + "async-lock 2.8.0", "async-trait", "beef", + "futures-timer", "futures-util", "hyper 0.14.28", "jsonrpsee-types 0.20.3", @@ -4933,9 +4811,7 @@ dependencies = [ "futures-util", "hyper 0.14.28", "jsonrpsee-types 0.22.4", - "parking_lot 0.12.3", "pin-project", - "rand", "rustc-hash", "serde", "serde_json", @@ -4946,6 +4822,26 @@ dependencies = [ "wasm-bindgen-futures", ] +[[package]] +name = "jsonrpsee-http-client" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" +dependencies = [ + "async-trait", + "hyper 0.14.28", + "hyper-rustls 0.24.2", + "jsonrpsee-core 0.20.3", + "jsonrpsee-types 0.20.3", + "serde", + "serde_json", + "thiserror", + "tokio", + "tower 0.4.13", + "tracing", + "url", +] + [[package]] name = "jsonrpsee-http-client" version = "0.22.4" @@ -4968,9 +4864,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515" +checksum = "dcc0eba68ba205452bcb4c7b80a79ddcb3bf36c261a841b239433142db632d24" dependencies = [ "heck 0.4.1", "proc-macro-crate 1.3.1", @@ -4979,19 +4875,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c326f9e95aeff7d707b2ffde72c22a52acc975ba1c48587776c02b90c4747a6" -dependencies = [ - "heck 0.4.1", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.82", -] - [[package]] name = "jsonrpsee-server" version = "0.20.3" @@ -5015,30 +4898,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-server" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b5bfbda5f8fb63f997102fd18f73e35e34c84c6dcdbdbbe72c6e48f6d2c959b" -dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.28", - "jsonrpsee-core 0.22.4", - "jsonrpsee-types 0.22.4", - "pin-project", - "route-recognizer", - "serde", - "serde_json", - "soketto", - "thiserror", - "tokio", - "tokio-stream", - "tokio-util", - "tower 0.4.13", - "tracing", -] - [[package]] name = "jsonrpsee-types" version = "0.20.3" @@ -5068,14 +4927,14 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.22.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f00abe918bf34b785f87459b9205790e5361a3f7437adb50e928dc243f27eb" +checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" dependencies = [ "http 0.2.12", - "jsonrpsee-client-transport", - "jsonrpsee-core 0.22.4", - "jsonrpsee-types 0.22.4", + "jsonrpsee-client-transport 0.20.3", + "jsonrpsee-core 0.20.3", + "jsonrpsee-types 0.20.3", "url", ] @@ -5926,9 +5785,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -6343,12 +6202,6 @@ dependencies = [ "libc", ] -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - [[package]] name = "no-std-net" version = "0.6.0" @@ -6377,12 +6230,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - [[package]] name = "normalize-line-endings" version = "0.3.0" @@ -6705,7 +6552,7 @@ dependencies = [ "entropy-shared", "frame-benchmarking", "frame-election-provider-support", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-bags-list", @@ -6724,7 +6571,7 @@ dependencies = [ "sp-io 31.0.0", "sp-npos-elections", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", "tdx-quote", ] @@ -6735,7 +6582,7 @@ version = "29.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd9a381c613e6538638391fb51f353fd13b16f849d0d1ac66a388326bd456f1" dependencies = [ - "frame-support 29.0.2", + "frame-support", "frame-system", "pallet-session", "parity-scale-codec", @@ -6752,7 +6599,7 @@ version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d83773e731a1760f99684b09961ed7b92acafe335f36f08ebb8313d3b9c72e2" dependencies = [ - "frame-support 29.0.2", + "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", @@ -6768,7 +6615,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3f2020c52667a650d64e84a4bbb63388e25bc1c9bc872a8243d03bfcb285049" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-authorship", @@ -6777,12 +6624,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-application-crypto 31.0.0", - "sp-consensus-babe 0.33.0", + "sp-consensus-babe", "sp-core 29.0.0", "sp-io 31.0.0", "sp-runtime 32.0.0", - "sp-session 28.0.0", - "sp-staking 27.0.0", + "sp-session", + "sp-staking", "sp-std 14.0.0", ] @@ -6796,7 +6643,7 @@ dependencies = [ "docify", "frame-benchmarking", "frame-election-provider-support", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-balances", @@ -6806,18 +6653,18 @@ dependencies = [ "sp-io 31.0.0", "sp-runtime 32.0.0", "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "pallet-balances" -version = "29.0.1" +version = "29.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27946a57494d7c6231ae8909275bbd3cb5460ee3d27b7a5774a8b8e64d3ab92" +checksum = "a9a54b5d0c7c4c3731883d6b1ac18aff44db20c3d0a3470c8861001a17afdc85" dependencies = [ "docify", "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "parity-scale-codec", @@ -6833,7 +6680,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4765879e96676c13cdbed746d66fd59dcde1e9e65fda1f064fa2fffa3bc5d597" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-treasury", @@ -6852,7 +6699,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c362a0b8f30895c15ecc7d8c24b0d94bb586c4b9bbd37ac8053b4629d9cc80b" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "parity-scale-codec", @@ -6870,7 +6717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa781d632063087bcd3ff46eb1a668f15647ab116f1c8a7c573b7168f62d72c3" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "parity-scale-codec", @@ -6890,7 +6737,7 @@ checksum = "b54d1d3fe9ae61a144d581147e699b7c3009169de0019a0f87cca0bed82681e7" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-election-provider-support-benchmarking", @@ -6928,7 +6775,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10cb0158cc7461fda5db04c5791d0df34635bec37181763aca449bade677d12d" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "parity-scale-codec", @@ -6937,7 +6784,7 @@ dependencies = [ "sp-io 31.0.0", "sp-npos-elections", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", ] @@ -6948,7 +6795,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5b20be8592eed7ebca2ee661fc43450088552ebe0bd483d7b101cf5968ab12d" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-authorship", @@ -6956,24 +6803,24 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-application-crypto 31.0.0", - "sp-consensus-grandpa 14.0.0", + "sp-consensus-grandpa", "sp-core 29.0.0", "sp-io 31.0.0", "sp-runtime 32.0.0", - "sp-session 28.0.0", - "sp-staking 27.0.0", + "sp-session", + "sp-staking", "sp-std 14.0.0", ] [[package]] name = "pallet-identity" -version = "29.0.0" +version = "29.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e1cae19e30e7dc822c419988b30bb1318d79a8d5da92733822d0e84fe760ca" +checksum = "452bba25325b7f0148eeecbde13e7c26dfb677ad46b3f160b359d7643b44c94b" dependencies = [ "enumflags2", "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "parity-scale-codec", @@ -6990,7 +6837,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "598ea5c87351edc953d1f455f32ff456cf2f1daf7bbada1f1e03be8e384852ab" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-authorship", @@ -7000,7 +6847,7 @@ dependencies = [ "sp-core 29.0.0", "sp-io 31.0.0", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", ] @@ -7011,7 +6858,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e880ebdb429ca76fb400b1b361ed7fce018a5ea2fc2da4764de5156fffdfa73" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", @@ -7029,7 +6876,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad901cdf3de23daf23ff8b092ab318b13faebfc1aa4d84263f2fdc84feaf3e9b" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "parity-scale-codec", @@ -7047,7 +6894,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "176f6a5c170185f892a047c0ae189bc52eb390f2c0b94d4261ed0ebc7f82a548" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "parity-scale-codec", @@ -7059,11 +6906,11 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" -version = "26.0.0" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f14519c1c613d2f8c95c27015864c11a37969a23deeba9f6dbaff4276e1b81c" +checksum = "b62091305ec7426e71c3da2b0944c2df5a804109ee4d2e8f4fe34865e049f8ac" dependencies = [ - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-balances", @@ -7072,9 +6919,9 @@ dependencies = [ "sp-core 29.0.0", "sp-io 31.0.0", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] @@ -7085,7 +6932,7 @@ checksum = "18a1eba3078e2492cad15e4695f90eb3fc570386d9f71f8b81f709c7123fc6b5" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 29.0.2", + "frame-support", "frame-system", "pallet-bags-list", "pallet-nomination-pools", @@ -7094,7 +6941,7 @@ dependencies = [ "scale-info", "sp-runtime 32.0.0", "sp-runtime-interface 25.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", ] @@ -7104,7 +6951,7 @@ version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b5bcfdc4f6032d7570929094fd459de12d840c440c395fb4d365d679e13eda" dependencies = [ - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-balances", @@ -7112,7 +6959,7 @@ dependencies = [ "scale-info", "serde", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", ] @@ -7124,7 +6971,7 @@ checksum = "bbc33e3086c19235cb903cbbbde1bc1c4f428519ad4c23446dc84c75d0061582" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-babe", @@ -7137,7 +6984,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", ] @@ -7146,7 +6993,7 @@ name = "pallet-oracle" version = "0.3.0-rc.1" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", @@ -7162,7 +7009,7 @@ version = "0.3.0-rc.1" dependencies = [ "entropy-shared", "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "pallet-session", "parity-scale-codec", @@ -7170,7 +7017,7 @@ dependencies = [ "sp-core 29.0.0", "sp-io 31.0.0", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", ] @@ -7181,7 +7028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7344a30c304771beb90aec34604100185e47cdc0366e268ad18922de602a0c7e" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "parity-scale-codec", @@ -7197,7 +7044,7 @@ name = "pallet-programs" version = "0.3.0-rc.1" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-balances", @@ -7206,7 +7053,7 @@ dependencies = [ "sp-core 29.0.0", "sp-io 31.0.0", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", ] @@ -7217,7 +7064,7 @@ dependencies = [ "entropy-shared", "frame-benchmarking", "frame-election-provider-support", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-attestation", @@ -7242,7 +7089,7 @@ dependencies = [ "sp-keystore 0.35.0", "sp-npos-elections", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", ] [[package]] @@ -7252,7 +7099,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7aa31a0b91e8060b808c3e3407e4578a5e94503b174b9e99769147b24fb2c56" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", @@ -7268,7 +7115,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "797b554ddc87082c18223440d61a81cf35ccab6573321ce473a099e7a709a760" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", @@ -7285,7 +7132,7 @@ dependencies = [ "entropy-shared", "frame-benchmarking", "frame-election-provider-support", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-authorship", @@ -7305,7 +7152,7 @@ dependencies = [ "sp-io 31.0.0", "sp-npos-elections", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", "synedrion", ] @@ -7318,7 +7165,7 @@ checksum = "45e2a4ebe6a5f98b14a26deed8d7a1ea28bb2c2d3ad4d6dc129a725523a2042d" dependencies = [ "docify", "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "parity-scale-codec", @@ -7335,7 +7182,7 @@ version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7412ac59247b300feee53709f7009a23d1c6f8c70528599f48f44e102d896d03" dependencies = [ - "frame-support 29.0.2", + "frame-support", "frame-system", "impl-trait-for-tuples", "log", @@ -7345,8 +7192,8 @@ dependencies = [ "sp-core 29.0.0", "sp-io 31.0.0", "sp-runtime 32.0.0", - "sp-session 28.0.0", - "sp-staking 27.0.0", + "sp-session", + "sp-staking", "sp-state-machine 0.36.0", "sp-std 14.0.0", "sp-trie 30.0.0", @@ -7359,14 +7206,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9c2731415381020db1e78db8b40207f8423a16099e78f2fde599cbcb57ea8db" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "pallet-session", "pallet-staking", "parity-scale-codec", "rand", "sp-runtime 32.0.0", - "sp-session 28.0.0", + "sp-session", "sp-std 14.0.0", ] @@ -7376,7 +7223,7 @@ version = "0.3.0-rc.1" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-bags-list", @@ -7392,19 +7239,19 @@ dependencies = [ "sp-io 31.0.0", "sp-npos-elections", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", ] [[package]] name = "pallet-staking" -version = "29.0.2" +version = "29.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668b7d28c499f0d9f295fad26cf6c342472e21842e3b13bcaaac8536358b2d6c" +checksum = "061b00814eb794a40df4eca7972a7c67b26473cd85cc7c54f5816ae49ad6e11b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-authorship", @@ -7416,7 +7263,7 @@ dependencies = [ "sp-application-crypto 31.0.0", "sp-io 31.0.0", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", ] @@ -7427,7 +7274,7 @@ dependencies = [ "entropy-shared", "frame-benchmarking", "frame-election-provider-support", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-bags-list", @@ -7442,12 +7289,12 @@ dependencies = [ "rand_core 0.6.4", "scale-info", "serde", - "sp-consensus-babe 0.33.0", + "sp-consensus-babe", "sp-core 29.0.0", "sp-io 31.0.0", "sp-npos-elections", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", "tdx-quote", ] @@ -7472,7 +7319,7 @@ checksum = "b6d02f7855d411913e77e57126f4a8b8a32d90d9bf47d0b747e367a1301729c3" dependencies = [ "docify", "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", @@ -7489,17 +7336,17 @@ checksum = "c1b8810ddfb254c7fb8cd7698229cce513d309a43ff117b38798dae6120f477b" dependencies = [ "docify", "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-inherents 27.0.0", + "sp-inherents", "sp-io 31.0.0", "sp-runtime 32.0.0", "sp-std 14.0.0", - "sp-storage 20.0.0", - "sp-timestamp 27.0.0", + "sp-storage", + "sp-timestamp", ] [[package]] @@ -7509,7 +7356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca4b9921c9e9b59e8eeb64677ba6ec49743ef5fe98e0b63f77411b2b9f6cc99" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-treasury", @@ -7527,7 +7374,7 @@ name = "pallet-transaction-pause" version = "0.3.0-rc.1" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "pallet-balances", "pallet-programs", @@ -7542,11 +7389,11 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" -version = "29.0.0" +version = "29.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f690f5c287ad34b28ca951ef7fae80b08cc9218d970723b7a70e4d29396872" +checksum = "5a5ba71f06f09e955b80dc313c333be3f8d9e8505b051558e0b7af4806b13310" dependencies = [ - "frame-support 29.0.2", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", @@ -7566,10 +7413,10 @@ dependencies = [ "jsonrpsee 0.20.3", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", - "sp-api 27.0.0", - "sp-blockchain 29.0.0", + "sp-api", + "sp-blockchain", "sp-core 29.0.0", - "sp-rpc 27.0.0", + "sp-rpc", "sp-runtime 32.0.0", "sp-weights 28.0.0", ] @@ -7582,7 +7429,7 @@ checksum = "c78bcba80c7c61712b98a6b5640975ebd25ceb688c18e975af78a0fac81785b0" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", - "sp-api 27.0.0", + "sp-api", "sp-runtime 32.0.0", "sp-weights 28.0.0", ] @@ -7595,29 +7442,29 @@ checksum = "5ee8aa1c1b88cddc8c675ec65faaa2ef5e880e114bd588ee6611c70d5341eaaa" dependencies = [ "array-bytes 6.2.2", "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-inherents 27.0.0", + "sp-inherents", "sp-io 31.0.0", "sp-runtime 32.0.0", "sp-std 14.0.0", - "sp-transaction-storage-proof 27.0.0", + "sp-transaction-storage-proof", ] [[package]] name = "pallet-treasury" -version = "28.0.0" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1605eb5083a2cd172544f33c6e59eca2e23ac49f02f13d1562b1b8a409df9c60" +checksum = "3eca44990d0d759213744f2d1f6fe1fadec1079a3e4e4da40556d6b4e42abbcd" dependencies = [ "docify", "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "impl-trait-for-tuples", "pallet-balances", @@ -7636,7 +7483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "954f15b98c3fdebb763bb5cea4ec6803fd180d540ec5b07a9fcb2c118251d52c" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", @@ -7653,7 +7500,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4525f3038cdf078fea39d913c563ca626f09a615e7724f0c9eac97743c75ff44" dependencies = [ "frame-benchmarking", - "frame-support 29.0.2", + "frame-support", "frame-system", "log", "parity-scale-codec", @@ -7979,28 +7826,6 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" -[[package]] -name = "polkavm" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3693e5efdb2bf74e449cd25fd777a28bd7ed87e41f5d5da75eb31b4de48b94" -dependencies = [ - "libc", - "log", - "polkavm-assembler", - "polkavm-common 0.9.0", - "polkavm-linux-raw", -] - -[[package]] -name = "polkavm-assembler" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa96d6d868243acc12de813dd48e756cbadcc8e13964c70d272753266deadc1" -dependencies = [ - "log", -] - [[package]] name = "polkavm-common" version = "0.8.0" @@ -8012,9 +7837,6 @@ name = "polkavm-common" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92" -dependencies = [ - "log", -] [[package]] name = "polkavm-derive" @@ -8078,12 +7900,6 @@ dependencies = [ "syn 2.0.82", ] -[[package]] -name = "polkavm-linux-raw" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26e85d3456948e650dff0cfc85603915847faf893ed1e66b020bb82ef4557120" - [[package]] name = "polling" version = "3.6.0" @@ -8368,12 +8184,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.4", + "prost-derive 0.12.6", ] [[package]] @@ -8413,9 +8229,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools 0.12.1", @@ -8464,21 +8280,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "quanta" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - [[package]] name = "quick-error" version = "1.2.3" @@ -8637,15 +8438,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "raw-cpuid" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" -dependencies = [ - "bitflags 2.5.0", -] - [[package]] name = "rawpointer" version = "0.2.1" @@ -9250,19 +9042,7 @@ checksum = "357127c91373ed6d1ae582f6e3300ab5b13bcde43bbf270a891f44194ef48b70" dependencies = [ "log", "sp-core 29.0.0", - "sp-wasm-interface 20.0.0", - "thiserror", -] - -[[package]] -name = "sc-allocator" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e78771bbc491d4d601afbbf01f5718d6d724d0d971c8581cf5b4c62a9502f7" -dependencies = [ - "log", - "sp-core 32.0.0", - "sp-wasm-interface 21.0.0", + "sp-wasm-interface", "thiserror", ] @@ -9281,14 +9061,14 @@ dependencies = [ "multihash 0.18.1", "multihash-codetable", "parity-scale-codec", - "prost 0.12.4", + "prost 0.12.6", "prost-build", "rand", - "sc-client-api 29.0.0", - "sc-network 0.35.0", - "sp-api 27.0.0", + "sc-client-api", + "sc-network", + "sp-api", "sp-authority-discovery", - "sp-blockchain 29.0.0", + "sp-blockchain", "sp-core 29.0.0", "sp-keystore 0.35.0", "sp-runtime 32.0.0", @@ -9306,15 +9086,15 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sc-block-builder 0.34.0", + "sc-block-builder", "sc-proposer-metrics", - "sc-telemetry 16.0.0", - "sc-transaction-pool-api 29.0.0", - "sp-api 27.0.0", - "sp-blockchain 29.0.0", - "sp-consensus 0.33.0", + "sc-telemetry", + "sc-transaction-pool-api", + "sp-api", + "sp-blockchain", + "sp-consensus", "sp-core 29.0.0", - "sp-inherents 27.0.0", + "sp-inherents", "sp-runtime 32.0.0", "substrate-prometheus-endpoint", ] @@ -9326,31 +9106,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e8b0640994965c6ff3afa13242d95a61611b83da21fd86ac2b1ebd03e241a02" dependencies = [ "parity-scale-codec", - "sp-api 27.0.0", - "sp-block-builder 27.0.0", - "sp-blockchain 29.0.0", + "sp-api", + "sp-block-builder", + "sp-blockchain", "sp-core 29.0.0", - "sp-inherents 27.0.0", + "sp-inherents", "sp-runtime 32.0.0", "sp-trie 30.0.0", ] -[[package]] -name = "sc-block-builder" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d54ed880c04f6df650dcf4672d7d4a2d08b30e95c51f07b4a3be75eaa535082" -dependencies = [ - "parity-scale-codec", - "sp-api 30.0.0", - "sp-block-builder 30.0.0", - "sp-blockchain 32.0.0", - "sp-core 32.0.0", - "sp-inherents 30.0.0", - "sp-runtime 35.0.0", - "sp-trie 33.0.0", -] - [[package]] name = "sc-chain-spec" version = "28.0.0" @@ -9360,51 +9124,24 @@ dependencies = [ "array-bytes 6.2.2", "docify", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "parity-scale-codec", "sc-chain-spec-derive", - "sc-client-api 29.0.0", - "sc-executor 0.33.0", - "sc-network 0.35.0", - "sc-telemetry 16.0.0", + "sc-client-api", + "sc-executor", + "sc-network", + "sc-telemetry", "serde", "serde_json", - "sp-blockchain 29.0.0", + "sp-blockchain", "sp-core 29.0.0", "sp-crypto-hashing", - "sp-genesis-builder 0.8.0", + "sp-genesis-builder", "sp-io 31.0.0", "sp-runtime 32.0.0", "sp-state-machine 0.36.0", ] -[[package]] -name = "sc-chain-spec" -version = "31.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d25ff00e77262342bd85a71de32170b136773f6a8cdd5641ce8b81fb4e16be" -dependencies = [ - "array-bytes 6.2.2", - "docify", - "log", - "memmap2 0.9.4", - "parity-scale-codec", - "sc-chain-spec-derive", - "sc-client-api 32.0.0", - "sc-executor 0.36.0", - "sc-network 0.38.0", - "sc-telemetry 18.0.0", - "serde", - "serde_json", - "sp-blockchain 32.0.0", - "sp-core 32.0.0", - "sp-crypto-hashing", - "sp-genesis-builder 0.11.0", - "sp-io 34.0.0", - "sp-runtime 35.0.0", - "sp-state-machine 0.39.0", -] - [[package]] name = "sc-chain-spec-derive" version = "11.0.0" @@ -9437,66 +9174,24 @@ dependencies = [ "rand", "regex", "rpassword", - "sc-client-api 29.0.0", - "sc-client-db 0.36.0", - "sc-keystore 26.0.0", - "sc-mixnet 0.5.0", - "sc-network 0.35.0", - "sc-service 0.36.0", - "sc-telemetry 16.0.0", - "sc-tracing 29.0.0", - "sc-utils 15.0.0", + "sc-client-api", + "sc-client-db", + "sc-keystore", + "sc-mixnet", + "sc-network", + "sc-service", + "sc-telemetry", + "sc-tracing", + "sc-utils", "serde", "serde_json", - "sp-blockchain 29.0.0", + "sp-blockchain", "sp-core 29.0.0", "sp-keyring 32.0.0", "sp-keystore 0.35.0", "sp-panic-handler", "sp-runtime 32.0.0", - "sp-version 30.0.0", - "thiserror", - "tokio", -] - -[[package]] -name = "sc-cli" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eade6864cba8ab29c4c7572c6a4a080c0423bc53cb48b00f70eef7d57d22abae" -dependencies = [ - "array-bytes 6.2.2", - "chrono", - "clap", - "fdlimit", - "futures", - "itertools 0.10.5", - "libp2p-identity", - "log", - "names", - "parity-bip39", - "parity-scale-codec", - "rand", - "regex", - "rpassword", - "sc-client-api 32.0.0", - "sc-client-db 0.39.0", - "sc-keystore 29.0.0", - "sc-mixnet 0.8.0", - "sc-network 0.38.0", - "sc-service 0.39.0", - "sc-telemetry 18.0.0", - "sc-tracing 32.0.0", - "sc-utils 17.0.0", - "serde", - "serde_json", - "sp-blockchain 32.0.0", - "sp-core 32.0.0", - "sp-keyring 35.0.0", - "sp-keystore 0.38.0", - "sp-panic-handler", - "sp-runtime 35.0.0", - "sp-version 33.0.0", + "sp-version", "thiserror", "tokio", ] @@ -9512,51 +9207,23 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-executor 0.33.0", - "sc-transaction-pool-api 29.0.0", - "sc-utils 15.0.0", - "sp-api 27.0.0", - "sp-blockchain 29.0.0", - "sp-consensus 0.33.0", + "sc-executor", + "sc-transaction-pool-api", + "sc-utils", + "sp-api", + "sp-blockchain", + "sp-consensus", "sp-core 29.0.0", "sp-database", "sp-externalities 0.26.0", "sp-runtime 32.0.0", "sp-state-machine 0.36.0", - "sp-statement-store 11.0.0", - "sp-storage 20.0.0", + "sp-statement-store", + "sp-storage", "sp-trie 30.0.0", "substrate-prometheus-endpoint", ] -[[package]] -name = "sc-client-api" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f69c592a2cab8b5cb7860bf57c5084a590d2e0c5df9308f62ddb405ca4d97e" -dependencies = [ - "fnv", - "futures", - "log", - "parity-scale-codec", - "parking_lot 0.12.3", - "sc-executor 0.36.0", - "sc-transaction-pool-api 32.0.0", - "sc-utils 17.0.0", - "sp-api 30.0.0", - "sp-blockchain 32.0.0", - "sp-consensus 0.36.0", - "sp-core 32.0.0", - "sp-database", - "sp-externalities 0.28.0", - "sp-runtime 35.0.0", - "sp-state-machine 0.39.0", - "sp-statement-store 14.0.0", - "sp-storage 21.0.0", - "sp-trie 33.0.0", - "substrate-prometheus-endpoint", -] - [[package]] name = "sc-client-db" version = "0.36.0" @@ -9572,11 +9239,11 @@ dependencies = [ "parity-db", "parity-scale-codec", "parking_lot 0.12.3", - "sc-client-api 29.0.0", - "sc-state-db 0.31.0", + "sc-client-api", + "sc-state-db", "schnellru", "sp-arithmetic 24.0.0", - "sp-blockchain 29.0.0", + "sp-blockchain", "sp-core 29.0.0", "sp-database", "sp-runtime 32.0.0", @@ -9584,33 +9251,6 @@ dependencies = [ "sp-trie 30.0.0", ] -[[package]] -name = "sc-client-db" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f4e8c9db1025f0b17438f5db8937c53022b417593f30d4624b8b2e0d3300b9f" -dependencies = [ - "hash-db", - "kvdb", - "kvdb-memorydb", - "kvdb-rocksdb", - "linked-hash-map", - "log", - "parity-db", - "parity-scale-codec", - "parking_lot 0.12.3", - "sc-client-api 32.0.0", - "sc-state-db 0.34.0", - "schnellru", - "sp-arithmetic 26.0.0", - "sp-blockchain 32.0.0", - "sp-core 32.0.0", - "sp-database", - "sp-runtime 35.0.0", - "sp-state-machine 0.39.0", - "sp-trie 33.0.0", -] - [[package]] name = "sc-consensus" version = "0.34.0" @@ -9624,12 +9264,12 @@ dependencies = [ "log", "mockall", "parking_lot 0.12.3", - "sc-client-api 29.0.0", - "sc-utils 15.0.0", + "sc-client-api", + "sc-utils", "serde", - "sp-api 27.0.0", - "sp-blockchain 29.0.0", - "sp-consensus 0.33.0", + "sp-api", + "sp-blockchain", + "sp-consensus", "sp-core 29.0.0", "sp-runtime 32.0.0", "sp-state-machine 0.36.0", @@ -9637,32 +9277,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sc-consensus" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a051ffa28788f7ec47e46d6236132126d5aa563469e6c852e87cfbe5069e0687" -dependencies = [ - "async-trait", - "futures", - "futures-timer", - "libp2p-identity", - "log", - "mockall", - "parking_lot 0.12.3", - "sc-client-api 32.0.0", - "sc-utils 17.0.0", - "serde", - "sp-api 30.0.0", - "sp-blockchain 32.0.0", - "sp-consensus 0.36.0", - "sp-core 32.0.0", - "sp-runtime 35.0.0", - "sp-state-machine 0.39.0", - "substrate-prometheus-endpoint", - "thiserror", -] - [[package]] name = "sc-consensus-babe" version = "0.35.0" @@ -9670,7 +9284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82ec3dc31f8fd024684d1306488836680558b680a8ec38219e19f20854811f02" dependencies = [ "async-trait", - "fork-tree 12.0.0", + "fork-tree", "futures", "log", "num-bigint", @@ -9678,22 +9292,22 @@ dependencies = [ "num-traits", "parity-scale-codec", "parking_lot 0.12.3", - "sc-client-api 29.0.0", - "sc-consensus 0.34.0", + "sc-client-api", + "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", - "sc-telemetry 16.0.0", - "sc-transaction-pool-api 29.0.0", - "sp-api 27.0.0", + "sc-telemetry", + "sc-transaction-pool-api", + "sp-api", "sp-application-crypto 31.0.0", - "sp-block-builder 27.0.0", - "sp-blockchain 29.0.0", - "sp-consensus 0.33.0", - "sp-consensus-babe 0.33.0", - "sp-consensus-slots 0.33.0", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-consensus-slots", "sp-core 29.0.0", "sp-crypto-hashing", - "sp-inherents 27.0.0", + "sp-inherents", "sp-keystore 0.35.0", "sp-runtime 32.0.0", "substrate-prometheus-endpoint", @@ -9710,13 +9324,13 @@ dependencies = [ "jsonrpsee 0.20.3", "sc-consensus-babe", "sc-consensus-epochs", - "sc-rpc-api 0.34.0", + "sc-rpc-api", "serde", - "sp-api 27.0.0", + "sp-api", "sp-application-crypto 31.0.0", - "sp-blockchain 29.0.0", - "sp-consensus 0.33.0", - "sp-consensus-babe 0.33.0", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", "sp-core 29.0.0", "sp-keystore 0.35.0", "sp-runtime 32.0.0", @@ -9729,11 +9343,11 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19f68ddb91626f901578515eed93c7919f739660161f4e9f7b9407e2d0ede981" dependencies = [ - "fork-tree 12.0.0", + "fork-tree", "parity-scale-codec", - "sc-client-api 29.0.0", - "sc-consensus 0.34.0", - "sp-blockchain 29.0.0", + "sc-client-api", + "sc-consensus", + "sp-blockchain", "sp-runtime 32.0.0", ] @@ -9748,31 +9362,31 @@ dependencies = [ "async-trait", "dyn-clone", "finality-grandpa", - "fork-tree 12.0.0", + "fork-tree", "futures", "futures-timer", "log", "parity-scale-codec", "parking_lot 0.12.3", "rand", - "sc-block-builder 0.34.0", - "sc-chain-spec 28.0.0", - "sc-client-api 29.0.0", - "sc-consensus 0.34.0", - "sc-network 0.35.0", - "sc-network-common 0.34.0", + "sc-block-builder", + "sc-chain-spec", + "sc-client-api", + "sc-consensus", + "sc-network", + "sc-network-common", "sc-network-gossip", - "sc-network-sync 0.34.0", - "sc-telemetry 16.0.0", - "sc-transaction-pool-api 29.0.0", - "sc-utils 15.0.0", + "sc-network-sync", + "sc-telemetry", + "sc-transaction-pool-api", + "sc-utils", "serde_json", - "sp-api 27.0.0", + "sp-api", "sp-application-crypto 31.0.0", "sp-arithmetic 24.0.0", - "sp-blockchain 29.0.0", - "sp-consensus 0.33.0", - "sp-consensus-grandpa 14.0.0", + "sp-blockchain", + "sp-consensus", + "sp-consensus-grandpa", "sp-core 29.0.0", "sp-crypto-hashing", "sp-keystore 0.35.0", @@ -9792,11 +9406,11 @@ dependencies = [ "jsonrpsee 0.20.3", "log", "parity-scale-codec", - "sc-client-api 29.0.0", + "sc-client-api", "sc-consensus-grandpa", - "sc-rpc 30.0.0", + "sc-rpc", "serde", - "sp-blockchain 29.0.0", + "sp-blockchain", "sp-core 29.0.0", "sp-runtime 32.0.0", "thiserror", @@ -9813,15 +9427,15 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sc-client-api 29.0.0", - "sc-consensus 0.34.0", - "sc-telemetry 16.0.0", + "sc-client-api", + "sc-consensus", + "sc-telemetry", "sp-arithmetic 24.0.0", - "sp-blockchain 29.0.0", - "sp-consensus 0.33.0", - "sp-consensus-slots 0.33.0", + "sp-blockchain", + "sp-consensus", + "sp-consensus-slots", "sp-core 29.0.0", - "sp-inherents 27.0.0", + "sp-inherents", "sp-runtime 32.0.0", "sp-state-machine 0.36.0", ] @@ -9834,42 +9448,18 @@ checksum = "aa2ac6c356538d67987bbb867e11a12a84ba87250c70fd50005b6d74f570a4f7" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", - "sc-executor-common 0.30.0", - "sc-executor-wasmtime 0.30.0", + "sc-executor-common", + "sc-executor-wasmtime", "schnellru", - "sp-api 27.0.0", + "sp-api", "sp-core 29.0.0", "sp-externalities 0.26.0", "sp-io 31.0.0", "sp-panic-handler", "sp-runtime-interface 25.0.0", "sp-trie 30.0.0", - "sp-version 30.0.0", - "sp-wasm-interface 20.0.0", - "tracing", -] - -[[package]] -name = "sc-executor" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6b47b642a92adcabaeadb7d76bd1a02bcf5a93f2b649e81afe8b940107bbda" -dependencies = [ - "parity-scale-codec", - "parking_lot 0.12.3", - "sc-executor-common 0.33.0", - "sc-executor-polkavm", - "sc-executor-wasmtime 0.33.0", - "schnellru", - "sp-api 30.0.0", - "sp-core 32.0.0", - "sp-externalities 0.28.0", - "sp-io 34.0.0", - "sp-panic-handler", - "sp-runtime-interface 27.0.0", - "sp-trie 33.0.0", - "sp-version 33.0.0", - "sp-wasm-interface 21.0.0", + "sp-version", + "sp-wasm-interface", "tracing", ] @@ -9879,39 +9469,13 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07498138dee3ddf2c71299ca372d8449880bb3a8a8a299a483094e9c26b0823e" dependencies = [ - "sc-allocator 24.0.0", - "sp-maybe-compressed-blob", - "sp-wasm-interface 20.0.0", - "thiserror", - "wasm-instrument", -] - -[[package]] -name = "sc-executor-common" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88c61ef111d7ccc7697ee4788654f4f998662db057c27ca2de4b94f20e3e6ed1" -dependencies = [ - "polkavm", - "sc-allocator 27.0.0", + "sc-allocator", "sp-maybe-compressed-blob", - "sp-wasm-interface 21.0.0", + "sp-wasm-interface", "thiserror", "wasm-instrument", ] -[[package]] -name = "sc-executor-polkavm" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb96b22b779ba14f449d114b63efd162f95f1cdf773cdac29f75fe6a250de24" -dependencies = [ - "log", - "polkavm", - "sc-executor-common 0.33.0", - "sp-wasm-interface 21.0.0", -] - [[package]] name = "sc-executor-wasmtime" version = "0.30.0" @@ -9924,29 +9488,10 @@ dependencies = [ "log", "parking_lot 0.12.3", "rustix 0.36.17", - "sc-allocator 24.0.0", - "sc-executor-common 0.30.0", + "sc-allocator", + "sc-executor-common", "sp-runtime-interface 25.0.0", - "sp-wasm-interface 20.0.0", - "wasmtime 8.0.1", -] - -[[package]] -name = "sc-executor-wasmtime" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be4652ea58937af5727433075934fe4cee90b9fac11796869caca991ddb5003" -dependencies = [ - "anyhow", - "cfg-if", - "libc", - "log", - "parking_lot 0.12.3", - "rustix 0.36.17", - "sc-allocator 27.0.0", - "sc-executor-common 0.33.0", - "sp-runtime-interface 27.0.0", - "sp-wasm-interface 21.0.0", + "sp-wasm-interface", "wasmtime 8.0.1", ] @@ -9960,32 +9505,14 @@ dependencies = [ "futures", "futures-timer", "log", - "sc-client-api 29.0.0", - "sc-network 0.35.0", - "sc-network-common 0.34.0", - "sc-network-sync 0.34.0", - "sp-blockchain 29.0.0", + "sc-client-api", + "sc-network", + "sc-network-common", + "sc-network-sync", + "sp-blockchain", "sp-runtime 32.0.0", ] -[[package]] -name = "sc-informant" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061006dce0dcae3ece90d5d9f656ade507dd922931911d59deea823f28be54dd" -dependencies = [ - "ansi_term", - "futures", - "futures-timer", - "log", - "sc-client-api 32.0.0", - "sc-network 0.38.0", - "sc-network-common 0.37.0", - "sc-network-sync 0.37.0", - "sp-blockchain 32.0.0", - "sp-runtime 35.0.0", -] - [[package]] name = "sc-keystore" version = "26.0.0" @@ -10001,21 +9528,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sc-keystore" -version = "29.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6477f27aa17ada189355325c16992d3e612d2fe276ecef9da1b36b6b297b3ac4" -dependencies = [ - "array-bytes 6.2.2", - "parking_lot 0.12.3", - "serde_json", - "sp-application-crypto 34.0.0", - "sp-core 32.0.0", - "sp-keystore 0.38.0", - "thiserror", -] - [[package]] name = "sc-mixnet" version = "0.5.0" @@ -10034,48 +9546,18 @@ dependencies = [ "multiaddr", "parity-scale-codec", "parking_lot 0.12.3", - "sc-client-api 29.0.0", - "sc-network 0.35.0", - "sc-transaction-pool-api 29.0.0", - "sp-api 27.0.0", - "sp-consensus 0.33.0", + "sc-client-api", + "sc-network", + "sc-transaction-pool-api", + "sp-api", + "sp-consensus", "sp-core 29.0.0", "sp-keystore 0.35.0", - "sp-mixnet 0.5.0", + "sp-mixnet", "sp-runtime 32.0.0", "thiserror", ] -[[package]] -name = "sc-mixnet" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e04fecf6e55e4597e473c87e8f3cea5a9963835af30a971203290d62bb2d03" -dependencies = [ - "array-bytes 4.2.0", - "arrayvec 0.7.4", - "blake2 0.10.6", - "bytes", - "futures", - "futures-timer", - "libp2p-identity", - "log", - "mixnet", - "multiaddr", - "parity-scale-codec", - "parking_lot 0.12.3", - "sc-client-api 32.0.0", - "sc-network 0.38.0", - "sc-transaction-pool-api 32.0.0", - "sp-api 30.0.0", - "sp-consensus 0.36.0", - "sp-core 32.0.0", - "sp-keystore 0.38.0", - "sp-mixnet 0.8.0", - "sp-runtime 35.0.0", - "thiserror", -] - [[package]] name = "sc-network" version = "0.35.0" @@ -10101,14 +9583,14 @@ dependencies = [ "partial_sort", "pin-project", "rand", - "sc-client-api 29.0.0", - "sc-network-common 0.34.0", - "sc-utils 15.0.0", + "sc-client-api", + "sc-network-common", + "sc-utils", "serde", "serde_json", "smallvec", "sp-arithmetic 24.0.0", - "sp-blockchain 29.0.0", + "sp-blockchain", "sp-core 29.0.0", "sp-runtime 32.0.0", "substrate-prometheus-endpoint", @@ -10120,50 +9602,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sc-network" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e68214c9245ee374a6c51fca3c00feddbe20a86451d92c76585a9cc9553425" -dependencies = [ - "array-bytes 6.2.2", - "async-channel 1.9.0", - "async-trait", - "asynchronous-codec", - "bytes", - "either", - "fnv", - "futures", - "futures-timer", - "ip_network", - "libp2p", - "linked_hash_set", - "log", - "mockall", - "parity-scale-codec", - "parking_lot 0.12.3", - "partial_sort", - "pin-project", - "rand", - "sc-client-api 32.0.0", - "sc-network-common 0.37.0", - "sc-utils 17.0.0", - "serde", - "serde_json", - "smallvec", - "sp-arithmetic 26.0.0", - "sp-blockchain 32.0.0", - "sp-core 32.0.0", - "sp-runtime 35.0.0", - "substrate-prometheus-endpoint", - "thiserror", - "tokio", - "tokio-stream", - "unsigned-varint", - "wasm-timer", - "zeroize", -] - [[package]] name = "sc-network-bitswap" version = "0.34.0" @@ -10175,37 +9613,16 @@ dependencies = [ "futures", "libp2p-identity", "log", - "prost 0.12.4", + "prost 0.12.6", "prost-build", - "sc-client-api 29.0.0", - "sc-network 0.35.0", - "sp-blockchain 29.0.0", + "sc-client-api", + "sc-network", + "sp-blockchain", "sp-runtime 32.0.0", "thiserror", "unsigned-varint", ] -[[package]] -name = "sc-network-bitswap" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf7cf01e661f39303737596859139fcdd31bd106a979fae0828f3e5b0decce89" -dependencies = [ - "async-channel 1.9.0", - "cid", - "futures", - "libp2p-identity", - "log", - "prost 0.12.4", - "prost-build", - "sc-client-api 32.0.0", - "sc-network 0.38.0", - "sp-blockchain 32.0.0", - "sp-runtime 35.0.0", - "thiserror", - "unsigned-varint", -] - [[package]] name = "sc-network-common" version = "0.34.0" @@ -10218,44 +9635,26 @@ dependencies = [ "libp2p-identity", "parity-scale-codec", "prost-build", - "sc-consensus 0.34.0", - "sp-consensus 0.33.0", - "sp-consensus-grandpa 14.0.0", + "sc-consensus", + "sp-consensus", + "sp-consensus-grandpa", "sp-runtime 32.0.0", ] [[package]] -name = "sc-network-common" -version = "0.37.0" +name = "sc-network-gossip" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b1732616f6fd5bcdabd44eac79b466c2075f3f47ebf0cf2f6d52d790890736" +checksum = "dad02cf809c34b53614fa61377e3289064edf6c78eb11df071d11fbf7546d7e9" dependencies = [ - "async-trait", - "bitflags 1.3.2", - "futures", - "libp2p-identity", - "parity-scale-codec", - "prost-build", - "sc-consensus 0.37.0", - "sp-consensus 0.36.0", - "sp-consensus-grandpa 17.0.0", - "sp-runtime 35.0.0", -] - -[[package]] -name = "sc-network-gossip" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad02cf809c34b53614fa61377e3289064edf6c78eb11df071d11fbf7546d7e9" -dependencies = [ - "ahash 0.8.11", + "ahash 0.8.11", "futures", "futures-timer", "libp2p", "log", - "sc-network 0.35.0", - "sc-network-common 0.34.0", - "sc-network-sync 0.34.0", + "sc-network", + "sc-network-common", + "sc-network-sync", "schnellru", "sp-runtime 32.0.0", "substrate-prometheus-endpoint", @@ -10274,38 +9673,16 @@ dependencies = [ "libp2p-identity", "log", "parity-scale-codec", - "prost 0.12.4", + "prost 0.12.6", "prost-build", - "sc-client-api 29.0.0", - "sc-network 0.35.0", - "sp-blockchain 29.0.0", + "sc-client-api", + "sc-network", + "sp-blockchain", "sp-core 29.0.0", "sp-runtime 32.0.0", "thiserror", ] -[[package]] -name = "sc-network-light" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be9c7b3d18d5ef3ed493be173e9cb00537585cd9b21bb4ebe24b9b555cf4fa4" -dependencies = [ - "array-bytes 6.2.2", - "async-channel 1.9.0", - "futures", - "libp2p-identity", - "log", - "parity-scale-codec", - "prost 0.12.4", - "prost-build", - "sc-client-api 32.0.0", - "sc-network 0.38.0", - "sp-blockchain 32.0.0", - "sp-core 32.0.0", - "sp-runtime 35.0.0", - "thiserror", -] - [[package]] name = "sc-network-sync" version = "0.34.0" @@ -10315,26 +9692,26 @@ dependencies = [ "array-bytes 6.2.2", "async-channel 1.9.0", "async-trait", - "fork-tree 12.0.0", + "fork-tree", "futures", "futures-timer", "libp2p", "log", "mockall", "parity-scale-codec", - "prost 0.12.4", + "prost 0.12.6", "prost-build", - "sc-client-api 29.0.0", - "sc-consensus 0.34.0", - "sc-network 0.35.0", - "sc-network-common 0.34.0", - "sc-utils 15.0.0", + "sc-client-api", + "sc-consensus", + "sc-network", + "sc-network-common", + "sc-utils", "schnellru", "smallvec", "sp-arithmetic 24.0.0", - "sp-blockchain 29.0.0", - "sp-consensus 0.33.0", - "sp-consensus-grandpa 14.0.0", + "sp-blockchain", + "sp-consensus", + "sp-consensus-grandpa", "sp-core 29.0.0", "sp-runtime 32.0.0", "substrate-prometheus-endpoint", @@ -10343,43 +9720,6 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "sc-network-sync" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8a240043ecd1c5ca54d1dfdc654878aed6b96fe7292c11dc9e8bc7c4884fb" -dependencies = [ - "array-bytes 6.2.2", - "async-channel 1.9.0", - "async-trait", - "fork-tree 13.0.0", - "futures", - "futures-timer", - "libp2p", - "log", - "mockall", - "parity-scale-codec", - "prost 0.12.4", - "prost-build", - "sc-client-api 32.0.0", - "sc-consensus 0.37.0", - "sc-network 0.38.0", - "sc-network-common 0.37.0", - "sc-utils 17.0.0", - "schnellru", - "smallvec", - "sp-arithmetic 26.0.0", - "sp-blockchain 32.0.0", - "sp-consensus 0.36.0", - "sp-consensus-grandpa 17.0.0", - "sp-core 32.0.0", - "sp-runtime 35.0.0", - "substrate-prometheus-endpoint", - "thiserror", - "tokio", - "tokio-stream", -] - [[package]] name = "sc-network-transactions" version = "0.34.0" @@ -10391,35 +9731,15 @@ dependencies = [ "libp2p", "log", "parity-scale-codec", - "sc-network 0.35.0", - "sc-network-common 0.34.0", - "sc-network-sync 0.34.0", - "sc-utils 15.0.0", - "sp-consensus 0.33.0", + "sc-network", + "sc-network-common", + "sc-network-sync", + "sc-utils", + "sp-consensus", "sp-runtime 32.0.0", "substrate-prometheus-endpoint", ] -[[package]] -name = "sc-network-transactions" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1514ca1cc195842970b3a35b80cc14ed002296f3565c19d4659be44ca9255b8" -dependencies = [ - "array-bytes 6.2.2", - "futures", - "libp2p", - "log", - "parity-scale-codec", - "sc-network 0.38.0", - "sc-network-common 0.37.0", - "sc-network-sync 0.37.0", - "sc-utils 17.0.0", - "sp-consensus 0.36.0", - "sp-runtime 35.0.0", - "substrate-prometheus-endpoint", -] - [[package]] name = "sc-offchain" version = "30.0.0" @@ -10440,16 +9760,16 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "rand", - "sc-client-api 29.0.0", - "sc-network 0.35.0", - "sc-network-common 0.34.0", - "sc-transaction-pool-api 29.0.0", - "sc-utils 15.0.0", - "sp-api 27.0.0", + "sc-client-api", + "sc-network", + "sc-network-common", + "sc-transaction-pool-api", + "sc-utils", + "sp-api", "sp-core 29.0.0", "sp-externalities 0.26.0", "sp-keystore 0.35.0", - "sp-offchain 27.0.0", + "sp-offchain", "sp-runtime 32.0.0", "threadpool", "tracing", @@ -10476,58 +9796,25 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-block-builder 0.34.0", - "sc-chain-spec 28.0.0", - "sc-client-api 29.0.0", - "sc-mixnet 0.5.0", - "sc-rpc-api 0.34.0", - "sc-tracing 29.0.0", - "sc-transaction-pool-api 29.0.0", - "sc-utils 15.0.0", + "sc-block-builder", + "sc-chain-spec", + "sc-client-api", + "sc-mixnet", + "sc-rpc-api", + "sc-tracing", + "sc-transaction-pool-api", + "sc-utils", "serde_json", - "sp-api 27.0.0", - "sp-blockchain 29.0.0", + "sp-api", + "sp-blockchain", "sp-core 29.0.0", "sp-keystore 0.35.0", - "sp-offchain 27.0.0", - "sp-rpc 27.0.0", + "sp-offchain", + "sp-rpc", "sp-runtime 32.0.0", - "sp-session 28.0.0", - "sp-statement-store 11.0.0", - "sp-version 30.0.0", - "tokio", -] - -[[package]] -name = "sc-rpc" -version = "33.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d7b43d6ce2c57d90dab64a0eab4673158a7a240119fd3ae934ce95f8ad973f" -dependencies = [ - "futures", - "jsonrpsee 0.22.4", - "log", - "parity-scale-codec", - "parking_lot 0.12.3", - "sc-block-builder 0.37.0", - "sc-chain-spec 31.0.0", - "sc-client-api 32.0.0", - "sc-mixnet 0.8.0", - "sc-rpc-api 0.37.0", - "sc-tracing 32.0.0", - "sc-transaction-pool-api 32.0.0", - "sc-utils 17.0.0", - "serde_json", - "sp-api 30.0.0", - "sp-blockchain 32.0.0", - "sp-core 32.0.0", - "sp-keystore 0.38.0", - "sp-offchain 30.0.0", - "sp-rpc 30.0.0", - "sp-runtime 35.0.0", - "sp-session 31.0.0", - "sp-statement-store 14.0.0", - "sp-version 33.0.0", + "sp-session", + "sp-statement-store", + "sp-version", "tokio", ] @@ -10539,37 +9826,16 @@ checksum = "e9db6aaabfa7e0c27ec15d0f0a11b994cd4bcf86e362f0d9732b4a414d793f0f" dependencies = [ "jsonrpsee 0.20.3", "parity-scale-codec", - "sc-chain-spec 28.0.0", - "sc-mixnet 0.5.0", - "sc-transaction-pool-api 29.0.0", + "sc-chain-spec", + "sc-mixnet", + "sc-transaction-pool-api", "scale-info", "serde", "serde_json", "sp-core 29.0.0", - "sp-rpc 27.0.0", + "sp-rpc", "sp-runtime 32.0.0", - "sp-version 30.0.0", - "thiserror", -] - -[[package]] -name = "sc-rpc-api" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b82060f09f886f59fd19a77cc6668c209e883fc93511e9c441ef84adfea80f36" -dependencies = [ - "jsonrpsee 0.22.4", - "parity-scale-codec", - "sc-chain-spec 31.0.0", - "sc-mixnet 0.8.0", - "sc-transaction-pool-api 32.0.0", - "scale-info", - "serde", - "serde_json", - "sp-core 32.0.0", - "sp-rpc 30.0.0", - "sp-runtime 35.0.0", - "sp-version 33.0.0", + "sp-version", "thiserror", ] @@ -10589,25 +9855,6 @@ dependencies = [ "tower-http 0.4.4", ] -[[package]] -name = "sc-rpc-server" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f6d0924de213aa5c72a47c7bd0d7668531c5845e832d1ac5c33c96d0ff7b9b" -dependencies = [ - "futures", - "governor", - "http 0.2.12", - "hyper 0.14.28", - "jsonrpsee 0.22.4", - "log", - "serde_json", - "substrate-prometheus-endpoint", - "tokio", - "tower 0.4.13", - "tower-http 0.4.4", -] - [[package]] name = "sc-rpc-spec-v2" version = "0.35.0" @@ -10622,50 +9869,18 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-chain-spec 28.0.0", - "sc-client-api 29.0.0", - "sc-rpc 30.0.0", - "sc-transaction-pool-api 29.0.0", - "sc-utils 15.0.0", - "serde", - "sp-api 27.0.0", - "sp-blockchain 29.0.0", + "sc-chain-spec", + "sc-client-api", + "sc-rpc", + "sc-transaction-pool-api", + "sc-utils", + "serde", + "sp-api", + "sp-blockchain", "sp-core 29.0.0", - "sp-rpc 27.0.0", + "sp-rpc", "sp-runtime 32.0.0", - "sp-version 30.0.0", - "thiserror", - "tokio", - "tokio-stream", -] - -[[package]] -name = "sc-rpc-spec-v2" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad831d2524de44a89b1801e306fd9718dc5fadb26ea3e88f486faa29c6fdd710" -dependencies = [ - "array-bytes 6.2.2", - "futures", - "futures-util", - "hex", - "jsonrpsee 0.22.4", - "log", - "parity-scale-codec", - "parking_lot 0.12.3", - "rand", - "sc-chain-spec 31.0.0", - "sc-client-api 32.0.0", - "sc-rpc 33.0.0", - "sc-transaction-pool-api 32.0.0", - "sc-utils 17.0.0", - "serde", - "sp-api 30.0.0", - "sp-blockchain 32.0.0", - "sp-core 32.0.0", - "sp-rpc 30.0.0", - "sp-runtime 35.0.0", - "sp-version 33.0.0", + "sp-version", "thiserror", "tokio", "tokio-stream", @@ -10688,109 +9903,44 @@ dependencies = [ "parking_lot 0.12.3", "pin-project", "rand", - "sc-chain-spec 28.0.0", - "sc-client-api 29.0.0", - "sc-client-db 0.36.0", - "sc-consensus 0.34.0", - "sc-executor 0.33.0", - "sc-informant 0.34.0", - "sc-keystore 26.0.0", - "sc-network 0.35.0", - "sc-network-bitswap 0.34.0", - "sc-network-common 0.34.0", - "sc-network-light 0.34.0", - "sc-network-sync 0.34.0", - "sc-network-transactions 0.34.0", - "sc-rpc 30.0.0", - "sc-rpc-server 12.0.0", - "sc-rpc-spec-v2 0.35.0", - "sc-sysinfo 28.0.0", - "sc-telemetry 16.0.0", - "sc-tracing 29.0.0", - "sc-transaction-pool 29.0.0", - "sc-transaction-pool-api 29.0.0", - "sc-utils 15.0.0", + "sc-chain-spec", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-executor", + "sc-informant", + "sc-keystore", + "sc-network", + "sc-network-bitswap", + "sc-network-common", + "sc-network-light", + "sc-network-sync", + "sc-network-transactions", + "sc-rpc", + "sc-rpc-server", + "sc-rpc-spec-v2", + "sc-sysinfo", + "sc-telemetry", + "sc-tracing", + "sc-transaction-pool", + "sc-transaction-pool-api", + "sc-utils", "serde", "serde_json", - "sp-api 27.0.0", - "sp-blockchain 29.0.0", - "sp-consensus 0.33.0", + "sp-api", + "sp-blockchain", + "sp-consensus", "sp-core 29.0.0", "sp-externalities 0.26.0", "sp-keystore 0.35.0", "sp-runtime 32.0.0", - "sp-session 28.0.0", + "sp-session", "sp-state-machine 0.36.0", - "sp-storage 20.0.0", - "sp-transaction-pool 27.0.0", - "sp-transaction-storage-proof 27.0.0", + "sp-storage", + "sp-transaction-pool", + "sp-transaction-storage-proof", "sp-trie 30.0.0", - "sp-version 30.0.0", - "static_init", - "substrate-prometheus-endpoint", - "tempfile", - "thiserror", - "tokio", - "tracing", - "tracing-futures", -] - -[[package]] -name = "sc-service" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff048cda961d13a0978bf6e75b1978c0fa886d2087133a4d2107a034afd27c8" -dependencies = [ - "async-trait", - "directories", - "exit-future", - "futures", - "futures-timer", - "jsonrpsee 0.22.4", - "log", - "parity-scale-codec", - "parking_lot 0.12.3", - "pin-project", - "rand", - "sc-chain-spec 31.0.0", - "sc-client-api 32.0.0", - "sc-client-db 0.39.0", - "sc-consensus 0.37.0", - "sc-executor 0.36.0", - "sc-informant 0.37.0", - "sc-keystore 29.0.0", - "sc-network 0.38.0", - "sc-network-bitswap 0.37.0", - "sc-network-common 0.37.0", - "sc-network-light 0.37.0", - "sc-network-sync 0.37.0", - "sc-network-transactions 0.37.0", - "sc-rpc 33.0.0", - "sc-rpc-server 15.0.0", - "sc-rpc-spec-v2 0.38.0", - "sc-sysinfo 31.0.0", - "sc-telemetry 18.0.0", - "sc-tracing 32.0.0", - "sc-transaction-pool 32.0.0", - "sc-transaction-pool-api 32.0.0", - "sc-utils 17.0.0", - "schnellru", - "serde", - "serde_json", - "sp-api 30.0.0", - "sp-blockchain 32.0.0", - "sp-consensus 0.36.0", - "sp-core 32.0.0", - "sp-externalities 0.28.0", - "sp-keystore 0.38.0", - "sp-runtime 35.0.0", - "sp-session 31.0.0", - "sp-state-machine 0.39.0", - "sp-storage 21.0.0", - "sp-transaction-pool 30.0.0", - "sp-transaction-storage-proof 30.0.0", - "sp-trie 33.0.0", - "sp-version 33.0.0", + "sp-version", "static_init", "substrate-prometheus-endpoint", "tempfile", @@ -10812,18 +9962,6 @@ dependencies = [ "sp-core 29.0.0", ] -[[package]] -name = "sc-state-db" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7259ab2e8e2fa1e7a1c38dd8a88353f80e66369ef8b48d5f7098dbc18c67887f" -dependencies = [ - "log", - "parity-scale-codec", - "parking_lot 0.12.3", - "sp-core 32.0.0", -] - [[package]] name = "sc-storage-monitor" version = "0.17.0" @@ -10846,14 +9984,14 @@ checksum = "9bc382c7d997f4531eee5e5d57f970eaf2761d722298d7747385a4ad69fa6b12" dependencies = [ "jsonrpsee 0.20.3", "parity-scale-codec", - "sc-chain-spec 28.0.0", - "sc-client-api 29.0.0", + "sc-chain-spec", + "sc-client-api", "sc-consensus-babe", "sc-consensus-epochs", "sc-consensus-grandpa", "serde", "serde_json", - "sp-blockchain 29.0.0", + "sp-blockchain", "sp-runtime 32.0.0", "thiserror", ] @@ -10871,7 +10009,7 @@ dependencies = [ "rand", "rand_pcg", "regex", - "sc-telemetry 16.0.0", + "sc-telemetry", "serde", "serde_json", "sp-core 29.0.0", @@ -10880,28 +10018,6 @@ dependencies = [ "sp-std 14.0.0", ] -[[package]] -name = "sc-sysinfo" -version = "31.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6a838bf3ba61e83c0f3be4a41ba7ed8c71d19c2adee6396046f78317006637b" -dependencies = [ - "derive_more 0.99.17", - "futures", - "libc", - "log", - "rand", - "rand_pcg", - "regex", - "sc-telemetry 18.0.0", - "serde", - "serde_json", - "sp-core 32.0.0", - "sp-crypto-hashing", - "sp-io 34.0.0", - "sp-std 14.0.0", -] - [[package]] name = "sc-telemetry" version = "16.0.0" @@ -10915,27 +10031,7 @@ dependencies = [ "parking_lot 0.12.3", "pin-project", "rand", - "sc-utils 15.0.0", - "serde", - "serde_json", - "thiserror", - "wasm-timer", -] - -[[package]] -name = "sc-telemetry" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a5a306d8c75e61e8c59e18b92886f85db6b4102c4669240eca101954fec79e" -dependencies = [ - "chrono", - "futures", - "libp2p", - "log", - "parking_lot 0.12.3", - "pin-project", - "rand", - "sc-utils 17.0.0", + "sc-utils", "serde", "serde_json", "thiserror", @@ -10958,46 +10054,15 @@ dependencies = [ "parking_lot 0.12.3", "regex", "rustc-hash", - "sc-client-api 29.0.0", + "sc-client-api", "sc-tracing-proc-macro", "serde", - "sp-api 27.0.0", - "sp-blockchain 29.0.0", + "sp-api", + "sp-blockchain", "sp-core 29.0.0", - "sp-rpc 27.0.0", + "sp-rpc", "sp-runtime 32.0.0", - "sp-tracing 16.0.0", - "thiserror", - "tracing", - "tracing-log 0.1.4", - "tracing-subscriber 0.2.25", -] - -[[package]] -name = "sc-tracing" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584e4f81defe03776909ce283429c9cd3d80fea6b2f3a303dc2bdf913e11d9e8" -dependencies = [ - "ansi_term", - "chrono", - "is-terminal", - "lazy_static", - "libc", - "log", - "parity-scale-codec", - "parking_lot 0.12.3", - "regex", - "rustc-hash", - "sc-client-api 32.0.0", - "sc-tracing-proc-macro", - "serde", - "sp-api 30.0.0", - "sp-blockchain 32.0.0", - "sp-core 32.0.0", - "sp-rpc 30.0.0", - "sp-runtime 35.0.0", - "sp-tracing 17.0.0", + "sp-tracing", "thiserror", "tracing", "tracing-log 0.1.4", @@ -11029,45 +10094,17 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-client-api 29.0.0", - "sc-transaction-pool-api 29.0.0", - "sc-utils 15.0.0", + "sc-client-api", + "sc-transaction-pool-api", + "sc-utils", "serde", - "sp-api 27.0.0", - "sp-blockchain 29.0.0", + "sp-api", + "sp-blockchain", "sp-core 29.0.0", "sp-crypto-hashing", "sp-runtime 32.0.0", - "sp-tracing 16.0.0", - "sp-transaction-pool 27.0.0", - "substrate-prometheus-endpoint", - "thiserror", -] - -[[package]] -name = "sc-transaction-pool" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54754bf43dede417a8e64a0d6a46bf2bbed47ff050c1f81c8a575f9b94416886" -dependencies = [ - "async-trait", - "futures", - "futures-timer", - "linked-hash-map", - "log", - "parity-scale-codec", - "parking_lot 0.12.3", - "sc-client-api 32.0.0", - "sc-transaction-pool-api 32.0.0", - "sc-utils 17.0.0", - "serde", - "sp-api 30.0.0", - "sp-blockchain 32.0.0", - "sp-core 32.0.0", - "sp-crypto-hashing", - "sp-runtime 35.0.0", - "sp-tracing 17.0.0", - "sp-transaction-pool 30.0.0", + "sp-tracing", + "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", ] @@ -11083,29 +10120,12 @@ dependencies = [ "log", "parity-scale-codec", "serde", - "sp-blockchain 29.0.0", + "sp-blockchain", "sp-core 29.0.0", "sp-runtime 32.0.0", "thiserror", ] -[[package]] -name = "sc-transaction-pool-api" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b563c7257ab650b2639d623da13d1a50a5a6c4ec582bc92e118c73d072bcd4" -dependencies = [ - "async-trait", - "futures", - "log", - "parity-scale-codec", - "serde", - "sp-blockchain 32.0.0", - "sp-core 32.0.0", - "sp-runtime 35.0.0", - "thiserror", -] - [[package]] name = "sc-utils" version = "15.0.0" @@ -11122,22 +10142,6 @@ dependencies = [ "sp-arithmetic 24.0.0", ] -[[package]] -name = "sc-utils" -version = "17.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf1bad736c230f16beb1cf48af9e69564df23b13aca9e5751a61266340b4bb5" -dependencies = [ - "async-channel 1.9.0", - "futures", - "futures-timer", - "lazy_static", - "log", - "parking_lot 0.12.3", - "prometheus", - "sp-arithmetic 26.0.0", -] - [[package]] name = "scale-bits" version = "0.5.0" @@ -11948,77 +10952,39 @@ dependencies = [ "flate2", "futures", "http 0.2.12", - "httparse", - "log", - "rand", - "sha-1", -] - -[[package]] -name = "sp-api" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef42aa652381ade883c14ffbbb5c0fec36d382d2217b5bace01b8a0e8634778" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "scale-info", - "sp-api-proc-macro 15.0.0", - "sp-core 29.0.0", - "sp-externalities 0.26.0", - "sp-metadata-ir 0.6.0", - "sp-runtime 32.0.0", - "sp-state-machine 0.36.0", - "sp-std 14.0.0", - "sp-trie 30.0.0", - "sp-version 30.0.0", - "thiserror", + "httparse", + "log", + "rand", + "sha-1", ] [[package]] name = "sp-api" -version = "30.0.0" +version = "27.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8abd1d0732054ad896db8f092abe822106f1acf8bbc462c70f57d0f24c0dcdf" +checksum = "2e4f8702afd77f14a32733e2b589c02694bf79d0b3a641963c508016208724d0" dependencies = [ "hash-db", "log", "parity-scale-codec", "scale-info", - "sp-api-proc-macro 18.0.0", - "sp-core 32.0.0", - "sp-externalities 0.28.0", - "sp-metadata-ir 0.7.0", - "sp-runtime 35.0.0", - "sp-runtime-interface 27.0.0", - "sp-state-machine 0.39.0", + "sp-api-proc-macro", + "sp-core 29.0.0", + "sp-externalities 0.26.0", + "sp-metadata-ir", + "sp-runtime 32.0.0", + "sp-state-machine 0.36.0", "sp-std 14.0.0", - "sp-trie 33.0.0", - "sp-version 33.0.0", + "sp-trie 30.0.0", + "sp-version", "thiserror", ] [[package]] name = "sp-api-proc-macro" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0694be2891593450916d6b53a274d234bccbc86bcbada36ba23fc356989070c7" -dependencies = [ - "Inflector", - "blake2 0.10.6", - "expander", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.82", -] - -[[package]] -name = "sp-api-proc-macro" -version = "18.0.0" +version = "15.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681e80c1b259ee71880cd3b4ad2a2d41454596252bd267c3edf4e14552ab40e1" +checksum = "0301e2f77afb450fbf2b093f8b324c7ad88cc82e5e69bd5dc8658a1f068b2a96" dependencies = [ "Inflector", "blake2 0.10.6", @@ -12057,20 +11023,6 @@ dependencies = [ "sp-std 14.0.0", ] -[[package]] -name = "sp-application-crypto" -version = "34.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505fad69251900048ddddc6387265e1545d1a366e3b4dcd57b76a03f0a65ae7" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 32.0.0", - "sp-io 34.0.0", - "sp-std 14.0.0", -] - [[package]] name = "sp-arithmetic" version = "24.0.0" @@ -12101,22 +11053,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "sp-arithmetic" -version = "26.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46d0d0a4c591c421d3231ddd5e27d828618c24456d51445d21a1f79fcee97c23" -dependencies = [ - "docify", - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-std 14.0.0", - "static_assertions", -] - [[package]] name = "sp-authority-discovery" version = "27.0.0" @@ -12125,7 +11061,7 @@ checksum = "c92b177c72b5d2973c36d60f6ef942d791d9fd91eae8b08c71882e4118d4fbfc" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api 27.0.0", + "sp-api", "sp-application-crypto 31.0.0", "sp-runtime 32.0.0", "sp-std 14.0.0", @@ -12137,23 +11073,12 @@ version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b36ce171caa7eb2bbe682c089f755fdefa71d3702e4fb1ba30d10146aef99d5" dependencies = [ - "sp-api 27.0.0", - "sp-inherents 27.0.0", + "sp-api", + "sp-inherents", "sp-runtime 32.0.0", "sp-std 14.0.0", ] -[[package]] -name = "sp-block-builder" -version = "30.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "466eaa1fe1745e9456a5e5afc033b67a52211463a137ea3551bff36b4d72ce03" -dependencies = [ - "sp-api 30.0.0", - "sp-inherents 30.0.0", - "sp-runtime 35.0.0", -] - [[package]] name = "sp-blockchain" version = "29.0.0" @@ -12165,33 +11090,14 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "schnellru", - "sp-api 27.0.0", - "sp-consensus 0.33.0", + "sp-api", + "sp-consensus", "sp-database", "sp-runtime 32.0.0", "sp-state-machine 0.36.0", "thiserror", ] -[[package]] -name = "sp-blockchain" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed0dc760fde2b2cd07ca9428e3d6b7ecc02bbd00a5dc32b7f829c80889b152b" -dependencies = [ - "futures", - "log", - "parity-scale-codec", - "parking_lot 0.12.3", - "schnellru", - "sp-api 30.0.0", - "sp-consensus 0.36.0", - "sp-database", - "sp-runtime 35.0.0", - "sp-state-machine 0.39.0", - "thiserror", -] - [[package]] name = "sp-consensus" version = "0.33.0" @@ -12202,43 +11108,28 @@ dependencies = [ "futures", "log", "sp-core 29.0.0", - "sp-inherents 27.0.0", + "sp-inherents", "sp-runtime 32.0.0", "sp-state-machine 0.36.0", "thiserror", ] -[[package]] -name = "sp-consensus" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19910bc7cd10336a1b13611df1212bce5cabbcfcd92a9394e23476498aa360c7" -dependencies = [ - "async-trait", - "futures", - "log", - "sp-core 32.0.0", - "sp-inherents 30.0.0", - "sp-runtime 35.0.0", - "sp-state-machine 0.39.0", - "thiserror", -] - [[package]] name = "sp-consensus-aura" -version = "0.36.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67647dc44d2f47f8b96a56f30a896926485e55a8209cfe916cf8d08a6d488f03" +checksum = "4bf13c293685319751f72fa5216c7fb5f25f3e8e8fe29b4503296ed5f5466b3d" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-api 30.0.0", - "sp-application-crypto 34.0.0", - "sp-consensus-slots 0.36.0", - "sp-inherents 30.0.0", - "sp-runtime 35.0.0", - "sp-timestamp 30.0.0", + "sp-api", + "sp-application-crypto 31.0.0", + "sp-consensus-slots", + "sp-inherents", + "sp-runtime 32.0.0", + "sp-std 14.0.0", + "sp-timestamp", ] [[package]] @@ -12251,33 +11142,14 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 27.0.0", + "sp-api", "sp-application-crypto 31.0.0", - "sp-consensus-slots 0.33.0", + "sp-consensus-slots", "sp-core 29.0.0", - "sp-inherents 27.0.0", + "sp-inherents", "sp-runtime 32.0.0", "sp-std 14.0.0", - "sp-timestamp 27.0.0", -] - -[[package]] -name = "sp-consensus-babe" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3500dd1ceb99ca5e6f399d37c4e42f22fcbb6505e07378791ebe57eec6a1960" -dependencies = [ - "async-trait", - "parity-scale-codec", - "scale-info", - "serde", - "sp-api 30.0.0", - "sp-application-crypto 34.0.0", - "sp-consensus-slots 0.36.0", - "sp-core 32.0.0", - "sp-inherents 30.0.0", - "sp-runtime 35.0.0", - "sp-timestamp 30.0.0", + "sp-timestamp", ] [[package]] @@ -12291,7 +11163,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 27.0.0", + "sp-api", "sp-application-crypto 31.0.0", "sp-core 29.0.0", "sp-keystore 0.35.0", @@ -12299,24 +11171,6 @@ dependencies = [ "sp-std 14.0.0", ] -[[package]] -name = "sp-consensus-grandpa" -version = "17.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffc3f88b33c2a8c14f4d05a3c69c5fc7b02cdd3300993a22d6d2175d35447f6" -dependencies = [ - "finality-grandpa", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-api 30.0.0", - "sp-application-crypto 34.0.0", - "sp-core 32.0.0", - "sp-keystore 0.38.0", - "sp-runtime 35.0.0", -] - [[package]] name = "sp-consensus-slots" version = "0.33.0" @@ -12327,19 +11181,7 @@ dependencies = [ "scale-info", "serde", "sp-std 14.0.0", - "sp-timestamp 27.0.0", -] - -[[package]] -name = "sp-consensus-slots" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52dcae1dac6908d80bceaff4f311bc694c3b9c0d3ac6e74128ed4e3a29e9e31f" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-timestamp 30.0.0", + "sp-timestamp", ] [[package]] @@ -12379,7 +11221,7 @@ dependencies = [ "sp-externalities 0.26.0", "sp-runtime-interface 25.0.0", "sp-std 14.0.0", - "sp-storage 20.0.0", + "sp-storage", "ss58-registry", "substrate-bip39 0.4.6", "thiserror", @@ -12426,7 +11268,7 @@ dependencies = [ "sp-externalities 0.27.0", "sp-runtime-interface 26.0.0", "sp-std 14.0.0", - "sp-storage 20.0.0", + "sp-storage", "ss58-registry", "substrate-bip39 0.5.0", "thiserror", @@ -12435,53 +11277,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sp-core" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2dac7e47c7ddbb61efe196d5cce99f6ea88926c961fa39909bfeae46fc5a7b" -dependencies = [ - "array-bytes 6.2.2", - "bitflags 1.3.2", - "blake2 0.10.6", - "bounded-collections", - "bs58 0.5.1", - "dyn-clonable", - "ed25519-zebra 3.1.0", - "futures", - "hash-db", - "hash256-std-hasher", - "impl-serde", - "itertools 0.10.5", - "k256", - "libsecp256k1", - "log", - "merlin", - "parity-bip39", - "parity-scale-codec", - "parking_lot 0.12.3", - "paste", - "primitive-types", - "rand", - "scale-info", - "schnorrkel", - "secp256k1", - "secrecy 0.8.0", - "serde", - "sp-crypto-hashing", - "sp-debug-derive", - "sp-externalities 0.28.0", - "sp-runtime-interface 27.0.0", - "sp-std 14.0.0", - "sp-storage 21.0.0", - "ss58-registry", - "substrate-bip39 0.6.0", - "thiserror", - "tracing", - "w3f-bls", - "zeroize", -] - [[package]] name = "sp-crypto-hashing" version = "0.1.0" @@ -12537,7 +11332,7 @@ dependencies = [ "environmental", "parity-scale-codec", "sp-std 14.0.0", - "sp-storage 20.0.0", + "sp-storage", ] [[package]] @@ -12549,18 +11344,7 @@ dependencies = [ "environmental", "parity-scale-codec", "sp-std 14.0.0", - "sp-storage 20.0.0", -] - -[[package]] -name = "sp-externalities" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33abaec4be69b1613796bbf430decbbcaaf978756379e2016e683a4d6379cd02" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-storage 21.0.0", + "sp-storage", ] [[package]] @@ -12570,22 +11354,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd865540ec19479c7349b584ccd78cc34c3f3a628a2a69dbb6365ceec36295ee" dependencies = [ "serde_json", - "sp-api 27.0.0", + "sp-api", "sp-runtime 32.0.0", "sp-std 14.0.0", ] -[[package]] -name = "sp-genesis-builder" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8a812b56fb4ed6a598ad7b43be127702aba1f7351ad4916f5bab995054cdc5" -dependencies = [ - "serde_json", - "sp-api 30.0.0", - "sp-runtime 35.0.0", -] - [[package]] name = "sp-inherents" version = "27.0.0" @@ -12601,20 +11374,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sp-inherents" -version = "30.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcba3b816fdfadf30d8c7c484e1873f1af89ed2560c77d2b2137d152cc5a585" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "sp-runtime 35.0.0", - "thiserror", -] - [[package]] name = "sp-io" version = "31.0.0" @@ -12635,7 +11394,7 @@ dependencies = [ "sp-runtime-interface 25.0.0", "sp-state-machine 0.36.0", "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "sp-trie 30.0.0", "tracing", "tracing-core", @@ -12662,39 +11421,12 @@ dependencies = [ "sp-runtime-interface 26.0.0", "sp-state-machine 0.38.0", "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "sp-trie 32.0.0", "tracing", "tracing-core", ] -[[package]] -name = "sp-io" -version = "34.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44ed47247b6eee76ff703f9fa9f04f99c4104ac1faf629e6d1128e09066b57b" -dependencies = [ - "bytes", - "ed25519-dalek", - "libsecp256k1", - "log", - "parity-scale-codec", - "polkavm-derive 0.9.1", - "rustversion", - "secp256k1", - "sp-core 32.0.0", - "sp-crypto-hashing", - "sp-externalities 0.28.0", - "sp-keystore 0.38.0", - "sp-runtime-interface 27.0.0", - "sp-state-machine 0.39.0", - "sp-std 14.0.0", - "sp-tracing 17.0.0", - "sp-trie 33.0.0", - "tracing", - "tracing-core", -] - [[package]] name = "sp-keyring" version = "32.0.0" @@ -12717,17 +11449,6 @@ dependencies = [ "strum 0.24.1", ] -[[package]] -name = "sp-keyring" -version = "35.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "089da5d08c4a6b4a36de664de287f4a391ac338e351a923b79aedfc46162f201" -dependencies = [ - "sp-core 32.0.0", - "sp-runtime 35.0.0", - "strum 0.26.3", -] - [[package]] name = "sp-keystore" version = "0.35.0" @@ -12753,18 +11474,6 @@ dependencies = [ "sp-externalities 0.27.0", ] -[[package]] -name = "sp-keystore" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6c7a7abd860a5211a356cf9d5fcabf0eb37d997985e5d722b6b33dcc815528" -dependencies = [ - "parity-scale-codec", - "parking_lot 0.12.3", - "sp-core 32.0.0", - "sp-externalities 0.28.0", -] - [[package]] name = "sp-maybe-compressed-blob" version = "11.0.0" @@ -12787,17 +11496,6 @@ dependencies = [ "sp-std 14.0.0", ] -[[package]] -name = "sp-metadata-ir" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a616fa51350b35326682a472ee8e6ba742fdacb18babac38ecd46b3e05ead869" -dependencies = [ - "frame-metadata 16.0.0", - "parity-scale-codec", - "scale-info", -] - [[package]] name = "sp-mixnet" version = "0.5.0" @@ -12806,23 +11504,11 @@ checksum = "7bebd44b915c65aeb7e7eeaea466aba3b27cdd915c83ea83d4643c54f21ffbbf" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api 27.0.0", + "sp-api", "sp-application-crypto 31.0.0", "sp-std 14.0.0", ] -[[package]] -name = "sp-mixnet" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ba1e6ceede3aa5e36ee161dc02f1b294a659823887cefc4f0f2fce589e3c11" -dependencies = [ - "parity-scale-codec", - "scale-info", - "sp-api 30.0.0", - "sp-application-crypto 34.0.0", -] - [[package]] name = "sp-npos-elections" version = "27.0.0" @@ -12840,24 +11526,13 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d83b955dce0b6d143bec3f60571311168f362b1c16cf044da7037a407b66c19" -dependencies = [ - "sp-api 27.0.0", - "sp-core 29.0.0", - "sp-runtime 32.0.0", -] - -[[package]] -name = "sp-offchain" -version = "30.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50efea44dfc8e40c59e9f9099c6a4f64dc750ad224fd8dbf9aec12fc857fa145" +checksum = "4d83b955dce0b6d143bec3f60571311168f362b1c16cf044da7037a407b66c19" dependencies = [ - "sp-api 30.0.0", - "sp-core 32.0.0", - "sp-runtime 35.0.0", + "sp-api", + "sp-core 29.0.0", + "sp-runtime 32.0.0", ] [[package]] @@ -12882,17 +11557,6 @@ dependencies = [ "sp-core 29.0.0", ] -[[package]] -name = "sp-rpc" -version = "30.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51104c3cab9d6c9e8361adbd487dd409a8343e740744fb0b3f983bc775fd1847" -dependencies = [ - "rustc-hash", - "serde", - "sp-core 32.0.0", -] - [[package]] name = "sp-runtime" version = "32.0.0" @@ -12943,31 +11607,6 @@ dependencies = [ "sp-weights 30.0.0", ] -[[package]] -name = "sp-runtime" -version = "35.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ce931b7fbfdeeca1340801dbd4a1cae54ad4c97a1e3dcfcc79709bc800dd46" -dependencies = [ - "docify", - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "paste", - "rand", - "scale-info", - "serde", - "simple-mermaid", - "sp-application-crypto 34.0.0", - "sp-arithmetic 26.0.0", - "sp-core 32.0.0", - "sp-io 34.0.0", - "sp-std 14.0.0", - "sp-weights 31.0.0", -] - [[package]] name = "sp-runtime-interface" version = "25.0.0" @@ -12981,9 +11620,9 @@ dependencies = [ "sp-externalities 0.26.0", "sp-runtime-interface-proc-macro 17.0.0", "sp-std 14.0.0", - "sp-storage 20.0.0", - "sp-tracing 16.0.0", - "sp-wasm-interface 20.0.0", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] @@ -13001,29 +11640,9 @@ dependencies = [ "sp-externalities 0.27.0", "sp-runtime-interface-proc-macro 18.0.0", "sp-std 14.0.0", - "sp-storage 20.0.0", - "sp-tracing 16.0.0", - "sp-wasm-interface 20.0.0", - "static_assertions", -] - -[[package]] -name = "sp-runtime-interface" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647db5e1dc481686628b41554e832df6ab400c4b43a6a54e54d3b0a71ca404aa" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "polkavm-derive 0.9.1", - "primitive-types", - "sp-externalities 0.28.0", - "sp-runtime-interface-proc-macro 18.0.0", - "sp-std 14.0.0", - "sp-storage 21.0.0", - "sp-tracing 17.0.0", - "sp-wasm-interface 21.0.0", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] @@ -13063,29 +11682,14 @@ checksum = "3b86531090cc04d2ab3535df07146258e2fb3ab6257b0a77ef14aa08282c3d4a" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api 27.0.0", + "sp-api", "sp-core 29.0.0", "sp-keystore 0.35.0", "sp-runtime 32.0.0", - "sp-staking 27.0.0", + "sp-staking", "sp-std 14.0.0", ] -[[package]] -name = "sp-session" -version = "31.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d66f0f2f00e4c520deae07eeab7acf04c1a41dd875c7a4689e4e4302fb89925" -dependencies = [ - "parity-scale-codec", - "scale-info", - "sp-api 30.0.0", - "sp-core 32.0.0", - "sp-keystore 0.38.0", - "sp-runtime 35.0.0", - "sp-staking 30.0.0", -] - [[package]] name = "sp-staking" version = "27.0.0" @@ -13101,20 +11705,6 @@ dependencies = [ "sp-std 14.0.0", ] -[[package]] -name = "sp-staking" -version = "30.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a43ec7f6c9759ba3011a16bb022afe056bc26f88b3c424598737cba71d3ef0" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 32.0.0", - "sp-runtime 35.0.0", -] - [[package]] name = "sp-state-machine" version = "0.36.0" @@ -13159,27 +11749,6 @@ dependencies = [ "trie-db", ] -[[package]] -name = "sp-state-machine" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d9078306c3066f1824e41153e1ceec34231d39d9a7e7956b101eadf7b9fd3a" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "parking_lot 0.12.3", - "rand", - "smallvec", - "sp-core 32.0.0", - "sp-externalities 0.28.0", - "sp-panic-handler", - "sp-trie 33.0.0", - "thiserror", - "tracing", - "trie-db", -] - [[package]] name = "sp-statement-store" version = "11.0.0" @@ -13194,7 +11763,7 @@ dependencies = [ "rand", "scale-info", "sha2 0.10.8", - "sp-api 27.0.0", + "sp-api", "sp-application-crypto 31.0.0", "sp-core 29.0.0", "sp-crypto-hashing", @@ -13206,31 +11775,6 @@ dependencies = [ "x25519-dalek 2.0.1", ] -[[package]] -name = "sp-statement-store" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e22e2d355461e02aa8325a819d24403fb7232a828bf1e21ad8982fde3f0dc0e" -dependencies = [ - "aes-gcm", - "curve25519-dalek 4.1.2", - "ed25519-dalek", - "hkdf", - "parity-scale-codec", - "rand", - "scale-info", - "sha2 0.10.8", - "sp-api 30.0.0", - "sp-application-crypto 34.0.0", - "sp-core 32.0.0", - "sp-crypto-hashing", - "sp-externalities 0.28.0", - "sp-runtime 35.0.0", - "sp-runtime-interface 27.0.0", - "thiserror", - "x25519-dalek 2.0.1", -] - [[package]] name = "sp-std" version = "12.0.0" @@ -13257,19 +11801,6 @@ dependencies = [ "sp-std 14.0.0", ] -[[package]] -name = "sp-storage" -version = "21.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c82989b3a4979a7e1ad848aad9f5d0b4388f1f454cc131766526601ab9e8f8" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive", -] - [[package]] name = "sp-timestamp" version = "27.0.0" @@ -13278,25 +11809,12 @@ checksum = "249cd06624f2edb53b25af528ab216a508dc9d0870e158b43caac3a97e86699f" dependencies = [ "async-trait", "parity-scale-codec", - "sp-inherents 27.0.0", + "sp-inherents", "sp-runtime 32.0.0", "sp-std 14.0.0", "thiserror", ] -[[package]] -name = "sp-timestamp" -version = "30.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d3965ef60cc066fcc01dbcb7837404f40de8ac58f1115e3a3a1d6550575ff6" -dependencies = [ - "async-trait", - "parity-scale-codec", - "sp-inherents 30.0.0", - "sp-runtime 35.0.0", - "thiserror", -] - [[package]] name = "sp-tracing" version = "16.0.0" @@ -13310,38 +11828,16 @@ dependencies = [ "tracing-subscriber 0.2.25", ] -[[package]] -name = "sp-tracing" -version = "17.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b3decf116db9f1dfaf1f1597096b043d0e12c952d3bcdc018c6d6b77deec7e" -dependencies = [ - "parity-scale-codec", - "tracing", - "tracing-core", - "tracing-subscriber 0.2.25", -] - [[package]] name = "sp-transaction-pool" version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9742861c5330bdcb42856a6eed3d3745b58ee1c92ca4c9260032ff4e6c387165" dependencies = [ - "sp-api 27.0.0", + "sp-api", "sp-runtime 32.0.0", ] -[[package]] -name = "sp-transaction-pool" -version = "30.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bddae32e6935eedda993b7371b79e69af901a277e11be2bbd6d9bc7643b49cb" -dependencies = [ - "sp-api 30.0.0", - "sp-runtime 35.0.0", -] - [[package]] name = "sp-transaction-storage-proof" version = "27.0.0" @@ -13352,27 +11848,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-core 29.0.0", - "sp-inherents 27.0.0", + "sp-inherents", "sp-runtime 32.0.0", "sp-std 14.0.0", "sp-trie 30.0.0", ] -[[package]] -name = "sp-transaction-storage-proof" -version = "30.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726f90279766e231ad86f884e5f07d9331852a59d739f27c5f5e28bee0fc6da5" -dependencies = [ - "async-trait", - "parity-scale-codec", - "scale-info", - "sp-core 32.0.0", - "sp-inherents 30.0.0", - "sp-runtime 35.0.0", - "sp-trie 33.0.0", -] - [[package]] name = "sp-trie" version = "30.0.0" @@ -13423,30 +11904,6 @@ dependencies = [ "trie-root", ] -[[package]] -name = "sp-trie" -version = "33.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1f5b3620a1c87c265a83d85d7519c6b60c47acf7f77593966afe313d086f00e" -dependencies = [ - "ahash 0.8.11", - "hash-db", - "lazy_static", - "memory-db", - "nohash-hasher", - "parity-scale-codec", - "parking_lot 0.12.3", - "rand", - "scale-info", - "schnellru", - "sp-core 32.0.0", - "sp-externalities 0.28.0", - "thiserror", - "tracing", - "trie-db", - "trie-root", -] - [[package]] name = "sp-version" version = "30.0.0" @@ -13461,25 +11918,7 @@ dependencies = [ "sp-crypto-hashing-proc-macro", "sp-runtime 32.0.0", "sp-std 14.0.0", - "sp-version-proc-macro 13.0.0", - "thiserror", -] - -[[package]] -name = "sp-version" -version = "33.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ba2f18b89ac5f356fb247f70163098bc976117221c373d5590079a5797a3b43" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "parity-wasm", - "scale-info", - "serde", - "sp-crypto-hashing-proc-macro", - "sp-runtime 35.0.0", - "sp-std 14.0.0", - "sp-version-proc-macro 14.0.0", + "sp-version-proc-macro", "thiserror", ] @@ -13495,18 +11934,6 @@ dependencies = [ "syn 2.0.82", ] -[[package]] -name = "sp-version-proc-macro" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aee8f6730641a65fcf0c8f9b1e448af4b3bb083d08058b47528188bccc7b7a7" -dependencies = [ - "parity-scale-codec", - "proc-macro2", - "quote", - "syn 2.0.82", -] - [[package]] name = "sp-wasm-interface" version = "20.0.0" @@ -13521,19 +11948,6 @@ dependencies = [ "wasmtime 8.0.1", ] -[[package]] -name = "sp-wasm-interface" -version = "21.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b04b919e150b4736d85089d49327eab65507deb1485eec929af69daa2278eb3" -dependencies = [ - "anyhow", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "wasmtime 8.0.1", -] - [[package]] name = "sp-weights" version = "28.0.0" @@ -13566,21 +11980,6 @@ dependencies = [ "sp-std 14.0.0", ] -[[package]] -name = "sp-weights" -version = "31.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93cdaf72a1dad537bbb130ba4d47307ebe5170405280ed1aa31fa712718a400e" -dependencies = [ - "bounded-collections", - "parity-scale-codec", - "scale-info", - "serde", - "smallvec", - "sp-arithmetic 26.0.0", - "sp-debug-derive", -] - [[package]] name = "spin" version = "0.5.2" @@ -13604,15 +12003,6 @@ dependencies = [ "strum 0.24.1", ] -[[package]] -name = "spinning_top" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" -dependencies = [ - "lock_api", -] - [[package]] name = "spki" version = "0.7.3" @@ -13779,19 +12169,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "substrate-bip39" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca58ffd742f693dc13d69bdbb2e642ae239e0053f6aab3b104252892f856700a" -dependencies = [ - "hmac 0.12.1", - "pbkdf2 0.12.2", - "schnorrkel", - "sha2 0.10.8", - "zeroize", -] - [[package]] name = "substrate-build-script-utils" version = "11.0.0" @@ -13809,11 +12186,11 @@ dependencies = [ "jsonrpsee 0.20.3", "log", "parity-scale-codec", - "sc-rpc-api 0.34.0", - "sc-transaction-pool-api 29.0.0", - "sp-api 27.0.0", - "sp-block-builder 27.0.0", - "sp-blockchain 29.0.0", + "sc-rpc-api", + "sc-transaction-pool-api", + "sp-api", + "sp-block-builder", + "sp-blockchain", "sp-core 29.0.0", "sp-runtime 32.0.0", ] @@ -13833,23 +12210,23 @@ dependencies = [ [[package]] name = "substrate-rpc-client" -version = "0.37.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812076602836d6d90242c431729814c790c49685d142f47ec41f3b897a5fb6ad" +checksum = "40e5235d8460ec81e9a382345aa80d75e2943f224a332559847344bb62fa13b3" dependencies = [ "async-trait", - "jsonrpsee 0.22.4", + "jsonrpsee 0.20.3", "log", - "sc-rpc-api 0.37.0", + "sc-rpc-api", "serde", - "sp-runtime 35.0.0", + "sp-runtime 32.0.0", ] [[package]] name = "substrate-wasm-builder" -version = "18.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511bbc2df035f5fe2556d855369a1bbb45df620360391a1f6e3fa1a1d64af79a" +checksum = "4a39a20e17c24ede36b5bd5e7543a4cef8d8a0daf6e1a046dc31832b837a54a0" dependencies = [ "build-helper", "cargo_metadata", @@ -14817,37 +13194,37 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "try-runtime-cli" -version = "0.42.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45904e10377e9973238ae9e52bd0fbbb0bba5d7be9198458ba9d3fe0a4173ed" +checksum = "9454e1af0a0be675f837d63080ef8f43510c05df8c059570622386a0cf40b548" dependencies = [ "async-trait", "clap", "frame-remote-externalities", - "frame-try-runtime 0.38.0", + "frame-try-runtime", "hex", "log", "parity-scale-codec", - "sc-cli 0.40.0", - "sc-executor 0.36.0", + "sc-cli", + "sc-executor", "serde", "serde_json", - "sp-api 30.0.0", + "sp-api", "sp-consensus-aura", - "sp-consensus-babe 0.36.0", - "sp-core 32.0.0", + "sp-consensus-babe", + "sp-core 29.0.0", "sp-debug-derive", - "sp-externalities 0.28.0", - "sp-inherents 30.0.0", - "sp-io 34.0.0", - "sp-keystore 0.38.0", - "sp-rpc 30.0.0", - "sp-runtime 35.0.0", - "sp-state-machine 0.39.0", - "sp-timestamp 30.0.0", - "sp-transaction-storage-proof 30.0.0", - "sp-version 33.0.0", - "sp-weights 31.0.0", + "sp-externalities 0.26.0", + "sp-inherents", + "sp-io 31.0.0", + "sp-keystore 0.35.0", + "sp-rpc", + "sp-runtime 32.0.0", + "sp-state-machine 0.36.0", + "sp-timestamp", + "sp-transaction-storage-proof", + "sp-version", + "sp-weights 28.0.0", "substrate-rpc-client", "zstd 0.12.4", ] diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index a23ed0153..b55a80ef6 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -27,67 +27,67 @@ itertools ="0.13.0" jsonrpsee ={ version="0.20.3", features=["server"] } lazy_static ={ version="1.5.0", features=["spin_no_std"] } log ="0.4.22" -pallet-im-online={ version="28.0.0" } +pallet-im-online= { version = "28.0.0" } rand ="0.8.5" serde ={ version="1.0.213", features=["derive"] } serde_json ='1.0.132' # Substrate Client -grandpa ={ version="0.20.0", package="sc-consensus-grandpa" } -sc-authority-discovery ={ version="0.35.0" } -sc-basic-authorship ={ version="0.35.0" } -sc-chain-spec ={ version="28.0.0" } -sc-cli ={ version="0.37.0", optional=true } -sc-client-api ={ version="29.0.0" } -sc-consensus ={ version="0.34.0" } -sc-consensus-babe ={ version="0.35.0" } -sc-consensus-babe-rpc ={ version="0.35.0" } -sc-consensus-epochs ={ version="0.34.0" } -sc-consensus-grandpa-rpc={ version="0.20.0" } -sc-consensus-slots ={ version="0.34.0" } -sc-executor ={ version="0.33.0" } -sc-network ={ version="0.35.0" } -sc-network-common ={ version="0.34.0" } -sc-network-sync ={ version="0.34.0" } -sc-offchain ={ version="30.0.0" } -sc-rpc ={ version="30.0.0" } -sc-rpc-api ={ version="0.34.0" } -sc-service ={ version="0.36.0" } -sc-storage-monitor ={ version="0.17.0" } -sc-sync-state-rpc ={ version="0.35.0" } -sc-sysinfo ={ version="28.0.0" } -sc-telemetry ={ version="16.0.0" } -sc-transaction-pool ={ version="29.0.0" } -sc-transaction-pool-api ={ version="29.0.0" } -sc-rpc-spec-v2 ={ version="0.35.0" } +grandpa = { version = "0.20.0", package = "sc-consensus-grandpa" } +sc-authority-discovery = { version = "0.35.0" } +sc-basic-authorship = { version = "0.35.0" } +sc-chain-spec = { version = "28.0.0" } +sc-cli = { version = "0.37.0", optional = true } +sc-client-api = { version = "29.0.0" } +sc-consensus = { version = "0.34.0" } +sc-consensus-babe = { version = "0.35.0" } +sc-consensus-babe-rpc = { version = "0.35.0" } +sc-consensus-epochs = { version = "0.34.0" } +sc-consensus-grandpa-rpc= { version = "0.20.0" } +sc-consensus-slots = { version = "0.34.0" } +sc-executor = { version = "0.33.0" } +sc-network = { version = "0.35.0" } +sc-network-common = { version = "0.34.0" } +sc-network-sync = { version = "0.34.0" } +sc-offchain = { version = "30.0.0" } +sc-rpc = { version = "30.0.0" } +sc-rpc-api = { version = "0.34.0" } +sc-service = { version = "0.36.0" } +sc-storage-monitor = { version = "0.17.0" } +sc-sync-state-rpc = { version = "0.35.0" } +sc-sysinfo = { version = "28.0.0" } +sc-telemetry = { version = "16.0.0" } +sc-transaction-pool = { version = "29.0.0" } +sc-transaction-pool-api = { version = "29.0.0" } +sc-rpc-spec-v2 = { version = "0.35.0" } # Substrate Primitives -grandpa-primitives ={ version="14.0.0", package="sp-consensus-grandpa" } -sp-api ={ version="27.0.0" } -sp-authority-discovery ={ version="27.0.0" } -sp-block-builder ={ version="27.0.0" } -sp-blockchain ={ version="29.0.0" } -sp-consensus ={ version="0.33.0" } -sp-consensus-babe ={ version="0.33.0" } -sp-core ={ version="29.0.0" } -sp-inherents ={ version="27.0.0" } -sp-keyring ={ version="32.0.0" } -sp-keystore ={ version="0.35.0" } -sp-runtime ={ version="32.0.0" } -sp-timestamp ={ version="27.0.0" } -sp-transaction-storage-proof={ version="27.0.0" } -substrate-frame-rpc-system ={ version="29.0.0" } +grandpa-primitives = { version = "14.0.0", package = "sp-consensus-grandpa" } +sp-api = { version = "27.0.1" } +sp-authority-discovery = { version = "27.0.0" } +sp-block-builder = { version = "27.0.0" } +sp-blockchain = { version = "29.0.0" } +sp-consensus = { version = "0.33.0" } +sp-consensus-babe = { version = "0.33.0" } +sp-core = { version = "29.0.0" } +sp-inherents = { version = "27.0.0" } +sp-keyring = { version = "32.0.0" } +sp-keystore = { version = "0.35.0" } +sp-runtime = { version = "32.0.0" } +sp-timestamp = { version = "27.0.0" } +sp-transaction-storage-proof= { version = "27.0.0" } +substrate-frame-rpc-system = { version = "29.0.0" } # FRAME Dependencies -frame-benchmarking ={ version="29.0.0" } -frame-benchmarking-cli ={ version="33.0.0", optional=true } -frame-system ={ version="29.0.0" } -frame-system-rpc-runtime-api={ version="27.0.0" } +frame-benchmarking = { version = "29.0.0" } +frame-benchmarking-cli = { version = "33.0.0", optional = true } +frame-system = { version = "29.0.0" } +frame-system-rpc-runtime-api= { version = "27.0.0" } # Substrate Pallets -pallet-transaction-payment ={ version="29.0.0" } -pallet-transaction-payment-rpc={ version="31.0.0" } +pallet-transaction-payment = { version = "29.0.2" } +pallet-transaction-payment-rpc= { version = "31.0.0" } # Entropy Dependencies entropy-runtime={ version="0.3.0-rc.1", path="../../runtime" } @@ -101,13 +101,13 @@ project-root="0.2.2" [build-dependencies] clap={ version="4.5.20", optional=true } -pallet-balances ={ version="29.0.0" } -substrate-build-script-utils={ version="11.0.0" } -try-runtime-cli ={ version="0.42.0" } +pallet-balances = { version = "29.0.2" } +substrate-build-script-utils= { version = "11.0.0" } +try-runtime-cli = { version = "0.39.0" } [dev-dependencies] tempfile ="3.13.0" -sp-tracing={ version="16.0.0" } +sp-tracing= { version = "16.0.0" } [features] default=["cli"] diff --git a/pallets/attestation/Cargo.toml b/pallets/attestation/Cargo.toml index a5e282d9d..b283d59f7 100644 --- a/pallets/attestation/Cargo.toml +++ b/pallets/attestation/Cargo.toml @@ -12,15 +12,15 @@ publish =false codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] } scale-info ={ version="2.11", default-features=false, features=["derive"] } log ={ version="0.4.22", default-features=false } -frame-support ={ version="29.0.0", default-features=false } -frame-system ={ version="29.0.0", default-features=false } -sp-io ={ version="31.0.0", default-features=false } -sp-core ={ version="29.0.0", default-features=false } -sp-runtime ={ version="32.0.0", default-features=false } -sp-staking ={ version="27.0.0", default-features=false } -frame-benchmarking={ version="29.0.0", default-features=false, optional=true } -sp-std ={ version="14.0.0", default-features=false } -pallet-session ={ version="29.0.0", default-features=false, optional=true } +frame-support = { version = "29.0.2", default-features = false } +frame-system = { version = "29.0.0", default-features = false } +sp-io = { version = "31.0.0", default-features = false } +sp-core = { version = "29.0.0", default-features = false } +sp-runtime = { version = "32.0.0", default-features = false } +sp-staking = { version = "27.0.0", default-features = false } +frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } +sp-std = { version = "14.0.0", default-features = false } +pallet-session = { version = "29.0.0", default-features = false, optional = true } rand_chacha ={ version="0.3", default-features=false } pallet-parameters={ version="0.3.0-rc.1", path="../parameters", default-features=false } @@ -31,14 +31,14 @@ pallet-staking-extension={ version="0.3.0-rc.1", path="../staking", default-feat tdx-quote="0.0.1" [dev-dependencies] -pallet-session ={ version="29.0.0", default-features=false } -pallet-staking ={ version="29.0.0", default-features=false } -pallet-balances ={ version="29.0.0", default-features=false } -pallet-bags-list ={ version="28.0.0", default-features=false } -pallet-timestamp ={ version="28.0.0", default-features=false } -sp-npos-elections ={ version="27.0.0", default-features=false } -frame-election-provider-support={ version="29.0.0", default-features=false } -pallet-staking-reward-curve ={ version="11.0.0" } +pallet-session = { version = "29.0.0", default-features = false } +pallet-staking = { version = "29.0.3", default-features = false } +pallet-balances = { version = "29.0.2", default-features = false } +pallet-bags-list = { version = "28.0.0", default-features = false } +pallet-timestamp = { version = "28.0.0", default-features = false } +sp-npos-elections = { version = "27.0.0", default-features = false } +frame-election-provider-support= { version = "29.0.0", default-features = false } +pallet-staking-reward-curve = { version = "11.0.0" } tdx-quote ={ version="0.0.1", features=["mock"] } rand_core ="0.6.4" diff --git a/pallets/oracle/Cargo.toml b/pallets/oracle/Cargo.toml index 81f3612dd..bd2967b57 100644 --- a/pallets/oracle/Cargo.toml +++ b/pallets/oracle/Cargo.toml @@ -12,15 +12,15 @@ publish =false codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] } scale-info={ version="2.11", default-features=false, features=["derive"] } -frame-benchmarking={ version="29.0.0", default-features=false, optional=true } -frame-support ={ version="29.0.0", default-features=false } -frame-system ={ version="29.0.0", default-features=false } -sp-runtime ={ version="32.0.0", default-features=false } -sp-std ={ version="14.0.0", default-features=false } +frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } +frame-support = { version = "29.0.2", default-features = false } +frame-system = { version = "29.0.0", default-features = false } +sp-runtime = { version = "32.0.0", default-features = false } +sp-std = { version = "14.0.0", default-features = false } [dev-dependencies] -sp-core={ version="29.0.0" } -sp-io ={ version="31.0.0" } +sp-core= { version = "29.0.0" } +sp-io = { version = "31.0.0" } [features] default=["std"] diff --git a/pallets/parameters/Cargo.toml b/pallets/parameters/Cargo.toml index ad3932b32..6143c3a71 100644 --- a/pallets/parameters/Cargo.toml +++ b/pallets/parameters/Cargo.toml @@ -12,21 +12,21 @@ publish =false codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] } scale-info={ version="2.11", default-features=false, features=["derive"] } -frame-benchmarking={ version="29.0.0", default-features=false, optional=true } -frame-support ={ version="29.0.0", default-features=false } -frame-system ={ version="29.0.0", default-features=false } -sp-runtime ={ version="32.0.0", default-features=false } -sp-std ={ version="14.0.0", default-features=false } -pallet-session ={ version="29.0.0", default-features=false } +frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } +frame-support = { version = "29.0.2", default-features = false } +frame-system = { version = "29.0.0", default-features = false } +sp-runtime = { version = "32.0.0", default-features = false } +sp-std = { version = "14.0.0", default-features = false } +pallet-session = { version = "29.0.0", default-features = false } entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", features=[ "wasm-no-std", ], default-features=false } [dev-dependencies] -sp-core ={ version="29.0.0" } -sp-io ={ version="31.0.0" } -sp-staking={ version="27.0.0", default-features=false } +sp-core = { version = "29.0.0" } +sp-io = { version = "31.0.0" } +sp-staking= { version = "27.0.0", default-features = false } [features] default=["std"] diff --git a/pallets/programs/Cargo.toml b/pallets/programs/Cargo.toml index d4d3c3002..ba281ebee 100644 --- a/pallets/programs/Cargo.toml +++ b/pallets/programs/Cargo.toml @@ -16,17 +16,17 @@ codec ={ package="parity-scale-codec", version="3.6.3", default-features=fal scale-info={ version="2.11", default-features=false, features=["derive"] } log ={ version="0.4.22", default-features=false } -frame-benchmarking={ version="29.0.0", default-features=false, optional=true } -frame-support ={ version="29.0.0", default-features=false } -frame-system ={ version="29.0.0", default-features=false } -sp-io ={ version="31.0.0", default-features=false } -sp-runtime ={ version="32.0.0", default-features=false } -sp-staking ={ version="27.0.0", default-features=false } -sp-std ={ version="14.0.0", default-features=false } +frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } +frame-support = { version = "29.0.2", default-features = false } +frame-system = { version = "29.0.0", default-features = false } +sp-io = { version = "31.0.0", default-features = false } +sp-runtime = { version = "32.0.0", default-features = false } +sp-staking = { version = "27.0.0", default-features = false } +sp-std = { version = "14.0.0", default-features = false } [dev-dependencies] -pallet-balances={ version="29.0.0" } -sp-core ={ version="29.0.0", default-features=false } +pallet-balances= { version = "29.0.2" } +sp-core = { version = "29.0.0", default-features = false } [features] default=['std'] diff --git a/pallets/propagation/Cargo.toml b/pallets/propagation/Cargo.toml index b21818add..85ae5e86b 100644 --- a/pallets/propagation/Cargo.toml +++ b/pallets/propagation/Cargo.toml @@ -16,15 +16,15 @@ codec ={ package="parity-scale-codec", version="3.6.3", default-features=fal log ={ version="0.4.22", default-features=false } scale-info={ version="2.11", default-features=false, features=["derive"] } -frame-benchmarking ={ version="29.0.0", default-features=false, optional=true } -frame-support ={ version="29.0.0", default-features=false } -frame-system ={ version="29.0.0", default-features=false } -pallet-authorship ={ version="29.0.0", default-features=false } -sp-application-crypto={ version="31.0.0", default-features=false } -sp-core ={ version="29.0.0", default-features=false } -sp-io ={ version="31.0.0", default-features=false } -sp-runtime ={ version="32.0.0", default-features=false } -sp-staking ={ version="27.0.0", default-features=false } +frame-benchmarking = { version = "29.0.0", default-features = false, optional = true } +frame-support = { version = "29.0.2", default-features = false } +frame-system = { version = "29.0.0", default-features = false } +pallet-authorship = { version = "29.0.0", default-features = false } +sp-application-crypto= { version = "31.0.0", default-features = false } +sp-core = { version = "29.0.0", default-features = false } +sp-io = { version = "31.0.0", default-features = false } +sp-runtime = { version = "32.0.0", default-features = false } +sp-staking = { version = "27.0.0", default-features = false } entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", default-features=false, features=[ "wasm-no-std", @@ -37,16 +37,16 @@ pallet-attestation={ version="0.3.0-rc.1", path="../attestation", default-featur [dev-dependencies] parking_lot="0.12.3" -frame-election-provider-support={ version="29.0.0", default-features=false } -pallet-babe ={ version="29.0.0", default-features=false } -pallet-bags-list ={ version="28.0.0", default-features=false } -pallet-balances ={ version="29.0.0", default-features=false } -pallet-session ={ version="29.0.0", default-features=false } -pallet-staking ={ version="29.0.0", default-features=false } -pallet-staking-reward-curve ={ version="11.0.0" } -pallet-timestamp ={ version="28.0.0", default-features=false } -sp-keystore ={ version="0.35.0" } -sp-npos-elections ={ version="27.0.0", default-features=false } +frame-election-provider-support= { version = "29.0.0", default-features = false } +pallet-babe = { version = "29.0.0", default-features = false } +pallet-bags-list = { version = "28.0.0", default-features = false } +pallet-balances = { version = "29.0.2", default-features = false } +pallet-session = { version = "29.0.0", default-features = false } +pallet-staking = { version = "29.0.3", default-features = false } +pallet-staking-reward-curve = { version = "11.0.0" } +pallet-timestamp = { version = "28.0.0", default-features = false } +sp-keystore = { version = "0.35.0" } +sp-npos-elections = { version = "27.0.0", default-features = false } pallet-parameters ={ version="0.3.0-rc.1", path="../parameters", default-features=false } [features] diff --git a/pallets/registry/Cargo.toml b/pallets/registry/Cargo.toml index a8bbc0922..7e404cdcd 100644 --- a/pallets/registry/Cargo.toml +++ b/pallets/registry/Cargo.toml @@ -19,15 +19,15 @@ scale-info={ version="2.11", default-features=false, features=["derive"] } synedrion ={ version="0.2.0-beta.0", default-features=false } rand ={ version="0.8.5", default-features=false, features=["alloc"] } -frame-benchmarking={ version="29.0.0", default-features=false, optional=true } -frame-support ={ version="29.0.0", default-features=false } -frame-system ={ version="29.0.0", default-features=false } -pallet-authorship ={ version="29.0.0", default-features=false } -pallet-session ={ version="29.0.0", default-features=false } -pallet-staking ={ version="29.0.0", default-features=false } -sp-core ={ version="29.0.0", default-features=false } -sp-runtime ={ version="32.0.0", default-features=false } -sp-std ={ version="14.0.0", default-features=false } +frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } +frame-support = { version = "29.0.2", default-features = false } +frame-system = { version = "29.0.0", default-features = false } +pallet-authorship = { version = "29.0.0", default-features = false } +pallet-session = { version = "29.0.0", default-features = false } +pallet-staking = { version = "29.0.3", default-features = false } +sp-core = { version = "29.0.0", default-features = false } +sp-runtime = { version = "32.0.0", default-features = false } +sp-std = { version = "14.0.0", default-features = false } entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", features=[ "wasm-no-std", @@ -37,14 +37,14 @@ pallet-staking-extension={ version="0.3.0-rc.1", path="../staking", default-feat pallet-parameters={ version="0.3.0-rc.1", path="../parameters", default-features=false } [dev-dependencies] -frame-election-provider-support={ version="29.0.0", default-features=false } -pallet-bags-list ={ version="28.0.0", default-features=false } -pallet-balances ={ version="29.0.0", default-features=false } -pallet-staking-reward-curve ={ version="11.0.0" } -pallet-timestamp ={ version="28.0.0", default-features=false } -sp-io ={ version="31.0.0", default-features=false } -sp-npos-elections ={ version="27.0.0", default-features=false } -sp-staking ={ version="27.0.0", default-features=false } +frame-election-provider-support= { version = "29.0.0", default-features = false } +pallet-bags-list = { version = "28.0.0", default-features = false } +pallet-balances = { version = "29.0.2", default-features = false } +pallet-staking-reward-curve = { version = "11.0.0" } +pallet-timestamp = { version = "28.0.0", default-features = false } +sp-io = { version = "31.0.0", default-features = false } +sp-npos-elections = { version = "27.0.0", default-features = false } +sp-staking = { version = "27.0.0", default-features = false } [features] diff --git a/pallets/slashing/Cargo.toml b/pallets/slashing/Cargo.toml index 7e3c90df8..99d352a7d 100644 --- a/pallets/slashing/Cargo.toml +++ b/pallets/slashing/Cargo.toml @@ -16,25 +16,25 @@ codec ={ package="parity-scale-codec", version="3.6.3", default-features=fal scale-info={ version="2.11", default-features=false, features=["derive"] } log ={ version="0.4.22", default-features=false } -frame-benchmarking ={ version="29.0.0", default-features=false, optional=true } -frame-support ={ version="29.0.0", default-features=false } -frame-system ={ version="29.0.0", default-features=false } -sp-application-crypto={ version="31.0.0", default-features=false } -sp-io ={ version="31.0.0", default-features=false } -sp-runtime ={ version="32.0.0", default-features=false } -sp-staking ={ version="27.0.0", default-features=false } -sp-std ={ version="14.0.0", default-features=false } +frame-benchmarking = { version = "29.0.0", default-features = false, optional = true } +frame-support = { version = "29.0.2", default-features = false } +frame-system = { version = "29.0.0", default-features = false } +sp-application-crypto= { version = "31.0.0", default-features = false } +sp-io = { version = "31.0.0", default-features = false } +sp-runtime = { version = "32.0.0", default-features = false } +sp-staking = { version = "27.0.0", default-features = false } +sp-std = { version = "14.0.0", default-features = false } [dev-dependencies] -frame-election-provider-support={ version="29.0.0", default-features=false } -pallet-bags-list ={ version="28.0.0", default-features=false } -pallet-balances ={ version="29.0.0", default-features=false } -pallet-session ={ version="29.0.0", default-features=false } -pallet-staking ={ version="29.0.0", default-features=false } -pallet-staking-reward-curve ={ version="11.0.0", default-features=false } -pallet-timestamp ={ version="28.0.0", default-features=false } -sp-core ={ version="29.0.0", default-features=false } -sp-npos-elections ={ version="27.0.0", default-features=false } +frame-election-provider-support= { version = "29.0.0", default-features = false } +pallet-bags-list = { version = "28.0.0", default-features = false } +pallet-balances = { version = "29.0.2", default-features = false } +pallet-session = { version = "29.0.0", default-features = false } +pallet-staking = { version = "29.0.3", default-features = false } +pallet-staking-reward-curve = { version = "11.0.0", default-features = false } +pallet-timestamp = { version = "28.0.0", default-features = false } +sp-core = { version = "29.0.0", default-features = false } +sp-npos-elections = { version = "27.0.0", default-features = false } [features] default=['std'] diff --git a/pallets/staking/Cargo.toml b/pallets/staking/Cargo.toml index 5729b1850..ff4a1a6cb 100644 --- a/pallets/staking/Cargo.toml +++ b/pallets/staking/Cargo.toml @@ -18,16 +18,16 @@ log ={ version="0.4.22", default-features=false } serde ={ version="1.0.213", default-features=false } rand_chacha={ version="0.3", default-features=false } -frame-benchmarking={ version="29.0.0", default-features=false, optional=true } -frame-support ={ version="29.0.0", default-features=false } -frame-system ={ version="29.0.0", default-features=false } -pallet-session ={ version="29.0.0", default-features=false } -pallet-staking ={ version="29.0.0", default-features=false } -sp-core ={ version="29.0.0", default-features=false } -sp-runtime ={ version="32.0.0", default-features=false } -sp-staking ={ version="27.0.0", default-features=false } -sp-std ={ version="14.0.0", default-features=false } -sp-consensus-babe ={ version="0.33.0", default-features=false } +frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } +frame-support = { version = "29.0.2", default-features = false } +frame-system = { version = "29.0.0", default-features = false } +pallet-session = { version = "29.0.0", default-features = false } +pallet-staking = { version = "29.0.3", default-features = false } +sp-core = { version = "29.0.0", default-features = false } +sp-runtime = { version = "32.0.0", default-features = false } +sp-staking = { version = "27.0.0", default-features = false } +sp-std = { version = "14.0.0", default-features = false } +sp-consensus-babe = { version = "0.33.0", default-features = false } pallet-parameters={ version="0.3.0-rc.1", path="../parameters", default-features=false } entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", features=[ @@ -39,13 +39,13 @@ entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", features=[ tdx-quote={ version="0.0.1", features=["mock"], optional=true } [dev-dependencies] -frame-election-provider-support={ version="29.0.0", default-features=false } -pallet-bags-list ={ version="28.0.0", default-features=false } -pallet-balances ={ version="29.0.0", default-features=false } -pallet-staking-reward-curve ={ version="11.0.0" } -pallet-timestamp ={ version="28.0.0", default-features=false } -sp-io ={ version="31.0.0", default-features=false } -sp-npos-elections ={ version="27.0.0", default-features=false } +frame-election-provider-support= { version = "29.0.0", default-features = false } +pallet-bags-list = { version = "28.0.0", default-features = false } +pallet-balances = { version = "29.0.2", default-features = false } +pallet-staking-reward-curve = { version = "11.0.0" } +pallet-timestamp = { version = "28.0.0", default-features = false } +sp-io = { version = "31.0.0", default-features = false } +sp-npos-elections = { version = "27.0.0", default-features = false } rand_core="0.6.4" tdx-quote={ version="0.0.1", features=["mock"] } diff --git a/pallets/transaction-pause/Cargo.toml b/pallets/transaction-pause/Cargo.toml index c9a349a98..3f968fe12 100644 --- a/pallets/transaction-pause/Cargo.toml +++ b/pallets/transaction-pause/Cargo.toml @@ -12,18 +12,18 @@ publish =false codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] } scale-info={ version="2.11", default-features=false, features=["derive"] } -frame-benchmarking={ version="29.0.0", default-features=false, optional=true } -frame-support ={ version="29.0.0", default-features=false } -frame-system ={ version="29.0.0", default-features=false } -sp-runtime ={ version="32.0.0", default-features=false } -sp-std ={ version="14.0.0", default-features=false } +frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } +frame-support = { version = "29.0.2", default-features = false } +frame-system = { version = "29.0.0", default-features = false } +sp-runtime = { version = "32.0.0", default-features = false } +sp-std = { version = "14.0.0", default-features = false } [dev-dependencies] smallvec="1.13.2" -pallet-balances={ version="29.0.0" } -sp-core ={ version="29.0.0" } -sp-io ={ version="31.0.0" } +pallet-balances= { version = "29.0.2" } +sp-core = { version = "29.0.0" } +sp-io = { version = "31.0.0" } pallet-programs={ version="0.3.0-rc.1", default-features=false, path="../programs" } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index fd90c6247..41d412440 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -26,73 +26,73 @@ scale-info={ version="2.11", default-features=false, features=["derive"] } static_assertions="1.1.0" # Substrate Primitives -sp-api ={ version="27.0.0", default-features=false } -sp-authority-discovery={ version="27.0.0", default-features=false } -sp-block-builder ={ version="27.0.0", default-features=false } -sp-consensus-babe ={ version="0.33.0", default-features=false } -sp-core ={ version="29.0.0", default-features=false } -sp-inherents ={ version="27.0.0", default-features=false } -sp-io ={ version="31.0.0", default-features=false } -sp-npos-elections ={ version="27.0.0", default-features=false } -sp-offchain ={ version="27.0.0", default-features=false } -sp-runtime ={ version="32.0.0", default-features=false } -sp-session ={ version="28.0.0", default-features=false } -sp-staking ={ version="27.0.0", default-features=false } -sp-std ={ version="14.0.0", default-features=false } -sp-storage ={ version="20.0.0", default-features=false, optional=true } -sp-transaction-pool ={ version="27.0.0", default-features=false } -sp-version ={ version="30.0.0", default-features=false } -sp-genesis-builder ={ version="0.8.0", default-features=false } +sp-api = { version = "27.0.1", default-features = false } +sp-authority-discovery= { version = "27.0.0", default-features = false } +sp-block-builder = { version = "27.0.0", default-features = false } +sp-consensus-babe = { version = "0.33.0", default-features = false } +sp-core = { version = "29.0.0", default-features = false } +sp-inherents = { version = "27.0.0", default-features = false } +sp-io = { version = "31.0.0", default-features = false } +sp-npos-elections = { version = "27.0.0", default-features = false } +sp-offchain = { version = "27.0.0", default-features = false } +sp-runtime = { version = "32.0.0", default-features = false } +sp-session = { version = "28.0.0", default-features = false } +sp-staking = { version = "27.0.0", default-features = false } +sp-std = { version = "14.0.0", default-features = false } +sp-storage = { version = "20.0.0", default-features = false, optional = true } +sp-transaction-pool = { version = "27.0.0", default-features = false } +sp-version = { version = "30.0.0", default-features = false } +sp-genesis-builder = { version = "0.8.0", default-features = false } # FRAME Dependencies -frame-benchmarking ={ version="29.0.0", default-features=false, optional=true } -frame-election-provider-support={ version="29.0.0", default-features=false } -frame-executive ={ version="29.0.0", default-features=false } -frame-support ={ version="29.0.0", default-features=false } -frame-system ={ version="29.0.0", default-features=false } -frame-system-benchmarking ={ version="29.0.0", default-features=false, optional=true } -frame-system-rpc-runtime-api ={ version="27.0.0", default-features=false } -frame-try-runtime ={ version="0.35.0", default-features=false, optional=true } +frame-benchmarking = { version = "29.0.0", default-features = false, optional = true } +frame-election-provider-support= { version = "29.0.0", default-features = false } +frame-executive = { version = "29.0.0", default-features = false } +frame-support = { version = "29.0.2", default-features = false } +frame-system = { version = "29.0.0", default-features = false } +frame-system-benchmarking = { version = "29.0.0", default-features = false, optional = true } +frame-system-rpc-runtime-api = { version = "27.0.0", default-features = false } +frame-try-runtime = { version = "0.35.0", default-features = false, optional = true } # Substrate Pallets -pallet-authority-discovery ={ version="29.0.0", default-features=false } -pallet-authorship ={ version="29.0.0", default-features=false } -pallet-babe ={ version="29.0.0", default-features=false } -pallet-bags-list ={ version="28.0.0", default-features=false } -pallet-balances ={ version="29.0.0", default-features=false } -pallet-bounties ={ version="28.0.0", default-features=false } -pallet-collective ={ version="29.0.0", default-features=false } -pallet-democracy ={ version="29.0.0", default-features=false } -pallet-election-provider-multi-phase ={ version="28.0.0", default-features=false } -pallet-election-provider-support-benchmarking={ version="28.0.0", default-features=false, optional=true } -pallet-elections-phragmen ={ version="30.0.0", default-features=false } -pallet-grandpa ={ version="29.0.0", default-features=false } -pallet-identity ={ version="29.0.0", default-features=false } -pallet-im-online ={ version="28.0.0", default-features=false } -pallet-indices ={ version="29.0.0", default-features=false } -pallet-membership ={ version="29.0.0", default-features=false } -pallet-multisig ={ version="29.0.0", default-features=false } -pallet-nomination-pools ={ version="26.0.0", default-features=false } -pallet-nomination-pools-benchmarking ={ version="27.0.0", default-features=false, optional=true } -pallet-offences ={ version="28.0.0", default-features=false } -pallet-offences-benchmarking ={ version="29.0.0", default-features=false, optional=true } -pallet-preimage ={ version="29.0.0", default-features=false } -pallet-proxy ={ version="29.0.0", default-features=false } -pallet-recovery ={ version="29.0.0", default-features=false } -pallet-scheduler ={ version="30.0.0", default-features=false } -pallet-session-benchmarking ={ version="29.0.0", default-features=false, optional=true } -pallet-session ={ version="29.0.0", default-features=false, features=["historical"] } -pallet-staking ={ version="29.0.0", default-features=false } -pallet-staking-reward-curve ={ version="11.0.0", default-features=false } -pallet-sudo ={ version="29.0.0", default-features=false, optional=true } -pallet-timestamp ={ version="28.0.0", default-features=false } -pallet-tips ={ version="28.0.0", default-features=false } -pallet-transaction-payment ={ version="29.0.0", default-features=false } -pallet-transaction-payment-rpc-runtime-api ={ version="29.0.0", default-features=false } -pallet-transaction-storage ={ version="28.0.0", default-features=false } -pallet-treasury ={ version="28.0.0", default-features=false } -pallet-utility ={ version="29.0.0", default-features=false } -pallet-vesting ={ version="29.0.0", default-features=false } +pallet-authority-discovery = { version = "29.0.1", default-features = false } +pallet-authorship = { version = "29.0.0", default-features = false } +pallet-babe = { version = "29.0.0", default-features = false } +pallet-bags-list = { version = "28.0.0", default-features = false } +pallet-balances = { version = "29.0.2", default-features = false } +pallet-bounties = { version = "28.0.0", default-features = false } +pallet-collective = { version = "29.0.0", default-features = false } +pallet-democracy = { version = "29.0.0", default-features = false } +pallet-election-provider-multi-phase = { version = "28.0.0", default-features = false } +pallet-election-provider-support-benchmarking= { version = "28.0.0", default-features = false, optional = true } +pallet-elections-phragmen = { version = "30.0.0", default-features = false } +pallet-grandpa = { version = "29.0.0", default-features = false } +pallet-identity = { version = "29.0.1", default-features = false } +pallet-im-online = { version = "28.0.0", default-features = false } +pallet-indices = { version = "29.0.0", default-features = false } +pallet-membership = { version = "29.0.0", default-features = false } +pallet-multisig = { version = "29.0.0", default-features = false } +pallet-nomination-pools = { version = "26.0.1", default-features = false } +pallet-nomination-pools-benchmarking = { version = "27.0.0", default-features = false, optional = true } +pallet-offences = { version = "28.0.0", default-features = false } +pallet-offences-benchmarking = { version = "29.0.0", default-features = false, optional = true } +pallet-preimage = { version = "29.0.0", default-features = false } +pallet-proxy = { version = "29.0.0", default-features = false } +pallet-recovery = { version = "29.0.0", default-features = false } +pallet-scheduler = { version = "30.0.0", default-features = false } +pallet-session-benchmarking = { version = "29.0.0", default-features = false, optional = true } +pallet-session = { version = "29.0.0", default-features = false, features = ["historical"] } +pallet-staking = { version = "29.0.3", default-features = false } +pallet-staking-reward-curve = { version = "11.0.0", default-features = false } +pallet-sudo = { version = "29.0.0", default-features = false, optional = true } +pallet-timestamp = { version = "28.0.0", default-features = false } +pallet-tips = { version = "28.0.0", default-features = false } +pallet-transaction-payment = { version = "29.0.2", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { version = "29.0.0", default-features = false } +pallet-transaction-storage = { version = "28.0.0", default-features = false } +pallet-treasury = { version = "28.0.1", default-features = false } +pallet-utility = { version = "29.0.0", default-features = false } +pallet-vesting = { version = "29.0.0", default-features = false } # Entropy Pallets pallet-programs ={ version='0.3.0-rc.1', path='../pallets/programs', default-features=false } @@ -110,7 +110,7 @@ entropy-shared={ version="0.3.0-rc.1", path="../crates/shared", default-features ] } [build-dependencies] -substrate-wasm-builder={ version="18.0.0", optional=true } +substrate-wasm-builder= { version = "18.0.1", optional = true } [features] default=["std"] From eec84becf04e125027a5e50a3e5322fd045afaff Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Tue, 29 Oct 2024 17:56:25 -0400 Subject: [PATCH 02/22] compilining polkadot-stable2409 --- Cargo.lock | 12071 ++++++++++++---- Cargo.toml | 2 +- crates/client/Cargo.toml | 9 +- crates/client/src/client.rs | 2 +- crates/client/src/errors.rs | 4 + crates/client/src/substrate.rs | 18 +- crates/kvdb/Cargo.toml | 2 +- crates/protocol/Cargo.toml | 6 +- crates/protocol/src/lib.rs | 2 +- crates/shared/Cargo.toml | 8 +- crates/test-cli/Cargo.toml | 6 +- crates/testing-utils/Cargo.toml | 6 +- crates/threshold-signature-server/Cargo.toml | 7 +- .../src/user/tests.rs | 2 +- .../tests/helpers/mod.rs | 2 +- node/cli/Cargo.toml | 110 +- node/cli/src/chain_spec/dev.rs | 3 +- node/cli/src/chain_spec/integration_tests.rs | 3 +- node/cli/src/chain_spec/mod.rs | 2 +- node/cli/src/chain_spec/testnet.rs | 3 +- node/cli/src/cli.rs | 4 + node/cli/src/command.rs | 14 +- node/cli/src/rpc.rs | 16 +- node/cli/src/service.rs | 81 +- pallets/attestation/Cargo.toml | 33 +- pallets/attestation/src/mock.rs | 1 - pallets/oracle/Cargo.toml | 13 +- pallets/parameters/Cargo.toml | 17 +- pallets/programs/Cargo.toml | 16 +- pallets/propagation/Cargo.toml | 38 +- pallets/propagation/src/mock.rs | 1 - pallets/registry/Cargo.toml | 33 +- pallets/registry/src/mock.rs | 1 - pallets/slashing/Cargo.toml | 32 +- pallets/staking/Cargo.toml | 33 +- pallets/staking/src/mock.rs | 1 - pallets/transaction-pause/Cargo.toml | 16 +- runtime/Cargo.toml | 131 +- runtime/src/lib.rs | 151 +- runtime/src/weights/pallet_balances.rs | 66 +- runtime/src/weights/pallet_membership.rs | 49 +- .../src/weights/pallet_nomination_pools.rs | 342 +- runtime/src/weights/pallet_scheduler.rs | 218 +- runtime/src/weights/pallet_treasury.rs | 153 +- scripts/create-test-keyshares/Cargo.toml | 2 +- 45 files changed, 10091 insertions(+), 3639 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 371233b34..e317e0586 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -32,18 +32,18 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ - "gimli 0.28.1", + "gimli 0.31.1", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aead" @@ -86,7 +86,7 @@ dependencies = [ "cipher 0.4.4", "ctr", "ghash", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -137,9 +137,68 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "alloy-primitives" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0628ec0ba5b98b3370bb6be17b12f23bfce8ee4ad83823325a20546d9b03b78" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if", + "const-hex", + "derive_more 0.99.18", + "hex-literal", + "itoa", + "proptest", + "rand", + "ruint", + "serde", + "tiny-keccak", +] + +[[package]] +name = "alloy-rlp" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0822426598f95e45dd1ea32a738dac057529a709ee645fcc516ffa4cbde08f" +dependencies = [ + "arrayvec 0.7.6", + "bytes", +] + +[[package]] +name = "alloy-sol-macro" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a98ad1696a2e17f010ae8e43e9f2a1e930ed176a8e3ff77acfeff6dfb07b42c" +dependencies = [ + "const-hex", + "dunce", + "heck 0.4.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.85", + "syn-solidity", + "tiny-keccak", +] + +[[package]] +name = "alloy-sol-types" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "98d7107bed88e8f09f0ddcc3335622d87bfb6821f3e0c7473329fb1cfad5e015" +dependencies = [ + "alloy-primitives", + "alloy-sol-macro", + "const-hex", + "serde", +] [[package]] name = "android-tzdata" @@ -167,50 +226,51 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -239,7 +299,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -255,8 +315,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f" dependencies = [ "ark-ec", - "ark-ff", - "ark-std", + "ark-ff 0.4.2", + "ark-std 0.4.0", +] + +[[package]] +name = "ark-bls12-377-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20c7021f180a0cbea0380eba97c2af3c57074cdaffe0eef7e840e1c9f2841e55" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-models-ext", + "ark-std 0.4.0", ] [[package]] @@ -266,9 +338,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" dependencies = [ "ark-ec", - "ark-ff", - "ark-serialize", - "ark-std", + "ark-ff 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", +] + +[[package]] +name = "ark-bls12-381-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1dc4b3d08f19e8ec06e949712f95b8361e43f1391d94f65e4234df03480631c" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff 0.4.2", + "ark-models-ext", + "ark-serialize 0.4.2", + "ark-std 0.4.0", +] + +[[package]] +name = "ark-bw6-761" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e0605daf0cc5aa2034b78d008aaf159f56901d92a52ee4f6ecdfdac4f426700" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-ff 0.4.2", + "ark-std 0.4.0", +] + +[[package]] +name = "ark-bw6-761-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccee5fba47266f460067588ee1bf070a9c760bf2050c1c509982c5719aadb4f2" +dependencies = [ + "ark-bw6-761", + "ark-ec", + "ark-ff 0.4.2", + "ark-models-ext", + "ark-std 0.4.0", ] [[package]] @@ -277,14 +388,83 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" dependencies = [ - "ark-ff", + "ark-ff 0.4.2", "ark-poly", - "ark-serialize", - "ark-std", + "ark-serialize 0.4.2", + "ark-std 0.4.0", "derivative", "hashbrown 0.13.2", "itertools 0.10.5", "num-traits", + "rayon", + "zeroize", +] + +[[package]] +name = "ark-ed-on-bls12-377" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10d901b9ac4b38f9c32beacedfadcdd64e46f8d7f8e88c1ae1060022cf6f6c6" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-ff 0.4.2", + "ark-std 0.4.0", +] + +[[package]] +name = "ark-ed-on-bls12-377-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524a4fb7540df2e1a8c2e67a83ba1d1e6c3947f4f9342cc2359fc2e789ad731d" +dependencies = [ + "ark-ec", + "ark-ed-on-bls12-377", + "ark-ff 0.4.2", + "ark-models-ext", + "ark-std 0.4.0", +] + +[[package]] +name = "ark-ed-on-bls12-381-bandersnatch" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff 0.4.2", + "ark-std 0.4.0", +] + +[[package]] +name = "ark-ed-on-bls12-381-bandersnatch-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15185f1acb49a07ff8cbe5f11a1adc5a93b19e211e325d826ae98e98e124346" +dependencies = [ + "ark-ec", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff 0.4.2", + "ark-models-ext", + "ark-std 0.4.0", +] + +[[package]] +name = "ark-ff" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" +dependencies = [ + "ark-ff-asm 0.3.0", + "ark-ff-macros 0.3.0", + "ark-serialize 0.3.0", + "ark-std 0.3.0", + "derivative", + "num-bigint", + "num-traits", + "paste", + "rustc_version 0.3.3", "zeroize", ] @@ -294,20 +474,30 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" dependencies = [ - "ark-ff-asm", - "ark-ff-macros", - "ark-serialize", - "ark-std", + "ark-ff-asm 0.4.2", + "ark-ff-macros 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", "derivative", "digest 0.10.7", "itertools 0.10.5", "num-bigint", "num-traits", "paste", - "rustc_version", + "rustc_version 0.4.1", "zeroize", ] +[[package]] +name = "ark-ff-asm" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "ark-ff-asm" version = "0.4.2" @@ -318,6 +508,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-ff-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" +dependencies = [ + "num-bigint", + "num-traits", + "quote", + "syn 1.0.109", +] + [[package]] name = "ark-ff-macros" version = "0.4.2" @@ -331,19 +533,56 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-models-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e9eab5d4b5ff2f228b763d38442adc9b084b0a465409b059fac5c2308835ec2" +dependencies = [ + "ark-ec", + "ark-ff 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", + "derivative", +] + [[package]] name = "ark-poly" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" dependencies = [ - "ark-ff", - "ark-serialize", - "ark-std", + "ark-ff 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", "derivative", "hashbrown 0.13.2", ] +[[package]] +name = "ark-scale" +version = "0.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f69c00b3b529be29528a6f2fd5fa7b1790f8bed81b9cdca17e326538545a179" +dependencies = [ + "ark-ec", + "ark-ff 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", + "parity-scale-codec", + "scale-info", +] + +[[package]] +name = "ark-serialize" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" +dependencies = [ + "ark-std 0.3.0", + "digest 0.9.0", +] + [[package]] name = "ark-serialize" version = "0.4.2" @@ -351,7 +590,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ "ark-serialize-derive", - "ark-std", + "ark-std 0.4.0", "digest 0.10.7", "num-bigint", ] @@ -367,6 +606,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-std" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" +dependencies = [ + "num-traits", + "rand", +] + [[package]] name = "ark-std" version = "0.4.0" @@ -375,6 +624,7 @@ checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", "rand", + "rayon", ] [[package]] @@ -385,15 +635,15 @@ checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" [[package]] name = "array-bytes" -version = "6.2.2" +version = "6.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f840fb7195bcfc5e17ea40c26e5ce6d5b9ce5d584466e17703209657e459ae0" +checksum = "5d5dde061bd34119e902bbb2d9b90c5692635cf59fb91d582c2b68043f1b8293" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -406,9 +656,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "asn1-rs" @@ -416,8 +666,24 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", + "asn1-rs-derive 0.4.0", + "asn1-rs-impl 0.1.0", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "asn1-rs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" +dependencies = [ + "asn1-rs-derive 0.5.1", + "asn1-rs-impl 0.2.0", "displaydoc", "nom", "num-traits", @@ -435,7 +701,19 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", + "synstructure 0.13.1", ] [[package]] @@ -449,6 +727,77 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "assert_matches" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" + +[[package]] +name = "asset-test-utils" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0324df9ce91a9840632e865dd3272bd20162023856f1b189b7ae58afa5c6b61" +dependencies = [ + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "frame-support 38.0.0", + "frame-system", + "pallet-assets", + "pallet-balances", + "pallet-collator-selection", + "pallet-session", + "pallet-timestamp", + "pallet-xcm", + "pallet-xcm-bridge-hub-router", + "parachains-common", + "parachains-runtimes-test-utils", + "parity-scale-codec", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "assets-common" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4556e56f9206b129c3f96249cd907b76e8d7ad5265fe368c228c708789a451a3" +dependencies = [ + "cumulus-primitives-core", + "frame-support 38.0.0", + "impl-trait-for-tuples", + "log", + "pallet-asset-conversion", + "pallet-assets", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "scale-info", + "sp-api 34.0.0", + "sp-runtime 39.0.2", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + [[package]] name = "async-channel" version = "1.9.0" @@ -462,24 +811,22 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy", "futures-core", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", ] [[package]] name = "async-executor" -version = "1.10.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand", @@ -489,52 +836,43 @@ dependencies = [ [[package]] name = "async-fs" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 3.3.0", + "async-lock", "blocking", "futures-lite", ] [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ - "async-lock 3.3.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", "futures-lite", "parking", "polling", - "rustix 0.38.37", + "rustix 0.38.38", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", - "pin-project-lite 0.2.14", + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite 0.2.15", ] [[package]] @@ -550,47 +888,46 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ - "async-channel 2.2.0", + "async-channel 2.3.1", "async-io", - "async-lock 3.3.0", + "async-lock", "async-signal", "async-task", "blocking", "cfg-if", - "event-listener 5.3.0", + "event-listener 5.3.1", "futures-lite", - "rustix 0.38.37", + "rustix 0.38.38", "tracing", - "windows-sys 0.52.0", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ "async-io", - "async-lock 2.8.0", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.37", + "rustix 0.38.38", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" @@ -600,7 +937,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -613,7 +950,7 @@ dependencies = [ "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", ] [[package]] @@ -628,6 +965,17 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +[[package]] +name = "attohttpc" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" +dependencies = [ + "http 0.2.12", + "log", + "url", +] + [[package]] name = "auto_impl" version = "1.2.0" @@ -636,14 +984,14 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "autocfg" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" @@ -657,16 +1005,16 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", - "hyper 1.2.0", + "hyper 1.5.0", "hyper-util", "itoa", "matchit", "memchr", "mime", "percent-encoding", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", "rustversion", "serde", "serde_json", @@ -675,7 +1023,7 @@ dependencies = [ "sha1", "sync_wrapper 1.0.1", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.24.0", "tower 0.5.1", "tower-layer", "tower-service", @@ -692,10 +1040,10 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "mime", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", "rustversion", "sync_wrapper 1.0.1", "tower-layer", @@ -712,24 +1060,24 @@ dependencies = [ "futures-core", "getrandom 0.2.15", "instant", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", "rand", "tokio", ] [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ - "addr2line 0.21.0", - "cc", + "addr2line 0.24.2", "cfg-if", "libc", "miniz_oxide", - "object 0.32.2", + "object 0.36.5", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -783,6 +1131,16 @@ dependencies = [ "serde", ] +[[package]] +name = "binary-merkle-tree" +version = "15.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "336bf780dd7526a9a4bc1521720b25c1994dc132cccd59553431923fa4d1a693" +dependencies = [ + "hash-db", + "log", +] + [[package]] name = "bincode" version = "1.3.3" @@ -813,13 +1171,13 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "prettyplease 0.2.17", + "prettyplease 0.2.25", "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -832,11 +1190,11 @@ dependencies = [ "hmac 0.12.1", "k256", "once_cell", - "pbkdf2 0.12.2", + "pbkdf2", "rand_core 0.6.4", "ripemd", "sha2 0.10.8", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -847,13 +1205,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33415e24172c1b7d6066f6d999545375ab8e1d95421d6784bdfff9496f292387" dependencies = [ "bitcoin_hashes", - "rand", - "rand_core 0.6.4", "serde", "unicode-normalization", "zeroize", ] +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitcoin-internals" version = "0.2.0" @@ -878,9 +1249,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitmaps" @@ -899,6 +1270,7 @@ checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", + "serde", "tap", "wyz", ] @@ -941,8 +1313,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.7.4", - "constant_time_eq 0.3.0", + "arrayvec 0.7.6", + "constant_time_eq 0.3.1", ] [[package]] @@ -952,8 +1324,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" dependencies = [ "arrayref", - "arrayvec 0.7.4", - "constant_time_eq 0.3.0", + "arrayvec 0.7.6", + "constant_time_eq 0.3.1", ] [[package]] @@ -963,10 +1335,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "cc", "cfg-if", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", ] [[package]] @@ -989,30 +1361,302 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel 2.2.0", - "async-lock 3.3.0", + "async-channel 2.3.1", "async-task", - "fastrand", "futures-io", "futures-lite", "piper", - "tracing", ] [[package]] name = "bounded-collections" -version = "0.2.0" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db436177db0d505b1507f03aca56a41442ae6efdf8b6eaa855d73e52c5b078dc" +dependencies = [ + "log", + "parity-scale-codec", + "scale-info", + "serde", +] + +[[package]] +name = "bp-header-chain" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32385ecb91a31bddaf908e8dcf4a15aef1bcd3913cc03ebfad02ff6d568abc1" +checksum = "fd93b190ef39272ff30b10a83f5cc7df7bd1b970967a3c238bfe7d68c0213ee6" dependencies = [ + "bp-runtime", + "finality-grandpa", + "frame-support 38.0.0", + "parity-scale-codec", + "scale-info", + "serde", + "sp-consensus-grandpa 21.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "bp-messages" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efabf94339950b914ba87249497f1a0e35a73849934d164fecae4b275928cf6" +dependencies = [ + "bp-header-chain", + "bp-runtime", + "frame-support 38.0.0", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-std", +] + +[[package]] +name = "bp-parachains" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9011e5c12c15caf3c4129a98f4f4916ea9165db8daf6ed85867c3106075f40df" +dependencies = [ + "bp-header-chain", + "bp-polkadot-core", + "bp-runtime", + "frame-support 38.0.0", + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "bp-polkadot" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa6277dd4333917ecfbcc35e9332a9f11682e0a506e76b617c336224660fce33" +dependencies = [ + "bp-header-chain", + "bp-polkadot-core", + "bp-runtime", + "frame-support 38.0.0", + "sp-api 34.0.0", + "sp-std", +] + +[[package]] +name = "bp-polkadot-core" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345cf472bac11ef79d403e4846a666b7d22a13cd16d9c85b62cd6b5e16c4a042" +dependencies = [ + "bp-messages", + "bp-runtime", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "parity-util-mem", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "bp-relayers" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9465ad727e466d67d64244a1aa7bb19933a297913fdde34b8e9bda0a341bdeb" +dependencies = [ + "bp-header-chain", + "bp-messages", + "bp-parachains", + "bp-runtime", + "frame-support 38.0.0", + "frame-system", + "pallet-utility", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "bp-runtime" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "746d9464f912b278f8a5e2400f10541f95da7fc6c7d688a2788b9a46296146ee" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "hash-db", + "impl-trait-for-tuples", "log", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-state-machine 0.43.0", + "sp-std", + "sp-trie 37.0.0", + "trie-db 0.29.1", +] + +[[package]] +name = "bp-test-utils" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e659078b54c0b6bd79896738212a305842ad37168976363233516754337826" +dependencies = [ + "bp-header-chain", + "bp-parachains", + "bp-polkadot-core", + "bp-runtime", + "ed25519-dalek", + "finality-grandpa", + "parity-scale-codec", + "sp-application-crypto 38.0.0", + "sp-consensus-grandpa 21.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-std", + "sp-trie 37.0.0", +] + +[[package]] +name = "bp-xcm-bridge-hub" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6909117ca87cb93703742939d5f0c4c93e9646d9cda22262e9709d68c929999b" +dependencies = [ + "bp-messages", + "bp-runtime", + "frame-support 38.0.0", "parity-scale-codec", "scale-info", "serde", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-std", + "staging-xcm", +] + +[[package]] +name = "bp-xcm-bridge-hub-router" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9284820ca704f5c065563cad77d2e3d069a23cc9cb3a29db9c0de8dd3b173a87" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "staging-xcm", +] + +[[package]] +name = "bridge-hub-common" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b53c53d627e2da38f8910807944bf3121e154b5c0ac9e122995af9dfb13ed" +dependencies = [ + "cumulus-primitives-core", + "frame-support 38.0.0", + "pallet-message-queue", + "parity-scale-codec", + "scale-info", + "snowbridge-core", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-std", + "staging-xcm", +] + +[[package]] +name = "bridge-hub-test-utils" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0b3aa5fd8481a06ca16e47fd3d2d9c6abe76b27d922ec8980a853f242173b3" +dependencies = [ + "asset-test-utils", + "bp-header-chain", + "bp-messages", + "bp-parachains", + "bp-polkadot-core", + "bp-relayers", + "bp-runtime", + "bp-test-utils", + "bp-xcm-bridge-hub", + "bridge-runtime-common", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "frame-support 38.0.0", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-balances", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-timestamp", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-bridge-hub", + "parachains-common", + "parachains-runtimes-test-utils", + "parity-scale-codec", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-keyring 39.0.0", + "sp-runtime 39.0.2", + "sp-tracing", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "bridge-runtime-common" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c639aa22de6e904156a3e8b0e6b9e6af790cb27a1299688cc07997e1ffe5b648" +dependencies = [ + "bp-header-chain", + "bp-messages", + "bp-parachains", + "bp-polkadot-core", + "bp-relayers", + "bp-runtime", + "bp-xcm-bridge-hub", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-transaction-payment", + "pallet-utility", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", + "sp-trie 37.0.0", + "staging-xcm", + "tuplex", ] [[package]] @@ -1060,9 +1704,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" [[package]] name = "byteorder" @@ -1102,9 +1746,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.6" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -1126,7 +1770,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.22", + "semver 1.0.23", "serde", "serde_json", "thiserror", @@ -1134,15 +1778,21 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.13" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cexpr" version = "0.6.0" @@ -1154,9 +1804,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", ] @@ -1234,9 +1884,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1256,7 +1906,20 @@ dependencies = [ "multibase", "multihash 0.17.0", "serde", - "unsigned-varint", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "cid" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" +dependencies = [ + "core2", + "multibase", + "multihash 0.18.1", + "serde", + "unsigned-varint 0.7.2", ] [[package]] @@ -1290,9 +1953,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -1318,7 +1981,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", "terminal_size", ] @@ -1331,14 +1994,14 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "codespan-reporting" @@ -1352,9 +2015,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "colored" @@ -1366,6 +2029,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "comfy-table" version = "7.1.1" @@ -1385,9 +2058,9 @@ checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -1413,9 +2086,9 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.11.3" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba00838774b4ab0233e355d26710fbfc8327a05c017f6dc4873f876d1f79f78" +checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586" dependencies = [ "cfg-if", "cpufeatures", @@ -1458,9 +2131,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "constcat" @@ -1486,9 +2159,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core2" @@ -1510,9 +2183,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1723,11 +2396,26 @@ dependencies = [ "wasmtime-types 12.0.2", ] +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -1762,9 +2450,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1781,7 +2469,7 @@ dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", "serdect", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -1813,17 +2501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.7", - "subtle 2.5.0", -] - -[[package]] -name = "crypto-mac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" -dependencies = [ - "generic-array 0.14.7", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -1846,32 +2524,321 @@ dependencies = [ ] [[package]] -name = "curve25519-dalek" -version = "3.2.0" +name = "cumulus-pallet-aura-ext" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "2cbe2735fc7cf2b6521eab00cb1a1ab025abc1575cc36887b36dc8c5cb1c9434" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle 2.5.0", - "zeroize", + "cumulus-pallet-parachain-system", + "frame-support 38.0.0", + "frame-system", + "pallet-aura", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-application-crypto 38.0.0", + "sp-consensus-aura 0.40.0", + "sp-runtime 39.0.2", ] [[package]] -name = "curve25519-dalek" -version = "4.1.2" +name = "cumulus-pallet-dmp-queue" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97263a8e758d201ebe81db7cea7b278b4fb869c11442f77acef70138ac1a252f" dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest 0.10.7", - "fiat-crypto", - "platforms", - "rustc_version", - "subtle 2.5.0", + "cumulus-primitives-core", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-xcm", +] + +[[package]] +name = "cumulus-pallet-parachain-system" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e205844c08da445cee1246893df33dca5e87b53aa85dcdc0fe0b66b8ebbaaf40" +dependencies = [ + "bytes", + "cumulus-pallet-parachain-system-proc-macro", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-primitives-proof-size-hostfunction", + "environmental", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-message-queue", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "scale-info", + "sp-core 34.0.0", + "sp-externalities 0.29.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-state-machine 0.43.0", + "sp-std", + "sp-trie 37.0.0", + "sp-version 37.0.0", + "staging-xcm", + "staging-xcm-builder", + "trie-db 0.29.1", +] + +[[package]] +name = "cumulus-pallet-parachain-system-proc-macro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "befbaf3a1ce23ac8476481484fef5f4d500cbd15b4dad6380ce1d28134b0c1f7" +dependencies = [ + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "cumulus-pallet-session-benchmarking" +version = "19.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18168570689417abfb514ac8812fca7e6429764d01942750e395d7d8ce0716ef" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "pallet-session", + "parity-scale-codec", + "sp-runtime 39.0.2", +] + +[[package]] +name = "cumulus-pallet-solo-to-para" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42c74548c8cab75da6f2479a953f044b582cfce98479862344a24df7bbd215" +dependencies = [ + "cumulus-pallet-parachain-system", + "frame-support 38.0.0", + "frame-system", + "pallet-sudo", + "parity-scale-codec", + "polkadot-primitives 16.0.0", + "scale-info", + "sp-runtime 39.0.2", +] + +[[package]] +name = "cumulus-pallet-xcm" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49231f6cd8274438b078305dc8ce44c54c0d3f4a28e902589bcbaa53d954608" +dependencies = [ + "cumulus-primitives-core", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-xcm", +] + +[[package]] +name = "cumulus-pallet-xcmp-queue" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f788bdac9474795ea13ba791b55798fb664b2e3da8c3a7385b480c9af4e6539" +dependencies = [ + "bounded-collections", + "bp-xcm-bridge-hub-router", + "cumulus-primitives-core", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-message-queue", + "parity-scale-codec", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "cumulus-ping" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47128f797359951723e2d106a80e592d007bb7446c299958cdbafb1489ddbf0" +dependencies = [ + "cumulus-pallet-xcm", + "cumulus-primitives-core", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", + "staging-xcm", +] + +[[package]] +name = "cumulus-primitives-aura" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11e7825bcf3cc6c962a5b9b9f47e02dc381109e521d0bc00cad785c65da18471" +dependencies = [ + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-primitives 15.0.0", + "sp-api 34.0.0", + "sp-consensus-aura 0.40.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "cumulus-primitives-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6b5221a4a3097f2ebef66c84c1e6d7a0b8ec7e63f2bd5ae04c1e6d3fc7514e" +dependencies = [ + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-primitives 16.0.0", + "scale-info", + "sp-api 34.0.0", + "sp-runtime 39.0.2", + "sp-trie 37.0.0", + "staging-xcm", +] + +[[package]] +name = "cumulus-primitives-parachain-inherent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "842a694901e04a62d88995418dec35c22f7dba2b34d32d2b8de37d6b92f973ff" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-trie 37.0.0", +] + +[[package]] +name = "cumulus-primitives-proof-size-hostfunction" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "421f03af054aac7c89e87a49e47964886e53a8d7395990eab27b6f201d42524f" +dependencies = [ + "sp-externalities 0.29.0", + "sp-runtime-interface 28.0.0", + "sp-trie 37.0.0", +] + +[[package]] +name = "cumulus-primitives-storage-weight-reclaim" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fc49dfec0ba3438afad73787736cc0dba88d15b5855881f12a4d8b812a72927" +dependencies = [ + "cumulus-primitives-core", + "cumulus-primitives-proof-size-hostfunction", + "docify", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", +] + +[[package]] +name = "cumulus-primitives-timestamp" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cffb8f010f39ac36b31d38994b8f9d9256d9b5e495d96b4ec59d3e30852d53" +dependencies = [ + "cumulus-primitives-core", + "sp-inherents 34.0.0", + "sp-timestamp 34.0.0", +] + +[[package]] +name = "cumulus-primitives-utility" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bdcf4d46dd93f1e6d5dd6d379133566a44042ba6476d04bdcbdb4981c622ae4" +dependencies = [ + "cumulus-primitives-core", + "frame-support 38.0.0", + "log", + "pallet-asset-conversion", + "parity-scale-codec", + "polkadot-runtime-common", + "sp-runtime 39.0.2", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "cumulus-test-relay-sproof-builder" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e570e41c3f05a8143ebff967bbb0c7dcaaa6f0bebd8639b9418b8005b13eda03" +dependencies = [ + "cumulus-primitives-core", + "parity-scale-codec", + "polkadot-primitives 16.0.0", + "sp-runtime 39.0.2", + "sp-state-machine 0.43.0", + "sp-trie 37.0.0", +] + +[[package]] +name = "curve25519-dalek" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", + "subtle 2.6.1", + "zeroize", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "rustc_version 0.4.1", + "subtle 2.6.1", "zeroize", ] @@ -1883,14 +2850,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "cxx" -version = "1.0.121" +version = "1.0.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21db378d04296a84d8b7d047c36bb3954f0b46529db725d7e62fb02f9ba53ccc" +checksum = "cbdc8cca144dce1c4981b5c9ab748761619979e515c3d53b5df385c677d1d007" dependencies = [ "cc", "cxxbridge-flags", @@ -1900,9 +2867,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.121" +version = "1.0.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5262a7fa3f0bae2a55b767c223ba98032d7c328f5c13fa5cdc980b77fc0658" +checksum = "c5764c3142ab44fcf857101d12c0ddf09c34499900557c764f5ad0597159d1fc" dependencies = [ "cc", "codespan-reporting", @@ -1910,107 +2877,85 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "cxxbridge-flags" -version = "1.0.121" +version = "1.0.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8dcadd2e2fb4a501e1d9e93d6e88e6ea494306d8272069c92d5a9edf8855c0" +checksum = "d422aff542b4fa28c2ce8e5cc202d42dbf24702345c1fba3087b2d3f8a1b90ff" [[package]] name = "cxxbridge-macro" -version = "1.0.121" +version = "1.0.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad08a837629ad949b73d032c637653d069e909cffe4ee7870b02301939ce39cc" +checksum = "a1719100f31492cd6adeeab9a0f46cdbc846e615fdb66d7b398aa46ec7fdd06f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", -] - -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", + "syn 2.0.85", ] [[package]] name = "darling" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" -dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", -] - -[[package]] -name = "darling_core" -version = "0.14.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", + "darling_core", + "darling_macro", ] [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.82", + "strsim", + "syn 2.0.85", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.14.4", + "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] -name = "darling_macro" -version = "0.20.8" +name = "dashmap" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "darling_core 0.20.8", - "quote", - "syn 2.0.82", + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core 0.9.10", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "data-encoding-macro" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e" +checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -2018,9 +2963,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3" +checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f" dependencies = [ "data-encoding", "syn 1.0.109", @@ -2051,7 +2996,21 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs 0.6.2", "displaydoc", "nom", "num-bigint", @@ -2081,37 +3040,37 @@ dependencies = [ [[package]] name = "derive-syn-parse" -version = "0.1.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" +checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] -name = "derive-syn-parse" -version = "0.2.0" +name = "derive-where" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" +checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version", - "syn 1.0.109", + "rustc_version 0.4.1", + "syn 2.0.85", ] [[package]] @@ -2131,7 +3090,8 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", + "unicode-xid", ] [[package]] @@ -2167,7 +3127,7 @@ dependencies = [ "block-buffer 0.10.4", "const-oid", "crypto-common", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -2214,13 +3174,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -2239,14 +3199,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad" dependencies = [ "common-path", - "derive-syn-parse 0.2.0", + "derive-syn-parse", "once_cell", "proc-macro2", "quote", "regex", - "syn 2.0.82", + "syn 2.0.85", "termcolor", - "toml 0.8.12", + "toml 0.8.19", "walkdir", ] @@ -2268,6 +3228,12 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "dyn-clonable" version = "0.9.0" @@ -2326,12 +3292,12 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek 4.1.2", + "curve25519-dalek 4.1.3", "ed25519", "rand_core 0.6.4", "serde", "sha2 0.10.8", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -2355,9 +3321,9 @@ version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" dependencies = [ - "curve25519-dalek 4.1.2", + "curve25519-dalek 4.1.3", "ed25519", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "hex", "rand_core 0.6.4", "sha2 0.10.8", @@ -2366,9 +3332,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -2387,7 +3353,7 @@ dependencies = [ "rand_core 0.6.4", "sec1", "serdect", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -2399,9 +3365,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -2420,7 +3386,7 @@ dependencies = [ "futures", "hex-literal", "itertools 0.13.0", - "jsonrpsee 0.20.3", + "jsonrpsee 0.24.7", "lazy_static", "log", "pallet-balances", @@ -2434,48 +3400,50 @@ dependencies = [ "rand", "sc-authority-discovery", "sc-basic-authorship", - "sc-chain-spec", - "sc-cli", - "sc-client-api", - "sc-consensus", + "sc-chain-spec 38.0.0", + "sc-cli 0.47.0", + "sc-client-api 37.0.0", + "sc-consensus 0.44.0", "sc-consensus-babe", "sc-consensus-babe-rpc", "sc-consensus-epochs", "sc-consensus-grandpa", "sc-consensus-grandpa-rpc", "sc-consensus-slots", - "sc-executor", - "sc-network", - "sc-network-common", - "sc-network-sync", + "sc-executor 0.40.1", + "sc-mixnet 0.15.0", + "sc-network 0.45.0", + "sc-network-common 0.44.0", + "sc-network-sync 0.44.0", "sc-offchain", - "sc-rpc", - "sc-rpc-api", - "sc-rpc-spec-v2", - "sc-service", + "sc-rpc 40.0.0", + "sc-rpc-api 0.44.0", + "sc-rpc-spec-v2 0.45.0", + "sc-service 0.46.0", "sc-storage-monitor", "sc-sync-state-rpc", - "sc-sysinfo", - "sc-telemetry", - "sc-transaction-pool", - "sc-transaction-pool-api", + "sc-sysinfo 38.0.0", + "sc-telemetry 25.0.0", + "sc-transaction-pool 37.0.0", + "sc-transaction-pool-api 37.0.0", "serde", "serde_json", - "sp-api", + "sp-api 34.0.0", "sp-authority-discovery", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-grandpa", - "sp-core 29.0.0", - "sp-inherents", - "sp-keyring 32.0.0", - "sp-keystore 0.35.0", - "sp-runtime 32.0.0", - "sp-timestamp", + "sp-block-builder 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-babe 0.40.0", + "sp-consensus-grandpa 21.0.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-keyring 39.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", + "sp-statement-store 18.0.0", + "sp-timestamp 34.0.0", "sp-tracing", - "sp-transaction-storage-proof", + "sp-transaction-storage-proof 34.0.0", "substrate-build-script-utils", "substrate-frame-rpc-system", "tempfile", @@ -2503,9 +3471,10 @@ dependencies = [ "serde_json", "serial_test", "sha3", - "sp-core 31.0.0", - "sp-keyring 34.0.0", + "sp-core 34.0.0", + "sp-keyring 39.0.0", "subxt", + "subxt-core", "synedrion", "thiserror", "tokio", @@ -2513,19 +3482,6 @@ dependencies = [ "x25519-dalek 2.0.1", ] -[[package]] -name = "entropy-create-test-keyshares" -version = "0.3.0-rc.1" -dependencies = [ - "entropy-kvdb", - "entropy-shared", - "entropy-testing-utils", - "entropy-tss", - "sp-core 31.0.0", - "synedrion", - "tokio", -] - [[package]] name = "entropy-kvdb" version = "0.3.0-rc.1" @@ -2540,7 +3496,7 @@ dependencies = [ "serde", "serial_test", "sled", - "sp-core 31.0.0", + "sp-core 34.0.0", "synedrion", "thiserror", "tokio", @@ -2584,7 +3540,7 @@ dependencies = [ "entropy-shared", "futures", "getrandom 0.2.15", - "gloo-net 0.6.0", + "gloo-net", "hex", "hpke-rs", "hpke-rs-crypto", @@ -2598,13 +3554,13 @@ dependencies = [ "serde_json", "serial_test", "snow", - "sp-core 31.0.0", - "sp-keyring 34.0.0", + "sp-core 34.0.0", + "sp-keyring 39.0.0", "subxt", "synedrion", "thiserror", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.24.0", "tracing", "wasm-bindgen", "wasm-bindgen-derive", @@ -2621,11 +3577,11 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-executive", - "frame-support", + "frame-support 38.0.0", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", - "frame-try-runtime", + "frame-try-runtime 0.44.0", "hex-literal", "log", "pallet-attestation", @@ -2651,7 +3607,7 @@ dependencies = [ "pallet-offences", "pallet-offences-benchmarking", "pallet-oracle", - "pallet-parameters", + "pallet-parameters 0.3.0-rc.1", "pallet-preimage", "pallet-programs", "pallet-propagation", @@ -2677,23 +3633,23 @@ dependencies = [ "pallet-vesting", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 34.0.0", "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-core 29.0.0", - "sp-genesis-builder", - "sp-inherents", - "sp-io 31.0.0", + "sp-block-builder 34.0.0", + "sp-consensus-babe 0.40.0", + "sp-core 34.0.0", + "sp-genesis-builder 0.15.1", + "sp-inherents 34.0.0", + "sp-io 38.0.0", "sp-npos-elections", - "sp-offchain", - "sp-runtime 32.0.0", - "sp-session", - "sp-staking", - "sp-std 14.0.0", + "sp-offchain 34.0.0", + "sp-runtime 39.0.2", + "sp-session 36.0.0", + "sp-staking 36.0.0", + "sp-std", "sp-storage", - "sp-transaction-pool", - "sp-version", + "sp-transaction-pool 34.0.0", + "sp-version 37.0.0", "static_assertions", "substrate-wasm-builder", ] @@ -2709,9 +3665,9 @@ dependencies = [ "scale-info", "serde", "serde_derive", - "sp-core 29.0.0", - "sp-runtime 32.0.0", - "sp-std 12.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-std", "strum 0.26.3", "strum_macros 0.26.4", "subxt", @@ -2728,8 +3684,8 @@ dependencies = [ "entropy-client", "entropy-shared", "hex", - "sp-core 31.0.0", - "sp-runtime 32.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", "subxt", "tokio", "x25519-dalek 2.0.1", @@ -2751,8 +3707,8 @@ dependencies = [ "project-root", "rand", "rand_core 0.6.4", - "sp-core 31.0.0", - "sp-keyring 34.0.0", + "sp-core 34.0.0", + "sp-keyring 39.0.0", "subxt", "synedrion", "tdx-quote", @@ -2808,16 +3764,15 @@ dependencies = [ "sha2 0.10.8", "sha3", "snow", - "sp-core 31.0.0", - "sp-keyring 34.0.0", + "sp-core 34.0.0", + "sp-keyring 39.0.0", "strum 0.26.3", "subxt", - "subxt-signer", "synedrion", "tdx-quote", "thiserror", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.24.0", "tower-http 0.6.1", "tracing", "tracing-bunyan-formatter", @@ -2841,24 +3796,47 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "enum-as-inner" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.85", +] + [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "enumn" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -2888,9 +3866,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2910,7 +3888,17 @@ dependencies = [ "serde_json", "sha3", "thiserror", - "uint", + "uint 0.9.5", +] + +[[package]] +name = "ethabi-decode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d398648d65820a727d6a81e58b962f874473396a047e4c30bafe3240953417" +dependencies = [ + "ethereum-types", + "tiny-keccak", ] [[package]] @@ -2921,9 +3909,9 @@ checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" dependencies = [ "crunchy", "fixed-hash", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", - "impl-serde", + "impl-serde 0.4.0", "scale-info", "tiny-keccak", ] @@ -2936,12 +3924,12 @@ checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" dependencies = [ "ethbloom", "fixed-hash", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", - "impl-serde", - "primitive-types", + "impl-serde 0.4.0", + "primitive-types 0.12.2", "scale-info", - "uint", + "uint 0.9.5", ] [[package]] @@ -2950,7 +3938,7 @@ version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bytes", "chrono", "const-hex", @@ -2979,44 +3967,23 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", ] [[package]] -name = "event-listener" -version = "5.3.0" +name = "event-listener-strategy" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite 0.2.14", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite 0.2.14", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" -dependencies = [ - "event-listener 5.3.0", - "pin-project-lite 0.2.14", + "event-listener 5.3.1", + "pin-project-lite 0.2.15", ] [[package]] @@ -3027,7 +3994,7 @@ checksum = "74fef4569247a5f429d9156b9d0a2599914385dd189c539334c625d8099d90ab" dependencies = [ "futures-core", "nom", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", ] [[package]] @@ -3041,16 +4008,17 @@ dependencies = [ [[package]] name = "expander" -version = "2.1.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e83c02035136f1592a47964ea60c05a50e4ed8b5892cfac197063850898d4d" +checksum = "e2c470c71d91ecbd179935b24170459e926382eaaa86b590b78814e180d8a8e2" dependencies = [ "blake2 0.10.6", + "file-guard", "fs-err", - "prettier-please", + "prettyplease 0.2.25", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3059,12 +4027,29 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "fastrand" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +[[package]] +name = "fastrlp" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" +dependencies = [ + "arrayvec 0.7.6", + "auto_impl", + "bytes", +] + [[package]] name = "fdlimit" version = "0.3.0" @@ -3082,14 +4067,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] name = "fiat-crypto" -version = "0.2.7" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "file-guard" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" +checksum = "21ef72acf95ec3d7dbf61275be556299490a245f017cf084bd23b4f68cf9407c" +dependencies = [ + "libc", + "winapi", +] [[package]] name = "file-per-thread-logger" @@ -3113,14 +4108,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -3139,6 +4134,16 @@ dependencies = [ "scale-info", ] +[[package]] +name = "finito" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2384245d85162258a14b43567a9ee3598f5ae746a1581fb5d3d2cb780f0dbf95" +dependencies = [ + "futures-timer", + "pin-project", +] + [[package]] name = "fixed-hash" version = "0.8.0" @@ -3159,9 +4164,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "libz-sys", @@ -3183,6 +4188,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -3200,9 +4211,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" -version = "12.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e93d3f0315c2eccf23453609e0ab92fe7c6ad1ca8129bcaf80b9a08c8d7fc52b" +checksum = "ad4cc2314d3be8b49c555f6a7e550f5559e73ffd6ef9690ffbd9a706774452e0" dependencies = [ "parity-scale-codec", ] @@ -3216,6 +4227,16 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "forwarded-header-value" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9" +dependencies = [ + "nonempty", + "thiserror", +] + [[package]] name = "fragile" version = "2.0.0" @@ -3224,12 +4245,12 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" -version = "29.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4090659c6aaa3c4d5b6c6ec909b4b0a25dec10ad92aad5f729efa8d5bd4d806a" +checksum = "a01bdd47c2d541b38bd892da647d1e972c9d85b4ecd7094ad64f7600175da54d" dependencies = [ - "frame-support", - "frame-support-procedural", + "frame-support 38.0.0", + "frame-support-procedural 30.0.4", "frame-system", "linregress", "log", @@ -3237,131 +4258,161 @@ dependencies = [ "paste", "scale-info", "serde", - "sp-api", - "sp-application-crypto 31.0.0", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-runtime-interface 25.0.0", - "sp-std 14.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-runtime-interface 28.0.0", "sp-storage", "static_assertions", ] [[package]] name = "frame-benchmarking-cli" -version = "33.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efe02c96362e3c7308cdea7545859f767194a1f3f00928f0e1357f4b8a0b3b2c" +checksum = "c9767c33709062605ba6876fcc3e5f31fb37da393c1ab384813614870209dd94" dependencies = [ "Inflector", - "array-bytes 6.2.2", + "array-bytes 6.2.3", "chrono", "clap", "comfy-table", "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "gethostname", "handlebars", - "itertools 0.10.5", + "itertools 0.11.0", "lazy_static", "linked-hash-map", "log", "parity-scale-codec", "rand", "rand_pcg", - "sc-block-builder", - "sc-cli", - "sc-client-api", - "sc-client-db", - "sc-executor", - "sc-service", - "sc-sysinfo", + "sc-block-builder 0.42.0", + "sc-chain-spec 38.0.0", + "sc-cli 0.47.0", + "sc-client-api 37.0.0", + "sc-client-db 0.44.1", + "sc-executor 0.40.1", + "sc-service 0.46.0", + "sc-sysinfo 38.0.0", "serde", "serde_json", - "sp-api", - "sp-blockchain", - "sp-core 29.0.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", "sp-database", - "sp-externalities 0.26.0", - "sp-inherents", - "sp-io 31.0.0", - "sp-keystore 0.35.0", - "sp-runtime 32.0.0", - "sp-state-machine 0.36.0", + "sp-externalities 0.29.0", + "sp-genesis-builder 0.15.1", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", + "sp-state-machine 0.43.0", "sp-storage", - "sp-trie 30.0.0", + "sp-trie 37.0.0", "sp-wasm-interface", "thiserror", "thousands", ] +[[package]] +name = "frame-benchmarking-pallet-pov" +version = "28.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ffde6f573a63eeb1ccb7d2667c5741a11ce93bc30f33712e5326b9d8a811c29" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "frame-decode" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d3379df61ff3dd871e2dde7d1bcdc0263e613c21c7579b149fd4f0ad9b1dc2" +dependencies = [ + "frame-metadata 17.0.0", + "parity-scale-codec", + "scale-decode", + "scale-info", + "scale-type-resolver", + "sp-crypto-hashing", +] + [[package]] name = "frame-election-provider-solution-type" -version = "13.0.0" +version = "14.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5c3bff645e46577c69c272733c53fa3a77d1ee6e40dfb66157bc94b0740b8fc" +checksum = "8156f209055d352994ecd49e19658c6b469d7c6de923bd79868957d0dcfb6f71" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "frame-election-provider-support" -version = "29.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87da19ee99e6473cd057ead84337d20011fe5e299c6750e88e43b8b7963b8852" +checksum = "c36f5116192c63d39f1b4556fa30ac7db5a6a52575fa241b045f7dfa82ecc2be" dependencies = [ "frame-election-provider-solution-type", - "frame-support", + "frame-support 38.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic 24.0.0", - "sp-core 29.0.0", + "sp-arithmetic", + "sp-core 34.0.0", "sp-npos-elections", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "frame-executive" -version = "29.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09bff9574ee2dcc349f646e1d2faadf76afd688c2ea1bbac5e4a0e19a0c19c59" +checksum = "c365bf3879de25bbee28e9584096955a02fbe8d7e7624e10675800317f1cee5b" dependencies = [ - "frame-support", + "aquamarine", + "frame-support 38.0.0", "frame-system", - "frame-try-runtime", + "frame-try-runtime 0.44.0", "log", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", "sp-tracing", ] [[package]] name = "frame-metadata" -version = "15.1.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" +checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692" dependencies = [ "cfg-if", "parity-scale-codec", "scale-info", + "serde", ] [[package]] name = "frame-metadata" -version = "16.0.0" +version = "17.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692" +checksum = "701bac17e9b55e0f95067c428ebcb46496587f08e8cf4ccc0fe5903bea10dbb8" dependencies = [ "cfg-if", "parity-scale-codec", @@ -3369,23 +4420,39 @@ dependencies = [ "serde", ] +[[package]] +name = "frame-metadata-hash-extension" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ac71dbd97039c49fdd69f416a4dd5d8da3652fdcafc3738b45772ad79eb4ec" +dependencies = [ + "array-bytes 6.2.3", + "docify", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", +] + [[package]] name = "frame-remote-externalities" -version = "0.36.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360bfdb6821372164a65933d9a6d5998f38c722360b59b69d2bf78a87ef58b2a" +checksum = "8f4afeb0769c0ef010c0dcc681a60167692a1cd52f0c0729b327a4415facddc5" dependencies = [ "futures", "indicatif", - "jsonrpsee 0.20.3", + "jsonrpsee 0.22.5", "log", "parity-scale-codec", "serde", - "sp-core 29.0.0", + "sp-core 32.0.0", "sp-crypto-hashing", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-state-machine 0.36.0", + "sp-io 34.0.0", + "sp-runtime 35.0.0", + "sp-state-machine 0.39.0", "spinners", "substrate-rpc-client", "tokio", @@ -3394,17 +4461,59 @@ dependencies = [ [[package]] name = "frame-support" -version = "29.0.2" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97100a956a2cd152ad4e63a5ec7b5e58503653223a73fff6e916b910b37f12ed" +dependencies = [ + "aquamarine", + "array-bytes 6.2.3", + "bitflags 1.3.2", + "docify", + "environmental", + "frame-metadata 16.0.0", + "frame-support-procedural 27.0.0", + "impl-trait-for-tuples", + "k256", + "log", + "macro_magic", + "parity-scale-codec", + "paste", + "scale-info", + "serde", + "serde_json", + "smallvec", + "sp-api 30.0.0", + "sp-arithmetic", + "sp-core 32.0.0", + "sp-crypto-hashing-proc-macro", + "sp-debug-derive", + "sp-genesis-builder 0.11.0", + "sp-inherents 30.0.0", + "sp-io 34.0.0", + "sp-metadata-ir", + "sp-runtime 35.0.0", + "sp-staking 30.0.0", + "sp-state-machine 0.39.0", + "sp-std", + "sp-tracing", + "sp-weights", + "static_assertions", + "tt-call", +] + +[[package]] +name = "frame-support" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e52c84b611d2049d9253f83a62ab0f093e4be5c42a7ef42ea5bb16d6611e32" +checksum = "1e44af69fa61bc5005ffe0339e198957e77f0f255704a9bee720da18a733e3dc" dependencies = [ "aquamarine", - "array-bytes 6.2.2", + "array-bytes 6.2.3", "bitflags 1.3.2", "docify", "environmental", "frame-metadata 16.0.0", - "frame-support-procedural", + "frame-support-procedural 30.0.4", "impl-trait-for-tuples", "k256", "log", @@ -3415,127 +4524,172 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-api", - "sp-arithmetic 24.0.0", - "sp-core 29.0.0", + "sp-api 34.0.0", + "sp-arithmetic", + "sp-core 34.0.0", "sp-crypto-hashing-proc-macro", "sp-debug-derive", - "sp-genesis-builder", - "sp-inherents", - "sp-io 31.0.0", + "sp-genesis-builder 0.15.1", + "sp-inherents 34.0.0", + "sp-io 38.0.0", "sp-metadata-ir", - "sp-runtime 32.0.0", - "sp-staking", - "sp-state-machine 0.36.0", - "sp-std 14.0.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", + "sp-state-machine 0.43.0", + "sp-std", "sp-tracing", - "sp-weights 28.0.0", + "sp-weights", "static_assertions", "tt-call", ] [[package]] name = "frame-support-procedural" -version = "24.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf1d648c4007d421b9677b3c893256913498fff159dc2d85022cdd9cc432f3c" +checksum = "7a74eda80052082e8acd36c7fa232569ce1f968c7ae2adc56d082039ac9d6ba4" dependencies = [ "Inflector", "cfg-expr", - "derive-syn-parse 0.1.5", + "derive-syn-parse", "expander", - "frame-support-procedural-tools", + "frame-support-procedural-tools 11.0.1", "itertools 0.10.5", "macro_magic", - "proc-macro-warning", + "proc-macro-warning 1.0.2", + "proc-macro2", + "quote", + "sp-crypto-hashing", + "syn 2.0.85", +] + +[[package]] +name = "frame-support-procedural" +version = "30.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e8f9b6bc1517a6fcbf0b2377e5c8c6d39f5bb7862b191a59a9992081d63972d" +dependencies = [ + "Inflector", + "cfg-expr", + "derive-syn-parse", + "expander", + "frame-support-procedural-tools 13.0.0", + "itertools 0.11.0", + "macro_magic", + "proc-macro-warning 1.0.2", "proc-macro2", "quote", "sp-crypto-hashing", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "frame-support-procedural-tools" -version = "10.0.0" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b482a1d18fa63aed1ff3fe3fcfb3bc23d92cb3903d6b9774f75dc2c4e1001c3a" +dependencies = [ + "frame-support-procedural-tools-derive", + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "frame-support-procedural-tools" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3363df38464c47a73eb521a4f648bfcc7537a82d70347ef8af3f73b6d019e910" +checksum = "bead15a320be1764cdd50458c4cfacb23e0cee65f64f500f8e34136a94c7eeca" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "frame-support-procedural-tools-derive" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68672b9ec6fe72d259d3879dc212c5e42e977588cdac830c76f54d9f492aeb58" +checksum = "ed971c6435503a099bdac99fe4c5bea08981709e5b5a0a8535a1856f48561191" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "frame-system" -version = "29.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc20a793c3cec0b11165c1075fe11a255b2491f3eef8230bb3073cb296e7383" +checksum = "e3c7fa02f8c305496d2ae52edaecdb9d165f11afa965e05686d7d7dd1ce93611" dependencies = [ "cfg-if", "docify", - "frame-support", + "frame-support 38.0.0", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", - "sp-version", - "sp-weights 28.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", + "sp-version 37.0.0", + "sp-weights", ] [[package]] name = "frame-system-benchmarking" -version = "29.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac47ee48fee3a0b49c9ab9ee68997dee3733776a355f780cf2858449cf495d69" +checksum = "9693b2a736beb076e673520e1e8dee4fc128b8d35b020ef3e8a4b1b5ad63d9f2" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "frame-system-rpc-runtime-api" -version = "27.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c1b20433c3c76b56ce905ed971631ec8c34fa64cf6c20e590afe46455fc0cc8" +checksum = "475c4f8604ba7e4f05cd2c881ba71105093e638b9591ec71a8db14a64b3b4ec3" dependencies = [ + "docify", "parity-scale-codec", - "sp-api", + "sp-api 34.0.0", ] [[package]] name = "frame-try-runtime" -version = "0.35.0" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "883f2a531ab7857e8b4bb09997f1333635da1b5e627ac1651c16b5e5152d8fa3" +dependencies = [ + "frame-support 32.0.0", + "parity-scale-codec", + "sp-api 30.0.0", + "sp-runtime 35.0.0", + "sp-std", +] + +[[package]] +name = "frame-try-runtime" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eab87d07bc2f9a2160b818d1b7506c303b3b28b6a8a5f01dc5e2641390450b5" +checksum = "83c811a5a1f5429c7fb5ebbf6cf9502d8f9b673fd395c12cf46c44a30a7daf0e" dependencies = [ - "frame-support", + "frame-support 38.0.0", "parity-scale-codec", - "sp-api", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-api 34.0.0", + "sp-runtime 39.0.2", ] [[package]] @@ -3563,7 +4717,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.38", "windows-sys 0.48.0", ] @@ -3588,6 +4742,16 @@ dependencies = [ "futures-util", ] +[[package]] +name = "futures-bounded" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b07bbbe7d7e78809544c6f718d875627addc73a7c3582447abc052cd3dc67e0" +dependencies = [ + "futures-timer", + "futures-util", +] + [[package]] name = "futures-channel" version = "0.3.31" @@ -3632,7 +4796,7 @@ dependencies = [ "futures-core", "futures-io", "parking", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", ] [[package]] @@ -3643,7 +4807,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3657,6 +4821,16 @@ dependencies = [ "webpki", ] +[[package]] +name = "futures-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28" +dependencies = [ + "futures-io", + "rustls 0.21.12", +] + [[package]] name = "futures-sink" version = "0.3.31" @@ -3692,7 +4866,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", "pin-utils", "slab", ] @@ -3712,7 +4886,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "debugid", "fxhash", "serde", @@ -3799,7 +4973,7 @@ version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" dependencies = [ - "fallible-iterator", + "fallible-iterator 0.2.0", "indexmap 1.9.3", "stable_deref_trait", ] @@ -3809,33 +4983,22 @@ name = "gimli" version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +dependencies = [ + "fallible-iterator 0.3.0", + "stable_deref_trait", +] [[package]] -name = "glob" -version = "0.3.1" +name = "gimli" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] -name = "gloo-net" -version = "0.5.0" +name = "glob" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "gloo-utils", - "http 0.2.12", - "js-sys", - "pin-project", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gloo-net" @@ -3850,6 +5013,8 @@ dependencies = [ "http 1.1.0", "js-sys", "pin-project", + "serde", + "serde_json", "thiserror", "wasm-bindgen", "wasm-bindgen-futures", @@ -3881,6 +5046,26 @@ dependencies = [ "web-sys", ] +[[package]] +name = "governor" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" +dependencies = [ + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot 0.12.3", + "portable-atomic", + "quanta", + "rand", + "smallvec", + "spinning_top", +] + [[package]] name = "group" version = "0.13.0" @@ -3889,7 +5074,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core 0.6.4", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -3904,7 +5089,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -3913,17 +5098,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http 1.1.0", - "indexmap 2.2.6", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -3932,9 +5117,9 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.5.0" +version = "5.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225" +checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b" dependencies = [ "log", "pest", @@ -3979,15 +5164,26 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", "serde", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + [[package]] name = "hashing-serializer" version = "0.1.1" @@ -4004,7 +5200,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -4029,16 +5225,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] -name = "hex" +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hex-conservative" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2" +checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20" [[package]] name = "hex-literal" @@ -4065,16 +5267,6 @@ dependencies = [ "digest 0.9.0", ] -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac 0.11.0", - "digest 0.9.0", -] - [[package]] name = "hmac" version = "0.12.1" @@ -4158,7 +5350,7 @@ dependencies = [ "hpke-rs-crypto", "p256", "p384", - "rand_chacha 0.3.1", + "rand_chacha", "rand_core 0.6.4", "sha2 0.10.8", "x25519-dalek 2.0.1", @@ -4194,14 +5386,14 @@ checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http 0.2.12", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", ] [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http 1.1.0", @@ -4209,15 +5401,15 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http 1.1.0", - "http-body 1.0.0", - "pin-project-lite 0.2.14", + "http-body 1.0.1", + "pin-project-lite 0.2.15", ] [[package]] @@ -4228,9 +5420,9 @@ checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -4246,9 +5438,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", @@ -4260,8 +5452,8 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.14", - "socket2 0.5.6", + "pin-project-lite 0.2.15", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -4270,20 +5462,20 @@ dependencies = [ [[package]] name = "hyper" -version = "1.2.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.4", + "h2 0.4.6", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", "smallvec", "tokio", "want", @@ -4297,9 +5489,9 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.28", + "hyper 0.14.31", "log", - "rustls 0.21.10", + "rustls 0.21.12", "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", @@ -4307,15 +5499,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.2.0", + "hyper 1.5.0", "hyper-util", - "rustls 0.23.7", + "rustls 0.23.16", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -4330,7 +5522,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.2.0", + "hyper 1.5.0", "hyper-util", "native-tls", "tokio", @@ -4340,29 +5532,28 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", - "http-body 1.0.0", - "hyper 1.2.0", - "pin-project-lite 0.2.14", - "socket2 0.5.6", + "http-body 1.0.1", + "hyper 1.5.0", + "pin-project-lite 0.2.15", + "socket2 0.5.7", "tokio", - "tower 0.4.13", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -4404,6 +5595,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "idna" version = "0.5.0" @@ -4443,6 +5644,25 @@ dependencies = [ "windows 0.51.1", ] +[[package]] +name = "igd-next" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4" +dependencies = [ + "async-trait", + "attohttpc", + "bytes", + "futures", + "http 0.2.12", + "hyper 0.14.31", + "log", + "rand", + "tokio", + "url", + "xmltree", +] + [[package]] name = "im-rc" version = "15.1.0" @@ -4466,6 +5686,15 @@ dependencies = [ "parity-scale-codec", ] +[[package]] +name = "impl-codec" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67aa010c1e3da95bf151bd8b4c059b2ed7e75387cdb969b4f8f2723a43f9941" +dependencies = [ + "parity-scale-codec", +] + [[package]] name = "impl-rlp" version = "0.3.0" @@ -4484,6 +5713,15 @@ dependencies = [ "serde", ] +[[package]] +name = "impl-serde" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a143eada6a1ec4aefa5049037a26a6d597bfd64f8c026d07b77133e02b7dd0b" +dependencies = [ + "serde", +] + [[package]] name = "impl-trait-for-tuples" version = "0.2.2" @@ -4497,18 +5735,18 @@ dependencies = [ [[package]] name = "include_dir" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" dependencies = [ "include_dir_macros", ] [[package]] name = "include_dir_macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" dependencies = [ "proc-macro2", "quote", @@ -4527,12 +5765,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.15.0", "serde", ] @@ -4566,14 +5804,11 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", ] [[package]] @@ -4591,7 +5826,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -4608,7 +5843,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.6", + "socket2 0.5.7", "widestring", "windows-sys 0.48.0", "winreg", @@ -4616,21 +5851,27 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.10.5" @@ -4640,6 +5881,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.12.1" @@ -4684,6 +5934,26 @@ dependencies = [ "cc", ] +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "jobserver" version = "0.1.32" @@ -4704,47 +5974,53 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.20.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" +checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad" dependencies = [ - "jsonrpsee-core 0.20.3", - "jsonrpsee-http-client 0.20.3", - "jsonrpsee-proc-macros", - "jsonrpsee-server", - "jsonrpsee-types 0.20.3", - "jsonrpsee-ws-client", + "jsonrpsee-core 0.22.5", + "jsonrpsee-http-client", + "jsonrpsee-proc-macros 0.22.5", + "jsonrpsee-server 0.22.5", + "jsonrpsee-types 0.22.5", + "jsonrpsee-ws-client 0.22.5", "tokio", "tracing", ] [[package]] name = "jsonrpsee" -version = "0.22.4" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4b0e68d9af1f066c06d6e2397583795b912d78537d7d907c561e82c13d69fa1" +checksum = "c5c71d8c1a731cc4227c2f698d377e7848ca12c8a48866fc5e6951c43a4db843" dependencies = [ - "jsonrpsee-client-transport 0.22.4", - "jsonrpsee-core 0.22.4", - "jsonrpsee-http-client 0.22.4", - "jsonrpsee-types 0.22.4", + "jsonrpsee-client-transport 0.24.7", + "jsonrpsee-core 0.24.7", + "jsonrpsee-proc-macros 0.24.7", + "jsonrpsee-server 0.24.7", + "jsonrpsee-types 0.24.7", + "jsonrpsee-wasm-client", + "jsonrpsee-ws-client 0.24.7", + "tokio", + "tracing", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.20.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" +checksum = "4978087a58c3ab02efc5b07c5e5e2803024536106fd5506f558db172c889b3aa" dependencies = [ "futures-util", "http 0.2.12", - "jsonrpsee-core 0.20.3", + "jsonrpsee-core 0.22.5", "pin-project", - "rustls-native-certs 0.6.3", - "soketto", + "rustls-native-certs 0.7.3", + "rustls-pki-types", + "soketto 0.7.1", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls 0.25.0", "tokio-util", "tracing", "url", @@ -4752,22 +6028,24 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.22.4" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92f254f56af1ae84815b9b1325094743dcf05b92abb5e94da2e81a35cff0cada" +checksum = "548125b159ba1314104f5bb5f38519e03a41862786aa3925cf349aae9cdd546e" dependencies = [ + "base64 0.22.1", "futures-channel", "futures-util", - "gloo-net 0.5.0", - "http 0.2.12", - "jsonrpsee-core 0.22.4", + "gloo-net", + "http 1.1.0", + "jsonrpsee-core 0.24.7", "pin-project", - "rustls-native-certs 0.7.0", + "rustls 0.23.16", "rustls-pki-types", - "soketto", + "rustls-platform-verifier", + "soketto 0.8.0", "thiserror", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tokio-util", "tracing", "url", @@ -4775,44 +6053,47 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.20.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b" +checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d" dependencies = [ "anyhow", - "async-lock 2.8.0", "async-trait", "beef", "futures-timer", "futures-util", - "hyper 0.14.28", - "jsonrpsee-types 0.20.3", + "hyper 0.14.31", + "jsonrpsee-types 0.22.5", "parking_lot 0.12.3", + "pin-project", "rand", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", - "soketto", "thiserror", "tokio", + "tokio-stream", "tracing", ] [[package]] name = "jsonrpsee-core" -version = "0.22.4" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "274d68152c24aa78977243bb56f28d7946e6aa309945b37d33174a3f92d89a3a" +checksum = "f2882f6f8acb9fdaec7cefc4fd607119a9bd709831df7d7672a1d3b644628280" dependencies = [ - "anyhow", "async-trait", - "beef", + "bytes", "futures-timer", "futures-util", - "hyper 0.14.28", - "jsonrpsee-types 0.22.4", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "jsonrpsee-types 0.24.7", + "parking_lot 0.12.3", "pin-project", - "rustc-hash", + "rand", + "rustc-hash 2.0.0", "serde", "serde_json", "thiserror", @@ -4824,15 +6105,15 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.20.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" +checksum = "1ccf93fc4a0bfe05d851d37d7c32b7f370fe94336b52a2f0efc5f1981895c2e5" dependencies = [ "async-trait", - "hyper 0.14.28", + "hyper 0.14.31", "hyper-rustls 0.24.2", - "jsonrpsee-core 0.20.3", - "jsonrpsee-types 0.20.3", + "jsonrpsee-core 0.22.5", + "jsonrpsee-types 0.22.5", "serde", "serde_json", "thiserror", @@ -4843,53 +6124,47 @@ dependencies = [ ] [[package]] -name = "jsonrpsee-http-client" -version = "0.22.4" +name = "jsonrpsee-proc-macros" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac13bc1e44cd00448a5ff485824a128629c945f02077804cb659c07a0ba41395" +checksum = "7d0bb047e79a143b32ea03974a6bf59b62c2a4c5f5d42a381c907a8bbb3f75c0" dependencies = [ - "async-trait", - "hyper 0.14.28", - "hyper-rustls 0.24.2", - "jsonrpsee-core 0.22.4", - "jsonrpsee-types 0.22.4", - "serde", - "serde_json", - "thiserror", - "tokio", - "tower 0.4.13", - "tracing", - "url", + "heck 0.4.1", + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.85", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.20.4" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc0eba68ba205452bcb4c7b80a79ddcb3bf36c261a841b239433142db632d24" +checksum = "c06c01ae0007548e73412c08e2285ffe5d723195bf268bce67b1b77c3bb2a14d" dependencies = [ - "heck 0.4.1", - "proc-macro-crate 1.3.1", + "heck 0.5.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] name = "jsonrpsee-server" -version = "0.20.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c" +checksum = "12d8b6a9674422a8572e0b0abb12feeb3f2aeda86528c80d0350c2bd0923ab41" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.28", - "jsonrpsee-core 0.20.3", - "jsonrpsee-types 0.20.3", + "hyper 0.14.31", + "jsonrpsee-core 0.22.5", + "jsonrpsee-types 0.22.5", + "pin-project", "route-recognizer", "serde", "serde_json", - "soketto", + "soketto 0.7.1", "thiserror", "tokio", "tokio-stream", @@ -4899,24 +6174,37 @@ dependencies = [ ] [[package]] -name = "jsonrpsee-types" -version = "0.20.3" +name = "jsonrpsee-server" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9" +checksum = "82ad8ddc14be1d4290cd68046e7d1d37acd408efed6d3ca08aefcc3ad6da069c" dependencies = [ - "anyhow", - "beef", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.5.0", + "hyper-util", + "jsonrpsee-core 0.24.7", + "jsonrpsee-types 0.24.7", + "pin-project", + "route-recognizer", "serde", "serde_json", + "soketto 0.8.0", "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tower 0.4.13", "tracing", ] [[package]] name = "jsonrpsee-types" -version = "0.22.4" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dc828e537868d6b12bbb07ec20324909a22ced6efca0057c825c3e1126b2c6d" +checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d" dependencies = [ "anyhow", "beef", @@ -4925,24 +6213,60 @@ dependencies = [ "thiserror", ] +[[package]] +name = "jsonrpsee-types" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a178c60086f24cc35bb82f57c651d0d25d99c4742b4d335de04e97fa1f08a8a1" +dependencies = [ + "http 1.1.0", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "jsonrpsee-wasm-client" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a01cd500915d24ab28ca17527e23901ef1be6d659a2322451e1045532516c25" +dependencies = [ + "jsonrpsee-client-transport 0.24.7", + "jsonrpsee-core 0.24.7", + "jsonrpsee-types 0.24.7", +] + [[package]] name = "jsonrpsee-ws-client" -version = "0.20.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" +checksum = "58b9db2dfd5bb1194b0ce921504df9ceae210a345bc2f6c5a61432089bbab070" dependencies = [ "http 0.2.12", - "jsonrpsee-client-transport 0.20.3", - "jsonrpsee-core 0.20.3", - "jsonrpsee-types 0.20.3", + "jsonrpsee-client-transport 0.22.5", + "jsonrpsee-core 0.22.5", + "jsonrpsee-types 0.22.5", + "url", +] + +[[package]] +name = "jsonrpsee-ws-client" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fe322e0896d0955a3ebdd5bf813571c53fea29edd713bc315b76620b327e86d" +dependencies = [ + "http 1.1.0", + "jsonrpsee-client-transport 0.24.7", + "jsonrpsee-core 0.24.7", + "jsonrpsee-types 0.24.7", "url", ] [[package]] name = "k256" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ "cfg-if", "ecdsa", @@ -4961,6 +6285,16 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "keccak-hash" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e1b8590eb6148af2ea2d75f38e7d29f5ca970d5a4df456b3ef19b8b415d0264" +dependencies = [ + "primitive-types 0.13.1", + "tiny-keccak", +] + [[package]] name = "keystream" version = "1.0.0" @@ -5023,15 +6357,15 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", "windows-targets 0.52.6", @@ -5039,9 +6373,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libp2p" @@ -5054,26 +6388,63 @@ dependencies = [ "futures-timer", "getrandom 0.2.15", "instant", - "libp2p-allow-block-list", - "libp2p-connection-limits", - "libp2p-core", - "libp2p-dns", - "libp2p-identify", - "libp2p-identity", - "libp2p-kad", - "libp2p-mdns", - "libp2p-metrics", - "libp2p-noise", - "libp2p-ping", - "libp2p-quic", - "libp2p-request-response", - "libp2p-swarm", - "libp2p-tcp", - "libp2p-wasm-ext", - "libp2p-websocket", - "libp2p-yamux", - "multiaddr", + "libp2p-allow-block-list 0.1.1", + "libp2p-connection-limits 0.1.0", + "libp2p-core 0.39.2", + "libp2p-dns 0.39.0", + "libp2p-identify 0.42.2", + "libp2p-identity 0.1.3", + "libp2p-kad 0.43.3", + "libp2p-mdns 0.43.1", + "libp2p-metrics 0.12.0", + "libp2p-noise 0.42.2", + "libp2p-ping 0.42.0", + "libp2p-quic 0.7.0-alpha.3", + "libp2p-request-response 0.24.1", + "libp2p-swarm 0.42.2", + "libp2p-tcp 0.39.0", + "libp2p-wasm-ext 0.39.0", + "libp2p-websocket 0.41.0", + "libp2p-yamux 0.43.1", + "multiaddr 0.17.1", + "pin-project", +] + +[[package]] +name = "libp2p" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94495eb319a85b70a68b85e2389a95bb3555c71c49025b78c691a854a7e6464" +dependencies = [ + "bytes", + "either", + "futures", + "futures-timer", + "getrandom 0.2.15", + "instant", + "libp2p-allow-block-list 0.2.0", + "libp2p-connection-limits 0.2.1", + "libp2p-core 0.40.1", + "libp2p-dns 0.40.1", + "libp2p-identify 0.43.1", + "libp2p-identity 0.2.9", + "libp2p-kad 0.44.6", + "libp2p-mdns 0.44.0", + "libp2p-metrics 0.13.1", + "libp2p-noise 0.43.2", + "libp2p-ping 0.43.1", + "libp2p-quic 0.9.3", + "libp2p-request-response 0.25.3", + "libp2p-swarm 0.43.7", + "libp2p-tcp 0.40.1", + "libp2p-upnp", + "libp2p-wasm-ext 0.40.0", + "libp2p-websocket 0.42.2", + "libp2p-yamux 0.44.1", + "multiaddr 0.18.2", "pin-project", + "rw-stream-sink 0.4.0", + "thiserror", ] [[package]] @@ -5082,9 +6453,21 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "510daa05efbc25184458db837f6f9a5143888f1caa742426d92e1833ddd38a50" dependencies = [ - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm 0.42.2", + "void", +] + +[[package]] +name = "libp2p-allow-block-list" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55b46558c5c0bf99d3e2a1a38fd54ff5476ca66dd1737b12466a1824dd219311" +dependencies = [ + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", "void", ] @@ -5094,9 +6477,21 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4caa33f1d26ed664c4fe2cca81a08c8e07d4c1c04f2f4ac7655c2dd85467fda0" dependencies = [ - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm 0.42.2", + "void", +] + +[[package]] +name = "libp2p-connection-limits" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f5107ad45cb20b2f6c3628c7b6014b996fcb13a88053f4569c872c6e30abf58" +dependencies = [ + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", "void", ] @@ -5111,20 +6506,48 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-identity", + "libp2p-identity 0.1.3", "log", - "multiaddr", + "multiaddr 0.17.1", "multihash 0.17.0", - "multistream-select", + "multistream-select 0.12.1", + "once_cell", + "parking_lot 0.12.3", + "pin-project", + "quick-protobuf", + "rand", + "rw-stream-sink 0.3.0", + "smallvec", + "thiserror", + "unsigned-varint 0.7.2", + "void", +] + +[[package]] +name = "libp2p-core" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd44289ab25e4c9230d9246c475a22241e301b23e8f4061d3bdef304a1a99713" +dependencies = [ + "either", + "fnv", + "futures", + "futures-timer", + "instant", + "libp2p-identity 0.2.9", + "log", + "multiaddr 0.18.2", + "multihash 0.19.2", + "multistream-select 0.13.0", "once_cell", "parking_lot 0.12.3", "pin-project", "quick-protobuf", "rand", - "rw-stream-sink", + "rw-stream-sink 0.4.0", "smallvec", "thiserror", - "unsigned-varint", + "unsigned-varint 0.7.2", "void", ] @@ -5135,11 +6558,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146ff7034daae62077c415c2376b8057368042df6ab95f5432ad5e88568b1554" dependencies = [ "futures", - "libp2p-core", + "libp2p-core 0.39.2", + "log", + "parking_lot 0.12.3", + "smallvec", + "trust-dns-resolver 0.22.0", +] + +[[package]] +name = "libp2p-dns" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a18db73084b4da2871438f6239fef35190b05023de7656e877c18a00541a3b" +dependencies = [ + "async-trait", + "futures", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", "log", "parking_lot 0.12.3", "smallvec", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", ] [[package]] @@ -5152,28 +6591,51 @@ dependencies = [ "either", "futures", "futures-timer", - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm 0.42.2", "log", "lru 0.10.1", "quick-protobuf", - "quick-protobuf-codec", + "quick-protobuf-codec 0.1.0", "smallvec", "thiserror", "void", ] [[package]] -name = "libp2p-identity" -version = "0.1.3" +name = "libp2p-identify" +version = "0.43.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45a96638a0a176bec0a4bcaebc1afa8cf909b114477209d7456ade52c61cd9cd" +dependencies = [ + "asynchronous-codec", + "either", + "futures", + "futures-bounded", + "futures-timer", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", + "log", + "lru 0.12.5", + "quick-protobuf", + "quick-protobuf-codec 0.2.0", + "smallvec", + "thiserror", + "void", +] + +[[package]] +name = "libp2p-identity" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58 0.4.0", "ed25519-dalek", "log", - "multiaddr", + "multiaddr 0.17.1", "multihash 0.17.0", "quick-protobuf", "rand", @@ -5182,13 +6644,59 @@ dependencies = [ "zeroize", ] +[[package]] +name = "libp2p-identity" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" +dependencies = [ + "bs58 0.5.1", + "ed25519-dalek", + "hkdf", + "multihash 0.19.2", + "quick-protobuf", + "rand", + "sha2 0.10.8", + "thiserror", + "tracing", + "zeroize", +] + [[package]] name = "libp2p-kad" version = "0.43.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", + "asynchronous-codec", + "bytes", + "either", + "fnv", + "futures", + "futures-timer", + "instant", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm 0.42.2", + "log", + "quick-protobuf", + "rand", + "sha2 0.10.8", + "smallvec", + "thiserror", + "uint 0.9.5", + "unsigned-varint 0.7.2", + "void", +] + +[[package]] +name = "libp2p-kad" +version = "0.44.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16ea178dabba6dde6ffc260a8e0452ccdc8f79becf544946692fff9d412fc29d" +dependencies = [ + "arrayvec 0.7.6", "asynchronous-codec", "bytes", "either", @@ -5196,17 +6704,18 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", "log", "quick-protobuf", + "quick-protobuf-codec 0.2.0", "rand", "sha2 0.10.8", "smallvec", "thiserror", - "uint", - "unsigned-varint", + "uint 0.9.5", + "unsigned-varint 0.7.2", "void", ] @@ -5219,15 +6728,36 @@ dependencies = [ "data-encoding", "futures", "if-watch", - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm 0.42.2", "log", "rand", "smallvec", "socket2 0.4.10", "tokio", - "trust-dns-proto", + "trust-dns-proto 0.22.0", + "void", +] + +[[package]] +name = "libp2p-mdns" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a2567c305232f5ef54185e9604579a894fd0674819402bb0ac0246da82f52a" +dependencies = [ + "data-encoding", + "futures", + "if-watch", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", + "log", + "rand", + "smallvec", + "socket2 0.5.7", + "tokio", + "trust-dns-proto 0.22.0", "void", ] @@ -5237,12 +6767,29 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a42ec91e227d7d0dafa4ce88b333cdf5f277253873ab087555c92798db2ddd46" dependencies = [ - "libp2p-core", - "libp2p-identify", - "libp2p-kad", - "libp2p-ping", - "libp2p-swarm", - "prometheus-client", + "libp2p-core 0.39.2", + "libp2p-identify 0.42.2", + "libp2p-kad 0.43.3", + "libp2p-ping 0.42.0", + "libp2p-swarm 0.42.2", + "prometheus-client 0.19.0", +] + +[[package]] +name = "libp2p-metrics" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239ba7d28f8d0b5d77760dc6619c05c7e88e74ec8fbbe97f856f20a56745e620" +dependencies = [ + "instant", + "libp2p-core 0.40.1", + "libp2p-identify 0.43.1", + "libp2p-identity 0.2.9", + "libp2p-kad 0.44.6", + "libp2p-ping 0.43.1", + "libp2p-swarm 0.43.7", + "once_cell", + "prometheus-client 0.21.2", ] [[package]] @@ -5254,8 +6801,8 @@ dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures", - "libp2p-core", - "libp2p-identity", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", "log", "once_cell", "quick-protobuf", @@ -5268,6 +6815,31 @@ dependencies = [ "zeroize", ] +[[package]] +name = "libp2p-noise" +version = "0.43.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2eeec39ad3ad0677551907dd304b2f13f17208ccebe333bef194076cd2e8921" +dependencies = [ + "bytes", + "curve25519-dalek 4.1.3", + "futures", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "log", + "multiaddr 0.18.2", + "multihash 0.19.2", + "once_cell", + "quick-protobuf", + "rand", + "sha2 0.10.8", + "snow", + "static_assertions", + "thiserror", + "x25519-dalek 2.0.1", + "zeroize", +] + [[package]] name = "libp2p-ping" version = "0.42.0" @@ -5278,8 +6850,26 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core", - "libp2p-swarm", + "libp2p-core 0.39.2", + "libp2p-swarm 0.42.2", + "log", + "rand", + "void", +] + +[[package]] +name = "libp2p-ping" +version = "0.43.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e702d75cd0827dfa15f8fd92d15b9932abe38d10d21f47c50438c71dd1b5dae3" +dependencies = [ + "either", + "futures", + "futures-timer", + "instant", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", "log", "rand", "void", @@ -5295,18 +6885,42 @@ dependencies = [ "futures", "futures-timer", "if-watch", - "libp2p-core", - "libp2p-identity", - "libp2p-tls", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-tls 0.1.0", "log", "parking_lot 0.12.3", - "quinn-proto", + "quinn-proto 0.9.6", "rand", "rustls 0.20.9", "thiserror", "tokio", ] +[[package]] +name = "libp2p-quic" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "130d451d83f21b81eb7b35b360bc7972aeafb15177784adc56528db082e6b927" +dependencies = [ + "bytes", + "futures", + "futures-timer", + "if-watch", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-tls 0.2.1", + "log", + "parking_lot 0.12.3", + "quinn 0.10.2", + "rand", + "ring 0.16.20", + "rustls 0.21.12", + "socket2 0.5.7", + "thiserror", + "tokio", +] + [[package]] name = "libp2p-request-response" version = "0.24.1" @@ -5316,11 +6930,29 @@ dependencies = [ "async-trait", "futures", "instant", - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm 0.42.2", + "rand", + "smallvec", +] + +[[package]] +name = "libp2p-request-response" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e3b4d67870478db72bac87bfc260ee6641d0734e0e3e275798f089c3fecfd4" +dependencies = [ + "async-trait", + "futures", + "instant", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", + "log", "rand", "smallvec", + "void", ] [[package]] @@ -5334,10 +6966,33 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core", - "libp2p-identity", - "libp2p-swarm-derive", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm-derive 0.32.0", + "log", + "rand", + "smallvec", + "tokio", + "void", +] + +[[package]] +name = "libp2p-swarm" +version = "0.43.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "580189e0074af847df90e75ef54f3f30059aedda37ea5a1659e8b9fca05c0141" +dependencies = [ + "either", + "fnv", + "futures", + "futures-timer", + "instant", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm-derive 0.33.0", "log", + "multistream-select 0.13.0", + "once_cell", "rand", "smallvec", "tokio", @@ -5355,6 +7010,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "libp2p-swarm-derive" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4d5ec2a3df00c7836d7696c136274c9c59705bac69133253696a6c932cd1d74" +dependencies = [ + "heck 0.4.1", + "proc-macro-warning 0.4.2", + "proc-macro2", + "quote", + "syn 2.0.85", +] + [[package]] name = "libp2p-tcp" version = "0.39.0" @@ -5365,12 +7033,29 @@ dependencies = [ "futures-timer", "if-watch", "libc", - "libp2p-core", + "libp2p-core 0.39.2", "log", "socket2 0.4.10", "tokio", ] +[[package]] +name = "libp2p-tcp" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b558dd40d1bcd1aaaed9de898e9ec6a436019ecc2420dd0016e712fbb61c5508" +dependencies = [ + "futures", + "futures-timer", + "if-watch", + "libc", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "log", + "socket2 0.5.7", + "tokio", +] + [[package]] name = "libp2p-tls" version = "0.1.0" @@ -5378,18 +7063,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781" dependencies = [ "futures", - "futures-rustls", - "libp2p-core", - "libp2p-identity", + "futures-rustls 0.22.2", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", "rcgen", "ring 0.16.20", "rustls 0.20.9", "thiserror", "webpki", - "x509-parser", + "x509-parser 0.14.0", + "yasna", +] + +[[package]] +name = "libp2p-tls" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8218d1d5482b122ccae396bbf38abdcb283ecc96fa54760e1dfd251f0546ac61" +dependencies = [ + "futures", + "futures-rustls 0.24.0", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "rcgen", + "ring 0.16.20", + "rustls 0.21.12", + "rustls-webpki 0.101.7", + "thiserror", + "x509-parser 0.15.1", "yasna", ] +[[package]] +name = "libp2p-upnp" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82775a47b34f10f787ad3e2a22e2c1541e6ebef4fe9f28f3ac553921554c94c1" +dependencies = [ + "futures", + "futures-timer", + "igd-next", + "libp2p-core 0.40.1", + "libp2p-swarm 0.43.7", + "log", + "tokio", + "void", +] + [[package]] name = "libp2p-wasm-ext" version = "0.39.0" @@ -5398,12 +7118,26 @@ checksum = "77dff9d32353a5887adb86c8afc1de1a94d9e8c3bc6df8b2201d7cdf5c848f43" dependencies = [ "futures", "js-sys", - "libp2p-core", + "libp2p-core 0.39.2", "parity-send-wrapper", "wasm-bindgen", "wasm-bindgen-futures", ] +[[package]] +name = "libp2p-wasm-ext" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e5d8e3a9e07da0ef5b55a9f26c009c8fb3c725d492d8bb4b431715786eea79c" +dependencies = [ + "futures", + "js-sys", + "libp2p-core 0.40.1", + "send_wrapper 0.6.0", + "wasm-bindgen", + "wasm-bindgen-futures", +] + [[package]] name = "libp2p-websocket" version = "0.41.0" @@ -5412,15 +7146,36 @@ checksum = "111273f7b3d3510524c752e8b7a5314b7f7a1fee7e68161c01a7d72cbb06db9f" dependencies = [ "either", "futures", - "futures-rustls", - "libp2p-core", + "futures-rustls 0.22.2", + "libp2p-core 0.39.2", "log", "parking_lot 0.12.3", "quicksink", - "rw-stream-sink", - "soketto", + "rw-stream-sink 0.3.0", + "soketto 0.7.1", + "url", + "webpki-roots 0.22.6", +] + +[[package]] +name = "libp2p-websocket" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004ee9c4a4631435169aee6aad2f62e3984dc031c43b6d29731e8e82a016c538" +dependencies = [ + "either", + "futures", + "futures-rustls 0.24.0", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "log", + "parking_lot 0.12.3", + "pin-project-lite 0.2.15", + "rw-stream-sink 0.4.0", + "soketto 0.8.0", + "thiserror", "url", - "webpki-roots", + "webpki-roots 0.25.4", ] [[package]] @@ -5430,10 +7185,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda" dependencies = [ "futures", - "libp2p-core", + "libp2p-core 0.39.2", + "log", + "thiserror", + "yamux 0.10.2", +] + +[[package]] +name = "libp2p-yamux" +version = "0.44.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eedcb62824c4300efb9cfd4e2a6edaf3ca097b9e68b36dabe45a44469fd6a85" +dependencies = [ + "futures", + "libp2p-core 0.40.1", "log", "thiserror", - "yamux", + "yamux 0.12.1", ] [[package]] @@ -5442,8 +7210,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall 0.5.7", ] [[package]] @@ -5488,7 +7257,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" dependencies = [ "crunchy", "digest 0.9.0", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -5511,9 +7280,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "pkg-config", @@ -5546,9 +7315,9 @@ dependencies = [ [[package]] name = "linregress" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de04dcecc58d366391f9920245b85ffa684558a5ef6e7736e754347c3aea9c2" +checksum = "a9eda9dcf4f2a99787827661f312ac3219292549c2ee992bf9a6248ffb066bf7" dependencies = [ "nalgebra", ] @@ -5578,32 +7347,96 @@ dependencies = [ ] [[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "loki-api" -version = "0.1.1" +name = "litep2p" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56d36f573486ba7f462b62cbae597fef7d5d93665e7047956b457531b8a1ced" +checksum = "0f46c51c205264b834ceed95c8b195026e700494bc3991aaba3b4ea9e20626d9" dependencies = [ - "prost 0.11.9", - "prost-types", -] - -[[package]] + "async-trait", + "bs58 0.4.0", + "bytes", + "cid 0.10.1", + "ed25519-dalek", + "futures", + "futures-timer", + "hex-literal", + "indexmap 2.6.0", + "libc", + "mockall 0.12.1", + "multiaddr 0.17.1", + "multihash 0.17.0", + "network-interface", + "nohash-hasher", + "parking_lot 0.12.3", + "pin-project", + "prost 0.12.6", + "prost-build 0.11.9", + "quinn 0.9.4", + "rand", + "rcgen", + "ring 0.16.20", + "rustls 0.20.9", + "serde", + "sha2 0.10.8", + "simple-dns", + "smallvec", + "snow", + "socket2 0.5.7", + "static_assertions", + "str0m", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tungstenite 0.20.1", + "tokio-util", + "tracing", + "trust-dns-resolver 0.23.2", + "uint 0.9.5", + "unsigned-varint 0.8.0", + "url", + "webpki", + "x25519-dalek 2.0.1", + "x509-parser 0.16.0", + "yasna", + "zeroize", +] + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "loki-api" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674883a98273598ac3aad4301724c56734bea90574c5033af067e8f9fb5eb399" +dependencies = [ + "prost 0.12.6", + "prost-types 0.12.6", +] + +[[package]] +name = "lru" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" +dependencies = [ + "hashbrown 0.12.3", +] + +[[package]] name = "lru" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5614,11 +7447,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.3" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.15.0", ] [[package]] @@ -5632,19 +7465,18 @@ dependencies = [ [[package]] name = "lz4" -version = "1.24.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1" +checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725" dependencies = [ - "libc", "lz4-sys", ] [[package]] name = "lz4-sys" -version = "1.9.4" +version = "1.11.1+lz4-1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" dependencies = [ "cc", "libc", @@ -5661,50 +7493,50 @@ dependencies = [ [[package]] name = "macro_magic" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" +checksum = "cc33f9f0351468d26fbc53d9ce00a096c8522ecb42f19b50f34f2c422f76d21d" dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "macro_magic_core" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" +checksum = "1687dc887e42f352865a393acae7cf79d98fab6351cde1f58e9e057da89bf150" dependencies = [ "const-random", - "derive-syn-parse 0.1.5", + "derive-syn-parse", "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "macro_magic_core_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" +checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "macro_magic_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" +checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -5751,9 +7583,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "matrixmultiply" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ "autocfg", "rawpointer", @@ -5761,9 +7593,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memfd" @@ -5771,7 +7603,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] @@ -5845,20 +7677,20 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", @@ -5871,20 +7703,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daa3eb39495d8e2e2947a1d862852c90cc6a4a8845f8b41c8829cb9fcc047f4a" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bitflags 1.3.2", "blake2 0.10.6", "c2-chacha", - "curve25519-dalek 4.1.2", + "curve25519-dalek 4.1.3", "either", "hashlink", "lioness", "log", "parking_lot 0.12.3", "rand", - "rand_chacha 0.3.1", + "rand_chacha", "rand_distr", - "subtle 2.5.0", + "subtle 2.6.1", "thiserror", "zeroize", ] @@ -5899,8 +7731,23 @@ dependencies = [ "downcast", "fragile", "lazy_static", - "mockall_derive", - "predicates", + "mockall_derive 0.11.4", + "predicates 2.1.5", + "predicates-tree", +] + +[[package]] +name = "mockall" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive 0.12.1", + "predicates 3.1.2", "predicates-tree", ] @@ -5916,12 +7763,30 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "mockall_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.85", +] + [[package]] name = "more-asserts" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e" +[[package]] +name = "multi-stash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685a9ac4b61f4e728e1d2c6a7844609c16527aeb5e6c865915c08e619c16410f" + [[package]] name = "multiaddr" version = "0.17.1" @@ -5937,7 +7802,26 @@ dependencies = [ "percent-encoding", "serde", "static_assertions", - "unsigned-varint", + "unsigned-varint 0.7.2", + "url", +] + +[[package]] +name = "multiaddr" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe6351f60b488e04c1d21bc69e56b89cb3f5e8f5d22557d6e8031bdfd79b6961" +dependencies = [ + "arrayref", + "byteorder", + "data-encoding", + "libp2p-identity 0.2.9", + "multibase", + "multihash 0.19.2", + "percent-encoding", + "serde", + "static_assertions", + "unsigned-varint 0.8.0", "url", ] @@ -5963,10 +7847,10 @@ dependencies = [ "blake3", "core2", "digest 0.10.7", - "multihash-derive 0.8.0", + "multihash-derive", "sha2 0.10.8", "sha3", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -5974,81 +7858,40 @@ name = "multihash" version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" -dependencies = [ - "core2", - "digest 0.10.7", - "multihash-derive 0.8.0", - "sha2 0.10.8", - "unsigned-varint", -] - -[[package]] -name = "multihash" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" -dependencies = [ - "core2", - "unsigned-varint", -] - -[[package]] -name = "multihash-codetable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d815ecb3c8238d00647f8630ede7060a642c9f704761cd6082cb4028af6935" dependencies = [ "blake2b_simd", "blake2s_simd", "blake3", "core2", "digest 0.10.7", - "multihash-derive 0.9.0", - "ripemd", - "serde", - "sha1", + "multihash-derive", "sha2 0.10.8", "sha3", - "strobe-rs", -] - -[[package]] -name = "multihash-derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", + "unsigned-varint 0.7.2", ] [[package]] -name = "multihash-derive" -version = "0.9.0" +name = "multihash" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "890e72cb7396cb99ed98c1246a97b243cc16394470d94e0bc8b0c2c11d84290e" +checksum = "cc41f430805af9d1cf4adae4ed2149c759b877b01d909a1f40256188d09345d2" dependencies = [ "core2", - "multihash 0.19.1", - "multihash-derive-impl", + "unsigned-varint 0.8.0", ] [[package]] -name = "multihash-derive-impl" -version = "0.1.0" +name = "multihash-derive" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38685e08adb338659871ecfc6ee47ba9b22dcc8abcf6975d379cc49145c3040" +checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro2", "quote", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", ] [[package]] @@ -6057,6 +7900,12 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +[[package]] +name = "multimap" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" + [[package]] name = "multistream-select" version = "0.12.1" @@ -6068,18 +7917,31 @@ dependencies = [ "log", "pin-project", "smallvec", - "unsigned-varint", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "multistream-select" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0df8e5eec2298a62b326ee4f0d7fe1a6b90a09dfcf9df37b38f947a8c42f19" +dependencies = [ + "bytes", + "futures", + "log", + "pin-project", + "smallvec", + "unsigned-varint 0.7.2", ] [[package]] name = "nalgebra" -version = "0.32.5" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef" +checksum = "3bf139e93ad757869338ad85239cb1d6c067b23b94e5846e637ca6328ee4be60" dependencies = [ "approx", "matrixmultiply", - "nalgebra-macros", "num-complex", "num-rational", "num-traits", @@ -6087,17 +7949,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "nalgebra-macros" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "names" version = "0.14.0" @@ -6109,11 +7960,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -6191,6 +8041,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "network-interface" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a43439bf756eed340bdf8feba761e2d50c7d47175d87545cd5cbe4a137c4d1" +dependencies = [ + "cc", + "libc", + "thiserror", + "winapi", +] + [[package]] name = "nix" version = "0.24.3" @@ -6203,10 +8065,10 @@ dependencies = [ ] [[package]] -name = "no-std-net" -version = "0.6.0" +name = "no-std-compat" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" [[package]] name = "nodrop" @@ -6230,6 +8092,18 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nonempty" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" + +[[package]] +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + [[package]] name = "normalize-line-endings" version = "0.3.0" @@ -6262,9 +8136,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -6285,13 +8159,24 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + [[package]] name = "num-format" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "itoa", ] @@ -6342,29 +8227,29 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -6415,20 +8300,38 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +dependencies = [ + "memchr", +] + [[package]] name = "oid-registry" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", +] + +[[package]] +name = "oid-registry" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" +dependencies = [ + "asn1-rs 0.6.2", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "opaque-debug" @@ -6448,7 +8351,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "786393f80485445794f6043fd3138854dd109cc6c4bd1a6383db304c9ce9b9ce" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "auto_impl", "bytes", "ethereum-types", @@ -6469,11 +8372,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -6490,7 +8393,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -6499,14 +8402,24 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.4.0+3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -6546,675 +8459,1708 @@ dependencies = [ ] [[package]] -name = "pallet-attestation" -version = "0.3.0-rc.1" +name = "pallet-alliance" +version = "37.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59378a648a0aa279a4b10650366c3389cd0a1239b1876f74bfecd268eecb086b" dependencies = [ - "entropy-shared", "frame-benchmarking", - "frame-election-provider-support", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", - "pallet-bags-list", - "pallet-balances", - "pallet-parameters", - "pallet-session", - "pallet-staking", - "pallet-staking-extension", - "pallet-staking-reward-curve", - "pallet-timestamp", + "pallet-collective", + "pallet-identity", "parity-scale-codec", - "rand_chacha 0.3.1", - "rand_core 0.6.4", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-npos-elections", - "sp-runtime 32.0.0", - "sp-staking", - "sp-std 14.0.0", - "tdx-quote", -] - -[[package]] -name = "pallet-authority-discovery" -version = "29.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd9a381c613e6538638391fb51f353fd13b16f849d0d1ac66a388326bd456f1" -dependencies = [ - "frame-support", - "frame-system", - "pallet-session", - "parity-scale-codec", - "scale-info", - "sp-application-crypto 31.0.0", - "sp-authority-discovery", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-crypto-hashing", + "sp-io 38.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-authorship" -version = "29.0.0" +name = "pallet-asset-conversion" +version = "20.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d83773e731a1760f99684b09961ed7b92acafe335f36f08ebb8313d3b9c72e2" +checksum = "33f0078659ae95efe6a1bf138ab5250bc41ab98f22ff3651d0208684f08ae797" dependencies = [ - "frame-support", + "frame-benchmarking", + "frame-support 38.0.0", "frame-system", - "impl-trait-for-tuples", + "log", "parity-scale-codec", "scale-info", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-api 34.0.0", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-babe" -version = "29.0.0" +name = "pallet-asset-conversion-ops" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3f2020c52667a650d64e84a4bbb63388e25bc1c9bc872a8243d03bfcb285049" +checksum = "3edbeda834bcd6660f311d4eead3dabdf6d385b7308ac75b0fae941a960e6c3a" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", - "pallet-authorship", - "pallet-session", - "pallet-timestamp", + "pallet-asset-conversion", "parity-scale-codec", "scale-info", - "sp-application-crypto 31.0.0", - "sp-consensus-babe", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-session", - "sp-staking", - "sp-std 14.0.0", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-bags-list" -version = "28.0.0" +name = "pallet-asset-conversion-tx-payment" +version = "20.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd27bfa4bfa5751652842b81241c7eff3e68f2806d9dacc17b03d2cb20a39756" +checksum = "1ab66c4c22ac0f20e620a954ce7ba050118d6d8011e2d02df599309502064e98" dependencies = [ - "aquamarine", - "docify", - "frame-benchmarking", - "frame-election-provider-support", - "frame-support", + "frame-support 38.0.0", "frame-system", - "log", - "pallet-balances", + "pallet-asset-conversion", + "pallet-transaction-payment", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", - "sp-tracing", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-balances" -version = "29.0.2" +name = "pallet-asset-rate" +version = "17.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a54b5d0c7c4c3731883d6b1ac18aff44db20c3d0a3470c8861001a17afdc85" +checksum = "71b2149aa741bc39466bbcc92d9d0ab6e9adcf39d2790443a735ad573b3191e7" dependencies = [ - "docify", "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", - "log", "parity-scale-codec", "scale-info", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-bounties" -version = "28.0.0" +name = "pallet-asset-tx-payment" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4765879e96676c13cdbed746d66fd59dcde1e9e65fda1f064fa2fffa3bc5d597" +checksum = "406a486466d15acc48c99420191f96f1af018f3381fde829c467aba489030f18" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", - "log", - "pallet-treasury", + "pallet-transaction-payment", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "serde", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-collective" -version = "29.0.0" +name = "pallet-assets" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c362a0b8f30895c15ecc7d8c24b0d94bb586c4b9bbd37ac8053b4629d9cc80b" +checksum = "f45f4eb6027fc34c4650e0ed6a7e57ed3335cc364be74b4531f714237676bcee" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", + "impl-trait-for-tuples", "log", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-democracy" -version = "29.0.0" +name = "pallet-assets-freezer" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa781d632063087bcd3ff46eb1a668f15647ab116f1c8a7c573b7168f62d72c3" +checksum = "127adc2250b89416b940850ce2175dab10a9297b503b1fcb05dc555bd9bd3207" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", + "pallet-assets", "parity-scale-codec", "scale-info", - "serde", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-election-provider-multi-phase" -version = "28.0.0" +name = "pallet-atomic-swap" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b54d1d3fe9ae61a144d581147e699b7c3009169de0019a0f87cca0bed82681e7" +checksum = "15906a685adeabe6027e49c814a34066222dd6136187a8a79c213d0d739b6634" dependencies = [ - "frame-benchmarking", - "frame-election-provider-support", - "frame-support", + "frame-support 38.0.0", "frame-system", - "log", - "pallet-election-provider-support-benchmarking", "parity-scale-codec", - "rand", "scale-info", - "sp-arithmetic 24.0.0", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-npos-elections", - "sp-runtime 32.0.0", - "sp-std 14.0.0", - "strum 0.24.1", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-election-provider-support-benchmarking" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46ec87816a1e32a1ab6deececa99e21e6684b111efe87b11b8298328dbbefd01" +name = "pallet-attestation" +version = "0.3.0-rc.1" dependencies = [ + "entropy-shared", "frame-benchmarking", "frame-election-provider-support", + "frame-support 38.0.0", "frame-system", + "log", + "pallet-bags-list", + "pallet-balances", + "pallet-parameters 0.3.0-rc.1", + "pallet-session", + "pallet-staking", + "pallet-staking-extension", + "pallet-staking-reward-curve", + "pallet-timestamp", "parity-scale-codec", + "rand_chacha", + "rand_core 0.6.4", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", "sp-npos-elections", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", + "sp-std", + "tdx-quote", ] [[package]] -name = "pallet-elections-phragmen" -version = "30.0.0" +name = "pallet-aura" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10cb0158cc7461fda5db04c5791d0df34635bec37181763aca449bade677d12d" +checksum = "b31da6e794d655d1f9c4da6557a57399538d75905a7862a2ed3f7e5fb711d7e4" dependencies = [ - "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", + "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-npos-elections", - "sp-runtime 32.0.0", - "sp-staking", - "sp-std 14.0.0", + "sp-application-crypto 38.0.0", + "sp-consensus-aura 0.40.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-grandpa" -version = "29.0.0" +name = "pallet-authority-discovery" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b20be8592eed7ebca2ee661fc43450088552ebe0bd483d7b101cf5968ab12d" +checksum = "ffb0208f0538d58dcb78ce1ff5e6e8641c5f37b23b20b05587e51da30ab13541" dependencies = [ - "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", - "log", - "pallet-authorship", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 31.0.0", - "sp-consensus-grandpa", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-session", - "sp-staking", - "sp-std 14.0.0", + "sp-application-crypto 38.0.0", + "sp-authority-discovery", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-identity" -version = "29.0.1" +name = "pallet-authorship" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452bba25325b7f0148eeecbde13e7c26dfb677ad46b3f160b359d7643b44c94b" +checksum = "625d47577cabbe1318ccec5d612e2379002d1b6af1ab6edcef3243c66ec246df" dependencies = [ - "enumflags2", - "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", - "log", + "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-im-online" -version = "28.0.0" +name = "pallet-babe" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598ea5c87351edc953d1f455f32ff456cf2f1daf7bbada1f1e03be8e384852ab" +checksum = "4ee096c0def13832475b340d00121025e0225de29604d44bc6dfcaa294c995b4" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", "pallet-authorship", + "pallet-session", + "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 31.0.0", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-staking", - "sp-std 14.0.0", + "sp-application-crypto 38.0.0", + "sp-consensus-babe 0.40.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-session 36.0.0", + "sp-staking 36.0.0", ] [[package]] -name = "pallet-indices" -version = "29.0.0" +name = "pallet-bags-list" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e880ebdb429ca76fb400b1b361ed7fce018a5ea2fc2da4764de5156fffdfa73" +checksum = "0fd23a6f94ba9c1e57c8a7f8a41327d132903a79c55c0c83f36cbae19946cf10" dependencies = [ + "aquamarine", + "docify", "frame-benchmarking", - "frame-support", + "frame-election-provider-support", + "frame-support 38.0.0", "frame-system", + "log", + "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-keyring 32.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-tracing", ] [[package]] -name = "pallet-membership" -version = "29.0.0" +name = "pallet-balances" +version = "39.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad901cdf3de23daf23ff8b092ab318b13faebfc1aa4d84263f2fdc84feaf3e9b" +checksum = "5c6945b078919acb14d126490e4b0973a688568b30142476ca69c6df2bed27ad" dependencies = [ + "docify", "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-multisig" -version = "29.0.0" +name = "pallet-beefy" +version = "39.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176f6a5c170185f892a047c0ae189bc52eb390f2c0b94d4261ed0ebc7f82a548" +checksum = "014d177a3aba19ac144fc6b2b5eb94930b9874734b91fd014902b6706288bb5f" dependencies = [ - "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", + "pallet-authorship", + "pallet-session", "parity-scale-codec", "scale-info", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "serde", + "sp-consensus-beefy", + "sp-runtime 39.0.2", + "sp-session 36.0.0", + "sp-staking 36.0.0", ] [[package]] -name = "pallet-nomination-pools" -version = "26.0.1" +name = "pallet-beefy-mmr" +version = "39.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62091305ec7426e71c3da2b0944c2df5a804109ee4d2e8f4fe34865e049f8ac" +checksum = "9c64f536e7f04cf3a0a17fdf20870ddb3d63a7690419c40f75cfd2f72b6e6d22" dependencies = [ - "frame-support", + "array-bytes 6.2.3", + "binary-merkle-tree", + "frame-benchmarking", + "frame-support 38.0.0", "frame-system", "log", - "pallet-balances", + "pallet-beefy", + "pallet-mmr", + "pallet-session", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-staking", - "sp-std 14.0.0", - "sp-tracing", + "serde", + "sp-api 34.0.0", + "sp-consensus-beefy", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-state-machine 0.43.0", ] [[package]] -name = "pallet-nomination-pools-benchmarking" -version = "27.0.0" +name = "pallet-bounties" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a1eba3078e2492cad15e4695f90eb3fc570386d9f71f8b81f709c7123fc6b5" +checksum = "a1163f9cd8bbc47ec0c6900a3ca67689d8d7b40bedfa6aa22b1b3c6027b1090e" dependencies = [ "frame-benchmarking", - "frame-election-provider-support", - "frame-support", + "frame-support 38.0.0", "frame-system", - "pallet-bags-list", - "pallet-nomination-pools", - "pallet-staking", + "log", + "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-runtime 32.0.0", - "sp-runtime-interface 25.0.0", - "sp-staking", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-offences" -version = "28.0.0" +name = "pallet-bridge-grandpa" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b5bcfdc4f6032d7570929094fd459de12d840c440c395fb4d365d679e13eda" +checksum = "1d825fbed9fb68bc5d344311653dc0f69caeabe647365abf79a539310b2245f6" dependencies = [ - "frame-support", + "bp-header-chain", + "bp-runtime", + "bp-test-utils", + "frame-benchmarking", + "frame-support 38.0.0", "frame-system", "log", - "pallet-balances", "parity-scale-codec", "scale-info", - "serde", - "sp-runtime 32.0.0", - "sp-staking", - "sp-std 14.0.0", + "sp-consensus-grandpa 21.0.0", + "sp-runtime 39.0.2", + "sp-std", ] [[package]] -name = "pallet-offences-benchmarking" -version = "29.0.0" +name = "pallet-bridge-messages" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc33e3086c19235cb903cbbbde1bc1c4f428519ad4c23446dc84c75d0061582" +checksum = "a1decdc9fb885e46eb17f850aa14f8cf39e17f31574aa6a5fa1a9e603cc526a2" dependencies = [ + "bp-header-chain", + "bp-messages", + "bp-runtime", "frame-benchmarking", - "frame-election-provider-support", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", - "pallet-babe", - "pallet-balances", - "pallet-grandpa", - "pallet-im-online", - "pallet-offences", - "pallet-session", - "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime 32.0.0", - "sp-staking", - "sp-std 14.0.0", + "sp-runtime 39.0.2", + "sp-std", + "sp-trie 37.0.0", ] [[package]] -name = "pallet-oracle" -version = "0.3.0-rc.1" +name = "pallet-bridge-parachains" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41450a8d214f20eaff57aeca8e647b20c0df7d66871ee2262609b90824bd4cca" dependencies = [ + "bp-header-chain", + "bp-parachains", + "bp-polkadot-core", + "bp-runtime", "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", + "log", + "pallet-bridge-grandpa", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-runtime 39.0.2", + "sp-std", ] [[package]] -name = "pallet-parameters" -version = "0.3.0-rc.1" +name = "pallet-bridge-relayers" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2faead05455a965a0a0ec69ffa779933479b599e40bda809c0aa1efa72a39281" dependencies = [ - "entropy-shared", + "bp-header-chain", + "bp-messages", + "bp-relayers", + "bp-runtime", "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", - "pallet-session", + "log", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-transaction-payment", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-staking", - "sp-std 14.0.0", + "sp-arithmetic", + "sp-runtime 39.0.2", + "sp-std", ] [[package]] -name = "pallet-preimage" -version = "29.0.0" +name = "pallet-broker" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7344a30c304771beb90aec34604100185e47cdc0366e268ad18922de602a0c7e" +checksum = "3043c90106d88cb93fcf0d9b6d19418f11f44cc2b11873414aec3b46044a24ea" dependencies = [ + "bitvec", "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-api 34.0.0", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-programs" -version = "0.3.0-rc.1" +name = "pallet-child-bounties" +version = "37.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f3bc38ae6584b5f57e4de3e49e5184bfc0f20692829530ae1465ffe04e09e7" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", - "pallet-balances", + "pallet-bounties", + "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-staking", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-propagation" -version = "0.3.0-rc.1" +name = "pallet-collator-selection" +version = "19.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658798d70c9054165169f6a6a96cfa9d6a5e7d24a524bc19825bf17fcbc5cc5a" dependencies = [ - "entropy-shared", "frame-benchmarking", - "frame-election-provider-support", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", - "pallet-attestation", "pallet-authorship", - "pallet-babe", - "pallet-bags-list", "pallet-balances", - "pallet-parameters", - "pallet-programs", - "pallet-registry", "pallet-session", - "pallet-staking", - "pallet-staking-extension", - "pallet-staking-reward-curve", - "pallet-timestamp", "parity-scale-codec", - "parking_lot 0.12.3", + "rand", "scale-info", - "sp-application-crypto 31.0.0", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-keystore 0.35.0", - "sp-npos-elections", - "sp-runtime 32.0.0", - "sp-staking", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", ] [[package]] -name = "pallet-proxy" -version = "29.0.0" +name = "pallet-collective" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7aa31a0b91e8060b808c3e3407e4578a5e94503b174b9e99769147b24fb2c56" +checksum = "8e149f1aefd444c9a1da6ec5a94bc8a7671d7a33078f85dd19ae5b06e3438e60" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", + "log", "parity-scale-codec", "scale-info", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-recovery" -version = "29.0.0" +name = "pallet-collective-content" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "797b554ddc87082c18223440d61a81cf35ccab6573321ce473a099e7a709a760" +checksum = "38a6a5cbe781d9c711be74855ba32ef138f3779d6c54240c08e6d1b4bbba4d1d" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", ] [[package]] -name = "pallet-registry" -version = "0.3.0-rc.1" +name = "pallet-contracts" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5df77077745d891c822b4275f273f336077a97e69e62a30134776aa721c96fee" dependencies = [ - "bip32", - "entropy-shared", + "bitflags 1.3.2", + "environmental", "frame-benchmarking", - "frame-election-provider-support", - "frame-support", + "frame-support 38.0.0", "frame-system", + "impl-trait-for-tuples", "log", - "pallet-authorship", - "pallet-bags-list", "pallet-balances", - "pallet-parameters", - "pallet-programs", - "pallet-session", - "pallet-staking", - "pallet-staking-extension", - "pallet-staking-reward-curve", - "pallet-timestamp", + "pallet-contracts-proc-macro", + "pallet-contracts-uapi", "parity-scale-codec", + "paste", "rand", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-npos-elections", - "sp-runtime 32.0.0", - "sp-staking", - "sp-std 14.0.0", - "synedrion", + "serde", + "smallvec", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", + "staging-xcm", + "staging-xcm-builder", + "wasm-instrument", + "wasmi", ] [[package]] -name = "pallet-scheduler" -version = "30.0.0" +name = "pallet-contracts-mock-network" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e2a4ebe6a5f98b14a26deed8d7a1ea28bb2c2d3ad4d6dc129a725523a2042d" +checksum = "309666537ed001c61a99f59fa7b98680f4a6e4e361ed3bc64f7b0237da3e3e06" dependencies = [ - "docify", - "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", - "log", + "pallet-assets", + "pallet-balances", + "pallet-contracts", + "pallet-contracts-proc-macro", + "pallet-contracts-uapi", + "pallet-insecure-randomness-collective-flip", + "pallet-message-queue", + "pallet-proxy", + "pallet-timestamp", + "pallet-utility", + "pallet-xcm", "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-primitives 16.0.0", + "polkadot-runtime-parachains", "scale-info", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", - "sp-weights 28.0.0", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", + "sp-tracing", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "xcm-simulator", ] [[package]] -name = "pallet-session" -version = "29.0.0" +name = "pallet-contracts-proc-macro" +version = "23.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7412ac59247b300feee53709f7009a23d1c6f8c70528599f48f44e102d896d03" +checksum = "94226cbd48516b7c310eb5dae8d50798c1ce73a7421dc0977c55b7fc2237a283" dependencies = [ - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "log", - "pallet-timestamp", + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "pallet-contracts-uapi" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f74b000590c33fadea48585d3ae3f4b7867e99f0a524c444d5779f36b9a1b6" +dependencies = [ + "bitflags 1.3.2", "parity-scale-codec", + "paste", + "polkavm-derive 0.9.1", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-session", - "sp-staking", - "sp-state-machine 0.36.0", - "sp-std 14.0.0", - "sp-trie 30.0.0", ] [[package]] -name = "pallet-session-benchmarking" -version = "29.0.0" +name = "pallet-conviction-voting" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9c2731415381020db1e78db8b40207f8423a16099e78f2fde599cbcb57ea8db" +checksum = "999c242491b74395b8c5409ef644e782fe426d87ae36ad92240ffbf21ff0a76e" dependencies = [ + "assert_matches", "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", - "pallet-session", + "parity-scale-codec", + "scale-info", + "serde", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-core-fellowship" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d063b41df454bd128d6fefd5800af8a71ac383c9dd6f20096832537efc110a8a" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-ranked-collective", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-delegated-staking" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "117f003a97f980514c6db25a50c22aaec2a9ccb5664b3cb32f52fb990e0b0c12" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", +] + +[[package]] +name = "pallet-democracy" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d1dc655f50b7c65bb2fb14086608ba11af02ef2936546f7a67db980ec1f133" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-dev-mode" +version = "20.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d8050c09c5e003d502c1addc7fdfbde21a854bd57787e94447078032710c8" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-election-provider-multi-phase" +version = "37.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f9ad5ae0c13ba3727183dadf1825b6b7b0b0598ed5c366f8697e13fd540f7d" +dependencies = [ + "frame-benchmarking", + "frame-election-provider-support", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-election-provider-support-benchmarking", + "parity-scale-codec", + "rand", + "scale-info", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-npos-elections", + "sp-runtime 39.0.2", + "strum 0.26.3", +] + +[[package]] +name = "pallet-election-provider-support-benchmarking" +version = "37.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4111d0d27545c260c9dd0d6fc504961db59c1ec4b42e1bcdc28ebd478895c22" +dependencies = [ + "frame-benchmarking", + "frame-election-provider-support", + "frame-system", + "parity-scale-codec", + "sp-npos-elections", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-elections-phragmen" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "705c66d6c231340c6d085a0df0319a6ce42a150f248171e88e389ab1e3ce20f5" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-npos-elections", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", +] + +[[package]] +name = "pallet-fast-unstake" +version = "37.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ee60e8ef10b3936f2700bd61fa45dcc190c61124becc63bed787addcfa0d20" +dependencies = [ + "docify", + "frame-benchmarking", + "frame-election-provider-support", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", +] + +[[package]] +name = "pallet-glutton" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1c79ab340890f6ab088a638c350ac1173a1b2a79c18004787523032025582b4" +dependencies = [ + "blake2 0.10.6", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-grandpa" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d3a570a4aac3173ea46b600408183ca2bcfdaadc077f802f11e6055963e2449" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-authorship", + "pallet-session", + "parity-scale-codec", + "scale-info", + "sp-application-crypto 38.0.0", + "sp-consensus-grandpa 21.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-session 36.0.0", + "sp-staking 36.0.0", +] + +[[package]] +name = "pallet-identity" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a4288548de9a755e39fcb82ffb9024b6bb1ba0f582464a44423038dd7a892e" +dependencies = [ + "enumflags2", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-im-online" +version = "37.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fd95270cf029d16cb40fe6bd9f8ab9c78cd966666dccbca4d8bfec35c5bba5" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-authorship", + "parity-scale-codec", + "scale-info", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", +] + +[[package]] +name = "pallet-indices" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e4b97de630427a39d50c01c9e81ab8f029a00e56321823958b39b438f7b940" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-keyring 39.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-insecure-randomness-collective-flip" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce7ad80675d78bd38a7a66ecbbf2d218dd32955e97f8e301d0afe6c87b0f251" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "safe-mix", + "scale-info", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-lottery" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae0920ee53cf7b0665cfb6d275759ae0537dc3850ec78da5f118d814c99d3562" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-membership" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868b5dca4bbfd1f4a222cbb80735a5197020712a71577b496bbb7e19aaa5394" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-message-queue" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca5df71ac372c51480a896277f33d4376766e1a36317c4d1fce3fd84d66dff81" +dependencies = [ + "environmental", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-weights", +] + +[[package]] +name = "pallet-migrations" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b417fc975636bce94e7c6d707e42d0706d67dfa513e72f5946918e1044beef1" +dependencies = [ + "docify", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-mixnet" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3fa2b7f759a47f698a403ab40c54bc8935e2969387947224cbdb4e2bc8a28a" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-application-crypto 38.0.0", + "sp-arithmetic", + "sp-io 38.0.0", + "sp-mixnet 0.12.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-mmr" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6932dfb85f77a57c2d1fdc28a7b3a59ffe23efd8d5bb02dc3039d91347e4a3b" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-mmr-primitives", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-multisig" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e5099c9a4442efcc1568d88ca1d22d624e81ab96358f99f616c67fbd82532d2" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-nft-fractionalization" +version = "21.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168792cf95a32fa3baf9b874efec82a45124da0a79cee1ae3c98a823e6841959" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-assets", + "pallet-nfts", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-nfts" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e2aad461a0849d7f0471576eeb1fe3151795bcf2ec9e15eca5cca5b9d743b2" +dependencies = [ + "enumflags2", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-nfts-runtime-api" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a1f50c217e19dc50ff586a71eb5915df6a05bc0b25564ea20674c8cd182c1f" +dependencies = [ + "pallet-nfts", + "parity-scale-codec", + "sp-api 34.0.0", +] + +[[package]] +name = "pallet-nis" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ac349e119880b7df1a7c4c36d919b33a498d0e9548af3c237365c654ae0c73d" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-node-authorization" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec3133be9e767b8feafbb26edd805824faa59956da008d2dc7fcf4b4720e56" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-nomination-pools" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c42906923f9f2b65b22f1211136b57c6878296ba6f6228a075c4442cc1fc1659" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", + "sp-tracing", +] + +[[package]] +name = "pallet-nomination-pools-benchmarking" +version = "36.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d2eaca0349bcda923343226b8b64d25a80b67e0a1ebaaa5b0ab1e1b3b225bc" +dependencies = [ + "frame-benchmarking", + "frame-election-provider-support", + "frame-support 38.0.0", + "frame-system", + "pallet-bags-list", + "pallet-delegated-staking", + "pallet-nomination-pools", + "pallet-staking", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", + "sp-runtime-interface 28.0.0", + "sp-staking 36.0.0", +] + +[[package]] +name = "pallet-nomination-pools-runtime-api" +version = "33.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9e1cb89cc2e6df06ce274a7fc814e5e688aad04c43902a10191fa3d2a56a96" +dependencies = [ + "pallet-nomination-pools", + "parity-scale-codec", + "sp-api 34.0.0", +] + +[[package]] +name = "pallet-offences" +version = "37.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c4379cf853465696c1c5c03e7e8ce80aeaca0a6139d698abe9ecb3223fd732a" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "serde", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", +] + +[[package]] +name = "pallet-offences-benchmarking" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69aa1b24cdffc3fa8c89cdea32c83f1bf9c1c82a87fa00e57ae4be8e85f5e24f" +dependencies = [ + "frame-benchmarking", + "frame-election-provider-support", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-babe", + "pallet-balances", + "pallet-grandpa", + "pallet-im-online", + "pallet-offences", + "pallet-session", + "pallet-staking", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", +] + +[[package]] +name = "pallet-oracle" +version = "0.3.0-rc.1" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "pallet-paged-list" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e099fb116068836b17ca4232dc52f762b69dc8cd4e33f509372d958de278b0" +dependencies = [ + "docify", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-metadata-ir", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-parameters" +version = "0.3.0-rc.1" +dependencies = [ + "entropy-shared", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "pallet-session", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", + "sp-std", +] + +[[package]] +name = "pallet-parameters" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9aba424d55e17b2a2bec766a41586eab878137704d4803c04bebd6a4743db7b" +dependencies = [ + "docify", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "paste", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-preimage" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "407828bc48c6193ac076fdf909b2fadcaaecd65f42b0b0a04afe22fe8e563834" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-programs" +version = "0.3.0-rc.1" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", + "sp-std", +] + +[[package]] +name = "pallet-propagation" +version = "0.3.0-rc.1" +dependencies = [ + "entropy-shared", + "frame-benchmarking", + "frame-election-provider-support", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-attestation", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-parameters 0.3.0-rc.1", + "pallet-programs", + "pallet-registry", + "pallet-session", + "pallet-staking", + "pallet-staking-extension", + "pallet-staking-reward-curve", + "pallet-timestamp", + "parity-scale-codec", + "parking_lot 0.12.3", + "scale-info", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-npos-elections", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", +] + +[[package]] +name = "pallet-proxy" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d39df395f0dbcf07dafe842916adea3266a87ce36ed87b5132184b6bcd746393" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-ranked-collective" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2b38708feaed202debf1ac6beffaa5e20c99a9825c5ca0991753c2d4eaaf3ac" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-recovery" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406a116aa6d05f88f3c10d79ff89cf577323680a48abd8e5550efb47317e67fa" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-referenda" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3008c20531d1730c9b457ae77ecf0e3c9b07aaf8c4f5d798d61ef6f0b9e2d4b" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-arithmetic", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-registry" +version = "0.3.0-rc.1" +dependencies = [ + "bip32", + "entropy-shared", + "frame-benchmarking", + "frame-election-provider-support", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-authorship", + "pallet-bags-list", + "pallet-balances", + "pallet-parameters 0.3.0-rc.1", + "pallet-programs", + "pallet-session", + "pallet-staking", + "pallet-staking-extension", + "pallet-staking-reward-curve", + "pallet-timestamp", + "parity-scale-codec", + "rand", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-npos-elections", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", + "sp-std", + "synedrion", +] + +[[package]] +name = "pallet-remark" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e8cae0e20888065ec73dda417325c6ecabf797f4002329484b59c25ecc34d4" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-revive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be02c94dcbadd206a910a244ec19b493aac793eed95e23d37d6699547234569f" +dependencies = [ + "bitflags 1.3.2", + "environmental", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-balances", + "pallet-revive-fixtures", + "pallet-revive-proc-macro", + "pallet-revive-uapi", + "parity-scale-codec", + "paste", + "polkavm 0.10.0", + "scale-info", + "serde", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", + "staging-xcm", + "staging-xcm-builder", +] + +[[package]] +name = "pallet-revive-fixtures" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a38c27f1531f36e5327f3084eb24cf1c9dd46b372e030c0169e843ce363105e" +dependencies = [ + "anyhow", + "frame-system", + "parity-wasm", + "polkavm-linker 0.10.0", + "sp-runtime 39.0.2", + "tempfile", + "toml 0.8.19", +] + +[[package]] +name = "pallet-revive-mock-network" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e74591d44dbd78db02c8593f5caa75bd61bcc4d63999302150223fb969ae37" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "pallet-assets", + "pallet-balances", + "pallet-message-queue", + "pallet-proxy", + "pallet-revive", + "pallet-revive-proc-macro", + "pallet-revive-uapi", + "pallet-timestamp", + "pallet-utility", + "pallet-xcm", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-primitives 16.0.0", + "polkadot-runtime-parachains", + "scale-info", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", + "sp-tracing", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "xcm-simulator", +] + +[[package]] +name = "pallet-revive-proc-macro" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc16d1f7cee6a1ee6e8cd710e16230d59fb4935316c1704cf770e4d2335f8d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "pallet-revive-uapi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecb4686c8415619cc13e43fadef146ffff46424d9b4d037fe4c069de52708aac" +dependencies = [ + "bitflags 1.3.2", + "parity-scale-codec", + "paste", + "polkavm-derive 0.10.0", + "scale-info", +] + +[[package]] +name = "pallet-root-offences" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35774b830928daaeeca7196cead7c56eeed952a6616ad6dc5ec068d8c85c81a" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "pallet-session", + "pallet-staking", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", +] + +[[package]] +name = "pallet-root-testing" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be95e7c320ac1d381715364cd721e67ab3152ab727f8e4defd3a92e41ebbc880" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-safe-mode" +version = "19.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d3e67dd4644c168cedbf257ac3dd2527aad81acf4a0d413112197094e549f76" +dependencies = [ + "docify", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "pallet-balances", + "pallet-proxy", + "pallet-utility", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-salary" +version = "23.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0544a71dba06a9a29da0778ba8cb37728c3b9a8377ac9737c4b1bc48c618bc2f" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-ranked-collective", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-scheduler" +version = "39.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26899a331e7ab5f7d5966cbf203e1cf5bd99cd110356d7ddcaa7597087cdc0b5" +dependencies = [ + "docify", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-weights", +] + +[[package]] +name = "pallet-scored-pool" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f84b48bb4702712c902f43931c4077d3a1cb6773c8d8c290d4a6251f6bc2a5c" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-session" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8474b62b6b7622f891e83d922a589e2ad5be5471f5ca47d45831a797dba0b3f4" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-session 36.0.0", + "sp-staking 36.0.0", + "sp-state-machine 0.43.0", + "sp-trie 37.0.0", +] + +[[package]] +name = "pallet-session-benchmarking" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aadce7df0fee981721983795919642648b846dab5ab9096f82c2cea781007d0" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "pallet-session", "pallet-staking", "parity-scale-codec", "rand", - "sp-runtime 32.0.0", - "sp-session", - "sp-std 14.0.0", + "sp-runtime 39.0.2", + "sp-session 36.0.0", +] + +[[package]] +name = "pallet-skip-feeless-payment" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c2cb0dae13d2c2d2e76373f337d408468f571459df1900cbd7458f21cf6c01" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", ] [[package]] @@ -7223,7 +10169,7 @@ version = "0.3.0-rc.1" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", "pallet-bags-list", @@ -7234,37 +10180,54 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 31.0.0", - "sp-core 29.0.0", - "sp-io 31.0.0", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", "sp-npos-elections", - "sp-runtime 32.0.0", - "sp-staking", - "sp-std 14.0.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", + "sp-std", +] + +[[package]] +name = "pallet-society" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1dc69fea8a8de343e71691f009d5fece6ae302ed82b7bb357882b2ea6454143" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "rand_chacha", + "scale-info", + "sp-arithmetic", + "sp-io 38.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "pallet-staking" -version = "29.0.3" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061b00814eb794a40df4eca7972a7c67b26473cd85cc7c54f5816ae49ad6e11b" +checksum = "c870d123f4f053b56af808a4beae1ffc4309a696e829796c26837936c926db3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", "pallet-authorship", "pallet-session", "parity-scale-codec", - "rand_chacha 0.2.2", + "rand_chacha", "scale-info", "serde", - "sp-application-crypto 31.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-staking", - "sp-std 14.0.0", + "sp-application-crypto 38.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", ] [[package]] @@ -7274,99 +10237,152 @@ dependencies = [ "entropy-shared", "frame-benchmarking", "frame-election-provider-support", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", "pallet-bags-list", "pallet-balances", - "pallet-parameters", + "pallet-parameters 0.3.0-rc.1", "pallet-session", "pallet-staking", "pallet-staking-reward-curve", "pallet-timestamp", "parity-scale-codec", - "rand_chacha 0.3.1", + "rand_chacha", "rand_core 0.6.4", "scale-info", "serde", - "sp-consensus-babe", - "sp-core 29.0.0", - "sp-io 31.0.0", + "sp-consensus-babe 0.40.0", + "sp-core 34.0.0", + "sp-io 38.0.0", "sp-npos-elections", - "sp-runtime 32.0.0", - "sp-staking", - "sp-std 14.0.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", + "sp-std", "tdx-quote", ] [[package]] name = "pallet-staking-reward-curve" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efca5a4a423427d2c83af5fe07ab648c16b91e3782c3cc23316fe0bd96b4c794" +checksum = "db5e6b1d8ee9d3f6894c5abd8c3e17737ed738c9854f87bfd16239741b7f4d5d" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", +] + +[[package]] +name = "pallet-staking-reward-fn" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "988a7ebeacc84d4bdb0b12409681e956ffe35438447d8f8bc78db547cffb6ebc" +dependencies = [ + "log", + "sp-arithmetic", +] + +[[package]] +name = "pallet-staking-runtime-api" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7298559ef3a6b2f5dfbe9a3b8f3d22f2ff9b073c97f4c4853d2b316d973e72d" +dependencies = [ + "parity-scale-codec", + "sp-api 34.0.0", + "sp-staking 36.0.0", +] + +[[package]] +name = "pallet-state-trie-migration" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138c15b4200b9dc4c3e031def6a865a235cdc76ff91ee96fba19ca1787c9dda6" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-statement" +version = "20.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e03e147efa900e75cd106337f36da3d7dcd185bd9e5f5c3df474c08c3c37d16" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-statement-store 18.0.0", ] [[package]] name = "pallet-sudo" -version = "29.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d02f7855d411913e77e57126f4a8b8a32d90d9bf47d0b747e367a1301729c3" +checksum = "1574fe2aed3d52db4a389b77b53d8c9758257b121e3e7bbe24c4904e11681e0e" dependencies = [ "docify", "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "pallet-timestamp" -version = "28.0.0" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b8810ddfb254c7fb8cd7698229cce513d309a43ff117b38798dae6120f477b" +checksum = "a9ba9b71bbfd33ae672f23ba7efaeed2755fdac37b8f946cb7474fc37841b7e1" dependencies = [ "docify", "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-inherents", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", "sp-storage", - "sp-timestamp", + "sp-timestamp 34.0.0", ] [[package]] name = "pallet-tips" -version = "28.0.0" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca4b9921c9e9b59e8eeb64677ba6ec49743ef5fe98e0b63f77411b2b9f6cc99" +checksum = "aa1d4371a70c309ba11624933f8f5262fe4edad0149c556361d31f26190da936" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", "pallet-treasury", "parity-scale-codec", "scale-info", "serde", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", ] [[package]] @@ -7374,139 +10390,330 @@ name = "pallet-transaction-pause" version = "0.3.0-rc.1" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "pallet-balances", "pallet-programs", "parity-scale-codec", "scale-info", "smallvec", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", ] [[package]] name = "pallet-transaction-payment" -version = "29.0.2" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5ba71f06f09e955b80dc313c333be3f8d9e8505b051558e0b7af4806b13310" +checksum = "47b1aa3498107a30237f941b0f02180db3b79012c3488878ff01a4ac3e8ee04e" dependencies = [ - "frame-support", + "frame-support 38.0.0", "frame-system", "parity-scale-codec", "scale-info", "serde", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "pallet-transaction-payment-rpc" -version = "31.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ef209d2d5d077e325bf49b024fd2eff109a5c2ca0d84ce0d50a65839e6b026" +checksum = "291a021e6828d43b5165042d31691c5c20b5748ea8d5fc51e0359752482a04c2" dependencies = [ - "jsonrpsee 0.20.3", + "jsonrpsee 0.24.7", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", - "sp-api", - "sp-blockchain", - "sp-core 29.0.0", - "sp-rpc", - "sp-runtime 32.0.0", - "sp-weights 28.0.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-rpc 32.0.0", + "sp-runtime 39.0.2", + "sp-weights", ] [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "29.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c78bcba80c7c61712b98a6b5640975ebd25ceb688c18e975af78a0fac81785b0" +checksum = "49fdf5ab71e9dbcadcf7139736b6ea6bac8ec4a83985d46cbd130e1eec770e41" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", - "sp-api", - "sp-runtime 32.0.0", - "sp-weights 28.0.0", + "sp-api 34.0.0", + "sp-runtime 39.0.2", + "sp-weights", ] [[package]] name = "pallet-transaction-storage" -version = "28.0.0" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee8aa1c1b88cddc8c675ec65faaa2ef5e880e114bd588ee6611c70d5341eaaa" +checksum = "f8c337a972a6a796c0a0acc6c03b5e02901c43ad721ce79eb87b45717d75c93b" dependencies = [ - "array-bytes 6.2.2", + "array-bytes 6.2.3", "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-inherents", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", - "sp-transaction-storage-proof", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-transaction-storage-proof 34.0.0", ] [[package]] name = "pallet-treasury" -version = "28.0.1" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eca44990d0d759213744f2d1f6fe1fadec1079a3e4e4da40556d6b4e42abbcd" +checksum = "98bfdd3bb9b58fb010bcd419ff5bf940817a8e404cdbf7886a53ac730f5dda2b" dependencies = [ "docify", "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-core 29.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-tx-pause" +version = "19.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee153f5be5efc84ebd53aa581e5361cde17dc3669ef80d8ad327f4041d89ebe" +dependencies = [ + "docify", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "pallet-balances", + "pallet-proxy", + "pallet-utility", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-uniques" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2b13cdaedf2d5bd913a5f6e637cb52b5973d8ed4b8d45e56d921bc4d627006f" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", ] [[package]] name = "pallet-utility" -version = "29.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "954f15b98c3fdebb763bb5cea4ec6803fd180d540ec5b07a9fcb2c118251d52c" +checksum = "2fdcade6efc0b66fc7fc4138964802c02d0ffb7380d894e26b9dd5073727d2b3" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 38.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "pallet-vesting" -version = "29.0.0" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "807df2ef13ab6bf940879352c3013bfa00b670458b4c125c2f60e5753f68e3d5" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-whitelist" +version = "37.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ef17df925290865cf37096dd0cb76f787df11805bba01b1d0ca3e106d06280b" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-api 34.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-xcm" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b1760b6589e53f4ad82216c72c0e38fcb4df149c37224ab3301dc240c85d1d4" +dependencies = [ + "bounded-collections", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "xcm-runtime-apis", +] + +[[package]] +name = "pallet-xcm-benchmarks" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da423463933b42f4a4c74175f9e9295a439de26719579b894ce533926665e4a" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "pallet-xcm-bridge-hub" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f9670065b7cba92771060a4a3925b6650ff67611443ccfccd5aa356f7d5aac" +dependencies = [ + "bp-messages", + "bp-runtime", + "bp-xcm-bridge-hub", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-bridge-messages", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "pallet-xcm-bridge-hub-router" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93225f8fa3a3a74cac3be3f56aa98aad246ad10ad7a4e272ec43685883dc4903" +dependencies = [ + "bp-xcm-bridge-hub-router", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-std", + "staging-xcm", + "staging-xcm-builder", +] + +[[package]] +name = "parachains-common" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9460a69f409be27c62161d8b4d36ffc32735d09a4f9097f9c789db0cca7196c" +dependencies = [ + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-message-queue", + "pallet-xcm", + "parity-scale-codec", + "polkadot-primitives 16.0.0", + "scale-info", + "sp-consensus-aura 0.40.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "parachains-runtimes-test-utils" +version = "17.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4525f3038cdf078fea39d913c563ca626f09a615e7724f0c9eac97743c75ff44" +checksum = "287d2db0a2d19466caa579a69f021bfdc6fa352f382c8395dade58d1d0c6adfe" dependencies = [ - "frame-benchmarking", - "frame-support", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-test-relay-sproof-builder", + "frame-support 38.0.0", "frame-system", - "log", + "pallet-balances", + "pallet-collator-selection", + "pallet-session", + "pallet-timestamp", + "pallet-xcm", "parity-scale-codec", - "scale-info", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "polkadot-parachain-primitives", + "sp-consensus-aura 0.40.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-tracing", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-executor", + "substrate-wasm-builder", ] [[package]] @@ -7522,6 +10729,12 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "parity-bytes" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b56e3a2420138bdb970f84dfb9c774aea80fa0e7371549eedec0d80c209c67" + [[package]] name = "parity-db" version = "0.4.13" @@ -7549,7 +10762,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bitvec", "byte-slice-cast", "bytes", @@ -7564,7 +10777,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", "syn 1.0.109", @@ -7576,6 +10789,35 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" +[[package]] +name = "parity-util-mem" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" +dependencies = [ + "cfg-if", + "ethereum-types", + "hashbrown 0.12.3", + "impl-trait-for-tuples", + "lru 0.8.1", + "parity-util-mem-derive", + "parking_lot 0.12.3", + "primitive-types 0.12.2", + "smallvec", + "winapi", +] + +[[package]] +name = "parity-util-mem-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" +dependencies = [ + "proc-macro2", + "syn 1.0.109", + "synstructure 0.12.6", +] + [[package]] name = "parity-wasm" version = "0.45.0" @@ -7584,9 +10826,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -7606,7 +10848,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -7625,15 +10867,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.7", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -7650,23 +10892,14 @@ checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", "rand_core 0.6.4", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pbkdf2" -version = "0.8.0" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" -dependencies = [ - "crypto-mac 0.11.0", -] +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -7702,9 +10935,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.9" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", "thiserror", @@ -7713,9 +10946,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.9" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" dependencies = [ "pest", "pest_generator", @@ -7723,22 +10956,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.9" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "pest_meta" -version = "2.7.9" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" dependencies = [ "once_cell", "pest", @@ -7747,32 +10980,32 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap 2.6.0", ] [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -7783,9 +11016,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -7795,9 +11028,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand", @@ -7816,35 +11049,541 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "polkadot-ckb-merkle-mountain-range" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b44320e5f7ce2c18227537a3032ae5b2c476a7e8eddba45333e1011fc31b92" +dependencies = [ + "cfg-if", + "itertools 0.10.5", +] + +[[package]] +name = "polkadot-core-primitives" +version = "15.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2900d3b857e34c480101618a950c3a4fbcddc8c0d50573d48553376185908b8" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "polkadot-parachain-primitives" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52b5648a2e8ce1f9a0f8c41c38def670cefd91932cd793468e1a5b0b0b4e4af1" +dependencies = [ + "bounded-collections", + "derive_more 0.99.18", + "parity-scale-codec", + "polkadot-core-primitives", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-weights", +] + +[[package]] +name = "polkadot-primitives" +version = "15.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b57bc055fa389372ec5fc0001b99aeffd50f3fd379280ce572d935189bb58dd8" +dependencies = [ + "bitvec", + "hex-literal", + "log", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "scale-info", + "serde", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-arithmetic", + "sp-authority-discovery", + "sp-consensus-slots 0.40.1", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", + "sp-staking 34.0.0", +] + +[[package]] +name = "polkadot-primitives" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb20b75d33212150242d39890d7ededab55f1084160c337f15d0eb8ca8c3ad4" +dependencies = [ + "bitvec", + "hex-literal", + "log", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "scale-info", + "serde", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-arithmetic", + "sp-authority-discovery", + "sp-consensus-slots 0.40.1", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", +] + +[[package]] +name = "polkadot-runtime-common" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc15154ba5ca55d323fcf7af0f5dcd39d58dcb4dfac3d9b30404840a6d8bbde4" +dependencies = [ + "bitvec", + "frame-benchmarking", + "frame-election-provider-support", + "frame-support 38.0.0", + "frame-system", + "impl-trait-for-tuples", + "libsecp256k1", + "log", + "pallet-asset-rate", + "pallet-authorship", + "pallet-balances", + "pallet-broker", + "pallet-election-provider-multi-phase", + "pallet-fast-unstake", + "pallet-identity", + "pallet-session", + "pallet-staking", + "pallet-staking-reward-fn", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-treasury", + "pallet-vesting", + "parity-scale-codec", + "polkadot-primitives 16.0.0", + "polkadot-runtime-parachains", + "rustc-hex", + "scale-info", + "serde", + "serde_derive", + "slot-range-helper", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-npos-elections", + "sp-runtime 39.0.2", + "sp-session 36.0.0", + "sp-staking 36.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "static_assertions", +] + +[[package]] +name = "polkadot-runtime-metrics" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c306f1ace7644a24de860479f92cf8d6467393bb0c9b0777c57e2d42c9d452a" +dependencies = [ + "bs58 0.5.1", + "frame-benchmarking", + "parity-scale-codec", + "polkadot-primitives 16.0.0", + "sp-tracing", +] + +[[package]] +name = "polkadot-runtime-parachains" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be514b77ad3cf996bfbc2ae17517e05bb9c69324e98210cbce2d601542d7ace" +dependencies = [ + "bitflags 1.3.2", + "bitvec", + "derive_more 0.99.18", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-balances", + "pallet-broker", + "pallet-message-queue", + "pallet-mmr", + "pallet-session", + "pallet-staking", + "pallet-timestamp", + "pallet-vesting", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-primitives 16.0.0", + "polkadot-runtime-metrics", + "rand", + "rand_chacha", + "scale-info", + "serde", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", + "sp-session 36.0.0", + "sp-staking 36.0.0", + "sp-std", + "staging-xcm", + "staging-xcm-executor", +] + +[[package]] +name = "polkadot-sdk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb819108697967452fa6d8d96ab4c0d48cbaa423b3156499dcb24f1cf95d6775" +dependencies = [ + "asset-test-utils", + "assets-common", + "binary-merkle-tree", + "bp-header-chain", + "bp-messages", + "bp-parachains", + "bp-polkadot", + "bp-polkadot-core", + "bp-relayers", + "bp-runtime", + "bp-test-utils", + "bp-xcm-bridge-hub", + "bp-xcm-bridge-hub-router", + "bridge-hub-common", + "bridge-hub-test-utils", + "bridge-runtime-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-parachain-system-proc-macro", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-solo-to-para", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-ping", + "cumulus-primitives-aura", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-primitives-proof-size-hostfunction", + "cumulus-primitives-storage-weight-reclaim", + "cumulus-primitives-timestamp", + "cumulus-primitives-utility", + "cumulus-test-relay-sproof-builder", + "frame-benchmarking", + "frame-benchmarking-pallet-pov", + "frame-election-provider-support", + "frame-executive", + "frame-metadata-hash-extension", + "frame-support 38.0.0", + "frame-support-procedural 30.0.4", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime 0.44.0", + "pallet-alliance", + "pallet-asset-conversion", + "pallet-asset-conversion-ops", + "pallet-asset-conversion-tx-payment", + "pallet-asset-rate", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-assets-freezer", + "pallet-atomic-swap", + "pallet-aura", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", + "pallet-bounties", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-broker", + "pallet-child-bounties", + "pallet-collator-selection", + "pallet-collective", + "pallet-collective-content", + "pallet-contracts", + "pallet-contracts-mock-network", + "pallet-conviction-voting", + "pallet-core-fellowship", + "pallet-delegated-staking", + "pallet-democracy", + "pallet-dev-mode", + "pallet-election-provider-multi-phase", + "pallet-election-provider-support-benchmarking", + "pallet-elections-phragmen", + "pallet-fast-unstake", + "pallet-glutton", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-insecure-randomness-collective-flip", + "pallet-lottery", + "pallet-membership", + "pallet-message-queue", + "pallet-migrations", + "pallet-mixnet", + "pallet-mmr", + "pallet-multisig", + "pallet-nft-fractionalization", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-nis", + "pallet-node-authorization", + "pallet-nomination-pools", + "pallet-nomination-pools-benchmarking", + "pallet-nomination-pools-runtime-api", + "pallet-offences", + "pallet-offences-benchmarking", + "pallet-paged-list", + "pallet-parameters 0.9.0", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-recovery", + "pallet-referenda", + "pallet-remark", + "pallet-revive", + "pallet-revive-fixtures", + "pallet-revive-mock-network", + "pallet-root-offences", + "pallet-root-testing", + "pallet-safe-mode", + "pallet-salary", + "pallet-scheduler", + "pallet-scored-pool", + "pallet-session", + "pallet-session-benchmarking", + "pallet-skip-feeless-payment", + "pallet-society", + "pallet-staking", + "pallet-staking-reward-fn", + "pallet-staking-runtime-api", + "pallet-state-trie-migration", + "pallet-statement", + "pallet-sudo", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-storage", + "pallet-treasury", + "pallet-tx-pause", + "pallet-uniques", + "pallet-utility", + "pallet-vesting", + "pallet-whitelist", + "pallet-xcm", + "pallet-xcm-benchmarks", + "pallet-xcm-bridge-hub", + "pallet-xcm-bridge-hub-router", + "parachains-common", + "parachains-runtimes-test-utils", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-primitives 16.0.0", + "polkadot-runtime-common", + "polkadot-runtime-metrics", + "polkadot-runtime-parachains", + "polkadot-sdk-frame", + "sc-executor 0.40.1", + "slot-range-helper", + "snowbridge-beacon-primitives", + "snowbridge-core", + "snowbridge-ethereum", + "snowbridge-outbound-queue-merkle-tree", + "snowbridge-outbound-queue-runtime-api", + "snowbridge-pallet-ethereum-client", + "snowbridge-pallet-ethereum-client-fixtures", + "snowbridge-pallet-inbound-queue", + "snowbridge-pallet-inbound-queue-fixtures", + "snowbridge-pallet-outbound-queue", + "snowbridge-pallet-system", + "snowbridge-router-primitives", + "snowbridge-runtime-common", + "snowbridge-runtime-test-common", + "snowbridge-system-runtime-api", + "sp-api 34.0.0", + "sp-api-proc-macro 20.0.0", + "sp-application-crypto 38.0.0", + "sp-arithmetic", + "sp-authority-discovery", + "sp-block-builder 34.0.0", + "sp-consensus-aura 0.40.0", + "sp-consensus-babe 0.40.0", + "sp-consensus-beefy", + "sp-consensus-grandpa 21.0.0", + "sp-consensus-pow", + "sp-consensus-slots 0.40.1", + "sp-core 34.0.0", + "sp-core-hashing", + "sp-crypto-ec-utils", + "sp-crypto-hashing", + "sp-debug-derive", + "sp-externalities 0.29.0", + "sp-genesis-builder 0.15.1", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-keyring 39.0.0", + "sp-keystore 0.40.0", + "sp-metadata-ir", + "sp-mixnet 0.12.0", + "sp-mmr-primitives", + "sp-npos-elections", + "sp-offchain 34.0.0", + "sp-runtime 39.0.2", + "sp-runtime-interface 28.0.0", + "sp-session 36.0.0", + "sp-staking 36.0.0", + "sp-state-machine 0.43.0", + "sp-statement-store 18.0.0", + "sp-std", + "sp-storage", + "sp-timestamp 34.0.0", + "sp-tracing", + "sp-transaction-pool 34.0.0", + "sp-transaction-storage-proof 34.0.0", + "sp-trie 37.0.0", + "sp-version 37.0.0", + "sp-wasm-interface", + "sp-weights", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-bip39", + "testnet-parachains-constants", + "xcm-runtime-apis", +] + +[[package]] +name = "polkadot-sdk-frame" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdeb15ce08142082461afe1a62c15f7ce10a731d91b203ad6a8dc8d2e4a6a54" +dependencies = [ + "docify", + "frame-benchmarking", + "frame-executive", + "frame-support 38.0.0", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime 0.44.0", + "log", + "parity-scale-codec", + "scale-info", + "sp-api 34.0.0", + "sp-arithmetic", + "sp-block-builder 34.0.0", + "sp-consensus-aura 0.40.0", + "sp-consensus-grandpa 21.0.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-offchain 34.0.0", + "sp-runtime 39.0.2", + "sp-session 36.0.0", + "sp-storage", + "sp-transaction-pool 34.0.0", + "sp-version 37.0.0", +] + +[[package]] +name = "polkavm" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a3693e5efdb2bf74e449cd25fd777a28bd7ed87e41f5d5da75eb31b4de48b94" +dependencies = [ + "libc", + "log", + "polkavm-assembler 0.9.0", + "polkavm-common 0.9.0", + "polkavm-linux-raw 0.9.0", +] + +[[package]] +name = "polkavm" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "b7ec0c5935f2eff23cfc4653002f4f8d12b37f87a720e0631282d188c32089d6" +dependencies = [ + "libc", + "log", + "polkavm-assembler 0.10.0", + "polkavm-common 0.10.0", + "polkavm-linux-raw 0.10.0", +] [[package]] -name = "platforms" -version = "3.4.0" +name = "polkavm-assembler" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" +checksum = "1fa96d6d868243acc12de813dd48e756cbadcc8e13964c70d272753266deadc1" +dependencies = [ + "log", +] [[package]] -name = "polkavm-common" -version = "0.8.0" +name = "polkavm-assembler" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c99f7eee94e7be43ba37eef65ad0ee8cbaf89b7c00001c3f6d2be985cb1817" +checksum = "d8e4fd5a43100bf1afe9727b8130d01f966f5cfc9144d5604b21e795c2bcd80e" +dependencies = [ + "log", +] [[package]] name = "polkavm-common" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92" +dependencies = [ + "log", +] [[package]] -name = "polkavm-derive" -version = "0.8.0" +name = "polkavm-common" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79fa916f7962348bd1bb1a65a83401675e6fc86c51a0fdbcf92a3108e58e6125" +checksum = "0097b48bc0bedf9f3f537ce8f37e8f1202d8d83f9b621bdb21ff2c59b9097c50" dependencies = [ - "polkavm-derive-impl-macro 0.8.0", + "log", + "polkavm-assembler 0.10.0", ] [[package]] @@ -7857,15 +11596,12 @@ dependencies = [ ] [[package]] -name = "polkavm-derive-impl" -version = "0.8.0" +name = "polkavm-derive" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c10b2654a8a10a83c260bfb93e97b262cf0017494ab94a65d389e0eda6de6c9c" +checksum = "0dcc701385c08c31bdb0569f0c51a290c580d892fa77f1dd88a7352a62679ecf" dependencies = [ - "polkavm-common 0.8.0", - "proc-macro2", - "quote", - "syn 2.0.82", + "polkavm-derive-impl-macro 0.10.0", ] [[package]] @@ -7877,17 +11613,19 @@ dependencies = [ "polkavm-common 0.9.0", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] -name = "polkavm-derive-impl-macro" -version = "0.8.0" +name = "polkavm-derive-impl" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e85319a0d5129dc9f021c62607e0804f5fb777a05cdda44d750ac0732def66" +checksum = "7855353a5a783dd5d09e3b915474bddf66575f5a3cf45dec8d1c5e051ba320dc" dependencies = [ - "polkavm-derive-impl 0.8.0", - "syn 2.0.82", + "polkavm-common 0.10.0", + "proc-macro2", + "quote", + "syn 2.0.85", ] [[package]] @@ -7897,22 +11635,74 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429" dependencies = [ "polkavm-derive-impl 0.9.0", - "syn 2.0.82", + "syn 2.0.85", +] + +[[package]] +name = "polkavm-derive-impl-macro" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9324fe036de37c17829af233b46ef6b5562d4a0c09bb7fdb9f8378856dee30cf" +dependencies = [ + "polkavm-derive-impl 0.10.0", + "syn 2.0.85", +] + +[[package]] +name = "polkavm-linker" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c7be503e60cf56c0eb785f90aaba4b583b36bff00e93997d93fef97f9553c39" +dependencies = [ + "gimli 0.28.1", + "hashbrown 0.14.5", + "log", + "object 0.32.2", + "polkavm-common 0.9.0", + "regalloc2 0.9.3", + "rustc-demangle", +] + +[[package]] +name = "polkavm-linker" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d704edfe7bdcc876784f19436d53d515b65eb07bc9a0fae77085d552c2dbbb5" +dependencies = [ + "gimli 0.28.1", + "hashbrown 0.14.5", + "log", + "object 0.36.5", + "polkavm-common 0.10.0", + "regalloc2 0.9.3", + "rustc-demangle", ] +[[package]] +name = "polkavm-linux-raw" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26e85d3456948e650dff0cfc85603915847faf893ed1e66b020bb82ef4557120" + +[[package]] +name = "polkavm-linux-raw" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26e45fa59c7e1bb12ef5289080601e9ec9b31435f6e32800a5c90c132453d126" + [[package]] name = "polling" -version = "3.6.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", - "pin-project-lite 0.2.14", - "rustix 0.38.37", + "hermit-abi 0.4.0", + "pin-project-lite 0.2.15", + "rustix 0.38.38", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7951,9 +11741,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "powerfmt" @@ -7963,9 +11753,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "predicates" @@ -7981,37 +11774,37 @@ dependencies = [ "regex", ] +[[package]] +name = "predicates" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +dependencies = [ + "anstyle", + "predicates-core", +] + [[package]] name = "predicates-core" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" [[package]] name = "predicates-tree" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" dependencies = [ "predicates-core", "termtree", ] -[[package]] -name = "prettier-please" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22020dfcf177fcc7bf5deaf7440af371400c67c0de14c399938d8ed4fb4645d3" -dependencies = [ - "proc-macro2", - "syn 2.0.82", -] - [[package]] name = "prettyplease" -version = "0.1.11" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28f53e8b192565862cf99343194579a022eb9c7dd3a8d03134734803c7b3125" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2", "syn 1.0.109", @@ -8019,12 +11812,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.17" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -8043,30 +11836,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", - "impl-serde", + "impl-serde 0.4.0", + "scale-info", + "uint 0.9.5", +] + +[[package]] +name = "primitive-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15600a7d856470b7d278b3fe0e311fe28c2526348549f8ef2ff7db3299c87f5" +dependencies = [ + "fixed-hash", + "impl-codec 0.7.0", + "impl-serde 0.5.0", "scale-info", - "uint", + "uint 0.10.0", ] [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ - "once_cell", - "toml_edit 0.19.15", + "thiserror", + "toml 0.5.11", ] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -8093,6 +11899,39 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "proc-macro-warning" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + [[package]] name = "proc-macro-warning" version = "1.0.2" @@ -8101,14 +11940,14 @@ checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "proc-macro2" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -8121,9 +11960,9 @@ checksum = "8bccbff07d5ed689c4087d20d7307a52ab6141edeedf487c3876a55b86cf63df" [[package]] name = "prometheus" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" dependencies = [ "cfg-if", "fnv", @@ -8145,6 +11984,18 @@ dependencies = [ "prometheus-client-derive-encode", ] +[[package]] +name = "prometheus-client" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c99afa9a01501019ac3a14d71d9f94050346f55ca471ce90c799a15c58f61e2" +dependencies = [ + "dtoa", + "itoa", + "parking_lot 0.12.3", + "prometheus-client-derive-encode", +] + [[package]] name = "prometheus-client-derive-encode" version = "0.4.2" @@ -8153,22 +12004,26 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "proptest" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ - "bitflags 2.5.0", + "bit-set", + "bit-vec", + "bitflags 2.6.0", "lazy_static", "num-traits", "rand", - "rand_chacha 0.3.1", + "rand_chacha", "rand_xorshift", - "regex-syntax 0.8.3", + "regex-syntax 0.8.5", + "rusty-fork", + "tempfile", "unarray", ] @@ -8203,17 +12058,38 @@ dependencies = [ "itertools 0.10.5", "lazy_static", "log", - "multimap", + "multimap 0.8.3", "petgraph", - "prettyplease 0.1.11", + "prettyplease 0.1.25", "prost 0.11.9", - "prost-types", + "prost-types 0.11.9", "regex", "syn 1.0.109", "tempfile", "which", ] +[[package]] +name = "prost-build" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +dependencies = [ + "bytes", + "heck 0.5.0", + "itertools 0.12.1", + "log", + "multimap 0.10.0", + "once_cell", + "petgraph", + "prettyplease 0.2.25", + "prost 0.12.6", + "prost-types 0.12.6", + "regex", + "syn 2.0.85", + "tempfile", +] + [[package]] name = "prost-derive" version = "0.11.9" @@ -8237,7 +12113,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -8249,11 +12125,20 @@ dependencies = [ "prost 0.11.9", ] +[[package]] +name = "prost-types" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost 0.12.6", +] + [[package]] name = "psm" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" dependencies = [ "cc", ] @@ -8275,11 +12160,26 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "memchr", "unicase", ] +[[package]] +name = "quanta" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi 0.11.0+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -8296,52 +12196,144 @@ dependencies = [ ] [[package]] -name = "quick-protobuf-codec" -version = "0.1.0" +name = "quick-protobuf-codec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1693116345026436eb2f10b677806169c1a1260c1c60eaaffe3fb5a29ae23d8b" +dependencies = [ + "asynchronous-codec", + "bytes", + "quick-protobuf", + "thiserror", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "quick-protobuf-codec" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98" +dependencies = [ + "asynchronous-codec", + "bytes", + "quick-protobuf", + "thiserror", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "quicksink" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77de3c815e5a160b1539c6592796801df2043ae35e123b46d73380cfa57af858" +dependencies = [ + "futures-core", + "futures-sink", + "pin-project-lite 0.1.12", +] + +[[package]] +name = "quinn" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" +dependencies = [ + "bytes", + "pin-project-lite 0.2.15", + "quinn-proto 0.9.6", + "quinn-udp 0.3.2", + "rustc-hash 1.1.0", + "rustls 0.20.9", + "thiserror", + "tokio", + "tracing", + "webpki", +] + +[[package]] +name = "quinn" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +dependencies = [ + "bytes", + "futures-io", + "pin-project-lite 0.2.15", + "quinn-proto 0.10.6", + "quinn-udp 0.4.1", + "rustc-hash 1.1.0", + "rustls 0.21.12", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" +dependencies = [ + "bytes", + "rand", + "ring 0.16.20", + "rustc-hash 1.1.0", + "rustls 0.20.9", + "slab", + "thiserror", + "tinyvec", + "tracing", + "webpki", +] + +[[package]] +name = "quinn-proto" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1693116345026436eb2f10b677806169c1a1260c1c60eaaffe3fb5a29ae23d8b" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ - "asynchronous-codec", "bytes", - "quick-protobuf", + "rand", + "ring 0.16.20", + "rustc-hash 1.1.0", + "rustls 0.21.12", + "slab", "thiserror", - "unsigned-varint", + "tinyvec", + "tracing", ] [[package]] -name = "quicksink" -version = "0.1.2" +name = "quinn-udp" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77de3c815e5a160b1539c6592796801df2043ae35e123b46d73380cfa57af858" +checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" dependencies = [ - "futures-core", - "futures-sink", - "pin-project-lite 0.1.12", + "libc", + "quinn-proto 0.9.6", + "socket2 0.4.10", + "tracing", + "windows-sys 0.42.0", ] [[package]] -name = "quinn-proto" -version = "0.9.6" +name = "quinn-udp" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ "bytes", - "rand", - "ring 0.16.20", - "rustc-hash", - "rustls 0.20.9", - "slab", - "thiserror", - "tinyvec", + "libc", + "socket2 0.5.7", "tracing", - "webpki", + "windows-sys 0.48.0", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -8359,20 +12351,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", + "rand_chacha", "rand_core 0.6.4", ] -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - [[package]] name = "rand_chacha" version = "0.3.1" @@ -8438,6 +12420,15 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "raw-cpuid" +version = "11.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "rawpointer" version = "0.2.1" @@ -8487,18 +12478,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.15", "libredox", @@ -8507,22 +12498,22 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -8545,21 +12536,21 @@ checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ "hashbrown 0.13.2", "log", - "rustc-hash", + "rustc-hash 1.1.0", "slice-group-by", "smallvec", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -8573,13 +12564,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.5", ] [[package]] @@ -8590,27 +12581,27 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.8" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.4.4", + "h2 0.4.6", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", - "hyper 1.2.0", - "hyper-rustls 0.27.2", + "hyper 1.5.0", + "hyper-rustls 0.27.3", "hyper-tls", "hyper-util", "ipnet", @@ -8620,13 +12611,13 @@ dependencies = [ "native-tls", "once_cell", "percent-encoding", - "pin-project-lite 0.2.14", - "rustls-pemfile 2.1.2", + "pin-project-lite 0.2.15", + "rustls-pemfile 2.2.0", "serde", "serde_json", "serde_urlencoded", "sync_wrapper 1.0.1", - "system-configuration 0.6.0", + "system-configuration 0.6.1", "tokio", "tokio-native-tls", "tokio-util", @@ -8650,7 +12641,7 @@ dependencies = [ "futures-timer", "mime", "nom", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", "reqwest", "thiserror", ] @@ -8672,7 +12663,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ "hmac 0.12.1", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -8746,6 +12737,23 @@ dependencies = [ "librocksdb-sys", ] +[[package]] +name = "rococo-runtime-constants" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1ec6683a2e52fe3be2eaf942a80619abd99eb36e973c5ab4489a2f3b100db5c" +dependencies = [ + "frame-support 38.0.0", + "polkadot-primitives 16.0.0", + "polkadot-runtime-common", + "smallvec", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", +] + [[package]] name = "route-recognizer" version = "0.3.1" @@ -8788,11 +12796,41 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "ruint" +version = "1.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3cc4c2511671f327125da14133d0c5c5d137f006a1017a16f557bc85b16286" +dependencies = [ + "alloy-rlp", + "ark-ff 0.3.0", + "ark-ff 0.4.2", + "bytes", + "fastrlp", + "num-bigint", + "num-traits", + "parity-scale-codec", + "primitive-types 0.12.2", + "proptest", + "rand", + "rlp", + "ruint-macro", + "serde", + "valuable", + "zeroize", +] + +[[package]] +name = "ruint-macro" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" + [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -8800,6 +12838,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc-hex" version = "2.1.0" @@ -8808,11 +12852,29 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver 0.11.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.22", + "semver 1.0.23", ] [[package]] @@ -8840,11 +12902,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys 0.4.14", @@ -8865,9 +12927,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring 0.17.8", @@ -8877,28 +12939,30 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.3" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.2", - "subtle 2.5.0", + "rustls-webpki 0.102.8", + "subtle 2.6.1", "zeroize", ] [[package]] name = "rustls" -version = "0.23.7" +version = "0.23.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebbbdb961df0ad3f2652da8f3fdc4b36122f568f968f45ad3316f26c025c677b" +checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" dependencies = [ + "log", "once_cell", + "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.2", - "subtle 2.5.0", + "rustls-webpki 0.102.8", + "subtle 2.6.1", "zeroize", ] @@ -8916,12 +12980,12 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.2", + "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", "security-framework", @@ -8938,19 +13002,45 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" + +[[package]] +name = "rustls-platform-verifier" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.16", + "rustls-native-certs 0.7.3", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.8", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.6", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" @@ -8964,9 +13054,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring 0.17.8", "rustls-pki-types", @@ -8975,19 +13065,30 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" + +[[package]] +name = "rusty-fork" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] [[package]] name = "ruzstd" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" +checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b" dependencies = [ "byteorder", - "derive_more 0.99.17", - "twox-hash", + "derive_more 0.99.18", ] [[package]] @@ -9001,17 +13102,37 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "rw-stream-sink" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8c9026ff5d2f23da5e45bbc283f156383001bfb09c4e44256d02c1a685fe9a1" +dependencies = [ + "futures", + "pin-project", + "static_assertions", +] + [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "safe-mix" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c" +dependencies = [ + "rustc_version 0.2.3", +] [[package]] name = "safe_arch" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" +checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a" dependencies = [ "bytemuck", ] @@ -9036,110 +13157,167 @@ dependencies = [ [[package]] name = "sc-allocator" -version = "24.0.0" +version = "27.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97e78771bbc491d4d601afbbf01f5718d6d724d0d971c8581cf5b4c62a9502f7" +dependencies = [ + "log", + "sp-core 32.0.0", + "sp-wasm-interface", + "thiserror", +] + +[[package]] +name = "sc-allocator" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357127c91373ed6d1ae582f6e3300ab5b13bcde43bbf270a891f44194ef48b70" +checksum = "b975ee3a95eaacb611e7b415737a7fa2db4d8ad7b880cc1b97371b04e95c7903" dependencies = [ "log", - "sp-core 29.0.0", + "sp-core 34.0.0", "sp-wasm-interface", "thiserror", ] [[package]] name = "sc-authority-discovery" -version = "0.35.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb3c14cb8022844835a6f7209196b8c6544d389fe5d2972d8df2ae4ca75afbe" +checksum = "c9ec2b6674cab85a74b607f9941b18e327edc4b2b00248d9ac8e2ca6d985569b" dependencies = [ "async-trait", "futures", "futures-timer", "ip_network", - "libp2p", + "libp2p 0.52.4", + "linked_hash_set", "log", - "multihash 0.18.1", - "multihash-codetable", + "multihash 0.19.2", "parity-scale-codec", "prost 0.12.6", - "prost-build", + "prost-build 0.12.6", "rand", - "sc-client-api", - "sc-network", - "sp-api", + "sc-client-api 37.0.0", + "sc-network 0.45.0", + "sc-network-types", + "sp-api 34.0.0", "sp-authority-discovery", - "sp-blockchain", - "sp-core 29.0.0", - "sp-keystore 0.35.0", - "sp-runtime 32.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-basic-authorship" -version = "0.35.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "724c3a6eee5f0829a1b79a15e12d63ed81b33281b14004a6331a8883b2fd8fd1" +checksum = "2d3f4152eda19b140abc876a3b7434fce27c4c8cd47eff4095af0398d82f8141" dependencies = [ "futures", "futures-timer", "log", "parity-scale-codec", - "sc-block-builder", + "sc-block-builder 0.42.0", "sc-proposer-metrics", - "sc-telemetry", - "sc-transaction-pool-api", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core 29.0.0", - "sp-inherents", - "sp-runtime 32.0.0", + "sc-telemetry 25.0.0", + "sc-transaction-pool-api 37.0.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.2", "substrate-prometheus-endpoint", ] [[package]] name = "sc-block-builder" -version = "0.34.0" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d54ed880c04f6df650dcf4672d7d4a2d08b30e95c51f07b4a3be75eaa535082" +dependencies = [ + "parity-scale-codec", + "sp-api 30.0.0", + "sp-block-builder 30.0.0", + "sp-blockchain 32.0.0", + "sp-core 32.0.0", + "sp-inherents 30.0.0", + "sp-runtime 35.0.0", + "sp-trie 33.0.0", +] + +[[package]] +name = "sc-block-builder" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8b0640994965c6ff3afa13242d95a61611b83da21fd86ac2b1ebd03e241a02" +checksum = "f666f8ff11f96bf6d90676739eb7ccb6a156a4507634b7af83b94f0aa8195a50" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-core 29.0.0", - "sp-inherents", - "sp-runtime 32.0.0", - "sp-trie 30.0.0", + "sp-api 34.0.0", + "sp-block-builder 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.2", + "sp-trie 37.0.0", ] [[package]] name = "sc-chain-spec" -version = "28.0.0" +version = "31.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d25ff00e77262342bd85a71de32170b136773f6a8cdd5641ce8b81fb4e16be" +dependencies = [ + "array-bytes 6.2.3", + "docify", + "log", + "memmap2 0.9.5", + "parity-scale-codec", + "sc-chain-spec-derive 11.0.0", + "sc-client-api 32.0.0", + "sc-executor 0.36.0", + "sc-network 0.38.0", + "sc-telemetry 18.0.0", + "serde", + "serde_json", + "sp-blockchain 32.0.0", + "sp-core 32.0.0", + "sp-crypto-hashing", + "sp-genesis-builder 0.11.0", + "sp-io 34.0.0", + "sp-runtime 35.0.0", + "sp-state-machine 0.39.0", +] + +[[package]] +name = "sc-chain-spec" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f73880050f8b04fed7f6301279ef3899df13a3891bd06156d56f9a1c50fefba" +checksum = "3534c5dc910e6c9e0f25871948e7bb683852d1aef44b8b7753062feef4235e7c" dependencies = [ - "array-bytes 6.2.2", + "array-bytes 6.2.3", "docify", "log", "memmap2 0.9.5", "parity-scale-codec", - "sc-chain-spec-derive", - "sc-client-api", - "sc-executor", - "sc-network", - "sc-telemetry", + "sc-chain-spec-derive 12.0.0", + "sc-client-api 37.0.0", + "sc-executor 0.40.1", + "sc-network 0.45.0", + "sc-telemetry 25.0.0", "serde", "serde_json", - "sp-blockchain", - "sp-core 29.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", "sp-crypto-hashing", - "sp-genesis-builder", - "sp-io 31.0.0", - "sp-runtime 32.0.0", - "sp-state-machine 0.36.0", + "sp-genesis-builder 0.15.1", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-state-machine 0.43.0", + "sp-tracing", ] [[package]] @@ -9148,87 +13326,196 @@ version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2e80fbdaea194762d4b4b0eec389037c25ad102676203b42d684774ae3019b8" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "sc-chain-spec-derive" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b18cef11d2c69703e0d7c3528202ef4ed1cd2b47a6f063e9e17cad8255b1fa94" +dependencies = [ + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "sc-cli" -version = "0.37.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a284c10ea92b1fe789b9f0e5815d393f3a1e3bf6a4adaa884f24e36143b83b" +checksum = "eade6864cba8ab29c4c7572c6a4a080c0423bc53cb48b00f70eef7d57d22abae" dependencies = [ - "array-bytes 6.2.2", - "bip39", + "array-bytes 6.2.3", "chrono", "clap", "fdlimit", "futures", "itertools 0.10.5", - "libp2p-identity", + "libp2p-identity 0.1.3", + "log", + "names", + "parity-bip39", + "parity-scale-codec", + "rand", + "regex", + "rpassword", + "sc-client-api 32.0.0", + "sc-client-db 0.39.0", + "sc-keystore 29.0.0", + "sc-mixnet 0.8.0", + "sc-network 0.38.0", + "sc-service 0.39.0", + "sc-telemetry 18.0.0", + "sc-tracing 32.0.0", + "sc-utils", + "serde", + "serde_json", + "sp-blockchain 32.0.0", + "sp-core 32.0.0", + "sp-keyring 35.0.0", + "sp-keystore 0.38.0", + "sp-panic-handler", + "sp-runtime 35.0.0", + "sp-version 33.0.0", + "thiserror", + "tokio", +] + +[[package]] +name = "sc-cli" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55a161ee7bf9d571c567f208b89ef4f2fd3c082180a54399403f7fdc44e94da5" +dependencies = [ + "array-bytes 6.2.3", + "chrono", + "clap", + "fdlimit", + "futures", + "itertools 0.11.0", + "libp2p-identity 0.2.9", "log", "names", + "parity-bip39", "parity-scale-codec", "rand", "regex", "rpassword", - "sc-client-api", - "sc-client-db", - "sc-keystore", - "sc-mixnet", - "sc-network", - "sc-service", - "sc-telemetry", - "sc-tracing", + "sc-client-api 37.0.0", + "sc-client-db 0.44.1", + "sc-keystore 33.0.0", + "sc-mixnet 0.15.0", + "sc-network 0.45.0", + "sc-service 0.46.0", + "sc-telemetry 25.0.0", + "sc-tracing 37.0.1", "sc-utils", "serde", "serde_json", - "sp-blockchain", - "sp-core 29.0.0", - "sp-keyring 32.0.0", - "sp-keystore 0.35.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-keyring 39.0.0", + "sp-keystore 0.40.0", "sp-panic-handler", - "sp-runtime 32.0.0", - "sp-version", + "sp-runtime 39.0.2", + "sp-version 37.0.0", "thiserror", "tokio", ] [[package]] name = "sc-client-api" -version = "29.0.0" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6f69c592a2cab8b5cb7860bf57c5084a590d2e0c5df9308f62ddb405ca4d97e" +dependencies = [ + "fnv", + "futures", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "sc-executor 0.36.0", + "sc-transaction-pool-api 32.0.0", + "sc-utils", + "sp-api 30.0.0", + "sp-blockchain 32.0.0", + "sp-consensus 0.36.0", + "sp-core 32.0.0", + "sp-database", + "sp-externalities 0.28.0", + "sp-runtime 35.0.0", + "sp-state-machine 0.39.0", + "sp-statement-store 14.0.0", + "sp-storage", + "sp-trie 33.0.0", + "substrate-prometheus-endpoint", +] + +[[package]] +name = "sc-client-api" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e914dfadaaf384d8869ae47f3ec783bf6a1ac24e7827f5fec2e0e649a450a91" +checksum = "e73f1673cdfe658c4be6ffd5113b71c0de74616717e604455dcfd29e15781729" dependencies = [ "fnv", "futures", "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-executor", - "sc-transaction-pool-api", + "sc-executor 0.40.1", + "sc-transaction-pool-api 37.0.0", "sc-utils", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core 29.0.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-core 34.0.0", "sp-database", - "sp-externalities 0.26.0", - "sp-runtime 32.0.0", - "sp-state-machine 0.36.0", - "sp-statement-store", + "sp-externalities 0.29.0", + "sp-runtime 39.0.2", + "sp-state-machine 0.43.0", + "sp-statement-store 18.0.0", "sp-storage", - "sp-trie 30.0.0", + "sp-trie 37.0.0", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" -version = "0.36.0" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f4e8c9db1025f0b17438f5db8937c53022b417593f30d4624b8b2e0d3300b9f" +dependencies = [ + "hash-db", + "kvdb", + "kvdb-memorydb", + "kvdb-rocksdb", + "linked-hash-map", + "log", + "parity-db", + "parity-scale-codec", + "parking_lot 0.12.3", + "sc-client-api 32.0.0", + "sc-state-db 0.34.0", + "schnellru", + "sp-arithmetic", + "sp-blockchain 32.0.0", + "sp-core 32.0.0", + "sp-database", + "sp-runtime 35.0.0", + "sp-state-machine 0.39.0", + "sp-trie 33.0.0", +] + +[[package]] +name = "sc-client-db" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f08c4f29e6d2b8915bab6435b8817fa39ef7708c04a7cf6226f803e133b017c" +checksum = "5517718f03357325c6f51a780710fac652f125316f3577d1a25a7fbdc1816db2" dependencies = [ "hash-db", "kvdb", @@ -9239,49 +13526,74 @@ dependencies = [ "parity-db", "parity-scale-codec", "parking_lot 0.12.3", - "sc-client-api", - "sc-state-db", + "sc-client-api 37.0.0", + "sc-state-db 0.36.0", "schnellru", - "sp-arithmetic 24.0.0", - "sp-blockchain", - "sp-core 29.0.0", + "sp-arithmetic", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", "sp-database", - "sp-runtime 32.0.0", - "sp-state-machine 0.36.0", - "sp-trie 30.0.0", + "sp-runtime 39.0.2", + "sp-state-machine 0.43.0", + "sp-trie 37.0.0", ] [[package]] name = "sc-consensus" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e1ac2c698b828073982b6f5b1a466fcc345a452983356af74254ade8e9987d" +checksum = "a051ffa28788f7ec47e46d6236132126d5aa563469e6c852e87cfbe5069e0687" dependencies = [ "async-trait", "futures", "futures-timer", - "libp2p-identity", + "libp2p-identity 0.1.3", + "log", + "mockall 0.11.4", + "parking_lot 0.12.3", + "sc-client-api 32.0.0", + "sc-utils", + "serde", + "sp-api 30.0.0", + "sp-blockchain 32.0.0", + "sp-consensus 0.36.0", + "sp-core 32.0.0", + "sp-runtime 35.0.0", + "sp-state-machine 0.39.0", + "substrate-prometheus-endpoint", + "thiserror", +] + +[[package]] +name = "sc-consensus" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f64e538ab9edefbf0ddc105ff5b088344c88bc86f21650a2d2020be04a957730" +dependencies = [ + "async-trait", + "futures", "log", - "mockall", + "mockall 0.11.4", "parking_lot 0.12.3", - "sc-client-api", + "sc-client-api 37.0.0", + "sc-network-types", "sc-utils", "serde", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core 29.0.0", - "sp-runtime 32.0.0", - "sp-state-machine 0.36.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-state-machine 0.43.0", "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-consensus-babe" -version = "0.35.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82ec3dc31f8fd024684d1306488836680558b680a8ec38219e19f20854811f02" +checksum = "39a6aecbb63f5e046c83055d656cf9f203715b38e000ae0df157461582c90eba" dependencies = [ "async-trait", "fork-tree", @@ -9292,73 +13604,73 @@ dependencies = [ "num-traits", "parity-scale-codec", "parking_lot 0.12.3", - "sc-client-api", - "sc-consensus", + "sc-client-api 37.0.0", + "sc-consensus 0.44.0", "sc-consensus-epochs", "sc-consensus-slots", - "sc-telemetry", - "sc-transaction-pool-api", - "sp-api", - "sp-application-crypto 31.0.0", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-slots", - "sp-core 29.0.0", + "sc-telemetry 25.0.0", + "sc-transaction-pool-api 37.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-block-builder 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-babe 0.40.0", + "sp-consensus-slots 0.40.1", + "sp-core 34.0.0", "sp-crypto-hashing", - "sp-inherents", - "sp-keystore 0.35.0", - "sp-runtime 32.0.0", + "sp-inherents 34.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-consensus-babe-rpc" -version = "0.35.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf2b3004672f9eea0d9af6c9b944fa3ef0bc72fd88cea9075cdf6dc96d1439ac" +checksum = "78556a2fc64c45518eab6f059ad379da808431fe351475df216e2bc66ac7af65" dependencies = [ "futures", - "jsonrpsee 0.20.3", + "jsonrpsee 0.24.7", "sc-consensus-babe", "sc-consensus-epochs", - "sc-rpc-api", + "sc-rpc-api 0.44.0", "serde", - "sp-api", - "sp-application-crypto 31.0.0", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-core 29.0.0", - "sp-keystore 0.35.0", - "sp-runtime 32.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-babe 0.40.0", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", "thiserror", ] [[package]] name = "sc-consensus-epochs" -version = "0.34.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f68ddb91626f901578515eed93c7919f739660161f4e9f7b9407e2d0ede981" +checksum = "3634e8f5dfc397e0d3fc8e3a714c21338eacb3ed276089a6df47e7aa926d51d4" dependencies = [ "fork-tree", "parity-scale-codec", - "sc-client-api", - "sc-consensus", - "sp-blockchain", - "sp-runtime 32.0.0", + "sc-client-api 37.0.0", + "sc-consensus 0.44.0", + "sp-blockchain 37.0.1", + "sp-runtime 39.0.2", ] [[package]] name = "sc-consensus-grandpa" -version = "0.20.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae91e5b5a120be4d13a59eaf94fd85d7c7af528482b8e21d861fa1167df3083" +checksum = "a3aaab70cf6f93ceea829ef0a4980ce95d84d5c7f4b5419b29bbed17fa04e1a6" dependencies = [ "ahash 0.8.11", - "array-bytes 6.2.2", + "array-bytes 6.2.3", "async-trait", "dyn-clone", "finality-grandpa", @@ -9369,107 +13681,134 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "rand", - "sc-block-builder", - "sc-chain-spec", - "sc-client-api", - "sc-consensus", - "sc-network", - "sc-network-common", + "sc-block-builder 0.42.0", + "sc-chain-spec 38.0.0", + "sc-client-api 37.0.0", + "sc-consensus 0.44.0", + "sc-network 0.45.0", + "sc-network-common 0.44.0", "sc-network-gossip", - "sc-network-sync", - "sc-telemetry", - "sc-transaction-pool-api", + "sc-network-sync 0.44.0", + "sc-network-types", + "sc-telemetry 25.0.0", + "sc-transaction-pool-api 37.0.0", "sc-utils", "serde_json", - "sp-api", - "sp-application-crypto 31.0.0", - "sp-arithmetic 24.0.0", - "sp-blockchain", - "sp-consensus", - "sp-consensus-grandpa", - "sp-core 29.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-arithmetic", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-grandpa 21.0.0", + "sp-core 34.0.0", "sp-crypto-hashing", - "sp-keystore 0.35.0", - "sp-runtime 32.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-consensus-grandpa-rpc" -version = "0.20.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697cbd528516561dbc818a8990d5477169e86d9335a0b29207cf6f6a90269e7c" +checksum = "fe70de1362284b9a3f2bffea380222347a252dee098c4dfccdb2c7a1a9061f91" dependencies = [ "finality-grandpa", "futures", - "jsonrpsee 0.20.3", + "jsonrpsee 0.24.7", "log", "parity-scale-codec", - "sc-client-api", + "sc-client-api 37.0.0", "sc-consensus-grandpa", - "sc-rpc", + "sc-rpc 40.0.0", "serde", - "sp-blockchain", - "sp-core 29.0.0", - "sp-runtime 32.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-runtime 39.0.2", "thiserror", ] [[package]] name = "sc-consensus-slots" -version = "0.34.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567bddd65d52951fb9bc7a7e05d1dfdfc47ff2c594ec5ca9756d27e7226635bb" +checksum = "30fcce6ff513c2479c57eac880ba8d4254c146b678a0072d90f81796d47091df" dependencies = [ "async-trait", "futures", "futures-timer", "log", "parity-scale-codec", - "sc-client-api", - "sc-consensus", - "sc-telemetry", - "sp-arithmetic 24.0.0", - "sp-blockchain", - "sp-consensus", - "sp-consensus-slots", - "sp-core 29.0.0", - "sp-inherents", - "sp-runtime 32.0.0", - "sp-state-machine 0.36.0", + "sc-client-api 37.0.0", + "sc-consensus 0.44.0", + "sc-telemetry 25.0.0", + "sp-arithmetic", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-slots 0.40.1", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.2", + "sp-state-machine 0.43.0", ] [[package]] name = "sc-executor" -version = "0.33.0" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6b47b642a92adcabaeadb7d76bd1a02bcf5a93f2b649e81afe8b940107bbda" +dependencies = [ + "parity-scale-codec", + "parking_lot 0.12.3", + "sc-executor-common 0.33.0", + "sc-executor-polkavm 0.30.0", + "sc-executor-wasmtime 0.33.1", + "schnellru", + "sp-api 30.0.0", + "sp-core 32.0.0", + "sp-externalities 0.28.0", + "sp-io 34.0.0", + "sp-panic-handler", + "sp-runtime-interface 27.0.0", + "sp-trie 33.0.0", + "sp-version 33.0.0", + "sp-wasm-interface", + "tracing", +] + +[[package]] +name = "sc-executor" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2ac6c356538d67987bbb867e11a12a84ba87250c70fd50005b6d74f570a4f7" +checksum = "3f0cc0a3728fd033589183460c5a49b2e7545d09dc89a098216ef9e9aadcd9dc" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", - "sc-executor-common", - "sc-executor-wasmtime", + "sc-executor-common 0.35.0", + "sc-executor-polkavm 0.32.0", + "sc-executor-wasmtime 0.35.0", "schnellru", - "sp-api", - "sp-core 29.0.0", - "sp-externalities 0.26.0", - "sp-io 31.0.0", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-externalities 0.29.0", + "sp-io 38.0.0", "sp-panic-handler", - "sp-runtime-interface 25.0.0", - "sp-trie 30.0.0", - "sp-version", + "sp-runtime-interface 28.0.0", + "sp-trie 37.0.0", + "sp-version 37.0.0", "sp-wasm-interface", "tracing", ] [[package]] name = "sc-executor-common" -version = "0.30.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07498138dee3ddf2c71299ca372d8449880bb3a8a8a299a483094e9c26b0823e" +checksum = "88c61ef111d7ccc7697ee4788654f4f998662db057c27ca2de4b94f20e3e6ed1" dependencies = [ - "sc-allocator", + "polkavm 0.9.3", + "sc-allocator 27.0.0", "sp-maybe-compressed-blob", "sp-wasm-interface", "thiserror", @@ -9477,10 +13816,67 @@ dependencies = [ ] [[package]] -name = "sc-executor-wasmtime" +name = "sc-executor-common" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3b703a33dcb7cddf19176fdf12294b9a6408125836b0f4afee3e6969e7f190" +dependencies = [ + "polkavm 0.9.3", + "sc-allocator 29.0.0", + "sp-maybe-compressed-blob", + "sp-wasm-interface", + "thiserror", + "wasm-instrument", +] + +[[package]] +name = "sc-executor-polkavm" version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a387779ab54ec1ffce0bf3a6631faada079459d42796c1895683767918a642" +checksum = "6fb96b22b779ba14f449d114b63efd162f95f1cdf773cdac29f75fe6a250de24" +dependencies = [ + "log", + "polkavm 0.9.3", + "sc-executor-common 0.33.0", + "sp-wasm-interface", +] + +[[package]] +name = "sc-executor-polkavm" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fe58d9cacfab73e5595fa84b80f7bd03efebe54a0574daaeb221a1d1f7ab80" +dependencies = [ + "log", + "polkavm 0.9.3", + "sc-executor-common 0.35.0", + "sp-wasm-interface", +] + +[[package]] +name = "sc-executor-wasmtime" +version = "0.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f45912e90278c06bacf2c37a11937ed6878ee0cd056ae2be2d0b45ec7ac34d1" +dependencies = [ + "anyhow", + "cfg-if", + "libc", + "log", + "parking_lot 0.12.3", + "rustix 0.36.17", + "sc-allocator 27.0.0", + "sc-executor-common 0.33.0", + "sp-runtime-interface 27.0.0", + "sp-wasm-interface", + "wasmtime 8.0.1", +] + +[[package]] +name = "sc-executor-wasmtime" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd498f2f77ec1f861c30804f5bfd796d4afcc8ce44ea1f11bfbe2847551d161" dependencies = [ "anyhow", "cfg-if", @@ -9488,232 +13884,426 @@ dependencies = [ "log", "parking_lot 0.12.3", "rustix 0.36.17", - "sc-allocator", - "sc-executor-common", - "sp-runtime-interface 25.0.0", + "sc-allocator 29.0.0", + "sc-executor-common 0.35.0", + "sp-runtime-interface 28.0.0", "sp-wasm-interface", "wasmtime 8.0.1", ] [[package]] name = "sc-informant" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb603a0a703f1bc10a4e6462bec1036d8fb8b3e3eff5513a9c07f98ccb8d662d" +checksum = "061006dce0dcae3ece90d5d9f656ade507dd922931911d59deea823f28be54dd" dependencies = [ "ansi_term", "futures", "futures-timer", "log", - "sc-client-api", - "sc-network", - "sc-network-common", - "sc-network-sync", - "sp-blockchain", - "sp-runtime 32.0.0", + "sc-client-api 32.0.0", + "sc-network 0.38.0", + "sc-network-common 0.37.0", + "sc-network-sync 0.37.0", + "sp-blockchain 32.0.0", + "sp-runtime 35.0.0", +] + +[[package]] +name = "sc-informant" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c24f636bccd2df534d75b75bd61d96d8abb68a5fe6f6c427e9faee7d7a07a96" +dependencies = [ + "console", + "futures", + "futures-timer", + "log", + "sc-client-api 37.0.0", + "sc-network 0.45.0", + "sc-network-common 0.44.0", + "sc-network-sync 0.44.0", + "sp-blockchain 37.0.1", + "sp-runtime 39.0.2", ] [[package]] name = "sc-keystore" -version = "26.0.0" +version = "29.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6477f27aa17ada189355325c16992d3e612d2fe276ecef9da1b36b6b297b3ac4" +dependencies = [ + "array-bytes 6.2.3", + "parking_lot 0.12.3", + "serde_json", + "sp-application-crypto 34.0.0", + "sp-core 32.0.0", + "sp-keystore 0.38.0", + "thiserror", +] + +[[package]] +name = "sc-keystore" +version = "33.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cc4f6a558dd23e3bae2e9f195da822465258b9aaf211c34360d7f6efb944e54" +checksum = "4ebd4b5b5713006117641c049cb082e8a439dd6ac5e7b171e5cef5ce1c9f8af8" dependencies = [ - "array-bytes 6.2.2", + "array-bytes 6.2.3", "parking_lot 0.12.3", "serde_json", - "sp-application-crypto 31.0.0", - "sp-core 29.0.0", - "sp-keystore 0.35.0", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-keystore 0.40.0", "thiserror", ] [[package]] name = "sc-mixnet" -version = "0.5.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fb213c15679fe5b87c383815d7fb758c70d3e7c573948bd7fe26ff344d2272" +checksum = "c8e04fecf6e55e4597e473c87e8f3cea5a9963835af30a971203290d62bb2d03" dependencies = [ "array-bytes 4.2.0", - "arrayvec 0.7.4", + "arrayvec 0.7.6", + "blake2 0.10.6", + "bytes", + "futures", + "futures-timer", + "libp2p-identity 0.1.3", + "log", + "mixnet", + "multiaddr 0.17.1", + "parity-scale-codec", + "parking_lot 0.12.3", + "sc-client-api 32.0.0", + "sc-network 0.38.0", + "sc-transaction-pool-api 32.0.0", + "sp-api 30.0.0", + "sp-consensus 0.36.0", + "sp-core 32.0.0", + "sp-keystore 0.38.0", + "sp-mixnet 0.8.0", + "sp-runtime 35.0.0", + "thiserror", +] + +[[package]] +name = "sc-mixnet" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "781a1ffd953074e060a5f9e253f7a029bedd935fe9621bb7483cc2d442a6b1d1" +dependencies = [ + "array-bytes 6.2.3", + "arrayvec 0.7.6", "blake2 0.10.6", "bytes", "futures", "futures-timer", - "libp2p-identity", "log", "mixnet", - "multiaddr", + "multiaddr 0.18.2", "parity-scale-codec", "parking_lot 0.12.3", - "sc-client-api", - "sc-network", - "sc-transaction-pool-api", - "sp-api", - "sp-consensus", - "sp-core 29.0.0", - "sp-keystore 0.35.0", - "sp-mixnet", - "sp-runtime 32.0.0", + "sc-client-api 37.0.0", + "sc-network 0.45.0", + "sc-network-types", + "sc-transaction-pool-api 37.0.0", + "sp-api 34.0.0", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-mixnet 0.12.0", + "sp-runtime 39.0.2", "thiserror", ] [[package]] name = "sc-network" -version = "0.35.0" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e68214c9245ee374a6c51fca3c00feddbe20a86451d92c76585a9cc9553425" +dependencies = [ + "array-bytes 6.2.3", + "async-channel 1.9.0", + "async-trait", + "asynchronous-codec", + "bytes", + "either", + "fnv", + "futures", + "futures-timer", + "ip_network", + "libp2p 0.51.4", + "linked_hash_set", + "log", + "mockall 0.11.4", + "parity-scale-codec", + "parking_lot 0.12.3", + "partial_sort", + "pin-project", + "rand", + "sc-client-api 32.0.0", + "sc-network-common 0.37.0", + "sc-utils", + "serde", + "serde_json", + "smallvec", + "sp-arithmetic", + "sp-blockchain 32.0.0", + "sp-core 32.0.0", + "sp-runtime 35.0.0", + "substrate-prometheus-endpoint", + "thiserror", + "tokio", + "tokio-stream", + "unsigned-varint 0.7.2", + "wasm-timer", + "zeroize", +] + +[[package]] +name = "sc-network" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f231c7d5e749ec428b4cfa669d759ae76cd3da4f50d7352a2d711acdc7532891" +checksum = "299cc0172716d599f692b094987ecd04c43ca2d37df3f4cd3668a99a65f17c24" dependencies = [ - "array-bytes 6.2.2", + "array-bytes 6.2.3", "async-channel 1.9.0", "async-trait", "asynchronous-codec", "bytes", + "cid 0.9.0", "either", "fnv", "futures", "futures-timer", "ip_network", - "libp2p", + "libp2p 0.52.4", "linked_hash_set", + "litep2p", "log", - "mockall", + "mockall 0.11.4", + "once_cell", "parity-scale-codec", "parking_lot 0.12.3", "partial_sort", "pin-project", + "prost 0.12.6", + "prost-build 0.12.6", "rand", - "sc-client-api", - "sc-network-common", + "sc-client-api 37.0.0", + "sc-network-common 0.44.0", + "sc-network-types", "sc-utils", + "schnellru", "serde", "serde_json", "smallvec", - "sp-arithmetic 24.0.0", - "sp-blockchain", - "sp-core 29.0.0", - "sp-runtime 32.0.0", + "sp-arithmetic", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-runtime 39.0.2", "substrate-prometheus-endpoint", "thiserror", "tokio", "tokio-stream", - "unsigned-varint", + "unsigned-varint 0.7.2", + "void", "wasm-timer", "zeroize", ] [[package]] name = "sc-network-bitswap" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f89b0134738cb3d982b6e625ca93ae8dbe83ce2a06e4b6a396e4df09ed3499" +checksum = "cf7cf01e661f39303737596859139fcdd31bd106a979fae0828f3e5b0decce89" dependencies = [ "async-channel 1.9.0", - "cid", + "cid 0.9.0", "futures", - "libp2p-identity", + "libp2p-identity 0.1.3", "log", "prost 0.12.6", - "prost-build", - "sc-client-api", - "sc-network", - "sp-blockchain", - "sp-runtime 32.0.0", + "prost-build 0.11.9", + "sc-client-api 32.0.0", + "sc-network 0.38.0", + "sp-blockchain 32.0.0", + "sp-runtime 35.0.0", "thiserror", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] name = "sc-network-common" -version = "0.34.0" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98b1732616f6fd5bcdabd44eac79b466c2075f3f47ebf0cf2f6d52d790890736" +dependencies = [ + "async-trait", + "bitflags 1.3.2", + "futures", + "libp2p-identity 0.1.3", + "parity-scale-codec", + "prost-build 0.11.9", + "sc-consensus 0.37.0", + "sp-consensus 0.36.0", + "sp-consensus-grandpa 17.0.0", + "sp-runtime 35.0.0", +] + +[[package]] +name = "sc-network-common" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3504bbff5ab016948dbab0f21a8be26324810b76eff3627ce744adb5bfc1b3ce" +checksum = "dbff059c0ca497757f633cfa13625fbaa3028f23a77a9696e94e700008f8dd5a" dependencies = [ "async-trait", "bitflags 1.3.2", "futures", - "libp2p-identity", + "libp2p-identity 0.2.9", "parity-scale-codec", - "prost-build", - "sc-consensus", - "sp-consensus", - "sp-consensus-grandpa", - "sp-runtime 32.0.0", + "prost-build 0.12.6", + "sc-consensus 0.44.0", + "sc-network-types", + "sp-consensus 0.40.0", + "sp-consensus-grandpa 21.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "sc-network-gossip" -version = "0.35.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad02cf809c34b53614fa61377e3289064edf6c78eb11df071d11fbf7546d7e9" +checksum = "d4086f4ac6b94ff2efd24f1776280c580454c5990b8665aa9f293fcd33c80630" dependencies = [ "ahash 0.8.11", "futures", "futures-timer", - "libp2p", "log", - "sc-network", - "sc-network-common", - "sc-network-sync", + "sc-network 0.45.0", + "sc-network-common 0.44.0", + "sc-network-sync 0.44.0", + "sc-network-types", "schnellru", - "sp-runtime 32.0.0", + "sp-runtime 39.0.2", "substrate-prometheus-endpoint", "tracing", ] [[package]] name = "sc-network-light" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84ef0b212c775f58e0304ec09166089f6b09afddf559b7c2b5702933b3be4" +checksum = "7be9c7b3d18d5ef3ed493be173e9cb00537585cd9b21bb4ebe24b9b555cf4fa4" dependencies = [ - "array-bytes 6.2.2", + "array-bytes 6.2.3", "async-channel 1.9.0", "futures", - "libp2p-identity", + "libp2p-identity 0.1.3", "log", "parity-scale-codec", "prost 0.12.6", - "prost-build", - "sc-client-api", - "sc-network", - "sp-blockchain", - "sp-core 29.0.0", - "sp-runtime 32.0.0", + "prost-build 0.11.9", + "sc-client-api 32.0.0", + "sc-network 0.38.0", + "sp-blockchain 32.0.0", + "sp-core 32.0.0", + "sp-runtime 35.0.0", + "thiserror", +] + +[[package]] +name = "sc-network-light" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05691091d6bf84eea06f52d67b9f703b65cee6048f9d8c8967707e4097034cba" +dependencies = [ + "array-bytes 6.2.3", + "async-channel 1.9.0", + "futures", + "log", + "parity-scale-codec", + "prost 0.12.6", + "prost-build 0.12.6", + "sc-client-api 37.0.0", + "sc-network 0.45.0", + "sc-network-types", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-runtime 39.0.2", "thiserror", ] [[package]] name = "sc-network-sync" -version = "0.34.0" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8a240043ecd1c5ca54d1dfdc654878aed6b96fe7292c11dc9e8bc7c4884fb" +dependencies = [ + "array-bytes 6.2.3", + "async-channel 1.9.0", + "async-trait", + "fork-tree", + "futures", + "futures-timer", + "libp2p 0.51.4", + "log", + "mockall 0.11.4", + "parity-scale-codec", + "prost 0.12.6", + "prost-build 0.11.9", + "sc-client-api 32.0.0", + "sc-consensus 0.37.0", + "sc-network 0.38.0", + "sc-network-common 0.37.0", + "sc-utils", + "schnellru", + "smallvec", + "sp-arithmetic", + "sp-blockchain 32.0.0", + "sp-consensus 0.36.0", + "sp-consensus-grandpa 17.0.0", + "sp-core 32.0.0", + "sp-runtime 35.0.0", + "substrate-prometheus-endpoint", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "sc-network-sync" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa9377059deece4e7d419d9ec456f657268c0c603e1cf98df4a920f6da83461" +checksum = "08c9df284544a234ed8e507c6b55e6e3ed4803b7730906b94339706cf12bcc32" dependencies = [ - "array-bytes 6.2.2", + "array-bytes 6.2.3", "async-channel 1.9.0", "async-trait", "fork-tree", "futures", "futures-timer", - "libp2p", + "libp2p 0.52.4", "log", - "mockall", + "mockall 0.11.4", "parity-scale-codec", "prost 0.12.6", - "prost-build", - "sc-client-api", - "sc-consensus", - "sc-network", - "sc-network-common", + "prost-build 0.12.6", + "sc-client-api 37.0.0", + "sc-consensus 0.44.0", + "sc-network 0.45.0", + "sc-network-common 0.44.0", + "sc-network-types", "sc-utils", "schnellru", "smallvec", - "sp-arithmetic 24.0.0", - "sp-blockchain", - "sp-consensus", - "sp-consensus-grandpa", - "sp-core 29.0.0", - "sp-runtime 32.0.0", + "sp-arithmetic", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-grandpa 21.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", "substrate-prometheus-endpoint", "thiserror", "tokio", @@ -9722,64 +14312,102 @@ dependencies = [ [[package]] name = "sc-network-transactions" -version = "0.34.0" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1514ca1cc195842970b3a35b80cc14ed002296f3565c19d4659be44ca9255b8" +dependencies = [ + "array-bytes 6.2.3", + "futures", + "libp2p 0.51.4", + "log", + "parity-scale-codec", + "sc-network 0.38.0", + "sc-network-common 0.37.0", + "sc-network-sync 0.37.0", + "sc-utils", + "sp-consensus 0.36.0", + "sp-runtime 35.0.0", + "substrate-prometheus-endpoint", +] + +[[package]] +name = "sc-network-transactions" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16c9cad4baf348725bd82eadcd1747fc112ec49c76b863755ce79c588fa73fe4" +checksum = "60e370eaa3add2d599014806b3690ffa5b402b36d5d0a3c7496d69ba73a7a5f7" dependencies = [ - "array-bytes 6.2.2", + "array-bytes 6.2.3", "futures", - "libp2p", "log", "parity-scale-codec", - "sc-network", - "sc-network-common", - "sc-network-sync", + "sc-network 0.45.0", + "sc-network-common 0.44.0", + "sc-network-sync 0.44.0", + "sc-network-types", "sc-utils", - "sp-consensus", - "sp-runtime 32.0.0", + "sp-consensus 0.40.0", + "sp-runtime 39.0.2", "substrate-prometheus-endpoint", ] +[[package]] +name = "sc-network-types" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c372dbda66644a1df0daa8c0d99c36b6f74db7dca213d2416cd84f507125224" +dependencies = [ + "bs58 0.5.1", + "ed25519-dalek", + "libp2p-identity 0.2.9", + "litep2p", + "log", + "multiaddr 0.18.2", + "multihash 0.19.2", + "rand", + "thiserror", + "zeroize", +] + [[package]] name = "sc-offchain" -version = "30.0.0" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aee89f2abd406356bfd688bd7a51155dc963259e4b752bb85d1f8a061a194fd" +checksum = "9185b82ad10f21f3eb977a079f772219bd216bf4eafedad7d5e4a0ff32383c75" dependencies = [ - "array-bytes 6.2.2", + "array-bytes 6.2.3", "bytes", "fnv", "futures", "futures-timer", - "hyper 0.14.28", + "hyper 0.14.31", "hyper-rustls 0.24.2", - "libp2p", "log", "num_cpus", "once_cell", "parity-scale-codec", "parking_lot 0.12.3", "rand", - "sc-client-api", - "sc-network", - "sc-network-common", - "sc-transaction-pool-api", + "sc-client-api 37.0.0", + "sc-network 0.45.0", + "sc-network-common 0.44.0", + "sc-network-types", + "sc-transaction-pool-api 37.0.0", "sc-utils", - "sp-api", - "sp-core 29.0.0", - "sp-externalities 0.26.0", - "sp-keystore 0.35.0", - "sp-offchain", - "sp-runtime 32.0.0", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-externalities 0.29.0", + "sp-keystore 0.40.0", + "sp-offchain 34.0.0", + "sp-runtime 39.0.2", "threadpool", "tracing", ] [[package]] name = "sc-proposer-metrics" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8dadb2ae5a316e4d08cad6aacd5de1dec792f3bd94e3960795ff7ffd07211c" +checksum = "f680a0bed67dab19898624246376ba85d5f70a89859ba030830aacd079c28d3c" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9787,66 +14415,123 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "30.0.0" +version = "33.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3d7b43d6ce2c57d90dab64a0eab4673158a7a240119fd3ae934ce95f8ad973f" +dependencies = [ + "futures", + "jsonrpsee 0.22.5", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "sc-block-builder 0.37.0", + "sc-chain-spec 31.0.0", + "sc-client-api 32.0.0", + "sc-mixnet 0.8.0", + "sc-rpc-api 0.37.0", + "sc-tracing 32.0.0", + "sc-transaction-pool-api 32.0.0", + "sc-utils", + "serde_json", + "sp-api 30.0.0", + "sp-blockchain 32.0.0", + "sp-core 32.0.0", + "sp-keystore 0.38.0", + "sp-offchain 30.0.0", + "sp-rpc 30.0.0", + "sp-runtime 35.0.0", + "sp-session 31.0.0", + "sp-statement-store 14.0.0", + "sp-version 33.0.0", + "tokio", +] + +[[package]] +name = "sc-rpc" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5acf6d89f062d1334a0c5b67e9dea97666cd47a49acb2696eab55ff1a1bf74" +checksum = "7137ecfd837c9b6e57244b59a99320a53c7e31f160b5581a325734f3c169aaba" dependencies = [ "futures", - "jsonrpsee 0.20.3", + "jsonrpsee 0.24.7", "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-block-builder", - "sc-chain-spec", - "sc-client-api", - "sc-mixnet", - "sc-rpc-api", - "sc-tracing", - "sc-transaction-pool-api", + "sc-block-builder 0.42.0", + "sc-chain-spec 38.0.0", + "sc-client-api 37.0.0", + "sc-mixnet 0.15.0", + "sc-rpc-api 0.44.0", + "sc-tracing 37.0.1", + "sc-transaction-pool-api 37.0.0", "sc-utils", "serde_json", - "sp-api", - "sp-blockchain", - "sp-core 29.0.0", - "sp-keystore 0.35.0", - "sp-offchain", - "sp-rpc", - "sp-runtime 32.0.0", - "sp-session", - "sp-statement-store", - "sp-version", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-offchain 34.0.0", + "sp-rpc 32.0.0", + "sp-runtime 39.0.2", + "sp-session 36.0.0", + "sp-statement-store 18.0.0", + "sp-version 37.0.0", "tokio", ] [[package]] name = "sc-rpc-api" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9db6aaabfa7e0c27ec15d0f0a11b994cd4bcf86e362f0d9732b4a414d793f0f" +checksum = "b82060f09f886f59fd19a77cc6668c209e883fc93511e9c441ef84adfea80f36" dependencies = [ - "jsonrpsee 0.20.3", + "jsonrpsee 0.22.5", "parity-scale-codec", - "sc-chain-spec", - "sc-mixnet", - "sc-transaction-pool-api", + "sc-chain-spec 31.0.0", + "sc-mixnet 0.8.0", + "sc-transaction-pool-api 32.0.0", "scale-info", "serde", "serde_json", - "sp-core 29.0.0", - "sp-rpc", - "sp-runtime 32.0.0", - "sp-version", + "sp-core 32.0.0", + "sp-rpc 30.0.0", + "sp-runtime 35.0.0", + "sp-version 33.0.0", + "thiserror", +] + +[[package]] +name = "sc-rpc-api" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147274633577e55db73dbdc64168c25b54cca6cac4fcde118bd9946cf7b24838" +dependencies = [ + "jsonrpsee 0.24.7", + "parity-scale-codec", + "sc-chain-spec 38.0.0", + "sc-mixnet 0.15.0", + "sc-transaction-pool-api 37.0.0", + "scale-info", + "serde", + "serde_json", + "sp-core 34.0.0", + "sp-rpc 32.0.0", + "sp-runtime 39.0.2", + "sp-version 37.0.0", "thiserror", ] [[package]] name = "sc-rpc-server" -version = "12.0.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691440bbaddd3bc2675309c965cc75f8bf694f51e0a28039bfc9658299fbc394" +checksum = "76f6d0924de213aa5c72a47c7bd0d7668531c5845e832d1ac5c33c96d0ff7b9b" dependencies = [ + "futures", + "governor", "http 0.2.12", - "jsonrpsee 0.20.3", + "hyper 0.14.31", + "jsonrpsee 0.22.5", "log", "serde_json", "substrate-prometheus-endpoint", @@ -9855,32 +14540,91 @@ dependencies = [ "tower-http 0.4.4", ] +[[package]] +name = "sc-rpc-server" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6942cc446d7e62ac111aa48dbf81cd0afac6fc710eb5f0ae65f1bdc077e4ce4a" +dependencies = [ + "dyn-clone", + "forwarded-header-value", + "futures", + "governor", + "http 1.1.0", + "http-body-util", + "hyper 1.5.0", + "ip_network", + "jsonrpsee 0.24.7", + "log", + "sc-rpc-api 0.44.0", + "serde", + "serde_json", + "substrate-prometheus-endpoint", + "tokio", + "tower 0.4.13", + "tower-http 0.5.2", +] + [[package]] name = "sc-rpc-spec-v2" -version = "0.35.0" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad831d2524de44a89b1801e306fd9718dc5fadb26ea3e88f486faa29c6fdd710" +dependencies = [ + "array-bytes 6.2.3", + "futures", + "futures-util", + "hex", + "jsonrpsee 0.22.5", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "rand", + "sc-chain-spec 31.0.0", + "sc-client-api 32.0.0", + "sc-rpc 33.0.0", + "sc-transaction-pool-api 32.0.0", + "sc-utils", + "serde", + "sp-api 30.0.0", + "sp-blockchain 32.0.0", + "sp-core 32.0.0", + "sp-rpc 30.0.0", + "sp-runtime 35.0.0", + "sp-version 33.0.0", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "sc-rpc-spec-v2" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f10275c62296a785f6e2ac716521e3b6e0fae470416fdf86491cbbfcc2e23d" +checksum = "6ca6bcb95e13ca0d87bd2b2e23dcc4040b671b467f5cc647169fc9c37b0ce1f7" dependencies = [ - "array-bytes 6.2.2", + "array-bytes 6.2.3", "futures", "futures-util", "hex", - "jsonrpsee 0.20.3", + "jsonrpsee 0.24.7", "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-chain-spec", - "sc-client-api", - "sc-rpc", - "sc-transaction-pool-api", + "rand", + "sc-chain-spec 38.0.0", + "sc-client-api 37.0.0", + "sc-rpc 40.0.0", + "sc-transaction-pool-api 37.0.0", "sc-utils", + "schnellru", "serde", - "sp-api", - "sp-blockchain", - "sp-core 29.0.0", - "sp-rpc", - "sp-runtime 32.0.0", - "sp-version", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-rpc 32.0.0", + "sp-runtime 39.0.2", + "sp-version 37.0.0", "thiserror", "tokio", "tokio-stream", @@ -9888,59 +14632,125 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.36.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ea779b8c5bdb0d0199c8beebcf1fdc5641e468c480e1c4684be660c8c90af" +checksum = "3ff048cda961d13a0978bf6e75b1978c0fa886d2087133a4d2107a034afd27c8" dependencies = [ "async-trait", "directories", "exit-future", "futures", "futures-timer", - "jsonrpsee 0.20.3", + "jsonrpsee 0.22.5", "log", "parity-scale-codec", "parking_lot 0.12.3", "pin-project", "rand", - "sc-chain-spec", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-executor", - "sc-informant", - "sc-keystore", - "sc-network", + "sc-chain-spec 31.0.0", + "sc-client-api 32.0.0", + "sc-client-db 0.39.0", + "sc-consensus 0.37.0", + "sc-executor 0.36.0", + "sc-informant 0.37.0", + "sc-keystore 29.0.0", + "sc-network 0.38.0", "sc-network-bitswap", - "sc-network-common", - "sc-network-light", - "sc-network-sync", - "sc-network-transactions", - "sc-rpc", - "sc-rpc-server", - "sc-rpc-spec-v2", - "sc-sysinfo", - "sc-telemetry", - "sc-tracing", - "sc-transaction-pool", - "sc-transaction-pool-api", + "sc-network-common 0.37.0", + "sc-network-light 0.37.0", + "sc-network-sync 0.37.0", + "sc-network-transactions 0.37.0", + "sc-rpc 33.0.0", + "sc-rpc-server 15.0.0", + "sc-rpc-spec-v2 0.38.0", + "sc-sysinfo 31.0.0", + "sc-telemetry 18.0.0", + "sc-tracing 32.0.0", + "sc-transaction-pool 32.0.0", + "sc-transaction-pool-api 32.0.0", + "sc-utils", + "schnellru", + "serde", + "serde_json", + "sp-api 30.0.0", + "sp-blockchain 32.0.0", + "sp-consensus 0.36.0", + "sp-core 32.0.0", + "sp-externalities 0.28.0", + "sp-keystore 0.38.0", + "sp-runtime 35.0.0", + "sp-session 31.0.0", + "sp-state-machine 0.39.0", + "sp-storage", + "sp-transaction-pool 30.0.0", + "sp-transaction-storage-proof 30.0.0", + "sp-trie 33.0.0", + "sp-version 33.0.0", + "static_init", + "substrate-prometheus-endpoint", + "tempfile", + "thiserror", + "tokio", + "tracing", + "tracing-futures", +] + +[[package]] +name = "sc-service" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f438103f736c3fb4baddd3e40122191c878496671c76ca968a9fad9fcc107a28" +dependencies = [ + "async-trait", + "directories", + "exit-future", + "futures", + "futures-timer", + "jsonrpsee 0.24.7", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "pin-project", + "rand", + "sc-chain-spec 38.0.0", + "sc-client-api 37.0.0", + "sc-client-db 0.44.1", + "sc-consensus 0.44.0", + "sc-executor 0.40.1", + "sc-informant 0.44.0", + "sc-keystore 33.0.0", + "sc-network 0.45.0", + "sc-network-common 0.44.0", + "sc-network-light 0.44.0", + "sc-network-sync 0.44.0", + "sc-network-transactions 0.44.0", + "sc-network-types", + "sc-rpc 40.0.0", + "sc-rpc-server 17.0.0", + "sc-rpc-spec-v2 0.45.0", + "sc-sysinfo 38.0.0", + "sc-telemetry 25.0.0", + "sc-tracing 37.0.1", + "sc-transaction-pool 37.0.0", + "sc-transaction-pool-api 37.0.0", "sc-utils", + "schnellru", "serde", "serde_json", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core 29.0.0", - "sp-externalities 0.26.0", - "sp-keystore 0.35.0", - "sp-runtime 32.0.0", - "sp-session", - "sp-state-machine 0.36.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-externalities 0.29.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", + "sp-session 36.0.0", + "sp-state-machine 0.43.0", "sp-storage", - "sp-transaction-pool", - "sp-transaction-storage-proof", - "sp-trie 30.0.0", - "sp-version", + "sp-transaction-pool 34.0.0", + "sp-transaction-storage-proof 34.0.0", + "sp-trie 37.0.0", + "sp-version 37.0.0", "static_init", "substrate-prometheus-endpoint", "tempfile", @@ -9952,85 +14762,140 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.31.0" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7259ab2e8e2fa1e7a1c38dd8a88353f80e66369ef8b48d5f7098dbc18c67887f" +dependencies = [ + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "sp-core 32.0.0", +] + +[[package]] +name = "sc-state-db" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa842052c41ad379eaecdfddc0d5c953d57e311ae688233f68f461b91d38da0a" +checksum = "f689d0b97c1bbdb2ca31b5f202bda195947f85c7fef990651cad202b99de896b" dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "sp-core 29.0.0", + "sp-core 34.0.0", ] [[package]] name = "sc-storage-monitor" -version = "0.17.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26cb401aad6732700c8d866cbbef1175b9aeb8230908aff27059ef14bd058ef3" +checksum = "1d117c3945c524b9c0e30966359895f5ad551c2cd4ccbb677b53917fbad5039a" dependencies = [ "clap", "fs4", "log", - "sp-core 29.0.0", + "sp-core 34.0.0", "thiserror", "tokio", ] [[package]] name = "sc-sync-state-rpc" -version = "0.35.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bc382c7d997f4531eee5e5d57f970eaf2761d722298d7747385a4ad69fa6b12" +checksum = "732368e1e11b335af0db58d654dff87605ea8531e1944d329cf22751eb23c44d" dependencies = [ - "jsonrpsee 0.20.3", + "jsonrpsee 0.24.7", "parity-scale-codec", - "sc-chain-spec", - "sc-client-api", + "sc-chain-spec 38.0.0", + "sc-client-api 37.0.0", "sc-consensus-babe", "sc-consensus-epochs", "sc-consensus-grandpa", "serde", "serde_json", - "sp-blockchain", - "sp-runtime 32.0.0", + "sp-blockchain 37.0.1", + "sp-runtime 39.0.2", "thiserror", ] [[package]] name = "sc-sysinfo" -version = "28.0.0" +version = "31.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6a838bf3ba61e83c0f3be4a41ba7ed8c71d19c2adee6396046f78317006637b" +dependencies = [ + "derive_more 0.99.18", + "futures", + "libc", + "log", + "rand", + "rand_pcg", + "regex", + "sc-telemetry 18.0.0", + "serde", + "serde_json", + "sp-core 32.0.0", + "sp-crypto-hashing", + "sp-io 34.0.0", + "sp-std", +] + +[[package]] +name = "sc-sysinfo" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25d2ab8f15021916a07cfbe7a08be484c5dc7d57f07bc0e2aa03260b55a5632f" +checksum = "d78810e8fd4a91716eff951f2e80744a08efcc34f53446e60ca055d2cef2e0aa" dependencies = [ - "derive_more 0.99.17", + "derive_more 0.99.18", "futures", "libc", "log", "rand", "rand_pcg", "regex", - "sc-telemetry", + "sc-telemetry 25.0.0", "serde", "serde_json", - "sp-core 29.0.0", + "sp-core 34.0.0", "sp-crypto-hashing", - "sp-io 31.0.0", - "sp-std 14.0.0", + "sp-io 38.0.0", + "sp-std", ] [[package]] name = "sc-telemetry" -version = "16.0.0" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72a5a306d8c75e61e8c59e18b92886f85db6b4102c4669240eca101954fec79e" +dependencies = [ + "chrono", + "futures", + "libp2p 0.51.4", + "log", + "parking_lot 0.12.3", + "pin-project", + "rand", + "sc-utils", + "serde", + "serde_json", + "thiserror", + "wasm-timer", +] + +[[package]] +name = "sc-telemetry" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0673a93aa0684b606abfc5fce6c882ada7bb5fad8a2ddc66a09a42bcc9664d91" +checksum = "e9e28cab12625bcdb8828f9a1177b8d061972f90fda89a70c10763da50e0aaa5" dependencies = [ "chrono", "futures", - "libp2p", + "libp2p 0.52.4", "log", "parking_lot 0.12.3", "pin-project", "rand", + "sc-network 0.45.0", "sc-utils", "serde", "serde_json", @@ -10040,9 +14905,9 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "29.0.0" +version = "32.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77b4fdb4f359f19c395ba862430f3ca0efb50b0310b09753caaa06997edd606" +checksum = "584e4f81defe03776909ce283429c9cd3d80fea6b2f3a303dc2bdf913e11d9e8" dependencies = [ "ansi_term", "chrono", @@ -10053,15 +14918,15 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "regex", - "rustc-hash", - "sc-client-api", + "rustc-hash 1.1.0", + "sc-client-api 32.0.0", "sc-tracing-proc-macro", "serde", - "sp-api", - "sp-blockchain", - "sp-core 29.0.0", - "sp-rpc", - "sp-runtime 32.0.0", + "sp-api 30.0.0", + "sp-blockchain 32.0.0", + "sp-core 32.0.0", + "sp-rpc 30.0.0", + "sp-runtime 35.0.0", "sp-tracing", "thiserror", "tracing", @@ -10069,23 +14934,81 @@ dependencies = [ "tracing-subscriber 0.2.25", ] +[[package]] +name = "sc-tracing" +version = "37.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2604130246c4f6c2a2633f320bde95e7122383385c779b263eb03b714d92758a" +dependencies = [ + "chrono", + "console", + "is-terminal", + "lazy_static", + "libc", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "rustc-hash 1.1.0", + "sc-client-api 37.0.0", + "sc-tracing-proc-macro", + "serde", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-rpc 32.0.0", + "sp-runtime 39.0.2", + "sp-tracing", + "thiserror", + "tracing", + "tracing-log 0.2.0", + "tracing-subscriber 0.3.18", +] + [[package]] name = "sc-tracing-proc-macro" version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "151cdf86d79abf22cf2a240a7ca95041c908dbd96c2ae9a818073042aa210964" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "sc-transaction-pool" -version = "29.0.0" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54754bf43dede417a8e64a0d6a46bf2bbed47ff050c1f81c8a575f9b94416886" +dependencies = [ + "async-trait", + "futures", + "futures-timer", + "linked-hash-map", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "sc-client-api 32.0.0", + "sc-transaction-pool-api 32.0.0", + "sc-utils", + "serde", + "sp-api 30.0.0", + "sp-blockchain 32.0.0", + "sp-core 32.0.0", + "sp-crypto-hashing", + "sp-runtime 35.0.0", + "sp-tracing", + "sp-transaction-pool 30.0.0", + "substrate-prometheus-endpoint", + "thiserror", +] + +[[package]] +name = "sc-transaction-pool" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "326dc8ea417c53b6787bd1bb27431d44768504451f5ce4efdde0c15877c7c121" +checksum = "f716ef0dc78458f6ecb831cdb3b60ec804c1ed93313d7f98661beb5438dbbf71" dependencies = [ "async-trait", "futures", @@ -10094,43 +15017,60 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-client-api", - "sc-transaction-pool-api", + "sc-client-api 37.0.0", + "sc-transaction-pool-api 37.0.0", "sc-utils", "serde", - "sp-api", - "sp-blockchain", - "sp-core 29.0.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", "sp-crypto-hashing", - "sp-runtime 32.0.0", + "sp-runtime 39.0.2", "sp-tracing", - "sp-transaction-pool", + "sp-transaction-pool 34.0.0", "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-transaction-pool-api" -version = "29.0.0" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b563c7257ab650b2639d623da13d1a50a5a6c4ec582bc92e118c73d072bcd4" +dependencies = [ + "async-trait", + "futures", + "log", + "parity-scale-codec", + "serde", + "sp-blockchain 32.0.0", + "sp-core 32.0.0", + "sp-runtime 35.0.0", + "thiserror", +] + +[[package]] +name = "sc-transaction-pool-api" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ae888ce3491acb1b489c3dba930d0c46c7ef9f9893ba0ab8af9125362f3d14" +checksum = "f02936289a079360935685eee5400311994b25e9edb2420a3c4247d419a77f46" dependencies = [ "async-trait", "futures", "log", "parity-scale-codec", "serde", - "sp-blockchain", - "sp-core 29.0.0", - "sp-runtime 32.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-runtime 39.0.2", "thiserror", ] [[package]] name = "sc-utils" -version = "15.0.0" +version = "17.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b1a238f5baa56405db4e440e2d2f697583736fa2e2f1aac345c438a42975f1" +checksum = "acf1bad736c230f16beb1cf48af9e69564df23b13aca9e5751a61266340b4bb5" dependencies = [ "async-channel 1.9.0", "futures", @@ -10139,14 +15079,14 @@ dependencies = [ "log", "parking_lot 0.12.3", "prometheus", - "sp-arithmetic 24.0.0", + "sp-arithmetic", ] [[package]] name = "scale-bits" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662d10dcd57b1c2a3c41c9cf68f71fb09747ada1ea932ad961aca7e2ca28315f" +checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54" dependencies = [ "parity-scale-codec", "scale-info", @@ -10156,13 +15096,13 @@ dependencies = [ [[package]] name = "scale-decode" -version = "0.11.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc79ba56a1c742f5aeeed1f1801f3edf51f7e818f0a54582cac6f131364ea7b" +checksum = "f8ae9cc099ae85ff28820210732b00f019546f36f33225f509fe25d5816864a0" dependencies = [ - "derive_more 0.99.17", + "derive_more 1.0.0", "parity-scale-codec", - "primitive-types", + "primitive-types 0.13.1", "scale-bits", "scale-decode-derive", "scale-type-resolver", @@ -10171,25 +15111,25 @@ dependencies = [ [[package]] name = "scale-decode-derive" -version = "0.11.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5398fdb3c7bea3cb419bac4983aadacae93fe1a7b5f693f4ebd98c3821aad7a5" +checksum = "5ed9401effa946b493f9f84dc03714cca98119b230497df6f3df6b84a2b03648" dependencies = [ - "darling 0.14.4", + "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] name = "scale-encode" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628800925a33794fb5387781b883b5e14d130fece9af5a63613867b8de07c5c7" +checksum = "5f9271284d05d0749c40771c46180ce89905fd95aa72a2a2fddb4b7c0aa424db" dependencies = [ - "derive_more 0.99.17", + "derive_more 1.0.0", "parity-scale-codec", - "primitive-types", + "primitive-types 0.13.1", "scale-bits", "scale-encode-derive", "scale-type-resolver", @@ -10198,15 +15138,15 @@ dependencies = [ [[package]] name = "scale-encode-derive" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a304e1af7cdfbe7a24e08b012721456cc8cecdedadc14b3d10513eada63233c" +checksum = "102fbc6236de6c53906c0b262f12c7aa69c2bdc604862c12728f5f4d370bc137" dependencies = [ - "darling 0.14.4", - "proc-macro-crate 1.3.1", + "darling", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] @@ -10229,17 +15169,17 @@ version = "2.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46385cc24172cf615450267463f937c10072516359b3ff1cb24228a4a08bf951" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "scale-type-resolver" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10b800069bfd43374e0f96f653e0d46882a2cb16d6d961ac43bea80f26c76843" +checksum = "f0cded6518aa0bd6c1be2b88ac81bf7044992f0f154bfbabd5ad34f43512abcb" dependencies = [ "scale-info", "smallvec", @@ -10247,28 +15187,27 @@ dependencies = [ [[package]] name = "scale-typegen" -version = "0.2.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d470fa75e71b12b3244a4113adc4bc49891f3daba2054703cacd06256066397e" +checksum = "0dc4c70c7fea2eef1740f0081d3fe385d8bee1eef11e9272d3bec7dc8e5438e0" dependencies = [ "proc-macro2", "quote", "scale-info", - "syn 2.0.82", + "syn 2.0.85", "thiserror", ] [[package]] name = "scale-value" -version = "0.14.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07ccfee963104335c971aaf8b7b0e749be8569116322df23f1f75c4ca9e4a28" +checksum = "f5e0ef2a0ee1e02a69ada37feb87ea1616ce9808aca072befe2d3131bf28576e" dependencies = [ "base58", "blake2 0.10.6", - "derive_more 0.99.17", + "derive_more 1.0.0", "either", - "frame-metadata 15.1.0", "parity-scale-codec", "scale-bits", "scale-decode", @@ -10281,20 +15220,20 @@ dependencies = [ [[package]] name = "scc" -version = "2.1.0" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96560eea317a9cc4e0bb1f6a2c93c09a19b8c4fc5cb3fcc0ec1c094cd783e2" +checksum = "d8d25269dd3a12467afe2e510f69fb0b46b698e5afb296b59f2145259deaf8e8" dependencies = [ "sdd", ] [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -10318,14 +15257,14 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "schnellru" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" +checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367" dependencies = [ "ahash 0.8.11", "cfg-if", @@ -10340,14 +15279,14 @@ checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0" dependencies = [ "aead 0.5.2", "arrayref", - "arrayvec 0.7.4", - "curve25519-dalek 4.1.2", + "arrayvec 0.7.6", + "curve25519-dalek 4.1.3", "getrandom_or_panic", "merlin", "rand_core 0.6.4", "serde_bytes", "sha2 0.10.8", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -10370,7 +15309,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" dependencies = [ "password-hash", - "pbkdf2 0.12.2", + "pbkdf2", "salsa20", "sha2 0.10.8", ] @@ -10385,11 +15324,26 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "sctp-proto" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6220f78bb44c15f326b0596113305f6101097a18755d53727a575c97e09fb24" +dependencies = [ + "bytes", + "crc", + "fxhash", + "log", + "rand", + "slab", + "thiserror", +] + [[package]] name = "sdd" -version = "0.2.0" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" +checksum = "49c1eeaf4b6a87c7479688c6d52b9f1153cedd3c489300564f932b065c6eab95" [[package]] name = "sec1" @@ -10402,7 +15356,7 @@ dependencies = [ "generic-array 0.14.7", "pkcs8", "serdect", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -10445,22 +15399,23 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", + "num-bigint", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -10472,14 +15427,32 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537" dependencies = [ - "semver-parser", + "semver-parser 0.7.0", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser 0.7.0", ] [[package]] name = "semver" -version = "1.0.22" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser 0.10.2", +] + +[[package]] +name = "semver" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] @@ -10490,6 +15463,15 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + [[package]] name = "send_wrapper" version = "0.4.0" @@ -10504,42 +15486,51 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.213" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] +[[package]] +name = "serde-big-array" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd31f59f6fe2b0c055371bb2f16d7f0aa7d8881676c04a55b1596d1a17cd10a4" +dependencies = [ + "serde", +] + [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.213" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "serde_derive_internals" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -10566,9 +15557,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -10617,7 +15608,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -10633,6 +15624,18 @@ dependencies = [ "opaque-debug 0.3.1", ] +[[package]] +name = "sha-1" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", + "sha1-asm", +] + [[package]] name = "sha1" version = "0.10.6" @@ -10644,6 +15647,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha1-asm" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "286acebaf8b67c1130aedffad26f594eff0c1292389158135327d2e23aed582b" +dependencies = [ + "cc", +] + [[package]] name = "sha2" version = "0.9.9" @@ -10695,9 +15707,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -10714,9 +15726,9 @@ dependencies = [ [[package]] name = "simba" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" +checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa" dependencies = [ "approx", "num-complex", @@ -10725,6 +15737,15 @@ dependencies = [ "wide", ] +[[package]] +name = "simple-dns" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cae9a3fcdadafb6d97f4c0e007e4247b114ee0f119f650c3cbf3a8b3a1479694" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "simple-mermaid" version = "0.1.1" @@ -10784,6 +15805,18 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" +[[package]] +name = "slot-range-helper" +version = "15.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e34f1146a457a5c554dedeae6c7273aa54c3b031f3e9eb0abd037b5511e2ce9" +dependencies = [ + "enumn", + "parity-scale-codec", + "paste", + "sp-runtime 39.0.2", +] + [[package]] name = "smallvec" version = "1.13.2" @@ -10792,15 +15825,15 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smol" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e635339259e51ef85ac7aa29a1cd991b957047507288697a690e80ab97d07cad" +checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f" dependencies = [ - "async-channel 2.2.0", + "async-channel 2.3.1", "async-executor", "async-fs", "async-io", - "async-lock 3.3.0", + "async-lock", "async-net", "async-process", "blocking", @@ -10809,116 +15842,439 @@ dependencies = [ [[package]] name = "smoldot" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d1eaa97d77be4d026a1e7ffad1bb3b78448763b357ea6f8188d3e6f736a9b9" +checksum = "966e72d77a3b2171bb7461d0cb91f43670c63558c62d7cf42809cae6c8b6b818" dependencies = [ - "arrayvec 0.7.4", - "async-lock 3.3.0", + "arrayvec 0.7.6", + "async-lock", "atomic-take", - "base64 0.21.7", + "base64 0.22.1", "bip39", "blake2-rfc", "bs58 0.5.1", "chacha20 0.9.1", "crossbeam-queue", - "derive_more 0.99.17", + "derive_more 0.99.18", "ed25519-zebra 4.0.3", "either", - "event-listener 4.0.3", + "event-listener 5.3.1", "fnv", "futures-lite", "futures-util", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "hex", "hmac 0.12.1", - "itertools 0.12.1", + "itertools 0.13.0", "libm", "libsecp256k1", "merlin", - "no-std-net", "nom", "num-bigint", "num-rational", "num-traits", - "pbkdf2 0.12.2", + "pbkdf2", "pin-project", "poly1305 0.8.0", "rand", - "rand_chacha 0.3.1", + "rand_chacha", "ruzstd", "schnorrkel", "serde", - "serde_json", - "sha2 0.10.8", - "sha3", - "siphasher 1.0.1", - "slab", - "smallvec", - "soketto", - "twox-hash", - "wasmi", - "x25519-dalek 2.0.1", - "zeroize", + "serde_json", + "sha2 0.10.8", + "sha3", + "siphasher 1.0.1", + "slab", + "smallvec", + "soketto 0.8.0", + "twox-hash", + "wasmi", + "x25519-dalek 2.0.1", + "zeroize", +] + +[[package]] +name = "smoldot-light" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a33b06891f687909632ce6a4e3fd7677b24df930365af3d0bcb078310129f3f" +dependencies = [ + "async-channel 2.3.1", + "async-lock", + "base64 0.22.1", + "blake2-rfc", + "bs58 0.5.1", + "derive_more 0.99.18", + "either", + "event-listener 5.3.1", + "fnv", + "futures-channel", + "futures-lite", + "futures-util", + "hashbrown 0.14.5", + "hex", + "itertools 0.13.0", + "log", + "lru 0.12.5", + "parking_lot 0.12.3", + "pin-project", + "rand", + "rand_chacha", + "serde", + "serde_json", + "siphasher 1.0.1", + "slab", + "smol", + "smoldot", + "zeroize", +] + +[[package]] +name = "snap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" + +[[package]] +name = "snow" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85" +dependencies = [ + "aes-gcm", + "blake2 0.10.6", + "chacha20poly1305 0.10.1", + "curve25519-dalek 4.1.3", + "rand_core 0.6.4", + "ring 0.17.8", + "rustc_version 0.4.1", + "sha2 0.10.8", + "subtle 2.6.1", +] + +[[package]] +name = "snowbridge-amcl" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460a9ed63cdf03c1b9847e8a12a5f5ba19c4efd5869e4a737e05be25d7c427e5" +dependencies = [ + "parity-scale-codec", + "scale-info", +] + +[[package]] +name = "snowbridge-beacon-primitives" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10bd720997e558beb556d354238fa90781deb38241cf31c1b6368738ef21c279" +dependencies = [ + "byte-slice-cast", + "frame-support 38.0.0", + "hex", + "parity-scale-codec", + "rlp", + "scale-info", + "serde", + "snowbridge-ethereum", + "snowbridge-milagro-bls", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", + "ssz_rs", + "ssz_rs_derive", +] + +[[package]] +name = "snowbridge-core" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6be61e4db95d1e253a1d5e722953b2d2f6605e5f9761f0a919e5d3fbdbff9da9" +dependencies = [ + "ethabi-decode", + "frame-support 38.0.0", + "frame-system", + "hex-literal", + "parity-scale-codec", + "polkadot-parachain-primitives", + "scale-info", + "serde", + "snowbridge-beacon-primitives", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", + "staging-xcm", + "staging-xcm-builder", +] + +[[package]] +name = "snowbridge-ethereum" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc3d6d549c57df27cf89ec852f932fa4008eea877a6911a87e03e8002104eabd" +dependencies = [ + "ethabi-decode", + "ethbloom", + "ethereum-types", + "hex-literal", + "parity-bytes", + "parity-scale-codec", + "rlp", + "scale-info", + "serde", + "serde-big-array", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "snowbridge-milagro-bls" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "026aa8638f690a53e3f7676024b9e913b1cab0111d1b7b92669d40a188f9d7e6" +dependencies = [ + "hex", + "lazy_static", + "parity-scale-codec", + "rand", + "scale-info", + "snowbridge-amcl", + "zeroize", +] + +[[package]] +name = "snowbridge-outbound-queue-merkle-tree" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74c6a9b65fa61711b704f0c6afb3663c6288288e8822ddae5cc1146fe3ad9ce8" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "snowbridge-outbound-queue-runtime-api" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d27b8d9cb8022637a5ce4f52692520fa75874f393e04ef5cd75bd8795087f6" +dependencies = [ + "frame-support 38.0.0", + "parity-scale-codec", + "snowbridge-core", + "snowbridge-outbound-queue-merkle-tree", + "sp-api 34.0.0", + "sp-std", +] + +[[package]] +name = "snowbridge-pallet-ethereum-client" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d53d32d8470c643f9f8c1f508e1e34263f76297e4c9150e10e8f2e0b63992e1" +dependencies = [ + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "serde", + "snowbridge-beacon-primitives", + "snowbridge-core", + "snowbridge-ethereum", + "snowbridge-pallet-ethereum-client-fixtures", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", + "static_assertions", +] + +[[package]] +name = "snowbridge-pallet-ethereum-client-fixtures" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3984b98465af1d862d4e87ba783e1731f2a3f851b148d6cb98d526cebd351185" +dependencies = [ + "hex-literal", + "snowbridge-beacon-primitives", + "snowbridge-core", + "sp-core 34.0.0", + "sp-std", +] + +[[package]] +name = "snowbridge-pallet-inbound-queue" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2e6a9d00e60e3744e6b6f0c21fea6694b9c6401ac40e41340a96e561dcf1935" +dependencies = [ + "alloy-primitives", + "alloy-sol-types", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "serde", + "snowbridge-beacon-primitives", + "snowbridge-core", + "snowbridge-pallet-inbound-queue-fixtures", + "snowbridge-router-primitives", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", + "staging-xcm", + "staging-xcm-executor", +] + +[[package]] +name = "snowbridge-pallet-inbound-queue-fixtures" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b099db83f4c10c0bf84e87deb1596019f91411ea1c8c9733ea9a7f2e7e967073" +dependencies = [ + "hex-literal", + "snowbridge-beacon-primitives", + "snowbridge-core", + "sp-core 34.0.0", + "sp-std", +] + +[[package]] +name = "snowbridge-pallet-outbound-queue" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d49478041b6512c710d0d4655675d146fe00a8e0c1624e5d8a1d6c161d490f" +dependencies = [ + "bridge-hub-common", + "ethabi-decode", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "serde", + "snowbridge-core", + "snowbridge-outbound-queue-merkle-tree", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", ] [[package]] -name = "smoldot-light" -version = "0.14.0" +name = "snowbridge-pallet-system" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5496f2d116b7019a526b1039ec2247dd172b8670633b1a64a614c9ea12c9d8c7" +checksum = "674db59b3c8013382e5c07243ad9439b64d81d2e8b3c4f08d752b55aa5de697e" dependencies = [ - "async-channel 2.2.0", - "async-lock 3.3.0", - "base64 0.21.7", - "blake2-rfc", - "derive_more 0.99.17", - "either", - "event-listener 4.0.3", - "fnv", - "futures-channel", - "futures-lite", - "futures-util", - "hashbrown 0.14.3", - "hex", - "itertools 0.12.1", + "frame-benchmarking", + "frame-support 38.0.0", + "frame-system", "log", - "lru 0.12.3", - "no-std-net", - "parking_lot 0.12.3", - "pin-project", - "rand", - "rand_chacha 0.3.1", - "serde", - "serde_json", - "siphasher 1.0.1", - "slab", - "smol", - "smoldot", - "zeroize", + "parity-scale-codec", + "scale-info", + "snowbridge-core", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", + "staging-xcm", + "staging-xcm-executor", ] [[package]] -name = "snap" -version = "1.1.1" +name = "snowbridge-router-primitives" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" +checksum = "025f1e6805753821b1db539369f1fb183fd59fd5df7023f7633a4c0cfd3e62f9" +dependencies = [ + "frame-support 38.0.0", + "hex-literal", + "log", + "parity-scale-codec", + "scale-info", + "snowbridge-core", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", + "staging-xcm", + "staging-xcm-executor", +] [[package]] -name = "snow" -version = "0.9.6" +name = "snowbridge-runtime-common" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85" +checksum = "6093f0e73d6cfdd2eea8712155d1d75b5063fc9b1d854d2665b097b4bb29570d" dependencies = [ - "aes-gcm", - "blake2 0.10.6", - "chacha20poly1305 0.10.1", - "curve25519-dalek 4.1.2", - "rand_core 0.6.4", - "ring 0.17.8", - "rustc_version", - "sha2 0.10.8", - "subtle 2.5.0", + "frame-support 38.0.0", + "log", + "parity-scale-codec", + "snowbridge-core", + "sp-arithmetic", + "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "snowbridge-runtime-test-common" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "893480d6cde2489051c65efb5d27fa87efe047b3b61216d8e27bb2f0509b7faf" +dependencies = [ + "cumulus-pallet-parachain-system", + "frame-support 38.0.0", + "frame-system", + "pallet-balances", + "pallet-collator-selection", + "pallet-message-queue", + "pallet-session", + "pallet-timestamp", + "pallet-utility", + "pallet-xcm", + "parachains-runtimes-test-utils", + "parity-scale-codec", + "snowbridge-core", + "snowbridge-pallet-ethereum-client", + "snowbridge-pallet-ethereum-client-fixtures", + "snowbridge-pallet-outbound-queue", + "snowbridge-pallet-system", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-keyring 39.0.0", + "sp-runtime 39.0.2", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-executor", +] + +[[package]] +name = "snowbridge-system-runtime-api" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b8b83b3db781c49844312a23965073e4d93341739a35eafe526c53b578d3b7" +dependencies = [ + "parity-scale-codec", + "snowbridge-core", + "sp-api 34.0.0", + "sp-std", + "staging-xcm", ] [[package]] @@ -10933,9 +16289,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -10955,243 +16311,423 @@ dependencies = [ "httparse", "log", "rand", - "sha-1", + "sha-1 0.9.8", +] + +[[package]] +name = "soketto" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", +] + +[[package]] +name = "sp-api" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8abd1d0732054ad896db8f092abe822106f1acf8bbc462c70f57d0f24c0dcdf" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "scale-info", + "sp-api-proc-macro 18.0.0", + "sp-core 32.0.0", + "sp-externalities 0.28.0", + "sp-metadata-ir", + "sp-runtime 35.0.0", + "sp-runtime-interface 27.0.0", + "sp-state-machine 0.39.0", + "sp-std", + "sp-trie 33.0.0", + "sp-version 33.0.0", + "thiserror", ] [[package]] name = "sp-api" -version = "27.0.1" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4f8702afd77f14a32733e2b589c02694bf79d0b3a641963c508016208724d0" +checksum = "bbce492e0482134128b7729ea36f5ef1a9f9b4de2d48ff8dde7b5e464e28ce75" dependencies = [ + "docify", "hash-db", "log", "parity-scale-codec", "scale-info", - "sp-api-proc-macro", - "sp-core 29.0.0", - "sp-externalities 0.26.0", + "sp-api-proc-macro 20.0.0", + "sp-core 34.0.0", + "sp-externalities 0.29.0", "sp-metadata-ir", - "sp-runtime 32.0.0", - "sp-state-machine 0.36.0", - "sp-std 14.0.0", - "sp-trie 30.0.0", - "sp-version", + "sp-runtime 39.0.2", + "sp-runtime-interface 28.0.0", + "sp-state-machine 0.43.0", + "sp-trie 37.0.0", + "sp-version 37.0.0", "thiserror", ] [[package]] name = "sp-api-proc-macro" -version = "15.0.1" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0301e2f77afb450fbf2b093f8b324c7ad88cc82e5e69bd5dc8658a1f068b2a96" +checksum = "681e80c1b259ee71880cd3b4ad2a2d41454596252bd267c3edf4e14552ab40e1" dependencies = [ "Inflector", "blake2 0.10.6", "expander", - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] -name = "sp-application-crypto" -version = "31.0.0" +name = "sp-api-proc-macro" +version = "20.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "547cad7a6eabb52c639ec117b3db9c6b43cf1b29a9393b18feb19e101a91833f" +checksum = "c9aadf9e97e694f0e343978aa632938c5de309cbcc8afed4136cb71596737278" dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-std 14.0.0", + "Inflector", + "blake2 0.10.6", + "expander", + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.85", ] [[package]] name = "sp-application-crypto" -version = "33.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13ca6121c22c8bd3d1dce1f05c479101fd0d7b159bef2a3e8c834138d839c75c" +checksum = "1505fad69251900048ddddc6387265e1545d1a366e3b4dcd57b76a03f0a65ae7" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 31.0.0", - "sp-io 33.0.0", - "sp-std 14.0.0", + "sp-core 32.0.0", + "sp-io 34.0.0", + "sp-std", ] [[package]] -name = "sp-arithmetic" -version = "24.0.0" +name = "sp-application-crypto" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa823ca5adc490d47dccb41d69ad482bc57a317bd341de275868378f48f131c" +checksum = "0d8133012faa5f75b2f0b1619d9f720c1424ac477152c143e5f7dbde2fe1a958" dependencies = [ - "integer-sqrt", - "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-std 14.0.0", - "static_assertions", + "sp-core 34.0.0", + "sp-io 38.0.0", ] [[package]] name = "sp-arithmetic" -version = "25.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "910c07fa263b20bf7271fdd4adcb5d3217dfdac14270592e0780223542e7e114" +checksum = "46d0d0a4c591c421d3231ddd5e27d828618c24456d51445d21a1f79fcee97c23" dependencies = [ + "docify", "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-std 14.0.0", + "sp-std", "static_assertions", ] [[package]] name = "sp-authority-discovery" -version = "27.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92b177c72b5d2973c36d60f6ef942d791d9fd91eae8b08c71882e4118d4fbfc" +checksum = "519c33af0e25ba2dd2eb3790dc404d634b6e4ce0801bcc8fa3574e07c365e734" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-application-crypto 31.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "sp-block-builder" -version = "27.0.0" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "466eaa1fe1745e9456a5e5afc033b67a52211463a137ea3551bff36b4d72ce03" +dependencies = [ + "sp-api 30.0.0", + "sp-inherents 30.0.0", + "sp-runtime 35.0.0", +] + +[[package]] +name = "sp-block-builder" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b36ce171caa7eb2bbe682c089f755fdefa71d3702e4fb1ba30d10146aef99d5" +checksum = "74738809461e3d4bd707b5b94e0e0c064a623a74a6a8fe5c98514417a02858dd" dependencies = [ - "sp-api", - "sp-inherents", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-api 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "sp-blockchain" -version = "29.0.0" +version = "32.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31303e766d2e53812641bbc1f1cec03a85793fc9e627e55f0a6854b28708758" +checksum = "eed0dc760fde2b2cd07ca9428e3d6b7ecc02bbd00a5dc32b7f829c80889b152b" dependencies = [ "futures", "log", "parity-scale-codec", "parking_lot 0.12.3", "schnellru", - "sp-api", - "sp-consensus", + "sp-api 30.0.0", + "sp-consensus 0.36.0", + "sp-database", + "sp-runtime 35.0.0", + "sp-state-machine 0.39.0", + "thiserror", +] + +[[package]] +name = "sp-blockchain" +version = "37.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a309eecd6b5689f57e67181deaa628d9c8951db1ba0d26f07c69e14dffdc4765" +dependencies = [ + "futures", + "parity-scale-codec", + "parking_lot 0.12.3", + "schnellru", + "sp-api 34.0.0", + "sp-consensus 0.40.0", + "sp-core 34.0.0", "sp-database", - "sp-runtime 32.0.0", - "sp-state-machine 0.36.0", + "sp-runtime 39.0.2", + "sp-state-machine 0.43.0", "thiserror", + "tracing", ] [[package]] name = "sp-consensus" -version = "0.33.0" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19910bc7cd10336a1b13611df1212bce5cabbcfcd92a9394e23476498aa360c7" +dependencies = [ + "async-trait", + "futures", + "log", + "sp-core 32.0.0", + "sp-inherents 30.0.0", + "sp-runtime 35.0.0", + "sp-state-machine 0.39.0", + "thiserror", +] + +[[package]] +name = "sp-consensus" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6e512b862c4ff7a26cdcd364898cc42e181ff5cb35fbb226ff27d88c81569a" +checksum = "ce75efd1e164be667a53c20182c45b4c2abe325abcbd21fc292b82be5b9240f7" dependencies = [ "async-trait", "futures", "log", - "sp-core 29.0.0", - "sp-inherents", - "sp-runtime 32.0.0", - "sp-state-machine 0.36.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.2", + "sp-state-machine 0.43.0", "thiserror", ] [[package]] name = "sp-consensus-aura" -version = "0.33.0" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67647dc44d2f47f8b96a56f30a896926485e55a8209cfe916cf8d08a6d488f03" +dependencies = [ + "async-trait", + "parity-scale-codec", + "scale-info", + "sp-api 30.0.0", + "sp-application-crypto 34.0.0", + "sp-consensus-slots 0.36.0", + "sp-inherents 30.0.0", + "sp-runtime 35.0.0", + "sp-timestamp 30.0.0", +] + +[[package]] +name = "sp-consensus-aura" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf13c293685319751f72fa5216c7fb5f25f3e8e8fe29b4503296ed5f5466b3d" +checksum = "7a8faaa05bbcb9c41f0cc535c4c1315abf6df472b53eae018678d1b4d811ac47" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-api", - "sp-application-crypto 31.0.0", - "sp-consensus-slots", - "sp-inherents", - "sp-runtime 32.0.0", - "sp-std 14.0.0", - "sp-timestamp", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-consensus-slots 0.40.1", + "sp-inherents 34.0.0", + "sp-runtime 39.0.2", + "sp-timestamp 34.0.0", ] [[package]] name = "sp-consensus-babe" -version = "0.33.0" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3500dd1ceb99ca5e6f399d37c4e42f22fcbb6505e07378791ebe57eec6a1960" +dependencies = [ + "async-trait", + "parity-scale-codec", + "scale-info", + "serde", + "sp-api 30.0.0", + "sp-application-crypto 34.0.0", + "sp-consensus-slots 0.36.0", + "sp-core 32.0.0", + "sp-inherents 30.0.0", + "sp-runtime 35.0.0", + "sp-timestamp 30.0.0", +] + +[[package]] +name = "sp-consensus-babe" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9be2f86a2f0ce2a78b455feb547aa27604fd76a7f7a691995cbad44e0b1b9dd" +checksum = "36ee95e17ee8dcd14db7d584b899a426565ca9abe5a266ab82277977fc547f86" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-application-crypto 31.0.0", - "sp-consensus-slots", - "sp-core 29.0.0", - "sp-inherents", - "sp-runtime 32.0.0", - "sp-std 14.0.0", - "sp-timestamp", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-consensus-slots 0.40.1", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.2", + "sp-timestamp 34.0.0", +] + +[[package]] +name = "sp-consensus-beefy" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d97e8cd75d85d15cda6f1923cf3834e848f80d5a6de1cf4edbbc5f0ad607eb" +dependencies = [ + "lazy_static", + "parity-scale-codec", + "scale-info", + "serde", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-crypto-hashing", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-mmr-primitives", + "sp-runtime 39.0.2", + "sp-weights", + "strum 0.26.3", ] [[package]] name = "sp-consensus-grandpa" -version = "14.0.0" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffc3f88b33c2a8c14f4d05a3c69c5fc7b02cdd3300993a22d6d2175d35447f6" +dependencies = [ + "finality-grandpa", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-api 30.0.0", + "sp-application-crypto 34.0.0", + "sp-core 32.0.0", + "sp-keystore 0.38.0", + "sp-runtime 35.0.0", +] + +[[package]] +name = "sp-consensus-grandpa" +version = "21.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b606164600db36e596db7abf32b4533dc9a74526d9444c4c45035427b2199b" +checksum = "587b791efe6c5f18e09dbbaf1ece0ee7b5fe51602c233e7151a3676b0de0260b" dependencies = [ "finality-grandpa", "log", "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-application-crypto 31.0.0", - "sp-core 29.0.0", - "sp-keystore 0.35.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "sp-consensus-pow" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fa6b7d199a1c16cea1b74ee7cee174bf08f2120ab66a87bee7b12353100b47c" +dependencies = [ + "parity-scale-codec", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "sp-consensus-slots" -version = "0.33.0" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52dcae1dac6908d80bceaff4f311bc694c3b9c0d3ac6e74128ed4e3a29e9e31f" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-timestamp 30.0.0", +] + +[[package]] +name = "sp-consensus-slots" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73a5bd1fcd84bbdc7255528c7cdb92f9357fd555f06ee553af7e340cbdab517c" +checksum = "bbafb7ed44f51c22fa277fb39b33dc601fa426133a8e2b53f3f46b10f07fba43" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std 14.0.0", - "sp-timestamp", + "sp-timestamp 34.0.0", ] [[package]] name = "sp-core" -version = "29.0.0" +version = "32.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c33c7a1568175250628567d50c4e1c54a6ac5bc1190413b9be29a9e810cbe73" +checksum = "bb2dac7e47c7ddbb61efe196d5cce99f6ea88926c961fa39909bfeae46fc5a7b" dependencies = [ - "array-bytes 6.2.2", - "bip39", + "array-bytes 6.2.3", "bitflags 1.3.2", "blake2 0.10.6", "bounded-collections", @@ -11201,15 +16737,17 @@ dependencies = [ "futures", "hash-db", "hash256-std-hasher", - "impl-serde", + "impl-serde 0.4.0", "itertools 0.10.5", + "k256", "libsecp256k1", "log", "merlin", + "parity-bip39", "parity-scale-codec", "parking_lot 0.12.3", "paste", - "primitive-types", + "primitive-types 0.12.2", "rand", "scale-info", "schnorrkel", @@ -11218,12 +16756,12 @@ dependencies = [ "serde", "sp-crypto-hashing", "sp-debug-derive", - "sp-externalities 0.26.0", - "sp-runtime-interface 25.0.0", - "sp-std 14.0.0", + "sp-externalities 0.28.0", + "sp-runtime-interface 27.0.0", + "sp-std", "sp-storage", "ss58-registry", - "substrate-bip39 0.4.6", + "substrate-bip39", "thiserror", "tracing", "w3f-bls", @@ -11232,22 +16770,22 @@ dependencies = [ [[package]] name = "sp-core" -version = "31.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d7a0fd8f16dcc3761198fc83be12872f823b37b749bc72a3a6a1f702509366" +checksum = "c961a5e33fb2962fa775c044ceba43df9c6f917e2c35d63bfe23738468fa76a7" dependencies = [ - "array-bytes 6.2.2", + "array-bytes 6.2.3", "bitflags 1.3.2", "blake2 0.10.6", "bounded-collections", "bs58 0.5.1", "dyn-clonable", - "ed25519-zebra 3.1.0", + "ed25519-zebra 4.0.3", "futures", "hash-db", "hash256-std-hasher", - "impl-serde", - "itertools 0.10.5", + "impl-serde 0.4.0", + "itertools 0.11.0", "k256", "libsecp256k1", "log", @@ -11256,7 +16794,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "paste", - "primitive-types", + "primitive-types 0.12.2", "rand", "scale-info", "schnorrkel", @@ -11265,18 +16803,48 @@ dependencies = [ "serde", "sp-crypto-hashing", "sp-debug-derive", - "sp-externalities 0.27.0", - "sp-runtime-interface 26.0.0", - "sp-std 14.0.0", + "sp-externalities 0.29.0", + "sp-runtime-interface 28.0.0", + "sp-std", "sp-storage", "ss58-registry", - "substrate-bip39 0.5.0", + "substrate-bip39", "thiserror", "tracing", "w3f-bls", "zeroize", ] +[[package]] +name = "sp-core-hashing" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f812cb2dff962eb378c507612a50f1c59f52d92eb97b710f35be3c2346a3cd7" +dependencies = [ + "sp-crypto-hashing", +] + +[[package]] +name = "sp-crypto-ec-utils" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acb24f8a607a48a87f0ee4c090fc5d577eee49ff39ced6a3c491e06eca03c37" +dependencies = [ + "ark-bls12-377", + "ark-bls12-377-ext", + "ark-bls12-381", + "ark-bls12-381-ext", + "ark-bw6-761", + "ark-bw6-761-ext", + "ark-ec", + "ark-ed-on-bls12-377", + "ark-ed-on-bls12-377-ext", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ed-on-bls12-381-bandersnatch-ext", + "ark-scale", + "sp-runtime-interface 28.0.0", +] + [[package]] name = "sp-crypto-hashing" version = "0.1.0" @@ -11299,7 +16867,7 @@ checksum = "b85d0f1f1e44bd8617eb2a48203ee854981229e3e79e6f468c7175d5fd37489b" dependencies = [ "quote", "sp-crypto-hashing", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -11320,93 +16888,118 @@ checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "sp-externalities" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7096ed024cec397804864898b093b51e14c7299f1d00c67dd5800330e02bb82" +checksum = "33abaec4be69b1613796bbf430decbbcaaf978756379e2016e683a4d6379cd02" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 14.0.0", "sp-storage", ] [[package]] name = "sp-externalities" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d6a4572eadd4a63cff92509a210bf425501a0c5e76574b30a366ac77653787" +checksum = "a904407d61cb94228c71b55a9d3708e9d6558991f9e83bd42bd91df37a159d30" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 14.0.0", "sp-storage", ] [[package]] name = "sp-genesis-builder" -version = "0.8.0" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee8a812b56fb4ed6a598ad7b43be127702aba1f7351ad4916f5bab995054cdc5" +dependencies = [ + "serde_json", + "sp-api 30.0.0", + "sp-runtime 35.0.0", +] + +[[package]] +name = "sp-genesis-builder" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd865540ec19479c7349b584ccd78cc34c3f3a628a2a69dbb6365ceec36295ee" +checksum = "32a646ed222fd86d5680faa4a8967980eb32f644cae6c8523e1c689a6deda3e8" dependencies = [ + "parity-scale-codec", + "scale-info", "serde_json", - "sp-api", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-api 34.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "sp-inherents" -version = "27.0.0" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcba3b816fdfadf30d8c7c484e1873f1af89ed2560c77d2b2137d152cc5a585" +dependencies = [ + "async-trait", + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "sp-runtime 35.0.0", + "thiserror", +] + +[[package]] +name = "sp-inherents" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "607c9e35e96966645ff180a9e9f976433b96e905d0a91d8d5315e605a21f4bc0" +checksum = "afffbddc380d99a90c459ba1554bbbc01d62e892de9f1485af6940b89c4c0d57" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-runtime 39.0.2", "thiserror", ] [[package]] name = "sp-io" -version = "31.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec43aa073eab35fcb920d7592474d5427ea3be2bf938706a3ad955d7ba54fd8d" +checksum = "c44ed47247b6eee76ff703f9fa9f04f99c4104ac1faf629e6d1128e09066b57b" dependencies = [ "bytes", "ed25519-dalek", "libsecp256k1", "log", "parity-scale-codec", + "polkavm-derive 0.9.1", "rustversion", "secp256k1", - "sp-core 29.0.0", + "sp-core 32.0.0", "sp-crypto-hashing", - "sp-externalities 0.26.0", - "sp-keystore 0.35.0", - "sp-runtime-interface 25.0.0", - "sp-state-machine 0.36.0", - "sp-std 14.0.0", + "sp-externalities 0.28.0", + "sp-keystore 0.38.0", + "sp-runtime-interface 27.0.0", + "sp-state-machine 0.39.0", + "sp-std", "sp-tracing", - "sp-trie 30.0.0", + "sp-trie 33.0.0", "tracing", "tracing-core", ] [[package]] name = "sp-io" -version = "33.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e09bba780b55bd9e67979cd8f654a31e4a6cf45426ff371394a65953d2177f2" +checksum = "59ef7eb561bb4839cc8424ce58c5ea236cbcca83f26fcc0426d8decfe8aa97d4" dependencies = [ "bytes", + "docify", "ed25519-dalek", "libsecp256k1", "log", @@ -11414,64 +17007,62 @@ dependencies = [ "polkavm-derive 0.9.1", "rustversion", "secp256k1", - "sp-core 31.0.0", + "sp-core 34.0.0", "sp-crypto-hashing", - "sp-externalities 0.27.0", - "sp-keystore 0.37.0", - "sp-runtime-interface 26.0.0", - "sp-state-machine 0.38.0", - "sp-std 14.0.0", + "sp-externalities 0.29.0", + "sp-keystore 0.40.0", + "sp-runtime-interface 28.0.0", + "sp-state-machine 0.43.0", "sp-tracing", - "sp-trie 32.0.0", + "sp-trie 37.0.0", "tracing", "tracing-core", ] [[package]] name = "sp-keyring" -version = "32.0.0" +version = "35.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cf0a2f881958466fc92bc9b39bbc2c0d815ded4a21f8f953372b0ac2e11b02" +checksum = "089da5d08c4a6b4a36de664de287f4a391ac338e351a923b79aedfc46162f201" dependencies = [ - "sp-core 29.0.0", - "sp-runtime 32.0.0", - "strum 0.24.1", + "sp-core 32.0.0", + "sp-runtime 35.0.0", + "strum 0.26.3", ] [[package]] name = "sp-keyring" -version = "34.0.0" +version = "39.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07a31da596d705b3a3458d784a897af7fd2f8090de436dc386a112e8ea7f34f" +checksum = "7c0e20624277f578b27f44ecfbe2ebc2e908488511ee2c900c5281599f700ab3" dependencies = [ - "sp-core 31.0.0", - "sp-runtime 34.0.0", - "strum 0.24.1", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "strum 0.26.3", ] [[package]] name = "sp-keystore" -version = "0.35.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444f2d53968b1ce5e908882710ff1f3873fcf3e95f59d57432daf685bbacb959" +checksum = "4e6c7a7abd860a5211a356cf9d5fcabf0eb37d997985e5d722b6b33dcc815528" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", - "sp-core 29.0.0", - "sp-externalities 0.26.0", - "thiserror", + "sp-core 32.0.0", + "sp-externalities 0.28.0", ] [[package]] name = "sp-keystore" -version = "0.37.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbab8b61bd61d5f8625a0c75753b5d5a23be55d3445419acd42caf59cf6236b" +checksum = "0248b4d784cb4a01472276928977121fa39d977a5bb24793b6b15e64b046df42" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", - "sp-core 31.0.0", - "sp-externalities 0.27.0", + "sp-core 34.0.0", + "sp-externalities 0.29.0", ] [[package]] @@ -11486,53 +17077,91 @@ dependencies = [ [[package]] name = "sp-metadata-ir" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0b5e87e56c1bb26d9524d48dd127121d630f895bd5914a34f0b017489f7c1d" +checksum = "a616fa51350b35326682a472ee8e6ba742fdacb18babac38ecd46b3e05ead869" dependencies = [ "frame-metadata 16.0.0", "parity-scale-codec", "scale-info", - "sp-std 14.0.0", ] [[package]] name = "sp-mixnet" -version = "0.5.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bebd44b915c65aeb7e7eeaea466aba3b27cdd915c83ea83d4643c54f21ffbbf" +checksum = "01ba1e6ceede3aa5e36ee161dc02f1b294a659823887cefc4f0f2fce589e3c11" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-application-crypto 31.0.0", - "sp-std 14.0.0", + "sp-api 30.0.0", + "sp-application-crypto 34.0.0", +] + +[[package]] +name = "sp-mixnet" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0b017dd54823b6e62f9f7171a1df350972e5c6d0bf17e0c2f78680b5c31942" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", +] + +[[package]] +name = "sp-mmr-primitives" +version = "34.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a12dd76e368f1e48144a84b4735218b712f84b3f976970e2f25a29b30440e10" +dependencies = [ + "log", + "parity-scale-codec", + "polkadot-ckb-merkle-mountain-range", + "scale-info", + "serde", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-debug-derive", + "sp-runtime 39.0.2", + "thiserror", ] [[package]] name = "sp-npos-elections" -version = "27.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195d7e1154c91cce5c3abc8c778689c3e5799da6411328dd32ac7a974c68e526" +checksum = "af922f112c7c1ed199eabe14f12a82ceb75e1adf0804870eccfbcf3399492847" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 24.0.0", - "sp-core 29.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "sp-offchain" -version = "27.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d83b955dce0b6d143bec3f60571311168f362b1c16cf044da7037a407b66c19" +checksum = "50efea44dfc8e40c59e9f9099c6a4f64dc750ad224fd8dbf9aec12fc857fa145" dependencies = [ - "sp-api", - "sp-core 29.0.0", - "sp-runtime 32.0.0", + "sp-api 30.0.0", + "sp-core 32.0.0", + "sp-runtime 35.0.0", +] + +[[package]] +name = "sp-offchain" +version = "34.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d9de237d72ecffd07f90826eef18360208b16d8de939d54e61591fac0fcbf99" +dependencies = [ + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", ] [[package]] @@ -11548,20 +17177,31 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "27.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9af4b73fe7ddd88b1641cca90048c4e525e721763199e6fd29c4f590884f4d16" +checksum = "51104c3cab9d6c9e8361adbd487dd409a8343e740744fb0b3f983bc775fd1847" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", "serde", - "sp-core 29.0.0", + "sp-core 32.0.0", ] [[package]] -name = "sp-runtime" +name = "sp-rpc" version = "32.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a95e71603a6281e91b0f1fd3d68057644be16d75a4602013187b8137db8abee" +checksum = "45458f0955870a92b3969098d4f1f4e9b55b4282d9f1dc112a51bb5bb6584900" +dependencies = [ + "rustc-hash 1.1.0", + "serde", + "sp-core 34.0.0", +] + +[[package]] +name = "sp-runtime" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ce931b7fbfdeeca1340801dbd4a1cae54ad4c97a1e3dcfcc79709bc800dd46" dependencies = [ "docify", "either", @@ -11574,52 +17214,55 @@ dependencies = [ "scale-info", "serde", "simple-mermaid", - "sp-application-crypto 31.0.0", - "sp-arithmetic 24.0.0", - "sp-core 29.0.0", - "sp-io 31.0.0", - "sp-std 14.0.0", - "sp-weights 28.0.0", + "sp-application-crypto 34.0.0", + "sp-arithmetic", + "sp-core 32.0.0", + "sp-io 34.0.0", + "sp-std", + "sp-weights", ] [[package]] name = "sp-runtime" -version = "34.0.0" +version = "39.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3cb126971e7db2f0fcf8053dce740684c438c7180cfca1959598230f342c58" +checksum = "658f23be7c79a85581029676a73265c107c5469157e3444c8c640fdbaa8bfed0" dependencies = [ "docify", "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", + "num-traits", "parity-scale-codec", "paste", "rand", "scale-info", "serde", "simple-mermaid", - "sp-application-crypto 33.0.0", - "sp-arithmetic 25.0.0", - "sp-core 31.0.0", - "sp-io 33.0.0", - "sp-std 14.0.0", - "sp-weights 30.0.0", + "sp-application-crypto 38.0.0", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-std", + "sp-weights", + "tracing", ] [[package]] name = "sp-runtime-interface" -version = "25.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2321ab29d4bcc31f1ba1b4f076a81fb2a666465231e5c981c72320d74dbe63" +checksum = "647db5e1dc481686628b41554e832df6ab400c4b43a6a54e54d3b0a71ca404aa" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", - "primitive-types", - "sp-externalities 0.26.0", - "sp-runtime-interface-proc-macro 17.0.0", - "sp-std 14.0.0", + "polkavm-derive 0.9.1", + "primitive-types 0.12.2", + "sp-externalities 0.28.0", + "sp-runtime-interface-proc-macro", + "sp-std", "sp-storage", "sp-tracing", "sp-wasm-interface", @@ -11628,18 +17271,18 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "26.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a675ea4858333d4d755899ed5ed780174aa34fec15953428d516af5452295" +checksum = "985eb981f40c689c6a0012c937b68ed58dabb4341d06f2dfe4dfd5ed72fa4017" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", - "polkavm-derive 0.8.0", - "primitive-types", - "sp-externalities 0.27.0", - "sp-runtime-interface-proc-macro 18.0.0", - "sp-std 14.0.0", + "polkavm-derive 0.9.1", + "primitive-types 0.12.2", + "sp-externalities 0.29.0", + "sp-runtime-interface-proc-macro", + "sp-std", "sp-storage", "sp-tracing", "sp-wasm-interface", @@ -11648,68 +17291,95 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "17.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfaf6e85b2ec12a4b99cd6d8d57d083e30c94b7f1b0d8f93547121495aae6f0c" +checksum = "0195f32c628fee3ce1dfbbf2e7e52a30ea85f3589da9fe62a8b816d70fc06294" dependencies = [ "Inflector", "expander", - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] -name = "sp-runtime-interface-proc-macro" -version = "18.0.0" +name = "sp-session" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0195f32c628fee3ce1dfbbf2e7e52a30ea85f3589da9fe62a8b816d70fc06294" +checksum = "3d66f0f2f00e4c520deae07eeab7acf04c1a41dd875c7a4689e4e4302fb89925" dependencies = [ - "Inflector", - "expander", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.82", + "parity-scale-codec", + "scale-info", + "sp-api 30.0.0", + "sp-core 32.0.0", + "sp-keystore 0.38.0", + "sp-runtime 35.0.0", + "sp-staking 30.0.0", ] [[package]] name = "sp-session" -version = "28.0.0" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b86531090cc04d2ab3535df07146258e2fb3ab6257b0a77ef14aa08282c3d4a" +checksum = "00a3a307fedc423fb8cd2a7726a3bbb99014f1b4b52f26153993e2aae3338fe6" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-core 29.0.0", - "sp-keystore 0.35.0", - "sp-runtime 32.0.0", - "sp-staking", - "sp-std 14.0.0", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.2", + "sp-staking 36.0.0", ] [[package]] name = "sp-staking" -version = "27.0.0" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a43ec7f6c9759ba3011a16bb022afe056bc26f88b3c424598737cba71d3ef0" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 32.0.0", + "sp-runtime 35.0.0", +] + +[[package]] +name = "sp-staking" +version = "34.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143a764cacbab58347d8b2fd4c8909031fb0888d7b02a0ec9fa44f81f780d732" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-runtime 39.0.2", +] + +[[package]] +name = "sp-staking" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e14d003ecf0b610bf1305a92bdab875289b39d514c073f30e75e78c2763a788" +checksum = "2a73eedb4b85f4cd420d31764827546aa22f82ce1646d0fd258993d051de7a90" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", - "sp-core 29.0.0", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "sp-state-machine" -version = "0.36.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67297e702aa32027d7766803f362a420d6d3ec9e2f84961f3c64e2e52b5aaf9" +checksum = "21d9078306c3066f1824e41153e1ceec34231d39d9a7e7956b101eadf7b9fd3a" dependencies = [ "hash-db", "log", @@ -11717,21 +17387,20 @@ dependencies = [ "parking_lot 0.12.3", "rand", "smallvec", - "sp-core 29.0.0", - "sp-externalities 0.26.0", + "sp-core 32.0.0", + "sp-externalities 0.28.0", "sp-panic-handler", - "sp-std 14.0.0", - "sp-trie 30.0.0", + "sp-trie 33.0.0", "thiserror", "tracing", - "trie-db", + "trie-db 0.28.0", ] [[package]] name = "sp-state-machine" -version = "0.38.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eae0eac8034ba14437e772366336f579398a46d101de13dbb781ab1e35e67c5" +checksum = "930104d6ae882626e8880d9b1578da9300655d337a3ffb45e130c608b6c89660" dependencies = [ "hash-db", "log", @@ -11739,47 +17408,64 @@ dependencies = [ "parking_lot 0.12.3", "rand", "smallvec", - "sp-core 31.0.0", - "sp-externalities 0.27.0", + "sp-core 34.0.0", + "sp-externalities 0.29.0", "sp-panic-handler", - "sp-std 14.0.0", - "sp-trie 32.0.0", + "sp-trie 37.0.0", "thiserror", "tracing", - "trie-db", + "trie-db 0.29.1", ] [[package]] name = "sp-statement-store" -version = "11.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309a9ae4e8134bbed8ffc510cf4d461a4a651f9250b556de782cedd876abe1ff" +checksum = "0e22e2d355461e02aa8325a819d24403fb7232a828bf1e21ad8982fde3f0dc0e" dependencies = [ "aes-gcm", - "curve25519-dalek 4.1.2", + "curve25519-dalek 4.1.3", "ed25519-dalek", "hkdf", "parity-scale-codec", "rand", "scale-info", "sha2 0.10.8", - "sp-api", - "sp-application-crypto 31.0.0", - "sp-core 29.0.0", + "sp-api 30.0.0", + "sp-application-crypto 34.0.0", + "sp-core 32.0.0", "sp-crypto-hashing", - "sp-externalities 0.26.0", - "sp-runtime 32.0.0", - "sp-runtime-interface 25.0.0", - "sp-std 14.0.0", + "sp-externalities 0.28.0", + "sp-runtime 35.0.0", + "sp-runtime-interface 27.0.0", "thiserror", "x25519-dalek 2.0.1", ] [[package]] -name = "sp-std" -version = "12.0.0" +name = "sp-statement-store" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c78c5a66682568cc7b153603c5d01a2cc8f5c221c7b1e921517a0eef18ae05" +checksum = "c219bc34ef4d1f9835f3ed881f965643c32034fcc030eb33b759dadbc802c1c2" +dependencies = [ + "aes-gcm", + "curve25519-dalek 4.1.3", + "ed25519-dalek", + "hkdf", + "parity-scale-codec", + "rand", + "scale-info", + "sha2 0.10.8", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-crypto-hashing", + "sp-externalities 0.29.0", + "sp-runtime 39.0.2", + "sp-runtime-interface 28.0.0", + "thiserror", + "x25519-dalek 2.0.1", +] [[package]] name = "sp-std" @@ -11789,76 +17475,110 @@ checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834" [[package]] name = "sp-storage" -version = "20.0.0" +version = "21.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dba5791cb3978e95daf99dad919ecb3ec35565604e88cd38d805d9d4981e8bd" +checksum = "99c82989b3a4979a7e1ad848aad9f5d0b4388f1f454cc131766526601ab9e8f8" dependencies = [ - "impl-serde", + "impl-serde 0.4.0", "parity-scale-codec", "ref-cast", "serde", "sp-debug-derive", - "sp-std 14.0.0", ] [[package]] name = "sp-timestamp" -version = "27.0.0" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6d3965ef60cc066fcc01dbcb7837404f40de8ac58f1115e3a3a1d6550575ff6" +dependencies = [ + "async-trait", + "parity-scale-codec", + "sp-inherents 30.0.0", + "sp-runtime 35.0.0", + "thiserror", +] + +[[package]] +name = "sp-timestamp" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "249cd06624f2edb53b25af528ab216a508dc9d0870e158b43caac3a97e86699f" +checksum = "72a1cb4df653d62ccc0dbce1db45d1c9443ec60247ee9576962d24da4c9c6f07" dependencies = [ "async-trait", "parity-scale-codec", - "sp-inherents", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.2", "thiserror", ] [[package]] name = "sp-tracing" -version = "16.0.0" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0351810b9d074df71c4514c5228ed05c250607cba131c1c9d1526760ab69c05c" +checksum = "cf641a1d17268c8fcfdb8e0fa51a79c2d4222f4cfda5f3944dbdbc384dced8d5" dependencies = [ "parity-scale-codec", - "sp-std 14.0.0", "tracing", "tracing-core", - "tracing-subscriber 0.2.25", + "tracing-subscriber 0.3.18", ] [[package]] name = "sp-transaction-pool" -version = "27.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9742861c5330bdcb42856a6eed3d3745b58ee1c92ca4c9260032ff4e6c387165" +checksum = "7bddae32e6935eedda993b7371b79e69af901a277e11be2bbd6d9bc7643b49cb" dependencies = [ - "sp-api", - "sp-runtime 32.0.0", + "sp-api 30.0.0", + "sp-runtime 35.0.0", +] + +[[package]] +name = "sp-transaction-pool" +version = "34.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc4bf251059485a7dd38fe4afeda8792983511cc47f342ff4695e2dcae6b5247" +dependencies = [ + "sp-api 34.0.0", + "sp-runtime 39.0.2", ] [[package]] name = "sp-transaction-storage-proof" -version = "27.0.0" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726f90279766e231ad86f884e5f07d9331852a59d739f27c5f5e28bee0fc6da5" +dependencies = [ + "async-trait", + "parity-scale-codec", + "scale-info", + "sp-core 32.0.0", + "sp-inherents 30.0.0", + "sp-runtime 35.0.0", + "sp-trie 33.0.0", +] + +[[package]] +name = "sp-transaction-storage-proof" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece8e22a5419c7a336a2544654e1389fec8cac19b93081a30912842b44e8167f" +checksum = "c765c2e9817d95f13d42a9f2295c60723464669765c6e5acbacebd2f54932f67" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-core 29.0.0", - "sp-inherents", - "sp-runtime 32.0.0", - "sp-std 14.0.0", - "sp-trie 30.0.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.2", + "sp-trie 37.0.0", ] [[package]] name = "sp-trie" -version = "30.0.0" +version = "33.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed48dfd05081e8b36741b10ce4eb686c135a2952227a11fe71caec89890ddbb" +checksum = "d1f5b3620a1c87c265a83d85d7519c6b60c47acf7f77593966afe313d086f00e" dependencies = [ "ahash 0.8.11", "hash-db", @@ -11870,20 +17590,19 @@ dependencies = [ "rand", "scale-info", "schnellru", - "sp-core 29.0.0", - "sp-externalities 0.26.0", - "sp-std 14.0.0", + "sp-core 32.0.0", + "sp-externalities 0.28.0", "thiserror", "tracing", - "trie-db", + "trie-db 0.28.0", "trie-root", ] [[package]] name = "sp-trie" -version = "32.0.0" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1aa91ad26c62b93d73e65f9ce7ebd04459c4bad086599348846a81988d6faa4" +checksum = "6282aef9f4b6ecd95a67a45bcdb67a71f4a4155c09a53c10add4ffe823db18cd" dependencies = [ "ahash 0.8.11", "hash-db", @@ -11895,89 +17614,88 @@ dependencies = [ "rand", "scale-info", "schnellru", - "sp-core 31.0.0", - "sp-externalities 0.27.0", - "sp-std 14.0.0", + "sp-core 34.0.0", + "sp-externalities 0.29.0", "thiserror", "tracing", - "trie-db", + "trie-db 0.29.1", "trie-root", ] [[package]] name = "sp-version" -version = "30.0.0" +version = "33.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ba2f18b89ac5f356fb247f70163098bc976117221c373d5590079a5797a3b43" +dependencies = [ + "impl-serde 0.4.0", + "parity-scale-codec", + "parity-wasm", + "scale-info", + "serde", + "sp-crypto-hashing-proc-macro", + "sp-runtime 35.0.0", + "sp-std", + "sp-version-proc-macro", + "thiserror", +] + +[[package]] +name = "sp-version" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4a660c68995663d6778df324f4e2b4efc48d55a8e9c92c22a5fb7dae7899cd" +checksum = "d521a405707b5be561367cd3d442ff67588993de24062ce3adefcf8437ee9fe1" dependencies = [ - "impl-serde", + "impl-serde 0.4.0", "parity-scale-codec", "parity-wasm", "scale-info", "serde", "sp-crypto-hashing-proc-macro", - "sp-runtime 32.0.0", - "sp-std 14.0.0", + "sp-runtime 39.0.2", + "sp-std", "sp-version-proc-macro", "thiserror", ] [[package]] name = "sp-version-proc-macro" -version = "13.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9bc3fed32d6dacbbbfb28dd1fe0224affbb737cb6cbfca1d9149351c2b69a7d" +checksum = "5aee8f6730641a65fcf0c8f9b1e448af4b3bb083d08058b47528188bccc7b7a7" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] name = "sp-wasm-interface" -version = "20.0.0" +version = "21.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef97172c42eb4c6c26506f325f48463e9bc29b2034a587f1b9e48c751229bee" +checksum = "b066baa6d57951600b14ffe1243f54c47f9c23dd89c262e17ca00ae8dca58be9" dependencies = [ "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 14.0.0", "wasmtime 8.0.1", ] [[package]] name = "sp-weights" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3be30aec904994451dcacf841a9168cfbbaf817de6b24b6a1c1418cbf1af2fe" -dependencies = [ - "bounded-collections", - "parity-scale-codec", - "scale-info", - "serde", - "smallvec", - "sp-arithmetic 24.0.0", - "sp-debug-derive", - "sp-std 14.0.0", -] - -[[package]] -name = "sp-weights" -version = "30.0.0" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9af6c661fe3066b29f9e1d258000f402ff5cc2529a9191972d214e5871d0ba87" +checksum = "93cdaf72a1dad537bbb130ba4d47307ebe5170405280ed1aa31fa712718a400e" dependencies = [ "bounded-collections", "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-arithmetic 25.0.0", + "sp-arithmetic", "sp-debug-derive", - "sp-std 14.0.0", ] [[package]] @@ -11998,9 +17716,18 @@ version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0ef947f358b9c238923f764c72a4a9d42f2d637c46e059dbd319d6e7cfb4f82" dependencies = [ - "lazy_static", - "maplit", - "strum 0.24.1", + "lazy_static", + "maplit", + "strum 0.24.1", +] + +[[package]] +name = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +dependencies = [ + "lock_api", ] [[package]] @@ -12021,9 +17748,9 @@ checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" [[package]] name = "ss58-registry" -version = "1.47.0" +version = "1.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4743ce898933fbff7bbf414f497c459a782d496269644b3d650a398ae6a487ba" +checksum = "19409f13998e55816d1c728395af0b52ec066206341d939e22e7766df9b494b8" dependencies = [ "Inflector", "num-format", @@ -12034,12 +17761,113 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "ssz_rs" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "057291e5631f280978fa9c8009390663ca4613359fc1318e36a8c24c392f6d1f" +dependencies = [ + "bitvec", + "num-bigint", + "sha2 0.9.9", + "ssz_rs_derive", +] + +[[package]] +name = "ssz_rs_derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f07d54c4d01a1713eb363b55ba51595da15f6f1211435b71466460da022aa140" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "staging-parachain-info" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d28266dfddbfff721d70ad2f873380845b569adfab32f257cf97d9cedd894b68" +dependencies = [ + "cumulus-primitives-core", + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", +] + +[[package]] +name = "staging-xcm" +version = "14.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bee7cd999e9cdf10f8db72342070d456e21e82a0f5962ff3b87edbd5f2b20e" +dependencies = [ + "array-bytes 6.2.3", + "bounded-collections", + "derivative", + "environmental", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-runtime 39.0.2", + "sp-weights", + "xcm-procedural", +] + +[[package]] +name = "staging-xcm-builder" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efade7c038a2cca0fc1bf10a4d5cd0e4b86cb3ed820bd6ee668cba0c0d86fde9" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-asset-conversion", + "pallet-transaction-payment", + "parity-scale-codec", + "polkadot-parachain-primitives", + "scale-info", + "sp-arithmetic", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-weights", + "staging-xcm", + "staging-xcm-executor", +] + +[[package]] +name = "staging-xcm-executor" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79dd0c5332a5318e58f0300b20768b71cf9427c906f94a743c9dc7c3ee9e7fa9" +dependencies = [ + "environmental", + "frame-benchmarking", + "frame-support 38.0.0", + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-weights", + "staging-xcm", + "tracing", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -12075,23 +17903,35 @@ dependencies = [ ] [[package]] -name = "strobe-rs" -version = "0.8.1" +name = "str0m" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabb238a1cccccfa4c4fb703670c0d157e1256c1ba695abf1b93bd2bb14bab2d" +checksum = "6706347e49b13373f7ddfafad47df7583ed52083d6fc8a594eb2c80497ef959d" dependencies = [ - "bitflags 1.3.2", - "byteorder", - "keccak", - "subtle 2.5.0", - "zeroize", + "combine", + "crc", + "fastrand", + "hmac 0.12.1", + "once_cell", + "openssl", + "openssl-sys", + "sctp-proto", + "serde", + "sha-1 0.10.1", + "thiserror", + "tracing", ] [[package]] -name = "strsim" -version = "0.10.0" +name = "string-interner" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "1c6a0d765f5807e98a091107bae0a56ea3799f66a5de47b2c84c94a39c09974e" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "serde", +] [[package]] name = "strsim" @@ -12140,30 +17980,17 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.82", -] - -[[package]] -name = "substrate-bip39" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7590dc041b9bc2825e52ce5af8416c73dbe9d0654402bfd4b4941938b94d8f" -dependencies = [ - "hmac 0.11.0", - "pbkdf2 0.8.0", - "schnorrkel", - "sha2 0.9.9", - "zeroize", + "syn 2.0.85", ] [[package]] name = "substrate-bip39" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2b564c293e6194e8b222e52436bcb99f60de72043c7f845cf6c4406db4df121" +checksum = "ca58ffd742f693dc13d69bdbb2e642ae239e0053f6aab3b104252892f856700a" dependencies = [ "hmac 0.12.1", - "pbkdf2 0.12.2", + "pbkdf2", "schnorrkel", "sha2 0.10.8", "zeroize", @@ -12177,22 +18004,23 @@ checksum = "b285e7d183a32732fdc119f3d81b7915790191fad602b7c709ef247073c77a2e" [[package]] name = "substrate-frame-rpc-system" -version = "29.0.0" +version = "39.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f903d2f34703204f0003136c9abbc569d691028279996a1daf8f248a7369f" +checksum = "d071d325decc80d906afd957ee83673d1cbd27b7b421a7f1c9f6132a437e17fd" dependencies = [ + "docify", "frame-system-rpc-runtime-api", "futures", - "jsonrpsee 0.20.3", + "jsonrpsee 0.24.7", "log", "parity-scale-codec", - "sc-rpc-api", - "sc-transaction-pool-api", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-core 29.0.0", - "sp-runtime 32.0.0", + "sc-rpc-api 0.44.0", + "sc-transaction-pool-api 37.0.0", + "sp-api 34.0.0", + "sp-block-builder 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-runtime 39.0.2", ] [[package]] @@ -12201,7 +18029,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8fe06b03b8a291c09507c42f92a2c2c10dd3d62975d02c7f64a92d87bfe09b" dependencies = [ - "hyper 0.14.28", + "hyper 0.14.31", "log", "prometheus", "thiserror", @@ -12210,33 +18038,35 @@ dependencies = [ [[package]] name = "substrate-rpc-client" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40e5235d8460ec81e9a382345aa80d75e2943f224a332559847344bb62fa13b3" +checksum = "812076602836d6d90242c431729814c790c49685d142f47ec41f3b897a5fb6ad" dependencies = [ "async-trait", - "jsonrpsee 0.20.3", + "jsonrpsee 0.22.5", "log", - "sc-rpc-api", + "sc-rpc-api 0.37.0", "serde", - "sp-runtime 32.0.0", + "sp-runtime 35.0.0", ] [[package]] name = "substrate-wasm-builder" -version = "18.0.1" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a39a20e17c24ede36b5bd5e7543a4cef8d8a0daf6e1a046dc31832b837a54a0" +checksum = "cf035ffe7335fb24053edfe4d0a5780250eda772082a1b80ae25835dd4c09265" dependencies = [ "build-helper", "cargo_metadata", "console", "filetime", + "jobserver", "parity-wasm", + "polkavm-linker 0.9.2", "sp-maybe-compressed-blob", - "strum 0.24.1", + "strum 0.26.3", "tempfile", - "toml 0.8.12", + "toml 0.8.19", "walkdir", "wasm-opt", ] @@ -12249,30 +18079,29 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "subxt" -version = "0.35.3" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd68bef23f4de5e513ab4c29af69053e232b098f9c87ab552d7ea153b4a1fbc5" +checksum = "c53029d133e4e0cb7933f1fe06f2c68804b956de9bb8fa930ffca44e9e5e4230" dependencies = [ "async-trait", - "base58", - "blake2 0.10.6", - "derivative", + "derive-where", "either", - "frame-metadata 16.0.0", + "finito", + "frame-metadata 17.0.0", "futures", "getrandom 0.2.15", "hex", - "impl-serde", - "instant", - "jsonrpsee 0.22.4", + "impl-serde 0.5.0", + "jsonrpsee 0.24.7", "parity-scale-codec", - "primitive-types", + "polkadot-sdk", + "primitive-types 0.13.1", "scale-bits", "scale-decode", "scale-encode", @@ -12280,51 +18109,76 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core 31.0.0", - "sp-crypto-hashing", - "sp-runtime 34.0.0", + "subxt-core", "subxt-lightclient", "subxt-macro", "subxt-metadata", "thiserror", + "tokio", "tokio-util", "tracing", "url", + "wasm-bindgen-futures", + "web-time", ] [[package]] name = "subxt-codegen" -version = "0.35.3" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d9e2b256b71d31a2629e44eb9cbfd944eb7d577c9e0c8e9802cc3c3943af2d9" +checksum = "3cfcfb7d9589f3df0ac87c4988661cf3fb370761fcb19f2fd33104cc59daf22a" dependencies = [ - "frame-metadata 16.0.0", "getrandom 0.2.15", - "heck 0.4.1", - "hex", - "jsonrpsee 0.22.4", + "heck 0.5.0", "parity-scale-codec", "proc-macro2", "quote", "scale-info", "scale-typegen", "subxt-metadata", - "syn 2.0.82", + "syn 2.0.85", "thiserror", - "tokio", +] + +[[package]] +name = "subxt-core" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ea28114366780d23684bd55ab879cd04c9d4cbba3b727a3854a3eca6bf29a1a" +dependencies = [ + "base58", + "blake2 0.10.6", + "derive-where", + "frame-decode", + "frame-metadata 17.0.0", + "hashbrown 0.14.5", + "hex", + "impl-serde 0.5.0", + "keccak-hash", + "parity-scale-codec", + "polkadot-sdk", + "primitive-types 0.13.1", + "scale-bits", + "scale-decode", + "scale-encode", + "scale-info", + "scale-value", + "serde", + "serde_json", + "subxt-metadata", + "tracing", ] [[package]] name = "subxt-lightclient" -version = "0.35.3" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f1ac12e3be7aafea4d037730a57da4f22f2e9c73955666081ffa2697c6f1" +checksum = "534d4b725183a9fa09ce0e0f135674473297fdd97dee4d683f41117f365ae997" dependencies = [ "futures", "futures-timer", "futures-util", "getrandom 0.2.15", - "instant", "js-sys", "pin-project", "send_wrapper 0.6.0", @@ -12339,58 +18193,48 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "web-time", ] [[package]] name = "subxt-macro" -version = "0.35.3" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98dc84d7e6a0abd7ed407cce0bf60d7d58004f699460cffb979640717d1ab506" +checksum = "228db9a5c95a6d8dc6152b4d6cdcbabc4f60821dd3f482a4f8791e022b7caadb" dependencies = [ - "darling 0.20.8", + "darling", "parity-scale-codec", - "proc-macro-error", + "proc-macro-error2", "quote", "scale-typegen", "subxt-codegen", - "syn 2.0.82", + "subxt-utils-fetchmetadata", + "syn 2.0.85", ] [[package]] name = "subxt-metadata" -version = "0.35.3" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc10c54028d079a9f1be65188707cd29e5ffd8d0031a2b1346a0941d57b7ab7e" +checksum = "ee13e6862eda035557d9a2871955306aff540d2b89c06e0a62a1136a700aed28" dependencies = [ - "derive_more 0.99.17", - "frame-metadata 16.0.0", - "hashbrown 0.14.3", + "frame-decode", + "frame-metadata 17.0.0", + "hashbrown 0.14.5", "parity-scale-codec", + "polkadot-sdk", "scale-info", - "sp-crypto-hashing", ] [[package]] -name = "subxt-signer" -version = "0.35.3" +name = "subxt-utils-fetchmetadata" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ccb59a38fe357fab55247756174435e8626b93929864e8a498635a15e779df8" +checksum = "3082b17a86e3c3fe45d858d94d68f6b5247caace193dad6201688f24db8ba9bb" dependencies = [ - "bip39", - "cfg-if", - "derive_more 0.99.17", "hex", - "hmac 0.12.1", "parity-scale-codec", - "pbkdf2 0.12.2", - "regex", - "schnorrkel", - "secp256k1", - "secrecy 0.8.0", - "sha2 0.10.8", - "sp-crypto-hashing", - "subxt", - "zeroize", + "thiserror", ] [[package]] @@ -12406,9 +18250,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.82" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -12429,6 +18273,18 @@ dependencies = [ "thiserror", ] +[[package]] +name = "syn-solidity" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b837ef12ab88835251726eb12237655e61ec8dc8a280085d1961cdc3dfd047" +dependencies = [ + "paste", + "proc-macro2", + "quote", + "syn 2.0.85", +] + [[package]] name = "sync_wrapper" version = "0.1.2" @@ -12481,6 +18337,17 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -12494,11 +18361,11 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys 0.6.0", ] @@ -12531,9 +18398,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tdx-quote" @@ -12555,7 +18422,7 @@ dependencies = [ "cfg-if", "fastrand", "once_cell", - "rustix 0.38.37", + "rustix 0.38.38", "windows-sys 0.59.0", ] @@ -12574,7 +18441,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.38", "windows-sys 0.59.0", ] @@ -12584,6 +18451,22 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +[[package]] +name = "testnet-parachains-constants" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94bceae6f7c89d47daff6c7e05f712551a01379f61b07d494661941144878589" +dependencies = [ + "cumulus-primitives-core", + "frame-support 38.0.0", + "polkadot-core-primitives", + "rococo-runtime-constants", + "smallvec", + "sp-runtime 39.0.2", + "staging-xcm", + "westend-runtime-constants", +] + [[package]] name = "thiserror" version = "1.0.65" @@ -12601,7 +18484,7 @@ checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -12683,9 +18566,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -12707,9 +18590,9 @@ dependencies = [ "libc", "mio", "parking_lot 0.12.3", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.52.0", ] @@ -12722,7 +18605,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -12752,7 +18635,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.10", + "rustls 0.21.12", "tokio", ] @@ -12762,7 +18645,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.3", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] @@ -12773,23 +18656,38 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.7", + "rustls 0.23.16", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", "tokio", "tokio-util", ] +[[package]] +name = "tokio-tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +dependencies = [ + "futures-util", + "log", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", + "tungstenite 0.20.1", +] + [[package]] name = "tokio-tungstenite" version = "0.24.0" @@ -12799,22 +18697,21 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.24.0", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", "tokio", - "tracing", ] [[package]] @@ -12828,58 +18725,36 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" -dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow", ] [[package]] @@ -12891,8 +18766,7 @@ dependencies = [ "futures-core", "futures-util", "pin-project", - "pin-project-lite 0.2.14", - "tokio", + "pin-project-lite 0.2.15", "tower-layer", "tower-service", "tracing", @@ -12906,7 +18780,7 @@ checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ "futures-core", "futures-util", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", "sync_wrapper 0.1.2", "tokio", "tower-layer", @@ -12920,14 +18794,30 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "futures-core", "futures-util", "http 0.2.12", "http-body 0.4.6", "http-range-header", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "pin-project-lite 0.2.15", "tower-layer", "tower-service", ] @@ -12938,11 +18828,11 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "http 1.1.0", - "http-body 1.0.0", - "pin-project-lite 0.2.14", + "http-body 1.0.1", + "pin-project-lite 0.2.15", "tower-layer", "tower-service", "tracing", @@ -12967,7 +18857,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", - "pin-project-lite 0.2.14", + "pin-project-lite 0.2.15", "tracing-attributes", "tracing-core", ] @@ -12980,7 +18870,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -13106,26 +18996,40 @@ dependencies = [ "matchers 0.1.0", "nu-ansi-term", "once_cell", + "parking_lot 0.12.3", "regex", "serde", "serde_json", "sharded-slab", "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log 0.2.0", - "tracing-serde", + "thread_local", + "time", + "tracing", + "tracing-core", + "tracing-log 0.2.0", + "tracing-serde", +] + +[[package]] +name = "trie-db" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" +dependencies = [ + "hash-db", + "hashbrown 0.13.2", + "log", + "rustc-hex", + "smallvec", ] [[package]] name = "trie-db" -version = "0.28.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" +checksum = "0c992b4f40c234a074d48a757efeabb1a6be88af84c0c23f7ca158950cb0ae7f" dependencies = [ "hash-db", - "hashbrown 0.13.2", "log", "rustc-hex", "smallvec", @@ -13149,7 +19053,7 @@ dependencies = [ "async-trait", "cfg-if", "data-encoding", - "enum-as-inner", + "enum-as-inner 0.5.1", "futures-channel", "futures-io", "futures-util", @@ -13166,6 +19070,31 @@ dependencies = [ "url", ] +[[package]] +name = "trust-dns-proto" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner 0.6.1", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + [[package]] name = "trust-dns-resolver" version = "0.22.0" @@ -13183,7 +19112,28 @@ dependencies = [ "thiserror", "tokio", "tracing", - "trust-dns-proto", + "trust-dns-proto 0.22.0", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot 0.12.3", + "rand", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto 0.23.2", ] [[package]] @@ -13194,37 +19144,37 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "try-runtime-cli" -version = "0.39.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9454e1af0a0be675f837d63080ef8f43510c05df8c059570622386a0cf40b548" +checksum = "a45904e10377e9973238ae9e52bd0fbbb0bba5d7be9198458ba9d3fe0a4173ed" dependencies = [ "async-trait", "clap", "frame-remote-externalities", - "frame-try-runtime", + "frame-try-runtime 0.38.0", "hex", "log", "parity-scale-codec", - "sc-cli", - "sc-executor", + "sc-cli 0.40.0", + "sc-executor 0.36.0", "serde", "serde_json", - "sp-api", - "sp-consensus-aura", - "sp-consensus-babe", - "sp-core 29.0.0", + "sp-api 30.0.0", + "sp-consensus-aura 0.36.0", + "sp-consensus-babe 0.36.0", + "sp-core 32.0.0", "sp-debug-derive", - "sp-externalities 0.26.0", - "sp-inherents", - "sp-io 31.0.0", - "sp-keystore 0.35.0", - "sp-rpc", - "sp-runtime 32.0.0", - "sp-state-machine 0.36.0", - "sp-timestamp", - "sp-transaction-storage-proof", - "sp-version", - "sp-weights 28.0.0", + "sp-externalities 0.28.0", + "sp-inherents 30.0.0", + "sp-io 34.0.0", + "sp-keystore 0.38.0", + "sp-rpc 30.0.0", + "sp-runtime 35.0.0", + "sp-state-machine 0.39.0", + "sp-timestamp 30.0.0", + "sp-transaction-storage-proof 30.0.0", + "sp-version 33.0.0", + "sp-weights", "substrate-rpc-client", "zstd 0.12.4", ] @@ -13235,6 +19185,26 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" +[[package]] +name = "tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 0.2.12", + "httparse", + "log", + "rand", + "rustls 0.21.12", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "tungstenite" version = "0.24.0" @@ -13253,6 +19223,12 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tuplex" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "676ac81d5454c4dcf37955d34fa8626ede3490f744b86ca14a7b90168d2a08aa" + [[package]] name = "twox-hash" version = "1.6.3" @@ -13273,9 +19249,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "uint" @@ -13289,6 +19265,18 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "uint" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909988d098b2f738727b161a106cfc7cab00c539c2687a8836f8e565976fb53e" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] + [[package]] name = "unarray" version = "0.1.4" @@ -13297,24 +19285,21 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" @@ -13327,21 +19312,21 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "universal-hash" @@ -13350,7 +19335,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" dependencies = [ "generic-array 0.14.7", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -13360,7 +19345,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -13375,6 +19360,16 @@ dependencies = [ "futures-util", ] +[[package]] +name = "unsigned-varint" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" +dependencies = [ + "bytes", + "tokio-util", +] + [[package]] name = "untrusted" version = "0.7.1" @@ -13389,9 +19384,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -13406,9 +19401,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" @@ -13445,9 +19440,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "void" @@ -13457,21 +19452,21 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "w3f-bls" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7335e4c132c28cc43caef6adb339789e599e39adbe78da0c4d547fad48cbc331" +checksum = "6a48c48447120a85b0bdb897ba9426a7aa15b4229498a2e19103e8c9368dd4b2" dependencies = [ "ark-bls12-377", "ark-bls12-381", "ark-ec", - "ark-ff", - "ark-serialize", + "ark-ff 0.4.2", + "ark-serialize 0.4.2", "ark-serialize-derive", "arrayref", "constcat", "digest 0.10.7", "rand", - "rand_chacha 0.3.1", + "rand_chacha", "rand_core 0.6.4", "sha2 0.10.8", "sha3", @@ -13479,6 +19474,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + [[package]] name = "walkdir" version = "2.5.0" @@ -13532,7 +19536,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", "wasm-bindgen-shared", ] @@ -13588,7 +19592,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -13619,11 +19623,12 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.202.0" +version = "0.219.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd106365a7f5f7aa3c1916a98cbb3ad477f5ff96ddb130285a91c6e7429e67a" +checksum = "29cbbd772edcb8e7d524a82ee8cef8dd046fc14033796a754c3ad246d019fa54" dependencies = [ "leb128", + "wasmparser 0.219.1", ] [[package]] @@ -13690,9 +19695,9 @@ dependencies = [ [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" dependencies = [ "futures-util", "js-sys", @@ -13718,28 +19723,37 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.31.2" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" +checksum = "50386c99b9c32bd2ed71a55b6dd4040af2580530fae8bdb9a6576571a80d0cca" dependencies = [ + "arrayvec 0.7.6", + "multi-stash", + "num-derive", + "num-traits", "smallvec", "spin 0.9.8", - "wasmi_arena", + "wasmi_collections", "wasmi_core", "wasmparser-nostd", ] [[package]] -name = "wasmi_arena" -version = "0.4.1" +name = "wasmi_collections" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" +checksum = "9c128c039340ffd50d4195c3f8ce31aac357f06804cfc494c8b9508d4b30dca4" +dependencies = [ + "ahash 0.8.11", + "hashbrown 0.14.5", + "string-interner", +] [[package]] name = "wasmi_core" -version = "0.13.0" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +checksum = "a23b3a7f6c8c3ceeec6b83531ee61f0013c56e51cbf2b14b0f213548b23a4b41" dependencies = [ "downcast-rs", "libm", @@ -13764,7 +19778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" dependencies = [ "indexmap 1.9.3", - "semver 1.0.22", + "semver 1.0.23", ] [[package]] @@ -13773,8 +19787,8 @@ version = "0.110.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c" dependencies = [ - "indexmap 2.2.6", - "semver 1.0.22", + "indexmap 2.6.0", + "semver 1.0.23", ] [[package]] @@ -13783,16 +19797,26 @@ version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ - "bitflags 2.5.0", - "indexmap 2.2.6", - "semver 1.0.22", + "bitflags 2.6.0", + "indexmap 2.6.0", + "semver 1.0.23", +] + +[[package]] +name = "wasmparser" +version = "0.219.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c771866898879073c53b565a6c7b49953795159836714ac56a5befb581227c5" +dependencies = [ + "bitflags 2.6.0", + "indexmap 2.6.0", ] [[package]] name = "wasmparser-nostd" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" dependencies = [ "indexmap-nostd", ] @@ -13848,7 +19872,7 @@ dependencies = [ "cfg-if", "encoding_rs", "fxprof-processed-profile", - "indexmap 2.2.6", + "indexmap 2.6.0", "libc", "log", "object 0.31.1", @@ -13924,7 +19948,7 @@ dependencies = [ "directories-next", "file-per-thread-logger 0.2.0", "log", - "rustix 0.38.37", + "rustix 0.38.38", "serde", "sha2 0.10.8", "toml 0.5.11", @@ -13941,7 +19965,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser 0.9.2", @@ -14058,7 +20082,7 @@ dependencies = [ "anyhow", "cranelift-entity 0.99.2", "gimli 0.27.3", - "indexmap 2.2.6", + "indexmap 2.6.0", "log", "object 0.31.1", "serde", @@ -14079,7 +20103,7 @@ checksum = "fc8c8410c03a79073ea06806ccde3da4854c646bd646b3b2707b99b3746c3f70" dependencies = [ "cc", "cfg-if", - "rustix 0.38.37", + "rustix 0.38.38", "wasmtime-asm-macros 12.0.2", "wasmtime-versioned-export-macros", "windows-sys 0.48.0", @@ -14125,7 +20149,7 @@ dependencies = [ "log", "object 0.31.1", "rustc-demangle", - "rustix 0.38.37", + "rustix 0.38.38", "serde", "target-lexicon", "wasmtime-environ 12.0.2", @@ -14154,7 +20178,7 @@ checksum = "aef27ea6c34ef888030d15560037fe7ef27a5609fbbba8e1e3e41dc4245f5bb2" dependencies = [ "object 0.31.1", "once_cell", - "rustix 0.38.37", + "rustix 0.38.38", "wasmtime-versioned-export-macros", ] @@ -14214,7 +20238,7 @@ dependencies = [ "cc", "cfg-if", "encoding_rs", - "indexmap 2.2.6", + "indexmap 2.6.0", "libc", "log", "mach", @@ -14222,7 +20246,7 @@ dependencies = [ "memoffset 0.9.1", "paste", "rand", - "rustix 0.38.37", + "rustix 0.38.38", "sptr", "wasm-encoder 0.31.1", "wasmtime-asm-macros 12.0.2", @@ -14265,7 +20289,7 @@ checksum = "ca7af9bb3ee875c4907835e607a275d10b04d15623d3aebe01afe8fbd3f85050" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -14293,37 +20317,47 @@ checksum = "14770d0820f56ba86cdd9987aef97cc3bacbb0394633c37dbfbc61ef29603a71" dependencies = [ "anyhow", "heck 0.4.1", - "indexmap 2.2.6", + "indexmap 2.6.0", "wit-parser 0.9.2", ] [[package]] name = "wast" -version = "202.0.0" +version = "219.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fbcb11204515c953c9b42ede0a46a1c5e17f82af05c4fae201a8efff1b0f4fe" +checksum = "4f79a9d9df79986a68689a6b40bcc8d5d40d807487b235bebc2ac69a242b54a1" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.202.0", + "wasm-encoder 0.219.1", ] [[package]] name = "wat" -version = "1.202.0" +version = "1.219.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de4b15a47135c56a3573406e9977b9518787a6154459b4842a9b9d3d1684848" +checksum = "8bc3cf014fb336883a411cd662f987abf6a1d2a27f2f0008616a0070bbf6bd0d" dependencies = [ "wast", ] [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -14348,6 +20382,38 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webpki-roots" +version = "0.26.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "westend-runtime-constants" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06861bf945aadac59f4be23b44c85573029520ea9bd3d6c9ab21c8b306e81cdc" +dependencies = [ + "frame-support 38.0.0", + "polkadot-primitives 16.0.0", + "polkadot-runtime-common", + "smallvec", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", +] + [[package]] name = "which" version = "4.4.2" @@ -14357,14 +20423,14 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] name = "wide" -version = "0.7.15" +version = "0.7.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89beec544f246e679fc25490e3f8e08003bc4bf612068f325120dad4cea02c1c" +checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690" dependencies = [ "bytemuck", "safe_arch", @@ -14394,11 +20460,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -14491,6 +20557,21 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -14707,18 +20788,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.5" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -14739,7 +20811,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a628591b3905328e886462f75de3b2af1e546b19af5f4c359086b26bec29c4bd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wit-bindgen-rust-macro", ] @@ -14785,7 +20857,7 @@ checksum = "78cce32dd08007af45dbaa00e225eb73d05524096f93933d7ecba852d50d8af3" dependencies = [ "anyhow", "proc-macro2", - "syn 2.0.82", + "syn 2.0.85", "wit-bindgen-core", "wit-bindgen-rust", "wit-component", @@ -14818,7 +20890,7 @@ dependencies = [ "indexmap 1.9.3", "log", "pulldown-cmark 0.8.0", - "semver 1.0.22", + "semver 1.0.23", "unicode-xid", "url", ] @@ -14831,10 +20903,10 @@ checksum = "541efa2046e544de53a9da1e2f6299e63079840360c9e106f1f8275a97771318" dependencies = [ "anyhow", "id-arena", - "indexmap 2.2.6", + "indexmap 2.6.0", "log", "pulldown-cmark 0.9.6", - "semver 1.0.22", + "semver 1.0.23", "unicode-xid", "url", ] @@ -14903,7 +20975,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ - "curve25519-dalek 4.1.2", + "curve25519-dalek 4.1.3", "rand_core 0.6.4", "serde", "zeroize", @@ -14915,18 +20987,117 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", "base64 0.13.1", "data-encoding", - "der-parser", + "der-parser 8.2.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "x509-parser" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" +dependencies = [ + "asn1-rs 0.5.2", + "data-encoding", + "der-parser 8.2.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "x509-parser" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" +dependencies = [ + "asn1-rs 0.6.2", + "data-encoding", + "der-parser 9.0.0", "lazy_static", "nom", - "oid-registry", + "oid-registry 0.7.1", "rusticata-macros", "thiserror", "time", ] +[[package]] +name = "xcm-procedural" +version = "10.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87fb4f14094d65c500a59bcf540cf42b99ee82c706edd6226a92e769ad60563e" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "xcm-runtime-apis" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d4473a5d157e4d437d9ebcb1b99f9693a64983877ee57d97005f0167869935" +dependencies = [ + "frame-support 38.0.0", + "parity-scale-codec", + "scale-info", + "sp-api 34.0.0", + "sp-weights", + "staging-xcm", + "staging-xcm-executor", +] + +[[package]] +name = "xcm-simulator" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058e21bfc3e1180bbd83cad3690d0e63f34f43ab309e338afe988160aa776fcf" +dependencies = [ + "frame-support 38.0.0", + "frame-system", + "parity-scale-codec", + "paste", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-primitives 16.0.0", + "polkadot-runtime-parachains", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "xml-rs" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" + +[[package]] +name = "xmltree" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb" +dependencies = [ + "xml-rs", +] + [[package]] name = "yamux" version = "0.10.2" @@ -14941,6 +21112,21 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "yamux" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed0164ae619f2dc144909a9f082187ebb5893693d8c0196e8085283ccd4b776" +dependencies = [ + "futures", + "log", + "nohash-hasher", + "parking_lot 0.12.3", + "pin-project", + "rand", + "static_assertions", +] + [[package]] name = "yap" version = "0.11.0" @@ -14958,22 +21144,23 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -14993,7 +21180,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -15036,9 +21223,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index ae1c23e06..6b6e30a4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,3 @@ [workspace] resolver="2" -members =['crates/*', 'node/*', 'pallets/*', 'runtime', 'scripts/create-test-keyshares'] +members =['crates/*', 'node/*', 'pallets/*', 'runtime'] diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml index 14403aca7..6b98b8cc6 100644 --- a/crates/client/Cargo.toml +++ b/crates/client/Cargo.toml @@ -12,11 +12,12 @@ repository ='https://github.com/entropyxyz/entropy-core' sha3 ="0.10.8" serde ={ version="1.0", default-features=false, features=["derive"] } entropy-shared={ version="0.3.0-rc.1", path="../shared", default-features=false } -subxt ={ version="0.35.3", default-features=false, features=["jsonrpsee"] } +subxt ={ version="0.38.0", default-features=false, features=["jsonrpsee"] } +subxt-core ={ version="0.38.0", default-features=false} num ="0.4.3" thiserror ="1.0.65" futures ="0.3" -sp-core ={ version="31.0.0", default-features=false, features=["full_crypto", "serde"] } +sp-core = { version = "34.0.0", default-features = false, features = ["full_crypto", "serde"] } tracing ="0.1.37" rand ={ version="0.8", default-features=false } @@ -38,7 +39,7 @@ tokio ={ version="1.41", features=["time"] } [dev-dependencies] serial_test ="3.1.1" -sp-keyring ="34.0.0" +sp-keyring = "39.0.0" entropy-testing-utils={ path="../testing-utils" } [features] @@ -49,7 +50,7 @@ native=[ "subxt/native", "subxt/substrate-compat", ] -wasm=["entropy-shared/wasm", "entropy-shared/user-wasm", "subxt/web"] +wasm=["entropy-shared/wasm", "entropy-shared/user-wasm", "subxt/web",] # This adds full client functionality. It is behind a feature flag because it is not needed by # entropy-tss diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs index 5e5ace6e0..c4a680e79 100644 --- a/crates/client/src/client.rs +++ b/crates/client/src/client.rs @@ -175,7 +175,7 @@ pub async fn sign( let sig_recovery = ::verify( &signature_of_signature, decoded_sig.clone(), - &sr25519::Public(signer_info.tss_account.0), + &sr25519::Public::from(signer_info.tss_account.0), ); sig_recovery_results.push(sig_recovery) } diff --git a/crates/client/src/errors.rs b/crates/client/src/errors.rs index 24705ae55..b21bfb61d 100644 --- a/crates/client/src/errors.rs +++ b/crates/client/src/errors.rs @@ -28,6 +28,8 @@ pub enum SubstrateError { BadEvent(String), #[error("User is not registered on-chain")] NotRegistered, + #[error("subxt_core error: {0}")] + SubxtCoreError(#[from] subxt_core::Error), } /// An error on getting the current subgroup signers @@ -108,4 +110,6 @@ pub enum ClientError { BadVerifyingKeyLength, #[error("There are no validators which can act as a relay node for signature requests")] NoNonSigningValidators, + #[error("subxt_core error: {0}")] + SubxtCoreError(#[from] subxt_core::Error), } diff --git a/crates/client/src/substrate.rs b/crates/client/src/substrate.rs index c8dfe4b41..21c2e6a68 100644 --- a/crates/client/src/substrate.rs +++ b/crates/client/src/substrate.rs @@ -22,12 +22,12 @@ use sp_core::{sr25519, Pair}; use subxt::{ backend::legacy::LegacyRpcMethods, blocks::ExtrinsicEvents, - config::PolkadotExtrinsicParamsBuilder as Params, - storage::address::{StorageAddress, Yes}, - tx::{Signer, TxPayload, TxStatus}, + config::DefaultExtrinsicParamsBuilder as Params, + tx::{Payload, Signer, TxStatus}, utils::{AccountId32, MultiSignature, H256}, Config, OnlineClient, }; +use subxt_core::{storage::address::Address, utils::Yes}; pub use crate::errors::SubstrateError; @@ -35,7 +35,7 @@ pub use crate::errors::SubstrateError; /// /// Optionally takes a nonce, otherwise it grabs the latest nonce from the chain /// -pub async fn submit_transaction>( +pub async fn submit_transaction>( api: &OnlineClient, rpc: &LegacyRpcMethods, signer: &S, @@ -76,7 +76,7 @@ pub async fn submit_transaction>( } /// Convenience function to send a transaction to the Entropy chain giving a sr25519::Pair to sign with -pub async fn submit_transaction_with_pair( +pub async fn submit_transaction_with_pair( api: &OnlineClient, rpc: &LegacyRpcMethods, pair: &sr25519::Pair, @@ -90,14 +90,14 @@ pub async fn submit_transaction_with_pair( /// Gets data from the Entropy chain /// /// Optionally takes a block hash, otherwise the latest block hash from the chain is used -pub async fn query_chain
( +pub async fn query_chain( api: &OnlineClient, rpc: &LegacyRpcMethods, - storage_call: Address, + storage_call: Addr, block_hash_option: Option, -) -> Result, SubstrateError> +) -> Result, SubstrateError> where - Address: StorageAddress, + Addr: Address, { let block_hash = if let Some(block_hash) = block_hash_option { block_hash diff --git a/crates/kvdb/Cargo.toml b/crates/kvdb/Cargo.toml index 4044ceade..cf8f832f8 100644 --- a/crates/kvdb/Cargo.toml +++ b/crates/kvdb/Cargo.toml @@ -16,7 +16,7 @@ thiserror="1.0.65" hex ="0.4.3" # Substrate -sp-core={ version="31.0.0", default-features=false } +sp-core= { version = "34.0.0", default-features = false } # Crypto zeroize ={ version="1.8", features=["zeroize_derive"], default-features=false } diff --git a/crates/protocol/Cargo.toml b/crates/protocol/Cargo.toml index 5e88c3dcf..fbef4b74a 100644 --- a/crates/protocol/Cargo.toml +++ b/crates/protocol/Cargo.toml @@ -13,8 +13,8 @@ async-trait ="0.1.83" entropy-shared ={ version="0.3.0-rc.1", path="../shared", default-features=false } synedrion ={ version="0.2.0-beta.0" } serde ={ version="1.0", features=["derive"], default-features=false } -subxt ={ version="0.35.3", default-features=false } -sp-core ={ version="31.0.0", default-features=false, features=["full_crypto", "serde"] } +subxt ={ version="0.38.0", default-features=false } +sp-core = { version = "34.0.0", default-features = false, features = ["full_crypto", "serde"] } tokio ={ version="1.41", features=["sync", "rt", "macros"] } x25519-dalek ={ version="2.0.1", features=["static_secrets"] } futures ="0.3" @@ -48,7 +48,7 @@ schnorrkel ={ version="0.11.4", default-features=false, features=["std" [dev-dependencies] serial_test="3.1.1" -sp-keyring ="34.0.0" +sp-keyring = "39.0.0" anyhow ="1.0.91" num_cpus ="1.16.0" diff --git a/crates/protocol/src/lib.rs b/crates/protocol/src/lib.rs index 648f0d96c..01bc2225d 100644 --- a/crates/protocol/src/lib.rs +++ b/crates/protocol/src/lib.rs @@ -64,7 +64,7 @@ impl PartyId { fn to_public(&self) -> sr25519::Public { // TODO (#376): assuming that `Public` and `AccountId32` represent the same 32 bytes. // Ideally we should use only one of those throughout the code, probably `Public`. - sr25519::Public(self.0 .0) + sr25519::Public::from(self.0 .0) } } diff --git a/crates/shared/Cargo.toml b/crates/shared/Cargo.toml index 2c5aa8698..80a79df57 100644 --- a/crates/shared/Cargo.toml +++ b/crates/shared/Cargo.toml @@ -17,12 +17,12 @@ strum ="0.26.3" strum_macros="0.26.4" blake2 ={ version="0.10.4", default-features=false } -sp-runtime ={ version="32.0.0", default-features=false, optional=true, features=["serde"] } -sp-std ={ version="12.0.0", default-features=false } +sp-runtime = { version = "39.0.1", default-features = false, optional = true, features = ["serde"] } +sp-std = { version = "14.0.0", default-features = false } lazy_static={ version="1.5.0", features=["spin_no_std"] } hex-literal="0.4.1" -sp-core ={ version="29.0.0", default-features=false } -subxt ={ version="0.35.3", default-features=false, optional=true } +sp-core = { version = "34.0.0", default-features = false } +subxt ={ version="0.38.0", default-features=false, optional=true } [features] default =["std"] diff --git a/crates/test-cli/Cargo.toml b/crates/test-cli/Cargo.toml index 192915798..517146806 100644 --- a/crates/test-cli/Cargo.toml +++ b/crates/test-cli/Cargo.toml @@ -12,12 +12,12 @@ edition ='2021' entropy-client={ version="0.3.0-rc.1", path="../client" } clap ={ version="4.5.20", features=["derive"] } colored ="2.0.4" -subxt ="0.35.3" -sp-core ="31.0.0" +subxt ="0.38.0" +sp-core = "34.0.0" anyhow ="1.0.91" tokio ={ version="1.41", features=["macros", "rt-multi-thread", "io-util", "process"] } hex ="0.4.3" bincode ="1.3.3" x25519-dalek ="2.0.1" -sp-runtime ={ version="32.0.0", default-features=false } +sp-runtime = { version = "39.0.1", default-features = false } entropy-shared={ version="0.3.0-rc.1", path="../shared" } diff --git a/crates/testing-utils/Cargo.toml b/crates/testing-utils/Cargo.toml index 68b37361d..38818d69c 100644 --- a/crates/testing-utils/Cargo.toml +++ b/crates/testing-utils/Cargo.toml @@ -9,10 +9,10 @@ repository ='https://github.com/entropyxyz/entropy-core' edition ='2021' [dependencies] -subxt="0.35.3" -sp-keyring="34.0.0" +subxt="0.38.0" +sp-keyring= "39.0.0" project-root="0.2.2" -sp-core={ version="31.0.0", default-features=false } +sp-core= { version = "34.0.0", default-features = false } parity-scale-codec="3.6.12" lazy_static="1.5.0" hex-literal="0.4.1" diff --git a/crates/threshold-signature-server/Cargo.toml b/crates/threshold-signature-server/Cargo.toml index eec257622..c2f206f56 100644 --- a/crates/threshold-signature-server/Cargo.toml +++ b/crates/threshold-signature-server/Cargo.toml @@ -35,9 +35,9 @@ reqwest={ version="0.12.8", features=["json", "stream"] } axum ={ version="0.7.7", features=["ws"] } # Substrate -subxt ="0.35.3" +subxt ="0.38.0" parity-scale-codec="3.6.12" -sp-core ={ version="31.0.0", default-features=false } +sp-core = { version = "34.0.0", default-features = false } # Entropy entropy-shared={ version="0.3.0-rc.1", path="../shared" } @@ -81,14 +81,13 @@ configfs-tsm ={ version="0.0.1", optional=true } serial_test ="3.1.1" hex-literal ="0.4.1" project-root="0.2.2" -sp-keyring ="34.0.0" +sp-keyring = "39.0.0" more-asserts="0.3.1" lazy_static ="1.5.0" blake3 ="1.5.4" ethers-core ="2.0.14" schnorrkel ={ version="0.11.4", default-features=false, features=["std"] } schemars ={ version="0.8.21" } -subxt-signer="0.35.3" tdx-quote ={ version="0.0.1", features=["mock"] } # Note: We don't specify versions here because otherwise we run into a cyclical dependency between diff --git a/crates/threshold-signature-server/src/user/tests.rs b/crates/threshold-signature-server/src/user/tests.rs index 111efb54f..b90367a30 100644 --- a/crates/threshold-signature-server/src/user/tests.rs +++ b/crates/threshold-signature-server/src/user/tests.rs @@ -1035,7 +1035,7 @@ pub async fn verify_signature( let sig_recovery = ::verify( &signing_result.clone().unwrap().1, BASE64_STANDARD.decode(signing_result.clone().unwrap().0).unwrap(), - &sr25519::Public(validator_info.tss_account.0), + &sr25519::Public::from(validator_info.tss_account.0), ); sig_recovery_results.push(sig_recovery) } diff --git a/crates/threshold-signature-server/tests/helpers/mod.rs b/crates/threshold-signature-server/tests/helpers/mod.rs index 1a89688a0..1d77134b0 100644 --- a/crates/threshold-signature-server/tests/helpers/mod.rs +++ b/crates/threshold-signature-server/tests/helpers/mod.rs @@ -53,7 +53,7 @@ pub async fn verify_signature( let sig_recovery = ::verify( &signing_result.clone().unwrap().1, BASE64_STANDARD.decode(signing_result.unwrap().0).unwrap(), - &sr25519::Public(TSS_ACCOUNTS[i].0), + &sr25519::Public::from(TSS_ACCOUNTS[i].0), ); assert!(sig_recovery); i += 1; diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index b55a80ef6..79813c84c 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -24,70 +24,72 @@ codec ={ package="parity-scale-codec", version="3.0.0" } futures ="0.3.31" hex-literal ="0.4.1" itertools ="0.13.0" -jsonrpsee ={ version="0.20.3", features=["server"] } +jsonrpsee ={ version="0.24.3" } lazy_static ={ version="1.5.0", features=["spin_no_std"] } log ="0.4.22" -pallet-im-online= { version = "28.0.0" } +pallet-im-online= { version = "37.0.0" } rand ="0.8.5" serde ={ version="1.0.213", features=["derive"] } serde_json ='1.0.132' # Substrate Client -grandpa = { version = "0.20.0", package = "sc-consensus-grandpa" } -sc-authority-discovery = { version = "0.35.0" } -sc-basic-authorship = { version = "0.35.0" } -sc-chain-spec = { version = "28.0.0" } -sc-cli = { version = "0.37.0", optional = true } -sc-client-api = { version = "29.0.0" } -sc-consensus = { version = "0.34.0" } -sc-consensus-babe = { version = "0.35.0" } -sc-consensus-babe-rpc = { version = "0.35.0" } -sc-consensus-epochs = { version = "0.34.0" } -sc-consensus-grandpa-rpc= { version = "0.20.0" } -sc-consensus-slots = { version = "0.34.0" } -sc-executor = { version = "0.33.0" } -sc-network = { version = "0.35.0" } -sc-network-common = { version = "0.34.0" } -sc-network-sync = { version = "0.34.0" } -sc-offchain = { version = "30.0.0" } -sc-rpc = { version = "30.0.0" } -sc-rpc-api = { version = "0.34.0" } -sc-service = { version = "0.36.0" } -sc-storage-monitor = { version = "0.17.0" } -sc-sync-state-rpc = { version = "0.35.0" } -sc-sysinfo = { version = "28.0.0" } -sc-telemetry = { version = "16.0.0" } -sc-transaction-pool = { version = "29.0.0" } -sc-transaction-pool-api = { version = "29.0.0" } -sc-rpc-spec-v2 = { version = "0.35.0" } +grandpa = { version = "0.30.0", package = "sc-consensus-grandpa" } +sc-authority-discovery = { version = "0.45.0" } +sc-basic-authorship = { version = "0.45.0" } +sc-chain-spec = { version = "38.0.0" } +sc-cli = { version = "0.47.0", optional = true } +sc-client-api = { version = "37.0.0" } +sc-consensus = { version = "0.44.0" } +sc-consensus-babe = { version = "0.45.0" } +sc-consensus-babe-rpc = { version = "0.45.0" } +sc-consensus-epochs = { version = "0.44.0" } +sc-consensus-grandpa-rpc= { version = "0.30.0" } +sc-consensus-slots = { version = "0.44.0" } +sc-executor = { version = "0.40.1" } +sc-network = { version = "0.45.0" } +sc-network-common = { version = "0.44.0" } +sc-network-sync = { version = "0.44.0" } +sc-offchain = { version = "40.0.0" } +sc-rpc = { version = "40.0.0" } +sc-rpc-api = { version = "0.44.0" } +sc-service = { version = "0.46.0" } +sc-storage-monitor = { version = "0.22.0" } +sc-sync-state-rpc = { version = "0.45.0" } +sc-sysinfo = { version = "38.0.0" } +sc-telemetry = { version = "25.0.0" } +sc-transaction-pool = { version = "37.0.0" } +sc-transaction-pool-api = { version = "37.0.0" } +sc-rpc-spec-v2 = { version = "0.45.0" } +sc-mixnet = { version = "0.15.0" } # Substrate Primitives -grandpa-primitives = { version = "14.0.0", package = "sp-consensus-grandpa" } -sp-api = { version = "27.0.1" } -sp-authority-discovery = { version = "27.0.0" } -sp-block-builder = { version = "27.0.0" } -sp-blockchain = { version = "29.0.0" } -sp-consensus = { version = "0.33.0" } -sp-consensus-babe = { version = "0.33.0" } -sp-core = { version = "29.0.0" } -sp-inherents = { version = "27.0.0" } -sp-keyring = { version = "32.0.0" } -sp-keystore = { version = "0.35.0" } -sp-runtime = { version = "32.0.0" } -sp-timestamp = { version = "27.0.0" } -sp-transaction-storage-proof= { version = "27.0.0" } -substrate-frame-rpc-system = { version = "29.0.0" } +grandpa-primitives = { version = "21.0.0", package = "sp-consensus-grandpa" } +sp-api = { version = "34.0.0" } +sp-authority-discovery = { version = "34.0.0" } +sp-block-builder = { version = "34.0.0" } +sp-blockchain = { version = "37.0.1" } +sp-consensus = { version = "0.40.0" } +sp-consensus-babe = { version = "0.40.0" } +sp-core = { version = "34.0.0" } +sp-inherents = { version = "34.0.0" } +sp-keyring = { version = "39.0.0" } +sp-keystore = { version = "0.40.0" } +sp-runtime = { version = "39.0.1" } +sp-timestamp = { version = "34.0.0" } +sp-transaction-storage-proof= { version = "34.0.0" } +substrate-frame-rpc-system = { version = "39.0.0" } +sp-statement-store = { version = "18.0.0" } # FRAME Dependencies -frame-benchmarking = { version = "29.0.0" } -frame-benchmarking-cli = { version = "33.0.0", optional = true } -frame-system = { version = "29.0.0" } -frame-system-rpc-runtime-api= { version = "27.0.0" } +frame-benchmarking = { version = "38.0.0", default-features = false, optional = true, features = ["std"] } +frame-benchmarking-cli = { version = "43.0.0", optional = true } +frame-system = { version = "38.0.0" } +frame-system-rpc-runtime-api= { version = "34.0.0" } # Substrate Pallets -pallet-transaction-payment = { version = "29.0.2" } -pallet-transaction-payment-rpc= { version = "31.0.0" } +pallet-transaction-payment = { version = "38.0.0" } +pallet-transaction-payment-rpc= { version = "41.0.0" } # Entropy Dependencies entropy-runtime={ version="0.3.0-rc.1", path="../../runtime" } @@ -101,13 +103,13 @@ project-root="0.2.2" [build-dependencies] clap={ version="4.5.20", optional=true } -pallet-balances = { version = "29.0.2" } +pallet-balances = { version = "39.0.0" } substrate-build-script-utils= { version = "11.0.0" } -try-runtime-cli = { version = "0.39.0" } +try-runtime-cli = { version = "0.42.0" } [dev-dependencies] tempfile ="3.13.0" -sp-tracing= { version = "16.0.0" } +sp-tracing= { version = "17.0.1" } [features] default=["cli"] @@ -115,6 +117,8 @@ cli=["clap", "frame-benchmarking-cli", "sc-cli", "sc-service/rocksdb"] runtime-benchmarks=[ "entropy-runtime/runtime-benchmarks", "frame-benchmarking-cli/runtime-benchmarks", + "frame-benchmarking/runtime-benchmarks", + "frame-benchmarking", ] # Enable features that allow the runtime to be tried and debugged. Name might be subject to change # in the near future. diff --git a/node/cli/src/chain_spec/dev.rs b/node/cli/src/chain_spec/dev.rs index 9fdc553e0..575e830ce 100644 --- a/node/cli/src/chain_spec/dev.rs +++ b/node/cli/src/chain_spec/dev.rs @@ -232,6 +232,7 @@ pub fn development_genesis_config( ) }) .collect::>(), + non_authority_keys: vec![], }, "staking": StakingConfig { validator_count: initial_authorities.len() as u32, @@ -271,7 +272,7 @@ pub fn development_genesis_config( "sudo": SudoConfig { key: Some(root_key.clone()) }, "babe": BabeConfig { authorities: vec![], - epoch_config: Some(entropy_runtime::BABE_GENESIS_EPOCH_CONFIG), + epoch_config: entropy_runtime::BABE_GENESIS_EPOCH_CONFIG, ..Default::default() }, "imOnline": ImOnlineConfig { keys: vec![] }, diff --git a/node/cli/src/chain_spec/integration_tests.rs b/node/cli/src/chain_spec/integration_tests.rs index b7b912f62..01f8135c2 100644 --- a/node/cli/src/chain_spec/integration_tests.rs +++ b/node/cli/src/chain_spec/integration_tests.rs @@ -141,6 +141,7 @@ pub fn integration_tests_genesis_config( ) }) .collect::>(), + non_authority_keys: vec![], }, "staking": StakingConfig { validator_count: initial_authorities.len() as u32, @@ -239,7 +240,7 @@ pub fn integration_tests_genesis_config( "sudo": SudoConfig { key: Some(root_key.clone()) }, "babe": BabeConfig { authorities: vec![], - epoch_config: Some(entropy_runtime::BABE_GENESIS_EPOCH_CONFIG), + epoch_config: entropy_runtime::BABE_GENESIS_EPOCH_CONFIG, ..Default::default() }, "imOnline": ImOnlineConfig { keys: vec![] }, diff --git a/node/cli/src/chain_spec/mod.rs b/node/cli/src/chain_spec/mod.rs index a4fbc6bcc..c467c72bd 100644 --- a/node/cli/src/chain_spec/mod.rs +++ b/node/cli/src/chain_spec/mod.rs @@ -176,7 +176,7 @@ pub struct Extensions { } /// Specialized `ChainSpec`. -pub type ChainSpec = sc_service::GenericChainSpec; +pub type ChainSpec = sc_service::GenericChainSpec; fn session_keys( grandpa: GrandpaId, diff --git a/node/cli/src/chain_spec/testnet.rs b/node/cli/src/chain_spec/testnet.rs index 9dd3c1f5f..6c3e7d2e1 100644 --- a/node/cli/src/chain_spec/testnet.rs +++ b/node/cli/src/chain_spec/testnet.rs @@ -405,6 +405,7 @@ pub fn testnet_genesis_config( ) }) .collect::>(), + non_authority_keys: vec![], }, "staking": StakingConfig { validator_count: initial_authorities.len() as u32, @@ -448,7 +449,7 @@ pub fn testnet_genesis_config( "sudo": SudoConfig { key: Some(root_key.clone()) }, "babe": BabeConfig { authorities: vec![], - epoch_config: Some(entropy_runtime::BABE_GENESIS_EPOCH_CONFIG), + epoch_config: entropy_runtime::BABE_GENESIS_EPOCH_CONFIG, ..Default::default() }, "imOnline": ImOnlineConfig { keys: vec![] }, diff --git a/node/cli/src/cli.rs b/node/cli/src/cli.rs index 1f2114026..b42d17993 100644 --- a/node/cli/src/cli.rs +++ b/node/cli/src/cli.rs @@ -42,6 +42,10 @@ pub struct Cli { #[clap(flatten)] pub run: sc_cli::RunCmd, + #[allow(missing_docs)] + #[clap(flatten)] + pub mixnet_params: sc_cli::MixnetParams, + /// Sets the URL of the Threshold Signing Server (TSS) to use. /// /// The format should be in the form of `scheme://hostname:port`. diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs index af0467e5f..28df64740 100644 --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -29,18 +29,18 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -use entropy_runtime::{Block, EXISTENTIAL_DEPOSIT}; -use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE}; -use sc_cli::SubstrateCli; -use sc_service::PartialComponents; -use sp_keyring::Sr25519Keyring; - use crate::{ benchmarking::{inherent_benchmark_data, RemarkBuilder, TransferKeepAliveBuilder}, chain_spec, cli::{Cli, Subcommand}, service, }; +use entropy_runtime::{Block, EXISTENTIAL_DEPOSIT}; +use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE}; +use sc_cli::SubstrateCli; +use sc_service::PartialComponents; +use sp_keyring::Sr25519Keyring; +use sp_runtime::traits::HashingFor; impl SubstrateCli for Cli { fn impl_name() -> String { @@ -161,7 +161,7 @@ pub fn run() -> sc_cli::Result<()> { .into()); } - cmd.run::(config) + cmd.run_with_spec::, sp_statement_store::runtime_api::HostFunctions>(Some(config.chain_spec)) }, BenchmarkCmd::Block(cmd) => { let PartialComponents { client, .. } = service::new_partial(&config)?; diff --git a/node/cli/src/rpc.rs b/node/cli/src/rpc.rs index a93797745..59138f942 100644 --- a/node/cli/src/rpc.rs +++ b/node/cli/src/rpc.rs @@ -99,8 +99,6 @@ pub struct FullDeps { pub select_chain: SC, /// A copy of the chain spec. pub chain_spec: Box, - /// Whether to deny unsafe calls - pub deny_unsafe: DenyUnsafe, /// BABE specific dependencies. pub babe: BabeDeps, /// GRANDPA specific dependencies. @@ -111,12 +109,7 @@ pub struct FullDeps { /// Instantiate all Full RPC extensions. pub fn create_full( - FullDeps { client, pool, select_chain, chain_spec, deny_unsafe, babe, grandpa, .. }: FullDeps< - C, - P, - SC, - B, - >, + FullDeps { client, pool, select_chain, chain_spec, babe, grandpa, .. }: FullDeps, ) -> Result> where C: ProvideRuntimeApi @@ -160,14 +153,13 @@ where let properties = chain_spec.properties(); io.merge(ChainSpec::new(chain_name, genesis_hash, properties).into_rpc())?; - io.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?; + io.merge(System::new(client.clone(), pool).into_rpc())?; // Making synchronous calls in light client freezes the browser currently, // more context: https://github.com/paritytech/substrate/pull/3480 // These RPCs should use an asynchronous caller instead. io.merge(TransactionPayment::new(client.clone()).into_rpc())?; io.merge( - Babe::new(client.clone(), babe_worker_handle.clone(), keystore, select_chain, deny_unsafe) - .into_rpc(), + Babe::new(client.clone(), babe_worker_handle.clone(), keystore, select_chain).into_rpc(), )?; io.merge( Grandpa::new( @@ -183,6 +175,6 @@ where SyncState::new(chain_spec, client.clone(), shared_authority_set, babe_worker_handle)? .into_rpc(), )?; - io.merge(Dev::new(client, deny_unsafe).into_rpc())?; + io.merge(Dev::new(client).into_rpc())?; Ok(io) } diff --git a/node/cli/src/service.rs b/node/cli/src/service.rs index 679164938..c8898f229 100644 --- a/node/cli/src/service.rs +++ b/node/cli/src/service.rs @@ -42,14 +42,19 @@ use futures::prelude::*; use sc_client_api::{Backend, BlockBackend}; use sc_consensus_babe::{self, SlotProportion}; use sc_executor::NativeElseWasmExecutor; -use sc_network::{event::Event, NetworkEventStream, NetworkService}; -use sc_network_sync::{strategy::warp::WarpSyncParams, SyncingService}; +use sc_network::{ + event::Event, service::traits::NetworkService, NetworkBackend, NetworkEventStream, +}; +use sc_network_sync::{service::network::Network, SyncingService}; use sc_offchain::OffchainDb; -use sc_service::{config::Configuration, error::Error as ServiceError, RpcHandlers, TaskManager}; +use sc_service::{ + config::Configuration, error::Error as ServiceError, RpcHandlers, TaskManager, WarpSyncConfig, +}; use sc_telemetry::{Telemetry, TelemetryWorker}; use sc_transaction_pool_api::OffchainTransactionPoolFactory; use sp_core::offchain::DbExternalities; use sp_runtime::traits::Block as BlockT; +use std::path::Path; use crate::cli::Cli; /// The full client type definition. @@ -100,7 +105,6 @@ pub fn new_partial( sc_transaction_pool::FullPool, ( impl Fn( - sc_rpc_api::DenyUnsafe, sc_rpc::SubscriptionTaskExecutor, ) -> Result, sc_service::Error>, ( @@ -214,13 +218,12 @@ pub fn new_partial( let chain_spec = config.chain_spec.cloned_box(); let backend = backend.clone(); - let rpc_extensions_builder = move |deny_unsafe, subscription_executor| { + let rpc_extensions_builder = move |subscription_executor| { let deps = crate::rpc::FullDeps { client: client.clone(), pool: pool.clone(), select_chain: select_chain.clone(), chain_spec: chain_spec.cloned_box(), - deny_unsafe, babe: crate::rpc::BabeDeps { keystore: keystore.clone(), babe_worker_handle: babe_worker_handle.clone(), @@ -261,7 +264,7 @@ pub struct NewFullBase { /// The client instance of the node. pub client: Arc, /// The networking service of the node. - pub network: Arc::Hash>>, + pub network: Arc, /// The syncing service of the node. pub sync: Arc>, /// The transaction pool of the node. @@ -271,8 +274,9 @@ pub struct NewFullBase { } /// Creates a full service from the configuration. -pub fn new_full_base( +pub fn new_full_base::Hash>>( config: Configuration, + mixnet_config: Option, disable_hardware_benchmarks: bool, with_startup_data: impl FnOnce( &sc_consensus_babe::BabeBlockImport, @@ -283,7 +287,7 @@ pub fn new_full_base( let hwbench = (!disable_hardware_benchmarks) .then_some(config.database.path().map(|database_path| { let _ = std::fs::create_dir_all(database_path); - sc_sysinfo::gather_hwbench(Some(database_path)) + sc_sysinfo::gather_hwbench(Some(database_path), &SUBSTRATE_REFERENCE_HARDWARE) })) .flatten(); @@ -298,14 +302,26 @@ pub fn new_full_base( other: (rpc_builder, import_setup, rpc_setup, mut telemetry), } = new_partial(&config)?; + let metrics = N::register_notification_metrics( + config.prometheus_config.as_ref().map(|cfg| &cfg.registry), + ); let shared_voter_state = rpc_setup; let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht; - let mut net_config = sc_network::config::FullNetworkConfiguration::new(&config.network); + let mut net_config = sc_network::config::FullNetworkConfiguration::<_, _, N>::new( + &config.network, + config.prometheus_config.as_ref().map(|cfg| cfg.registry.clone()), + ); + + let peer_store_handle = net_config.peer_store_handle(); let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"); let grandpa_protocol_name = grandpa::protocol_standard_name(&genesis_hash, &config.chain_spec); let (grandpa_protocol_config, grandpa_notification_service) = - grandpa::grandpa_peers_set_config(grandpa_protocol_name.clone()); + grandpa::grandpa_peers_set_config::<_, N>( + grandpa_protocol_name.clone(), + metrics.clone(), + Arc::clone(&peer_store_handle), + ); net_config.add_notification_protocol(grandpa_protocol_config); let warp_sync = Arc::new(grandpa::warp_proof::NetworkProvider::new( @@ -323,8 +339,9 @@ pub fn new_full_base( spawn_handle: task_manager.spawn_handle(), import_queue, block_announce_validator_builder: None, - warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)), + warp_sync_config: Some(WarpSyncConfig::WithProvider(warp_sync)), block_relay: None, + metrics, })?; if config.offchain_worker.enabled { @@ -340,7 +357,7 @@ pub fn new_full_base( transaction_pool: Some(OffchainTransactionPoolFactory::new( transaction_pool.clone(), )), - network_provider: network.clone(), + network_provider: Arc::new(network.clone()), is_validator: config.role.is_authority(), enable_http_requests: true, custom_extensions: move |_| vec![], @@ -406,7 +423,7 @@ pub fn new_full_base( if let Some(hwbench) = hwbench { sc_sysinfo::print_hwbench(&hwbench); - match SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) { + match SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench, role.is_authority()) { Err(err) if role.is_authority() => { log::warn!( "⚠️ The hardware does not meet the minimal requirements {} for role 'Authority' find out more at:\n\ @@ -504,7 +521,7 @@ pub fn new_full_base( ..Default::default() }, client.clone(), - network.clone(), + Arc::new(network.clone()), Box::pin(dht_event_stream), authority_discovery_role, prometheus_registry.clone(), @@ -575,14 +592,38 @@ pub fn new_full_base( /// Builds a new service for a full client. pub fn new_full(config: Configuration, cli: Cli) -> Result { - let database_source = config.database.clone(); - let task_manager = - new_full_base(config, cli.no_hardware_benchmarks, |_, _| (), cli.tss_server_endpoint) + let mixnet_config = cli.mixnet_params.config(config.role.is_authority()); + let database_path = config.database.path().map(Path::to_path_buf); + + let task_manager = match config.network.network_backend { + sc_network::config::NetworkBackendType::Libp2p => { + let task_manager = new_full_base::>( + config, + mixnet_config, + cli.no_hardware_benchmarks, + |_, _| (), + cli.tss_server_endpoint, + ) .map(|NewFullBase { task_manager, .. }| task_manager)?; - if let Some(path) = database_source.path() { + task_manager + }, + sc_network::config::NetworkBackendType::Litep2p => { + let task_manager = new_full_base::( + config, + mixnet_config, + cli.no_hardware_benchmarks, + |_, _| (), + cli.tss_server_endpoint, + ) + .map(|NewFullBase { task_manager, .. }| task_manager)?; + task_manager + }, + }; + + if let Some(database_path) = database_path { sc_storage_monitor::StorageMonitorService::try_spawn( cli.storage_monitor, - path.to_path_buf(), + database_path, &task_manager.spawn_essential_handle(), ) .map_err(|e| ServiceError::Application(e.into()))?; diff --git a/pallets/attestation/Cargo.toml b/pallets/attestation/Cargo.toml index b283d59f7..dcb6dcfae 100644 --- a/pallets/attestation/Cargo.toml +++ b/pallets/attestation/Cargo.toml @@ -12,15 +12,15 @@ publish =false codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] } scale-info ={ version="2.11", default-features=false, features=["derive"] } log ={ version="0.4.22", default-features=false } -frame-support = { version = "29.0.2", default-features = false } -frame-system = { version = "29.0.0", default-features = false } -sp-io = { version = "31.0.0", default-features = false } -sp-core = { version = "29.0.0", default-features = false } -sp-runtime = { version = "32.0.0", default-features = false } -sp-staking = { version = "27.0.0", default-features = false } -frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } +frame-support = { version = "38.0.0", default-features = false } +frame-system = { version = "38.0.0", default-features = false } +sp-io = { version = "38.0.0", default-features = false } +sp-core = { version = "34.0.0", default-features = false } +sp-runtime = { version = "39.0.1", default-features = false } +sp-staking = { version = "36.0.0", default-features = false } +frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } sp-std = { version = "14.0.0", default-features = false } -pallet-session = { version = "29.0.0", default-features = false, optional = true } +pallet-session = { version = "38.0.0", default-features = false, optional = true } rand_chacha ={ version="0.3", default-features=false } pallet-parameters={ version="0.3.0-rc.1", path="../parameters", default-features=false } @@ -31,14 +31,14 @@ pallet-staking-extension={ version="0.3.0-rc.1", path="../staking", default-feat tdx-quote="0.0.1" [dev-dependencies] -pallet-session = { version = "29.0.0", default-features = false } -pallet-staking = { version = "29.0.3", default-features = false } -pallet-balances = { version = "29.0.2", default-features = false } -pallet-bags-list = { version = "28.0.0", default-features = false } -pallet-timestamp = { version = "28.0.0", default-features = false } -sp-npos-elections = { version = "27.0.0", default-features = false } -frame-election-provider-support= { version = "29.0.0", default-features = false } -pallet-staking-reward-curve = { version = "11.0.0" } +pallet-session = { version = "38.0.0", default-features = false } +pallet-staking = { version = "38.0.0", default-features = false } +pallet-balances = { version = "39.0.0", default-features = false } +pallet-bags-list = { version = "37.0.0", default-features = false } +pallet-timestamp = { version = "37.0.0", default-features = false } +sp-npos-elections = { version = "34.0.0", default-features = false } +frame-election-provider-support= { version = "38.0.0", default-features = false } +pallet-staking-reward-curve = { version = "12.0.0" } tdx-quote ={ version="0.0.1", features=["mock"] } rand_core ="0.6.4" @@ -55,6 +55,7 @@ std=[ 'pallet-parameters/std', 'sp-io/std', "sp-runtime/std", + "codec/std", "rand_chacha/std", ] try-runtime=['frame-support/try-runtime'] diff --git a/pallets/attestation/src/mock.rs b/pallets/attestation/src/mock.rs index f75f82b58..e9485f086 100644 --- a/pallets/attestation/src/mock.rs +++ b/pallets/attestation/src/mock.rs @@ -261,7 +261,6 @@ impl pallet_staking::Config for Test { type MaxUnlockingChunks = ConstU32<32>; type NextNewSession = Session; type NominationsQuota = pallet_staking::FixedNominationsQuota<16>; - type OffendingValidatorsThreshold = OffendingValidatorsThreshold; type Reward = (); type RewardRemainder = (); type RuntimeEvent = RuntimeEvent; diff --git a/pallets/oracle/Cargo.toml b/pallets/oracle/Cargo.toml index bd2967b57..2b8efa0e3 100644 --- a/pallets/oracle/Cargo.toml +++ b/pallets/oracle/Cargo.toml @@ -12,15 +12,15 @@ publish =false codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] } scale-info={ version="2.11", default-features=false, features=["derive"] } -frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } -frame-support = { version = "29.0.2", default-features = false } -frame-system = { version = "29.0.0", default-features = false } -sp-runtime = { version = "32.0.0", default-features = false } +frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } +frame-support = { version = "38.0.0", default-features = false } +frame-system = { version = "38.0.0", default-features = false } +sp-runtime = { version = "39.0.1", default-features = false } sp-std = { version = "14.0.0", default-features = false } [dev-dependencies] -sp-core= { version = "29.0.0" } -sp-io = { version = "31.0.0" } +sp-core= { version = "34.0.0" } +sp-io = { version = "38.0.0" } [features] default=["std"] @@ -34,6 +34,7 @@ std=[ "frame-system/std", "scale-info/std", "sp-runtime/std", + "sp-io/std", "sp-std/std", 'frame-benchmarking/std', ] diff --git a/pallets/parameters/Cargo.toml b/pallets/parameters/Cargo.toml index 6143c3a71..61ca7f519 100644 --- a/pallets/parameters/Cargo.toml +++ b/pallets/parameters/Cargo.toml @@ -12,21 +12,21 @@ publish =false codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] } scale-info={ version="2.11", default-features=false, features=["derive"] } -frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } -frame-support = { version = "29.0.2", default-features = false } -frame-system = { version = "29.0.0", default-features = false } -sp-runtime = { version = "32.0.0", default-features = false } +frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } +frame-support = { version = "38.0.0", default-features = false } +frame-system = { version = "38.0.0", default-features = false } +sp-runtime = { version = "39.0.1", default-features = false } sp-std = { version = "14.0.0", default-features = false } -pallet-session = { version = "29.0.0", default-features = false } +pallet-session = { version = "38.0.0", default-features = false } entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", features=[ "wasm-no-std", ], default-features=false } [dev-dependencies] -sp-core = { version = "29.0.0" } -sp-io = { version = "31.0.0" } -sp-staking= { version = "27.0.0", default-features = false } +sp-core = { version = "34.0.0" } +sp-io = { version = "38.0.0" } +sp-staking= { version = "36.0.0", default-features = false } [features] default=["std"] @@ -41,6 +41,7 @@ std=[ "pallet-session/std", "scale-info/std", "sp-runtime/std", + "sp-io/std", "sp-std/std", 'frame-benchmarking/std', ] diff --git a/pallets/programs/Cargo.toml b/pallets/programs/Cargo.toml index ba281ebee..5a6e4175b 100644 --- a/pallets/programs/Cargo.toml +++ b/pallets/programs/Cargo.toml @@ -16,17 +16,17 @@ codec ={ package="parity-scale-codec", version="3.6.3", default-features=fal scale-info={ version="2.11", default-features=false, features=["derive"] } log ={ version="0.4.22", default-features=false } -frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } -frame-support = { version = "29.0.2", default-features = false } -frame-system = { version = "29.0.0", default-features = false } -sp-io = { version = "31.0.0", default-features = false } -sp-runtime = { version = "32.0.0", default-features = false } -sp-staking = { version = "27.0.0", default-features = false } +frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } +frame-support = { version = "38.0.0", default-features = false } +frame-system = { version = "38.0.0", default-features = false } +sp-io = { version = "38.0.0", default-features = false } +sp-runtime = { version = "39.0.1", default-features = false } +sp-staking = { version = "36.0.0", default-features = false } sp-std = { version = "14.0.0", default-features = false } [dev-dependencies] -pallet-balances= { version = "29.0.2" } -sp-core = { version = "29.0.0", default-features = false } +pallet-balances= { version = "39.0.0" } +sp-core = { version = "34.0.0", default-features = false } [features] default=['std'] diff --git a/pallets/propagation/Cargo.toml b/pallets/propagation/Cargo.toml index 85ae5e86b..245a865c5 100644 --- a/pallets/propagation/Cargo.toml +++ b/pallets/propagation/Cargo.toml @@ -16,15 +16,15 @@ codec ={ package="parity-scale-codec", version="3.6.3", default-features=fal log ={ version="0.4.22", default-features=false } scale-info={ version="2.11", default-features=false, features=["derive"] } -frame-benchmarking = { version = "29.0.0", default-features = false, optional = true } -frame-support = { version = "29.0.2", default-features = false } -frame-system = { version = "29.0.0", default-features = false } -pallet-authorship = { version = "29.0.0", default-features = false } -sp-application-crypto= { version = "31.0.0", default-features = false } -sp-core = { version = "29.0.0", default-features = false } -sp-io = { version = "31.0.0", default-features = false } -sp-runtime = { version = "32.0.0", default-features = false } -sp-staking = { version = "27.0.0", default-features = false } +frame-benchmarking = { version = "38.0.0", default-features = false, optional = true } +frame-support = { version = "38.0.0", default-features = false } +frame-system = { version = "38.0.0", default-features = false } +pallet-authorship = { version = "38.0.0", default-features = false } +sp-application-crypto= { version = "38.0.0", default-features = false } +sp-core = { version = "34.0.0", default-features = false } +sp-io = { version = "38.0.0", default-features = false } +sp-runtime = { version = "39.0.1", default-features = false } +sp-staking = { version = "36.0.0", default-features = false } entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", default-features=false, features=[ "wasm-no-std", @@ -37,16 +37,16 @@ pallet-attestation={ version="0.3.0-rc.1", path="../attestation", default-featur [dev-dependencies] parking_lot="0.12.3" -frame-election-provider-support= { version = "29.0.0", default-features = false } -pallet-babe = { version = "29.0.0", default-features = false } -pallet-bags-list = { version = "28.0.0", default-features = false } -pallet-balances = { version = "29.0.2", default-features = false } -pallet-session = { version = "29.0.0", default-features = false } -pallet-staking = { version = "29.0.3", default-features = false } -pallet-staking-reward-curve = { version = "11.0.0" } -pallet-timestamp = { version = "28.0.0", default-features = false } -sp-keystore = { version = "0.35.0" } -sp-npos-elections = { version = "27.0.0", default-features = false } +frame-election-provider-support= { version = "38.0.0", default-features = false } +pallet-babe = { version = "38.0.0", default-features = false } +pallet-bags-list = { version = "37.0.0", default-features = false } +pallet-balances = { version = "39.0.0", default-features = false } +pallet-session = { version = "38.0.0", default-features = false } +pallet-staking = { version = "38.0.0", default-features = false } +pallet-staking-reward-curve = { version = "12.0.0" } +pallet-timestamp = { version = "37.0.0", default-features = false } +sp-keystore = { version = "0.40.0" } +sp-npos-elections = { version = "34.0.0", default-features = false } pallet-parameters ={ version="0.3.0-rc.1", path="../parameters", default-features=false } [features] diff --git a/pallets/propagation/src/mock.rs b/pallets/propagation/src/mock.rs index 31e4e1600..21c660c2a 100644 --- a/pallets/propagation/src/mock.rs +++ b/pallets/propagation/src/mock.rs @@ -253,7 +253,6 @@ impl pallet_staking::Config for Test { type MaxUnlockingChunks = ConstU32<32>; type NextNewSession = Session; type NominationsQuota = pallet_staking::FixedNominationsQuota<16>; - type OffendingValidatorsThreshold = OffendingValidatorsThreshold; type Reward = (); type RewardRemainder = (); type RuntimeEvent = RuntimeEvent; diff --git a/pallets/registry/Cargo.toml b/pallets/registry/Cargo.toml index 7e404cdcd..a02ed5cb9 100644 --- a/pallets/registry/Cargo.toml +++ b/pallets/registry/Cargo.toml @@ -19,14 +19,14 @@ scale-info={ version="2.11", default-features=false, features=["derive"] } synedrion ={ version="0.2.0-beta.0", default-features=false } rand ={ version="0.8.5", default-features=false, features=["alloc"] } -frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } -frame-support = { version = "29.0.2", default-features = false } -frame-system = { version = "29.0.0", default-features = false } -pallet-authorship = { version = "29.0.0", default-features = false } -pallet-session = { version = "29.0.0", default-features = false } -pallet-staking = { version = "29.0.3", default-features = false } -sp-core = { version = "29.0.0", default-features = false } -sp-runtime = { version = "32.0.0", default-features = false } +frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } +frame-support = { version = "38.0.0", default-features = false } +frame-system = { version = "38.0.0", default-features = false } +pallet-authorship = { version = "38.0.0", default-features = false } +pallet-session = { version = "38.0.0", default-features = false } +pallet-staking = { version = "38.0.0", default-features = false } +sp-core = { version = "34.0.0", default-features = false } +sp-runtime = { version = "39.0.1", default-features = false } sp-std = { version = "14.0.0", default-features = false } entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", features=[ @@ -37,20 +37,21 @@ pallet-staking-extension={ version="0.3.0-rc.1", path="../staking", default-feat pallet-parameters={ version="0.3.0-rc.1", path="../parameters", default-features=false } [dev-dependencies] -frame-election-provider-support= { version = "29.0.0", default-features = false } -pallet-bags-list = { version = "28.0.0", default-features = false } -pallet-balances = { version = "29.0.2", default-features = false } -pallet-staking-reward-curve = { version = "11.0.0" } -pallet-timestamp = { version = "28.0.0", default-features = false } -sp-io = { version = "31.0.0", default-features = false } -sp-npos-elections = { version = "27.0.0", default-features = false } -sp-staking = { version = "27.0.0", default-features = false } +frame-election-provider-support= { version = "38.0.0", default-features = false } +pallet-bags-list = { version = "37.0.0", default-features = false } +pallet-balances = { version = "39.0.0", default-features = false } +pallet-staking-reward-curve = { version = "12.0.0" } +pallet-timestamp = { version = "37.0.0", default-features = false } +sp-io = { version = "38.0.0", default-features = false } +sp-npos-elections = { version = "34.0.0", default-features = false } +sp-staking = { version = "36.0.0", default-features = false } [features] std=[ "sp-npos-elections/std", "sp-runtime/std", + "sp-io/std", "sp-std/std", 'codec/std', 'frame-benchmarking/std', diff --git a/pallets/registry/src/mock.rs b/pallets/registry/src/mock.rs index 4f20fe263..43a61af66 100644 --- a/pallets/registry/src/mock.rs +++ b/pallets/registry/src/mock.rs @@ -250,7 +250,6 @@ impl pallet_staking::Config for Test { type MaxUnlockingChunks = ConstU32<32>; type NextNewSession = Session; type NominationsQuota = pallet_staking::FixedNominationsQuota<16>; - type OffendingValidatorsThreshold = OffendingValidatorsThreshold; type Reward = (); type RewardRemainder = (); type RuntimeEvent = RuntimeEvent; diff --git a/pallets/slashing/Cargo.toml b/pallets/slashing/Cargo.toml index 99d352a7d..a23e397bc 100644 --- a/pallets/slashing/Cargo.toml +++ b/pallets/slashing/Cargo.toml @@ -16,25 +16,25 @@ codec ={ package="parity-scale-codec", version="3.6.3", default-features=fal scale-info={ version="2.11", default-features=false, features=["derive"] } log ={ version="0.4.22", default-features=false } -frame-benchmarking = { version = "29.0.0", default-features = false, optional = true } -frame-support = { version = "29.0.2", default-features = false } -frame-system = { version = "29.0.0", default-features = false } -sp-application-crypto= { version = "31.0.0", default-features = false } -sp-io = { version = "31.0.0", default-features = false } -sp-runtime = { version = "32.0.0", default-features = false } -sp-staking = { version = "27.0.0", default-features = false } +frame-benchmarking = { version = "38.0.0", default-features = false, optional = true } +frame-support = { version = "38.0.0", default-features = false } +frame-system = { version = "38.0.0", default-features = false } +sp-application-crypto= { version = "38.0.0", default-features = false } +sp-io = { version = "38.0.0", default-features = false } +sp-runtime = { version = "39.0.1", default-features = false } +sp-staking = { version = "36.0.0", default-features = false } sp-std = { version = "14.0.0", default-features = false } [dev-dependencies] -frame-election-provider-support= { version = "29.0.0", default-features = false } -pallet-bags-list = { version = "28.0.0", default-features = false } -pallet-balances = { version = "29.0.2", default-features = false } -pallet-session = { version = "29.0.0", default-features = false } -pallet-staking = { version = "29.0.3", default-features = false } -pallet-staking-reward-curve = { version = "11.0.0", default-features = false } -pallet-timestamp = { version = "28.0.0", default-features = false } -sp-core = { version = "29.0.0", default-features = false } -sp-npos-elections = { version = "27.0.0", default-features = false } +frame-election-provider-support= { version = "38.0.0", default-features = false } +pallet-bags-list = { version = "37.0.0", default-features = false } +pallet-balances = { version = "39.0.0", default-features = false } +pallet-session = { version = "38.0.0", default-features = false } +pallet-staking = { version = "38.0.0", default-features = false } +pallet-staking-reward-curve = { version = "12.0.0", default-features = false } +pallet-timestamp = { version = "37.0.0", default-features = false } +sp-core = { version = "34.0.0", default-features = false } +sp-npos-elections = { version = "34.0.0", default-features = false } [features] default=['std'] diff --git a/pallets/staking/Cargo.toml b/pallets/staking/Cargo.toml index ff4a1a6cb..f6716e222 100644 --- a/pallets/staking/Cargo.toml +++ b/pallets/staking/Cargo.toml @@ -18,16 +18,16 @@ log ={ version="0.4.22", default-features=false } serde ={ version="1.0.213", default-features=false } rand_chacha={ version="0.3", default-features=false } -frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } -frame-support = { version = "29.0.2", default-features = false } -frame-system = { version = "29.0.0", default-features = false } -pallet-session = { version = "29.0.0", default-features = false } -pallet-staking = { version = "29.0.3", default-features = false } -sp-core = { version = "29.0.0", default-features = false } -sp-runtime = { version = "32.0.0", default-features = false } -sp-staking = { version = "27.0.0", default-features = false } +frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } +frame-support = { version = "38.0.0", default-features = false } +frame-system = { version = "38.0.0", default-features = false } +pallet-session = { version = "38.0.0", default-features = false } +pallet-staking = { version = "38.0.0", default-features = false } +sp-core = { version = "34.0.0", default-features = false } +sp-runtime = { version = "39.0.1", default-features = false } +sp-staking = { version = "36.0.0", default-features = false } sp-std = { version = "14.0.0", default-features = false } -sp-consensus-babe = { version = "0.33.0", default-features = false } +sp-consensus-babe = { version = "0.40.0", default-features = false } pallet-parameters={ version="0.3.0-rc.1", path="../parameters", default-features=false } entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", features=[ @@ -39,13 +39,13 @@ entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", features=[ tdx-quote={ version="0.0.1", features=["mock"], optional=true } [dev-dependencies] -frame-election-provider-support= { version = "29.0.0", default-features = false } -pallet-bags-list = { version = "28.0.0", default-features = false } -pallet-balances = { version = "29.0.2", default-features = false } -pallet-staking-reward-curve = { version = "11.0.0" } -pallet-timestamp = { version = "28.0.0", default-features = false } -sp-io = { version = "31.0.0", default-features = false } -sp-npos-elections = { version = "27.0.0", default-features = false } +frame-election-provider-support= { version = "38.0.0", default-features = false } +pallet-bags-list = { version = "37.0.0", default-features = false } +pallet-balances = { version = "39.0.0", default-features = false } +pallet-staking-reward-curve = { version = "12.0.0" } +pallet-timestamp = { version = "37.0.0", default-features = false } +sp-io = { version = "38.0.0", default-features = false } +sp-npos-elections = { version = "34.0.0", default-features = false } rand_core="0.6.4" tdx-quote={ version="0.0.1", features=["mock"] } @@ -57,6 +57,7 @@ std=[ "sp-npos-elections/std", "sp-staking/std", "sp-std/std", + "sp-io/std", 'codec/std', 'frame-benchmarking/std', 'frame-support/std', diff --git a/pallets/staking/src/mock.rs b/pallets/staking/src/mock.rs index 58898d137..e45462db3 100644 --- a/pallets/staking/src/mock.rs +++ b/pallets/staking/src/mock.rs @@ -317,7 +317,6 @@ impl pallet_staking::Config for Test { type MaxUnlockingChunks = ConstU32<32>; type NextNewSession = Session; type NominationsQuota = pallet_staking::FixedNominationsQuota<16>; - type OffendingValidatorsThreshold = OffendingValidatorsThreshold; type Reward = (); type RewardRemainder = (); type RuntimeEvent = RuntimeEvent; diff --git a/pallets/transaction-pause/Cargo.toml b/pallets/transaction-pause/Cargo.toml index 3f968fe12..9aba4f0bc 100644 --- a/pallets/transaction-pause/Cargo.toml +++ b/pallets/transaction-pause/Cargo.toml @@ -12,18 +12,18 @@ publish =false codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] } scale-info={ version="2.11", default-features=false, features=["derive"] } -frame-benchmarking= { version = "29.0.0", default-features = false, optional = true } -frame-support = { version = "29.0.2", default-features = false } -frame-system = { version = "29.0.0", default-features = false } -sp-runtime = { version = "32.0.0", default-features = false } +frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } +frame-support = { version = "38.0.0", default-features = false } +frame-system = { version = "38.0.0", default-features = false } +sp-runtime = { version = "39.0.1", default-features = false } sp-std = { version = "14.0.0", default-features = false } [dev-dependencies] smallvec="1.13.2" -pallet-balances= { version = "29.0.2" } -sp-core = { version = "29.0.0" } -sp-io = { version = "31.0.0" } +pallet-balances= { version = "39.0.0" } +sp-core = { version = "34.0.0" } +sp-io = { version = "38.0.0" } pallet-programs={ version="0.3.0-rc.1", default-features=false, path="../programs" } @@ -35,11 +35,13 @@ runtime-benchmarks=[ 'frame-system/runtime-benchmarks', ] std=[ + 'frame-benchmarking/std', "frame-support/std", "frame-system/std", "pallet-programs/std", "scale-info/std", "sp-runtime/std", "sp-std/std", + "sp-io/std", ] try-runtime=["frame-support/try-runtime"] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 41d412440..763ef36d7 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -26,73 +26,73 @@ scale-info={ version="2.11", default-features=false, features=["derive"] } static_assertions="1.1.0" # Substrate Primitives -sp-api = { version = "27.0.1", default-features = false } -sp-authority-discovery= { version = "27.0.0", default-features = false } -sp-block-builder = { version = "27.0.0", default-features = false } -sp-consensus-babe = { version = "0.33.0", default-features = false } -sp-core = { version = "29.0.0", default-features = false } -sp-inherents = { version = "27.0.0", default-features = false } -sp-io = { version = "31.0.0", default-features = false } -sp-npos-elections = { version = "27.0.0", default-features = false } -sp-offchain = { version = "27.0.0", default-features = false } -sp-runtime = { version = "32.0.0", default-features = false } -sp-session = { version = "28.0.0", default-features = false } -sp-staking = { version = "27.0.0", default-features = false } +sp-api = { version = "34.0.0", default-features = false } +sp-authority-discovery= { version = "34.0.0", default-features = false } +sp-block-builder = { version = "34.0.0", default-features = false } +sp-consensus-babe = { version = "0.40.0", default-features = false } +sp-core = { version = "34.0.0", default-features = false } +sp-inherents = { version = "34.0.0", default-features = false } +sp-io = { version = "38.0.0", default-features = false } +sp-npos-elections = { version = "34.0.0", default-features = false } +sp-offchain = { version = "34.0.0", default-features = false } +sp-runtime = { version = "39.0.1", default-features = false } +sp-session = { version = "36.0.0", default-features = false } +sp-staking = { version = "36.0.0", default-features = false } sp-std = { version = "14.0.0", default-features = false } -sp-storage = { version = "20.0.0", default-features = false, optional = true } -sp-transaction-pool = { version = "27.0.0", default-features = false } -sp-version = { version = "30.0.0", default-features = false } -sp-genesis-builder = { version = "0.8.0", default-features = false } +sp-storage = { version = "21.0.0", default-features = false, optional = true } +sp-transaction-pool = { version = "34.0.0", default-features = false } +sp-version = { version = "37.0.0", default-features = false } +sp-genesis-builder = { version = "0.15.1", default-features = false } # FRAME Dependencies -frame-benchmarking = { version = "29.0.0", default-features = false, optional = true } -frame-election-provider-support= { version = "29.0.0", default-features = false } -frame-executive = { version = "29.0.0", default-features = false } -frame-support = { version = "29.0.2", default-features = false } -frame-system = { version = "29.0.0", default-features = false } -frame-system-benchmarking = { version = "29.0.0", default-features = false, optional = true } -frame-system-rpc-runtime-api = { version = "27.0.0", default-features = false } -frame-try-runtime = { version = "0.35.0", default-features = false, optional = true } +frame-benchmarking = { version = "38.0.0", default-features = false, optional = true } +frame-election-provider-support= { version = "38.0.0", default-features = false } +frame-executive = { version = "38.0.0", default-features = false } +frame-support = { version = "38.0.0", default-features = false } +frame-system = { version = "38.0.0", default-features = false } +frame-system-benchmarking = { version = "38.0.0", default-features = false, optional = true } +frame-system-rpc-runtime-api = { version = "34.0.0", default-features = false } +frame-try-runtime = { version = "0.44.0", default-features = false, optional = true } # Substrate Pallets -pallet-authority-discovery = { version = "29.0.1", default-features = false } -pallet-authorship = { version = "29.0.0", default-features = false } -pallet-babe = { version = "29.0.0", default-features = false } -pallet-bags-list = { version = "28.0.0", default-features = false } -pallet-balances = { version = "29.0.2", default-features = false } -pallet-bounties = { version = "28.0.0", default-features = false } -pallet-collective = { version = "29.0.0", default-features = false } -pallet-democracy = { version = "29.0.0", default-features = false } -pallet-election-provider-multi-phase = { version = "28.0.0", default-features = false } -pallet-election-provider-support-benchmarking= { version = "28.0.0", default-features = false, optional = true } -pallet-elections-phragmen = { version = "30.0.0", default-features = false } -pallet-grandpa = { version = "29.0.0", default-features = false } -pallet-identity = { version = "29.0.1", default-features = false } -pallet-im-online = { version = "28.0.0", default-features = false } -pallet-indices = { version = "29.0.0", default-features = false } -pallet-membership = { version = "29.0.0", default-features = false } -pallet-multisig = { version = "29.0.0", default-features = false } -pallet-nomination-pools = { version = "26.0.1", default-features = false } -pallet-nomination-pools-benchmarking = { version = "27.0.0", default-features = false, optional = true } -pallet-offences = { version = "28.0.0", default-features = false } -pallet-offences-benchmarking = { version = "29.0.0", default-features = false, optional = true } -pallet-preimage = { version = "29.0.0", default-features = false } -pallet-proxy = { version = "29.0.0", default-features = false } -pallet-recovery = { version = "29.0.0", default-features = false } -pallet-scheduler = { version = "30.0.0", default-features = false } -pallet-session-benchmarking = { version = "29.0.0", default-features = false, optional = true } -pallet-session = { version = "29.0.0", default-features = false, features = ["historical"] } -pallet-staking = { version = "29.0.3", default-features = false } -pallet-staking-reward-curve = { version = "11.0.0", default-features = false } -pallet-sudo = { version = "29.0.0", default-features = false, optional = true } -pallet-timestamp = { version = "28.0.0", default-features = false } -pallet-tips = { version = "28.0.0", default-features = false } -pallet-transaction-payment = { version = "29.0.2", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { version = "29.0.0", default-features = false } -pallet-transaction-storage = { version = "28.0.0", default-features = false } -pallet-treasury = { version = "28.0.1", default-features = false } -pallet-utility = { version = "29.0.0", default-features = false } -pallet-vesting = { version = "29.0.0", default-features = false } +pallet-authority-discovery = { version = "38.0.0", default-features = false } +pallet-authorship = { version = "38.0.0", default-features = false } +pallet-babe = { version = "38.0.0", default-features = false } +pallet-bags-list = { version = "37.0.0", default-features = false } +pallet-balances = { version = "39.0.0", default-features = false } +pallet-bounties = { version = "37.0.0", default-features = false } +pallet-collective = { version = "38.0.0", default-features = false } +pallet-democracy = { version = "38.0.0", default-features = false } +pallet-election-provider-multi-phase = { version = "37.0.0", default-features = false } +pallet-election-provider-support-benchmarking= { version = "37.0.0", default-features = false, optional = true } +pallet-elections-phragmen = { version = "39.0.0", default-features = false } +pallet-grandpa = { version = "38.0.0", default-features = false } +pallet-identity = { version = "38.0.0", default-features = false } +pallet-im-online = { version = "37.0.0", default-features = false } +pallet-indices = { version = "38.0.0", default-features = false } +pallet-membership = { version = "38.0.0", default-features = false } +pallet-multisig = { version = "38.0.0", default-features = false } +pallet-nomination-pools = { version = "35.0.0", default-features = false } +pallet-nomination-pools-benchmarking = { version = "36.0.0", default-features = false, optional = true } +pallet-offences = { version = "37.0.0", default-features = false } +pallet-offences-benchmarking = { version = "38.0.0", default-features = false, optional = true } +pallet-preimage = { version = "38.0.0", default-features = false } +pallet-proxy = { version = "38.0.0", default-features = false } +pallet-recovery = { version = "38.0.0", default-features = false } +pallet-scheduler = { version = "39.0.0", default-features = false } +pallet-session-benchmarking = { version = "38.0.0", default-features = false, optional = true } +pallet-session = { version = "38.0.0", default-features = false, features = ["historical"] } +pallet-staking = { version = "38.0.0", default-features = false } +pallet-staking-reward-curve = { version = "12.0.0", default-features = false } +pallet-sudo = { version = "38.0.0", default-features = false, optional = true } +pallet-timestamp = { version = "37.0.0", default-features = false } +pallet-tips = { version = "37.0.0", default-features = false } +pallet-transaction-payment = { version = "38.0.0", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { version = "38.0.0", default-features = false } +pallet-transaction-storage = { version = "37.0.0", default-features = false } +pallet-treasury = { version = "37.0.0", default-features = false } +pallet-utility = { version = "38.0.0", default-features = false } +pallet-vesting = { version = "38.0.0", default-features = false } # Entropy Pallets pallet-programs ={ version='0.3.0-rc.1', path='../pallets/programs', default-features=false } @@ -110,14 +110,16 @@ entropy-shared={ version="0.3.0-rc.1", path="../crates/shared", default-features ] } [build-dependencies] -substrate-wasm-builder= { version = "18.0.1", optional = true } +substrate-wasm-builder= { version = "24.0.1", optional = true } [features] default=["std"] with-tracing=["frame-executive/with-tracing"] std=[ "codec/std", - "frame-benchmarking/std", + "frame-benchmarking?/std", + "frame-system-benchmarking?/std", + "frame-election-provider-support/std", "frame-executive/std", "frame-support/std", "frame-system-rpc-runtime-api/std", @@ -134,6 +136,7 @@ std=[ "pallet-collective/std", "pallet-democracy/std", "pallet-election-provider-multi-phase/std", + "pallet-election-provider-support-benchmarking?/std", "pallet-elections-phragmen/std", "pallet-grandpa/std", "pallet-identity/std", diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index b50d3dcaa..ffe573547 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -32,10 +32,8 @@ //! The Substrate runtime. This can be compiled with `#[no_std]`, ready for Wasm. #![cfg_attr(not(feature = "std"), no_std)] -// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. -#![recursion_limit = "256"] -#![allow(unused_imports)] - +// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 512. +#![recursion_limit = "512"] use codec::{Decode, Encode, MaxEncodedLen}; use frame_election_provider_support::{ bounds::ElectionBoundsBuilder, generate_solution_type, onchain, BalancingConfig, @@ -44,25 +42,25 @@ use frame_election_provider_support::{ use frame_support::{ construct_runtime, dispatch::DispatchClass, - genesis_builder_helper::{build_config, create_default_config}, + genesis_builder_helper::{build_state, get_preset}, pallet_prelude::Get, parameter_types, sp_runtime::RuntimeDebug, traits::{ - fungible::{self, HoldConsideration}, + fungible::{self, Credit, HoldConsideration}, tokens::{ - nonfungibles_v2::Inspect, pay::PayAssetFromAccount, GetSalary, Pay, PayFromAccount, - PaymentStatus, Preservation, UnityAssetBalanceConversion, + imbalance::ResolveTo, nonfungibles_v2::Inspect, pay::PayAssetFromAccount, GetSalary, + Pay, PayFromAccount, PaymentStatus, Preservation, UnityAssetBalanceConversion, }, - ConstU16, ConstU32, Contains, Currency, EitherOfDiverse, EqualPrivilegeOnly, Imbalance, - InstanceFilter, KeyOwnerProofSystem, LinearStoragePrice, LockIdentifier, OnUnbalanced, - WithdrawReasons, + ConstU16, ConstU32, Contains, Currency, EitherOf, EitherOfDiverse, EqualPrivilegeOnly, + Imbalance, InstanceFilter, KeyOwnerProofSystem, LinearStoragePrice, LockIdentifier, + OnUnbalanced, WithdrawReasons, }, weights::{ constants::{ BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND, }, - IdentityFee, Weight, + ConstantMultiplier, IdentityFee, Weight, }, PalletId, }; @@ -91,6 +89,7 @@ use sp_api::impl_runtime_apis; use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId; pub use sp_consensus_babe::AuthorityId as BabeId; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; +use sp_genesis_builder::PresetId; use sp_inherents::{CheckInherentsResult, InherentData}; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; @@ -106,7 +105,11 @@ use sp_runtime::{ ApplyExtrinsicResult, DispatchError, FixedPointNumber, FixedU128, Perbill, Percent, Permill, Perquintill, }; -use sp_std::prelude::*; +use sp_std::{ + cmp::Ordering, + collections::{btree_map::BTreeMap, vec_deque::VecDeque}, + prelude::*, +}; #[cfg(any(feature = "std", test))] use sp_version::NativeVersion; use sp_version::RuntimeVersion; @@ -248,7 +251,7 @@ type NegativeImbalance = >::NegativeImbalance; pub struct DealWithFees; impl OnUnbalanced for DealWithFees { - fn on_unbalanceds(mut fees_then_tips: impl Iterator) { + fn on_unbalanceds(mut fees_then_tips: impl Iterator) { if let Some(fees) = fees_then_tips.next() { // for fees, 80% to treasury, 20% to author let mut split = fees.ration(80, 20); @@ -262,6 +265,83 @@ impl OnUnbalanced for DealWithFees { } } +// pub struct DealWithFees; +// impl OnUnbalanced::AccountId, Balances>> +// for DealWithFees +// { +// fn on_unbalanceds( +// mut fees_then_tips: impl Iterator< +// Item = fungible::Credit<::AccountId, Balances>, +// >, +// ) { +// if let Some(fees) = fees_then_tips.next() { +// FeeUnbalancedAmount::mutate(|a| *a += fees.peek()); +// if let Some(tips) = fees_then_tips.next() { +// TipUnbalancedAmount::mutate(|a| *a += tips.peek()); +// } +// } +// } +// } + +// pub struct DealWithFees; +// impl OnUnbalanced::AccountId, Balances>> for DealWithFees { +// fn on_unbalanceds( +// mut fees_then_tips: impl Iterator< +// Item = fungible::Credit<::AccountId, Balances>, +// >, +// ) { +// if let Some(fees) = fees_then_tips.next() { +// // for fees, 80% to treasury, 20% to author +// let mut split = fees.ration(80, 20); +// if let Some(tips) = fees_then_tips.next() { +// // for tips, if any, 80% to treasury, 20% to author (though this can be anything) +// tips.ration_merge_into(80, 20, &mut split); +// } +// Treasury::on_unbalanced(split.0); +// Author::on_unbalanced(split.1); +// } +// } +// } + +// pub struct ToAuthor(sp_std::marker::PhantomData); +// impl OnUnbalanced>> for ToAuthor +// where +// R: pallet_balances::Config + pallet_authorship::Config, +// ::AccountId: From, +// ::AccountId: Into, +// { +// fn on_nonzero_unbalanced( +// amount: Credit<::AccountId, pallet_balances::Pallet>, +// ) { +// if let Some(author) = >::author() { +// let _ = >::resolve(&author, amount); +// } +// } +// } + +// pub struct DealWithFees(core::marker::PhantomData); +// impl OnUnbalanced>> for DealWithFees +// where +// R: pallet_balances::Config + pallet_authorship::Config + pallet_treasury::Config, +// ::AccountId: From, +// ::AccountId: Into, +// { +// fn on_unbalanceds( +// mut fees_then_tips: impl Iterator>>, +// ) { +// if let Some(fees) = fees_then_tips.next() { +// // for fees, 80% to treasury, 20% to author +// let mut split = fees.ration(80, 20); +// if let Some(tips) = fees_then_tips.next() { +// // for tips, if any, 100% to author +// tips.merge_into(&mut split.1); +// } +// ResolveTo::, pallet_balances::Pallet>::on_unbalanced(split.0); +// as OnUnbalanced<_>>::on_unbalanced(split.1); +// } +// } +// } + /// We assume that ~10% of the block weight is consumed by `on_initialize` handlers. /// This is used to limit the maximal weight of a single extrinsic. const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10); @@ -356,6 +436,11 @@ impl frame_system::Config for Runtime { type SS58Prefix = SS58Prefix; type SystemWeightInfo = weights::frame_system::WeightInfo; type Version = Version; + type SingleBlockMigrations = (); + type MultiBlockMigrator = (); + type PreInherents = (); + type PostInherents = (); + type PostTransactions = (); } impl pallet_utility::Config for Runtime { @@ -547,6 +632,9 @@ parameter_types! { pub MaximumMultiplier: Multiplier = Bounded::max_value(); } +// Can't use `FungibleAdapter` here until Treasury pallet migrates to fungibles +// +#[allow(deprecated)] impl pallet_transaction_payment::Config for Runtime { type FeeMultiplierUpdate = TargetedFeeAdjustment< Self, @@ -555,7 +643,7 @@ impl pallet_transaction_payment::Config for Runtime { MinimumMultiplier, MaximumMultiplier, >; - type LengthToFee = IdentityFee; + type LengthToFee = ConstantMultiplier; type OnChargeTransaction = CurrencyAdapter; type OperationalFeeMultiplier = OperationalFeeMultiplier; type RuntimeEvent = RuntimeEvent; @@ -694,7 +782,6 @@ impl pallet_staking::Config for Runtime { type MaxExposurePageSize = MaxExposurePageSize; type MaxControllersInDeprecationBatch = ConstU32<5314>; type NextNewSession = Session; - type OffendingValidatorsThreshold = OffendingValidatorsThreshold; // send the slashed funds to the treasury. type Reward = (); type RewardRemainder = Treasury; @@ -707,6 +794,7 @@ impl pallet_staking::Config for Runtime { type TargetList = pallet_staking::UseValidatorsMap; type UnixTime = Timestamp; type VoterList = BagsList; + type DisablingStrategy = pallet_staking::UpToLimitDisablingStrategy; type WeightInfo = weights::pallet_staking::WeightInfo; } @@ -749,7 +837,7 @@ parameter_types! { .get(DispatchClass::Normal); } -generate_solution_type!( +frame_election_provider_support::generate_solution_type!( #[compact] pub struct NposCompactSolution16::< VoterIndex = u32, @@ -1040,19 +1128,11 @@ parameter_types! { } impl pallet_treasury::Config for Runtime { - type ApproveOrigin = EitherOfDiverse< - EnsureRoot, - pallet_collective::EnsureProportionAtLeast, - >; type Burn = Burn; type BurnDestination = (); type Currency = Balances; type MaxApprovals = MaxApprovals; - type OnSlash = Treasury; type PalletId = TreasuryPalletId; - type ProposalBond = ProposalBond; - type ProposalBondMaximum = ProposalBondMaximum; - type ProposalBondMinimum = ProposalBondMinimum; type RejectOrigin = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionMoreThan, @@ -1142,6 +1222,7 @@ impl pallet_bounties::Config for Runtime { type DataDepositPerByte = DataDepositPerByte; type MaximumReasonLength = MaximumReasonLength; type RuntimeEvent = RuntimeEvent; + type OnSlash = Treasury; type WeightInfo = weights::pallet_bounties::WeightInfo; } @@ -1154,6 +1235,7 @@ impl pallet_tips::Config for Runtime { type TipFindersFee = TipFindersFee; type TipReportDepositBase = TipReportDepositBase; type Tippers = Elections; + type OnSlash = Treasury; type WeightInfo = weights::pallet_tips::WeightInfo; } @@ -1429,8 +1511,9 @@ impl pallet_nomination_pools::Config for Runtime { type RuntimeFreezeReason = RuntimeFreezeReason; type RewardCounter = FixedU128; type RuntimeEvent = RuntimeEvent; - type Staking = Staking; type U256ToBalance = U256ToBalance; + type StakeAdapter = pallet_nomination_pools::adapter::TransferStake; + type AdminOrigin = EnsureRoot; type WeightInfo = weights::pallet_nomination_pools::WeightInfo; } @@ -1677,8 +1760,8 @@ impl_runtime_apis! { Executive::execute_block(block); } - fn initialize_block(header: &::Header) { - Executive::initialize_block(header) + fn initialize_block(header: &::Header) -> sp_runtime::ExtrinsicInclusionMode { + Executive::initialize_block(header) } } @@ -1828,12 +1911,16 @@ impl_runtime_apis! { } impl sp_genesis_builder::GenesisBuilder for Runtime { - fn create_default_config() -> Vec { - create_default_config::() + fn build_state(config: Vec) -> sp_genesis_builder::Result { + build_state::(config) + } + + fn get_preset(id: &Option) -> Option> { + None } - fn build_config(config: Vec) -> sp_genesis_builder::Result { - build_config::(config) + fn preset_names() -> Vec { + vec![] } } diff --git a/runtime/src/weights/pallet_balances.rs b/runtime/src/weights/pallet_balances.rs index fb2431d4f..d6c687410 100644 --- a/runtime/src/weights/pallet_balances.rs +++ b/runtime/src/weights/pallet_balances.rs @@ -54,8 +54,8 @@ impl pallet_balances::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `3593` - // Minimum execution time: 65_096_000 picoseconds. - Weight::from_parts(66_081_000, 0) + // Minimum execution time: 52_700_000 picoseconds. + Weight::from_parts(53_260_000, 0) .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) @@ -66,8 +66,8 @@ impl pallet_balances::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `3593` - // Minimum execution time: 52_045_000 picoseconds. - Weight::from_parts(53_157_000, 0) + // Minimum execution time: 41_161_000 picoseconds. + Weight::from_parts(41_600_000, 0) .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) @@ -76,10 +76,10 @@ impl pallet_balances::WeightInfo for WeightInfo { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn force_set_balance_creating() -> Weight { // Proof Size summary in bytes: - // Measured: `207` + // Measured: `174` // Estimated: `3593` - // Minimum execution time: 19_173_000 picoseconds. - Weight::from_parts(20_039_000, 0) + // Minimum execution time: 15_540_000 picoseconds. + Weight::from_parts(15_901_000, 0) .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) @@ -88,10 +88,10 @@ impl pallet_balances::WeightInfo for WeightInfo { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn force_set_balance_killing() -> Weight { // Proof Size summary in bytes: - // Measured: `207` + // Measured: `174` // Estimated: `3593` - // Minimum execution time: 26_263_000 picoseconds. - Weight::from_parts(27_560_000, 0) + // Minimum execution time: 21_430_000 picoseconds. + Weight::from_parts(21_870_000, 0) .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) @@ -102,8 +102,8 @@ impl pallet_balances::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `103` // Estimated: `6196` - // Minimum execution time: 66_145_000 picoseconds. - Weight::from_parts(68_442_000, 0) + // Minimum execution time: 54_471_000 picoseconds. + Weight::from_parts(55_011_000, 0) .saturating_add(Weight::from_parts(0, 6196)) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) @@ -114,8 +114,8 @@ impl pallet_balances::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `3593` - // Minimum execution time: 64_301_000 picoseconds. - Weight::from_parts(65_397_000, 0) + // Minimum execution time: 51_360_000 picoseconds. + Weight::from_parts(52_030_000, 0) .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) @@ -124,26 +124,26 @@ impl pallet_balances::WeightInfo for WeightInfo { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn force_unreserve() -> Weight { // Proof Size summary in bytes: - // Measured: `207` + // Measured: `174` // Estimated: `3593` - // Minimum execution time: 22_997_000 picoseconds. - Weight::from_parts(24_161_000, 0) + // Minimum execution time: 18_390_000 picoseconds. + Weight::from_parts(18_890_000, 0) .saturating_add(Weight::from_parts(0, 3593)) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } - /// Storage: `System::Account` (r:1000 w:1000) + /// Storage: `System::Account` (r:999 w:999) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// The range of component `u` is `[1, 1000]`. fn upgrade_accounts(u: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0 + u * (135 ±0)` // Estimated: `990 + u * (2603 ±0)` - // Minimum execution time: 23_571_000 picoseconds. - Weight::from_parts(23_636_000, 0) + // Minimum execution time: 17_690_000 picoseconds. + Weight::from_parts(17_840_000, 0) .saturating_add(Weight::from_parts(0, 990)) - // Standard Error: 26_889 - .saturating_add(Weight::from_parts(18_359_738, 0).saturating_mul(u.into())) + // Standard Error: 12_257 + .saturating_add(Weight::from_parts(15_499_028, 0).saturating_mul(u.into())) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into()))) .saturating_add(Weight::from_parts(0, 2603).saturating_mul(u.into())) @@ -152,8 +152,24 @@ impl pallet_balances::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 8_989_000 picoseconds. - Weight::from_parts(9_336_000, 0) + // Minimum execution time: 6_580_000 picoseconds. + Weight::from_parts(6_880_000, 0) .saturating_add(Weight::from_parts(0, 0)) } -} \ No newline at end of file + fn burn_allow_death() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 32_820_000 picoseconds. + Weight::from_parts(33_220_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + } + fn burn_keep_alive() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 21_700_000 picoseconds. + Weight::from_parts(22_030_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + } +} diff --git a/runtime/src/weights/pallet_membership.rs b/runtime/src/weights/pallet_membership.rs index a7f9d8992..db88412f0 100644 --- a/runtime/src/weights/pallet_membership.rs +++ b/runtime/src/weights/pallet_membership.rs @@ -118,26 +118,26 @@ impl pallet_membership::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().writes(3)) .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } - /// Storage: `TechnicalMembership::Members` (r:1 w:1) - /// Proof: `TechnicalMembership::Members` (`max_values`: Some(1), `max_size`: Some(3202), added: 3697, mode: `MaxEncodedLen`) - /// Storage: `TechnicalCommittee::Proposals` (r:1 w:0) - /// Proof: `TechnicalCommittee::Proposals` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `TechnicalMembership::Prime` (r:1 w:0) - /// Proof: `TechnicalMembership::Prime` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`) - /// Storage: `TechnicalCommittee::Members` (r:0 w:1) - /// Proof: `TechnicalCommittee::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `TechnicalCommittee::Prime` (r:0 w:1) - /// Proof: `TechnicalCommittee::Prime` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `Membership::Members` (r:1 w:1) + /// Proof: `Membership::Members` (`max_values`: Some(1), `max_size`: Some(3202), added: 3697, mode: `MaxEncodedLen`) + /// Storage: `Collective::Proposals` (r:1 w:0) + /// Proof: `Collective::Proposals` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `Membership::Prime` (r:1 w:0) + /// Proof: `Membership::Prime` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`) + /// Storage: `Collective::Members` (r:0 w:1) + /// Proof: `Collective::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `Collective::Prime` (r:0 w:1) + /// Proof: `Collective::Prime` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) /// The range of component `m` is `[1, 100]`. - fn reset_member(m: u32, ) -> Weight { + fn reset_members(m: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `243 + m * (64 ±0)` + // Measured: `206 + m * (64 ±0)` // Estimated: `4687 + m * (64 ±0)` - // Minimum execution time: 18_990_000 picoseconds. - Weight::from_parts(20_488_348, 0) + // Minimum execution time: 15_980_000 picoseconds. + Weight::from_parts(17_188_812, 0) .saturating_add(Weight::from_parts(0, 4687)) - // Standard Error: 2_393 - .saturating_add(Weight::from_parts(143_442, 0).saturating_mul(m.into())) + // Standard Error: 611 + .saturating_add(Weight::from_parts(160_008, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) @@ -186,20 +186,17 @@ impl pallet_membership::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().writes(2)) .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) } - /// Storage: `TechnicalMembership::Prime` (r:0 w:1) - /// Proof: `TechnicalMembership::Prime` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`) - /// Storage: `TechnicalCommittee::Prime` (r:0 w:1) - /// Proof: `TechnicalCommittee::Prime` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// The range of component `m` is `[1, 100]`. - fn clear_prime(m: u32, ) -> Weight { + /// Storage: `Membership::Prime` (r:0 w:1) + /// Proof: `Membership::Prime` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`) + /// Storage: `Collective::Prime` (r:0 w:1) + /// Proof: `Collective::Prime` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + fn clear_prime() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_513_000 picoseconds. - Weight::from_parts(3_938_328, 0) + // Minimum execution time: 2_590_000 picoseconds. + Weight::from_parts(2_680_000, 0) .saturating_add(Weight::from_parts(0, 0)) - // Standard Error: 323 - .saturating_add(Weight::from_parts(47, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().writes(2)) } } \ No newline at end of file diff --git a/runtime/src/weights/pallet_nomination_pools.rs b/runtime/src/weights/pallet_nomination_pools.rs index 536933662..de896ac1a 100644 --- a/runtime/src/weights/pallet_nomination_pools.rs +++ b/runtime/src/weights/pallet_nomination_pools.rs @@ -51,7 +51,7 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Storage: `NominationPools::MinJoinBond` (r:1 w:0) /// Proof: `NominationPools::MinJoinBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) /// Storage: `NominationPools::PoolMembers` (r:1 w:1) - /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`) + /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`) /// Storage: `NominationPools::BondedPools` (r:1 w:1) /// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`) /// Storage: `Staking::Bonded` (r:1 w:0) @@ -70,28 +70,30 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `NominationPools::MaxPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1) /// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) + /// Storage: `Staking::VirtualStakers` (r:1 w:0) + /// Proof: `Staking::VirtualStakers` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`) /// Storage: `Balances::Locks` (r:1 w:1) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) /// Storage: `Balances::Freezes` (r:1 w:0) /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`) - /// Storage: `BagsList::ListNodes` (r:3 w:3) - /// Proof: `BagsList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`) - /// Storage: `BagsList::ListBags` (r:2 w:2) - /// Proof: `BagsList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`) + /// Storage: `VoterList::ListNodes` (r:3 w:3) + /// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`) + /// Storage: `VoterList::ListBags` (r:2 w:2) + /// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`) /// Storage: `NominationPools::TotalValueLocked` (r:1 w:1) /// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) fn join() -> Weight { // Proof Size summary in bytes: - // Measured: `3518` + // Measured: `3358` // Estimated: `8877` - // Minimum execution time: 256_544_000 picoseconds. - Weight::from_parts(260_805_000, 0) + // Minimum execution time: 215_842_000 picoseconds. + Weight::from_parts(218_182_000, 0) .saturating_add(Weight::from_parts(0, 8877)) - .saturating_add(T::DbWeight::get().reads(20)) + .saturating_add(T::DbWeight::get().reads(21)) .saturating_add(T::DbWeight::get().writes(13)) } /// Storage: `NominationPools::PoolMembers` (r:1 w:1) - /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`) + /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`) /// Storage: `NominationPools::BondedPools` (r:1 w:1) /// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`) /// Storage: `NominationPools::RewardPools` (r:1 w:1) @@ -104,30 +106,32 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`) /// Storage: `Staking::Ledger` (r:1 w:1) /// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`) + /// Storage: `Staking::VirtualStakers` (r:1 w:0) + /// Proof: `Staking::VirtualStakers` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`) /// Storage: `Balances::Locks` (r:1 w:1) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) /// Storage: `Balances::Freezes` (r:1 w:0) /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`) - /// Storage: `BagsList::ListNodes` (r:3 w:3) - /// Proof: `BagsList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`) - /// Storage: `BagsList::ListBags` (r:2 w:2) - /// Proof: `BagsList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`) + /// Storage: `VoterList::ListNodes` (r:3 w:3) + /// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`) + /// Storage: `VoterList::ListBags` (r:2 w:2) + /// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`) /// Storage: `NominationPools::TotalValueLocked` (r:1 w:1) /// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) fn bond_extra_transfer() -> Weight { // Proof Size summary in bytes: - // Measured: `3532` + // Measured: `3368` // Estimated: `8877` - // Minimum execution time: 259_862_000 picoseconds. - Weight::from_parts(262_660_000, 0) + // Minimum execution time: 214_562_000 picoseconds. + Weight::from_parts(216_331_000, 0) .saturating_add(Weight::from_parts(0, 8877)) - .saturating_add(T::DbWeight::get().reads(17)) + .saturating_add(T::DbWeight::get().reads(18)) .saturating_add(T::DbWeight::get().writes(13)) } /// Storage: `NominationPools::ClaimPermissions` (r:1 w:0) /// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`) /// Storage: `NominationPools::PoolMembers` (r:1 w:1) - /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`) + /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`) /// Storage: `NominationPools::BondedPools` (r:1 w:1) /// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`) /// Storage: `NominationPools::RewardPools` (r:1 w:1) @@ -140,30 +144,32 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`) /// Storage: `Staking::Ledger` (r:1 w:1) /// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`) + /// Storage: `Staking::VirtualStakers` (r:1 w:0) + /// Proof: `Staking::VirtualStakers` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`) /// Storage: `Balances::Locks` (r:1 w:1) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) /// Storage: `Balances::Freezes` (r:1 w:0) /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`) - /// Storage: `BagsList::ListNodes` (r:2 w:2) - /// Proof: `BagsList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`) - /// Storage: `BagsList::ListBags` (r:2 w:2) - /// Proof: `BagsList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`) + /// Storage: `VoterList::ListNodes` (r:2 w:2) + /// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`) + /// Storage: `VoterList::ListBags` (r:2 w:2) + /// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`) /// Storage: `NominationPools::TotalValueLocked` (r:1 w:1) /// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) fn bond_extra_other() -> Weight { // Proof Size summary in bytes: - // Measured: `3441` + // Measured: `3278` // Estimated: `8799` - // Minimum execution time: 301_317_000 picoseconds. - Weight::from_parts(303_281_000, 0) + // Minimum execution time: 246_702_000 picoseconds. + Weight::from_parts(248_282_000, 0) .saturating_add(Weight::from_parts(0, 8799)) - .saturating_add(T::DbWeight::get().reads(17)) + .saturating_add(T::DbWeight::get().reads(18)) .saturating_add(T::DbWeight::get().writes(13)) } /// Storage: `NominationPools::ClaimPermissions` (r:1 w:0) /// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`) /// Storage: `NominationPools::PoolMembers` (r:1 w:1) - /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`) + /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`) /// Storage: `NominationPools::BondedPools` (r:1 w:1) /// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`) /// Storage: `NominationPools::RewardPools` (r:1 w:1) @@ -174,16 +180,16 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn claim_payout() -> Weight { // Proof Size summary in bytes: - // Measured: `1238` - // Estimated: `3719` - // Minimum execution time: 103_222_000 picoseconds. - Weight::from_parts(105_342_000, 0) - .saturating_add(Weight::from_parts(0, 3719)) + // Measured: `1138` + // Estimated: `4182` + // Minimum execution time: 85_921_000 picoseconds. + Weight::from_parts(86_420_000, 0) + .saturating_add(Weight::from_parts(0, 4182)) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(4)) } /// Storage: `NominationPools::PoolMembers` (r:1 w:1) - /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`) + /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`) /// Storage: `NominationPools::BondedPools` (r:1 w:1) /// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`) /// Storage: `NominationPools::RewardPools` (r:1 w:1) @@ -202,26 +208,28 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`) /// Storage: `Staking::MinNominatorBond` (r:1 w:0) /// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) + /// Storage: `Staking::VirtualStakers` (r:1 w:0) + /// Proof: `Staking::VirtualStakers` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`) /// Storage: `Balances::Locks` (r:1 w:1) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) /// Storage: `Balances::Freezes` (r:1 w:0) /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`) - /// Storage: `BagsList::ListNodes` (r:3 w:3) - /// Proof: `BagsList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`) - /// Storage: `BagsList::ListBags` (r:2 w:2) - /// Proof: `BagsList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`) + /// Storage: `VoterList::ListNodes` (r:3 w:3) + /// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`) + /// Storage: `VoterList::ListBags` (r:2 w:2) + /// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`) /// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1) - /// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(24382), added: 26857, mode: `MaxEncodedLen`) + /// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(1197), added: 3672, mode: `MaxEncodedLen`) /// Storage: `NominationPools::CounterForSubPoolsStorage` (r:1 w:1) /// Proof: `NominationPools::CounterForSubPoolsStorage` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) fn unbond() -> Weight { // Proof Size summary in bytes: - // Measured: `3708` - // Estimated: `27847` - // Minimum execution time: 238_730_000 picoseconds. - Weight::from_parts(242_773_000, 0) - .saturating_add(Weight::from_parts(0, 27847)) - .saturating_add(T::DbWeight::get().reads(20)) + // Measured: `3548` + // Estimated: `8877` + // Minimum execution time: 196_581_000 picoseconds. + Weight::from_parts(197_982_000, 0) + .saturating_add(Weight::from_parts(0, 8877)) + .saturating_add(T::DbWeight::get().reads(21)) .saturating_add(T::DbWeight::get().writes(13)) } /// Storage: `NominationPools::BondedPools` (r:1 w:0) @@ -232,43 +240,51 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`) /// Storage: `Staking::CurrentEra` (r:1 w:0) /// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) + /// Storage: `Staking::VirtualStakers` (r:1 w:0) + /// Proof: `Staking::VirtualStakers` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`) /// Storage: `Balances::Locks` (r:1 w:1) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) /// Storage: `Balances::Freezes` (r:1 w:0) /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`) + /// Storage: `NominationPools::ReversePoolIdLookup` (r:1 w:0) + /// Proof: `NominationPools::ReversePoolIdLookup` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) /// Storage: `NominationPools::TotalValueLocked` (r:1 w:1) /// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) /// The range of component `s` is `[0, 100]`. fn pool_withdraw_unbonded(s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1904` + // Measured: `1843` // Estimated: `4764` - // Minimum execution time: 99_193_000 picoseconds. - Weight::from_parts(102_214_029, 0) + // Minimum execution time: 79_951_000 picoseconds. + Weight::from_parts(81_372_250, 0) .saturating_add(Weight::from_parts(0, 4764)) - // Standard Error: 1_330 - .saturating_add(Weight::from_parts(64_649, 0).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(7)) + // Standard Error: 397 + .saturating_add(Weight::from_parts(17_010, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(9)) .saturating_add(T::DbWeight::get().writes(3)) } /// Storage: `NominationPools::PoolMembers` (r:1 w:1) - /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`) + /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`) /// Storage: `Staking::CurrentEra` (r:1 w:0) /// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `NominationPools::BondedPools` (r:1 w:1) /// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`) /// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1) - /// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(24382), added: 26857, mode: `MaxEncodedLen`) + /// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(1197), added: 3672, mode: `MaxEncodedLen`) /// Storage: `Staking::Bonded` (r:1 w:0) /// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`) /// Storage: `Staking::Ledger` (r:1 w:1) /// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`) + /// Storage: `Staking::VirtualStakers` (r:1 w:0) + /// Proof: `Staking::VirtualStakers` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`) /// Storage: `Balances::Locks` (r:1 w:1) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) /// Storage: `Balances::Freezes` (r:1 w:0) /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`) /// Storage: `System::Account` (r:1 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `NominationPools::ReversePoolIdLookup` (r:1 w:0) + /// Proof: `NominationPools::ReversePoolIdLookup` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) /// Storage: `NominationPools::TotalValueLocked` (r:1 w:1) /// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) /// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1) @@ -278,30 +294,32 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// The range of component `s` is `[0, 100]`. fn withdraw_unbonded_update(s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `2293` - // Estimated: `27847` - // Minimum execution time: 187_794_000 picoseconds. - Weight::from_parts(193_229_436, 0) - .saturating_add(Weight::from_parts(0, 27847)) - // Standard Error: 2_123 - .saturating_add(Weight::from_parts(89_772, 0).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(11)) + // Measured: `2233` + // Estimated: `4764` + // Minimum execution time: 157_181_000 picoseconds. + Weight::from_parts(158_794_627, 0) + .saturating_add(Weight::from_parts(0, 4764)) + // Standard Error: 577 + .saturating_add(Weight::from_parts(18_736, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(13)) .saturating_add(T::DbWeight::get().writes(9)) } /// Storage: `NominationPools::PoolMembers` (r:1 w:1) - /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`) + /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`) /// Storage: `Staking::CurrentEra` (r:1 w:0) /// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `NominationPools::BondedPools` (r:1 w:1) /// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`) /// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1) - /// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(24382), added: 26857, mode: `MaxEncodedLen`) + /// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(1197), added: 3672, mode: `MaxEncodedLen`) /// Storage: `Staking::Bonded` (r:1 w:1) /// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`) /// Storage: `Staking::Ledger` (r:1 w:1) /// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`) /// Storage: `Staking::SlashingSpans` (r:1 w:0) /// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`) + /// Storage: `Staking::VirtualStakers` (r:1 w:1) + /// Proof: `Staking::VirtualStakers` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`) /// Storage: `Balances::Locks` (r:2 w:1) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) /// Storage: `Balances::Freezes` (r:2 w:1) @@ -312,12 +330,12 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`) /// Storage: `Staking::Nominators` (r:1 w:0) /// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`) + /// Storage: `NominationPools::ReversePoolIdLookup` (r:1 w:1) + /// Proof: `NominationPools::ReversePoolIdLookup` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) /// Storage: `NominationPools::TotalValueLocked` (r:1 w:1) /// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) /// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1) /// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `NominationPools::ReversePoolIdLookup` (r:1 w:1) - /// Proof: `NominationPools::ReversePoolIdLookup` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) /// Storage: `NominationPools::CounterForReversePoolIdLookup` (r:1 w:1) /// Proof: `NominationPools::CounterForReversePoolIdLookup` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `NominationPools::RewardPools` (r:1 w:1) @@ -335,17 +353,15 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Storage: `NominationPools::ClaimPermissions` (r:0 w:1) /// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`) /// The range of component `s` is `[0, 100]`. - fn withdraw_unbonded_kill(s: u32, ) -> Weight { + fn withdraw_unbonded_kill(_s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `2752` - // Estimated: `27847` - // Minimum execution time: 334_846_000 picoseconds. - Weight::from_parts(342_266_815, 0) - .saturating_add(Weight::from_parts(0, 27847)) - // Standard Error: 3_293 - .saturating_add(Weight::from_parts(254, 0).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(24)) - .saturating_add(T::DbWeight::get().writes(20)) + // Measured: `2625` + // Estimated: `8538` + // Minimum execution time: 276_063_000 picoseconds. + Weight::from_parts(278_579_392, 0) + .saturating_add(Weight::from_parts(0, 8538)) + .saturating_add(T::DbWeight::get().reads(25)) + .saturating_add(T::DbWeight::get().writes(21)) } /// Storage: `NominationPools::LastPoolId` (r:1 w:1) /// Proof: `NominationPools::LastPoolId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) @@ -360,19 +376,21 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Storage: `NominationPools::CounterForBondedPools` (r:1 w:1) /// Proof: `NominationPools::CounterForBondedPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `NominationPools::PoolMembers` (r:1 w:1) - /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`) + /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`) /// Storage: `NominationPools::MaxPoolMembersPerPool` (r:1 w:0) /// Proof: `NominationPools::MaxPoolMembersPerPool` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `NominationPools::MaxPoolMembers` (r:1 w:0) /// Proof: `NominationPools::MaxPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1) /// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:2 w:2) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// Storage: `Staking::Bonded` (r:1 w:1) /// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:2 w:2) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// Storage: `Staking::Ledger` (r:1 w:1) /// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`) + /// Storage: `Staking::VirtualStakers` (r:1 w:0) + /// Proof: `Staking::VirtualStakers` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`) /// Storage: `Balances::Locks` (r:2 w:1) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) /// Storage: `Balances::Freezes` (r:2 w:1) @@ -393,22 +411,28 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`) fn create() -> Weight { // Proof Size summary in bytes: - // Measured: `1308` + // Measured: `1202` // Estimated: `8538` - // Minimum execution time: 256_840_000 picoseconds. - Weight::from_parts(259_983_000, 0) + // Minimum execution time: 200_752_000 picoseconds. + Weight::from_parts(202_142_000, 0) .saturating_add(Weight::from_parts(0, 8538)) - .saturating_add(T::DbWeight::get().reads(24)) + .saturating_add(T::DbWeight::get().reads(25)) .saturating_add(T::DbWeight::get().writes(17)) } /// Storage: `NominationPools::BondedPools` (r:1 w:0) /// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`) + /// Storage: `NominationPools::PoolMembers` (r:1 w:0) + /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`) /// Storage: `Staking::Bonded` (r:1 w:0) /// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`) /// Storage: `Staking::Ledger` (r:1 w:0) /// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`) /// Storage: `Staking::MinNominatorBond` (r:1 w:0) /// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) + /// Storage: `NominationPools::MinCreateBond` (r:1 w:0) + /// Proof: `NominationPools::MinCreateBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) + /// Storage: `NominationPools::MinJoinBond` (r:1 w:0) + /// Proof: `NominationPools::MinJoinBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) /// Storage: `Staking::Nominators` (r:1 w:1) /// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`) /// Storage: `Staking::MaxNominatorsCount` (r:1 w:0) @@ -417,25 +441,25 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`) /// Storage: `Staking::CurrentEra` (r:1 w:0) /// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `BagsList::ListNodes` (r:1 w:1) - /// Proof: `BagsList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`) - /// Storage: `BagsList::ListBags` (r:1 w:1) - /// Proof: `BagsList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`) - /// Storage: `BagsList::CounterForListNodes` (r:1 w:1) - /// Proof: `BagsList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) + /// Storage: `VoterList::ListNodes` (r:1 w:1) + /// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`) + /// Storage: `VoterList::ListBags` (r:1 w:1) + /// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`) + /// Storage: `VoterList::CounterForListNodes` (r:1 w:1) + /// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `Staking::CounterForNominators` (r:1 w:1) /// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// The range of component `n` is `[1, 16]`. fn nominate(n: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1948` + // Measured: `1993` // Estimated: `4556 + n * (2520 ±0)` - // Minimum execution time: 89_373_000 picoseconds. - Weight::from_parts(89_803_523, 0) + // Minimum execution time: 92_781_000 picoseconds. + Weight::from_parts(91_455_668, 0) .saturating_add(Weight::from_parts(0, 4556)) - // Standard Error: 9_792 - .saturating_add(Weight::from_parts(2_365_055, 0).saturating_mul(n.into())) - .saturating_add(T::DbWeight::get().reads(12)) + // Standard Error: 4_353 + .saturating_add(Weight::from_parts(1_788_595, 0).saturating_mul(n.into())) + .saturating_add(T::DbWeight::get().reads(15)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into()))) .saturating_add(T::DbWeight::get().writes(5)) .saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into())) @@ -448,10 +472,10 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`) fn set_state() -> Weight { // Proof Size summary in bytes: - // Measured: `1453` + // Measured: `1397` // Estimated: `4556` - // Minimum execution time: 41_134_000 picoseconds. - Weight::from_parts(42_596_000, 0) + // Minimum execution time: 38_470_000 picoseconds. + Weight::from_parts(39_110_000, 0) .saturating_add(Weight::from_parts(0, 4556)) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(1)) @@ -465,13 +489,13 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// The range of component `n` is `[1, 256]`. fn set_metadata(n: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `565` + // Measured: `498` // Estimated: `3735` - // Minimum execution time: 18_296_000 picoseconds. - Weight::from_parts(18_973_808, 0) + // Minimum execution time: 14_360_000 picoseconds. + Weight::from_parts(14_754_526, 0) .saturating_add(Weight::from_parts(0, 3735)) - // Standard Error: 142 - .saturating_add(Weight::from_parts(2_290, 0).saturating_mul(n.into())) + // Standard Error: 47 + .saturating_add(Weight::from_parts(1_052, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -491,8 +515,8 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 6_288_000 picoseconds. - Weight::from_parts(6_478_000, 0) + // Minimum execution time: 4_250_000 picoseconds. + Weight::from_parts(4_410_000, 0) .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(6)) } @@ -500,40 +524,44 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`) fn update_roles() -> Weight { // Proof Size summary in bytes: - // Measured: `565` + // Measured: `498` // Estimated: `3719` - // Minimum execution time: 21_829_000 picoseconds. - Weight::from_parts(22_711_000, 0) + // Minimum execution time: 18_120_000 picoseconds. + Weight::from_parts(18_500_000, 0) .saturating_add(Weight::from_parts(0, 3719)) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } /// Storage: `NominationPools::BondedPools` (r:1 w:0) /// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`) + /// Storage: `NominationPools::PoolMembers` (r:1 w:0) + /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`) /// Storage: `Staking::Bonded` (r:1 w:0) /// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`) /// Storage: `Staking::Ledger` (r:1 w:0) /// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`) + /// Storage: `Staking::MinNominatorBond` (r:1 w:0) + /// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) /// Storage: `Staking::Validators` (r:1 w:0) /// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`) /// Storage: `Staking::Nominators` (r:1 w:1) /// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`) /// Storage: `Staking::CounterForNominators` (r:1 w:1) /// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `BagsList::ListNodes` (r:1 w:1) - /// Proof: `BagsList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`) - /// Storage: `BagsList::ListBags` (r:1 w:1) - /// Proof: `BagsList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`) - /// Storage: `BagsList::CounterForListNodes` (r:1 w:1) - /// Proof: `BagsList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) + /// Storage: `VoterList::ListNodes` (r:1 w:1) + /// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`) + /// Storage: `VoterList::ListBags` (r:1 w:1) + /// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`) + /// Storage: `VoterList::CounterForListNodes` (r:1 w:1) + /// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) fn chill() -> Weight { // Proof Size summary in bytes: - // Measured: `2117` + // Measured: `2166` // Estimated: `4556` - // Minimum execution time: 82_724_000 picoseconds. - Weight::from_parts(85_102_000, 0) + // Minimum execution time: 85_640_000 picoseconds. + Weight::from_parts(86_401_000, 0) .saturating_add(Weight::from_parts(0, 4556)) - .saturating_add(T::DbWeight::get().reads(9)) + .saturating_add(T::DbWeight::get().reads(11)) .saturating_add(T::DbWeight::get().writes(5)) } /// Storage: `NominationPools::BondedPools` (r:1 w:1) @@ -546,10 +574,10 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn set_commission() -> Weight { // Proof Size summary in bytes: - // Measured: `837` + // Measured: `770` // Estimated: `3719` - // Minimum execution time: 43_491_000 picoseconds. - Weight::from_parts(44_485_000, 0) + // Minimum execution time: 37_840_000 picoseconds. + Weight::from_parts(38_341_000, 0) .saturating_add(Weight::from_parts(0, 3719)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) @@ -560,10 +588,10 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) fn set_commission_max() -> Weight { // Proof Size summary in bytes: - // Measured: `605` + // Measured: `538` // Estimated: `3719` - // Minimum execution time: 22_130_000 picoseconds. - Weight::from_parts(22_921_000, 0) + // Minimum execution time: 18_060_000 picoseconds. + Weight::from_parts(18_470_000, 0) .saturating_add(Weight::from_parts(0, 3719)) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) @@ -572,10 +600,10 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`) fn set_commission_change_rate() -> Weight { // Proof Size summary in bytes: - // Measured: `565` + // Measured: `498` // Estimated: `3719` - // Minimum execution time: 21_834_000 picoseconds. - Weight::from_parts(22_496_000, 0) + // Minimum execution time: 18_000_000 picoseconds. + Weight::from_parts(18_230_000, 0) .saturating_add(Weight::from_parts(0, 3719)) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) @@ -584,25 +612,25 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`) fn set_commission_claim_permission() -> Weight { // Proof Size summary in bytes: - // Measured: `565` + // Measured: `498` // Estimated: `3719` - // Minimum execution time: 21_530_000 picoseconds. - Weight::from_parts(22_531_000, 0) + // Minimum execution time: 17_240_000 picoseconds. + Weight::from_parts(17_690_000, 0) .saturating_add(Weight::from_parts(0, 3719)) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } /// Storage: `NominationPools::PoolMembers` (r:1 w:0) - /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`) + /// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`) /// Storage: `NominationPools::ClaimPermissions` (r:1 w:1) /// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`) fn set_claim_permission() -> Weight { // Proof Size summary in bytes: - // Measured: `575` - // Estimated: `3702` - // Minimum execution time: 17_998_000 picoseconds. - Weight::from_parts(18_504_000, 0) - .saturating_add(Weight::from_parts(0, 3702)) + // Measured: `508` + // Estimated: `4182` + // Minimum execution time: 15_661_000 picoseconds. + Weight::from_parts(16_020_000, 0) + .saturating_add(Weight::from_parts(0, 4182)) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -616,10 +644,10 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn claim_commission() -> Weight { // Proof Size summary in bytes: - // Measured: `1068` + // Measured: `968` // Estimated: `3719` - // Minimum execution time: 83_852_000 picoseconds. - Weight::from_parts(85_593_000, 0) + // Minimum execution time: 71_691_000 picoseconds. + Weight::from_parts(72_270_000, 0) .saturating_add(Weight::from_parts(0, 3719)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) @@ -634,12 +662,44 @@ impl pallet_nomination_pools::WeightInfo for WeightInfo /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) fn adjust_pool_deposit() -> Weight { // Proof Size summary in bytes: - // Measured: `1047` + // Measured: `947` // Estimated: `4764` - // Minimum execution time: 94_584_000 picoseconds. - Weight::from_parts(95_706_000, 0) + // Minimum execution time: 80_551_000 picoseconds. + Weight::from_parts(80_990_000, 0) .saturating_add(Weight::from_parts(0, 4764)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } + fn apply_slash() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 3_010_000 picoseconds. + Weight::from_parts(3_190_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + } + fn apply_slash_fail() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 3_120_000 picoseconds. + Weight::from_parts(3_200_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + } + fn pool_migrate() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 2_900_000 picoseconds. + Weight::from_parts(2_980_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + } + fn migrate_delegation() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 2_820_000 picoseconds. + Weight::from_parts(2_930_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + } } \ No newline at end of file diff --git a/runtime/src/weights/pallet_scheduler.rs b/runtime/src/weights/pallet_scheduler.rs index de669fcc8..871300b99 100644 --- a/runtime/src/weights/pallet_scheduler.rs +++ b/runtime/src/weights/pallet_scheduler.rs @@ -52,26 +52,26 @@ impl pallet_scheduler::WeightInfo for WeightInfo { /// Proof: `Scheduler::IncompleteSince` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) fn service_agendas_base() -> Weight { // Proof Size summary in bytes: - // Measured: `30` + // Measured: `69` // Estimated: `1489` - // Minimum execution time: 3_909_000 picoseconds. - Weight::from_parts(4_193_000, 0) + // Minimum execution time: 3_720_000 picoseconds. + Weight::from_parts(4_040_000, 0) .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } /// Storage: `Scheduler::Agenda` (r:1 w:1) - /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(107022), added: 109497, mode: `MaxEncodedLen`) - /// The range of component `s` is `[0, 512]`. + /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) + /// The range of component `s` is `[0, 50]`. fn service_agenda_base(s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `80 + s * (177 ±0)` - // Estimated: `110487` - // Minimum execution time: 5_215_000 picoseconds. - Weight::from_parts(6_386_564, 0) - .saturating_add(Weight::from_parts(0, 110487)) - // Standard Error: 2_115 - .saturating_add(Weight::from_parts(453_152, 0).saturating_mul(s.into())) + // Measured: `116 + s * (177 ±0)` + // Estimated: `42428` + // Minimum execution time: 4_280_000 picoseconds. + Weight::from_parts(7_707_396, 0) + .saturating_add(Weight::from_parts(0, 42428)) + // Standard Error: 1_502 + .saturating_add(Weight::from_parts(386_131, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -79,12 +79,12 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_763_000 picoseconds. - Weight::from_parts(5_086_000, 0) + // Minimum execution time: 3_740_000 picoseconds. + Weight::from_parts(3_920_000, 0) .saturating_add(Weight::from_parts(0, 0)) } /// Storage: `Preimage::PreimageFor` (r:1 w:1) - /// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`) + /// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `Measured`) /// Storage: `Preimage::StatusFor` (r:1 w:0) /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) @@ -92,15 +92,16 @@ impl pallet_scheduler::WeightInfo for WeightInfo { /// The range of component `s` is `[128, 4194304]`. fn service_task_fetched(s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `246 + s * (1 ±0)` - // Estimated: `4197809` - // Minimum execution time: 23_984_000 picoseconds. - Weight::from_parts(24_296_000, 0) - .saturating_add(Weight::from_parts(0, 4197809)) - // Standard Error: 4 - .saturating_add(Weight::from_parts(1_201, 0).saturating_mul(s.into())) + // Measured: `179 + s * (1 ±0)` + // Estimated: `3644 + s * (1 ±0)` + // Minimum execution time: 19_310_000 picoseconds. + Weight::from_parts(19_570_000, 0) + .saturating_add(Weight::from_parts(0, 3644)) + // Standard Error: 8 + .saturating_add(Weight::from_parts(1_196, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into())) } /// Storage: `Scheduler::Lookup` (r:0 w:1) /// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`) @@ -108,8 +109,8 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 7_028_000 picoseconds. - Weight::from_parts(7_264_000, 0) + // Minimum execution time: 5_300_000 picoseconds. + Weight::from_parts(5_480_000, 0) .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -117,90 +118,171 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_482_000 picoseconds. - Weight::from_parts(4_882_000, 0) + // Minimum execution time: 3_800_000 picoseconds. + Weight::from_parts(3_930_000, 0) .saturating_add(Weight::from_parts(0, 0)) } fn execute_dispatch_signed() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_395_000 picoseconds. - Weight::from_parts(3_548_000, 0) + // Minimum execution time: 2_340_000 picoseconds. + Weight::from_parts(2_430_000, 0) .saturating_add(Weight::from_parts(0, 0)) } fn execute_dispatch_unsigned() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_489_000 picoseconds. - Weight::from_parts(3_664_000, 0) + // Minimum execution time: 2_390_000 picoseconds. + Weight::from_parts(2_470_000, 0) .saturating_add(Weight::from_parts(0, 0)) } /// Storage: `Scheduler::Agenda` (r:1 w:1) - /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(107022), added: 109497, mode: `MaxEncodedLen`) - /// The range of component `s` is `[0, 511]`. + /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) + /// The range of component `s` is `[0, 49]`. fn schedule(s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `80 + s * (177 ±0)` - // Estimated: `110487` - // Minimum execution time: 14_621_000 picoseconds. - Weight::from_parts(14_384_507, 0) - .saturating_add(Weight::from_parts(0, 110487)) - // Standard Error: 2_828 - .saturating_add(Weight::from_parts(515_847, 0).saturating_mul(s.into())) + // Measured: `116 + s * (177 ±0)` + // Estimated: `42428` + // Minimum execution time: 11_710_000 picoseconds. + Weight::from_parts(15_080_364, 0) + .saturating_add(Weight::from_parts(0, 42428)) + // Standard Error: 1_462 + .saturating_add(Weight::from_parts(393_231, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } /// Storage: `Scheduler::Agenda` (r:1 w:1) - /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(107022), added: 109497, mode: `MaxEncodedLen`) + /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) + /// Storage: `Scheduler::Retries` (r:0 w:1) + /// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`) /// Storage: `Scheduler::Lookup` (r:0 w:1) /// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`) - /// The range of component `s` is `[1, 512]`. + /// The range of component `s` is `[1, 50]`. fn cancel(s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `80 + s * (177 ±0)` - // Estimated: `110487` - // Minimum execution time: 20_199_000 picoseconds. - Weight::from_parts(16_359_633, 0) - .saturating_add(Weight::from_parts(0, 110487)) - // Standard Error: 4_061 - .saturating_add(Weight::from_parts(776_539, 0).saturating_mul(s.into())) + // Measured: `116 + s * (177 ±0)` + // Estimated: `42428` + // Minimum execution time: 17_570_000 picoseconds. + Weight::from_parts(17_410_059, 0) + .saturating_add(Weight::from_parts(0, 42428)) + // Standard Error: 722 + .saturating_add(Weight::from_parts(596_176, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().writes(2)) + .saturating_add(T::DbWeight::get().writes(3)) } /// Storage: `Scheduler::Lookup` (r:1 w:1) /// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`) /// Storage: `Scheduler::Agenda` (r:1 w:1) - /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(107022), added: 109497, mode: `MaxEncodedLen`) - /// The range of component `s` is `[0, 511]`. + /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) + /// The range of component `s` is `[0, 49]`. fn schedule_named(s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `636 + s * (177 ±0)` - // Estimated: `110487` - // Minimum execution time: 18_998_000 picoseconds. - Weight::from_parts(23_198_582, 0) - .saturating_add(Weight::from_parts(0, 110487)) - // Standard Error: 2_538 - .saturating_add(Weight::from_parts(509_543, 0).saturating_mul(s.into())) + // Measured: `293 + s * (185 ±0)` + // Estimated: `42428` + // Minimum execution time: 15_190_000 picoseconds. + Weight::from_parts(19_873_163, 0) + .saturating_add(Weight::from_parts(0, 42428)) + // Standard Error: 2_740 + .saturating_add(Weight::from_parts(428_771, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } /// Storage: `Scheduler::Lookup` (r:1 w:1) /// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`) /// Storage: `Scheduler::Agenda` (r:1 w:1) - /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(107022), added: 109497, mode: `MaxEncodedLen`) - /// The range of component `s` is `[1, 512]`. + /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) + /// Storage: `Scheduler::Retries` (r:0 w:1) + /// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`) + /// The range of component `s` is `[1, 50]`. fn cancel_named(s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `705 + s * (177 ±0)` - // Estimated: `110487` - // Minimum execution time: 22_998_000 picoseconds. - Weight::from_parts(19_418_522, 0) - .saturating_add(Weight::from_parts(0, 110487)) - // Standard Error: 3_827 - .saturating_add(Weight::from_parts(782_935, 0).saturating_mul(s.into())) + // Measured: `319 + s * (185 ±0)` + // Estimated: `42428` + // Minimum execution time: 19_600_000 picoseconds. + Weight::from_parts(20_702_477, 0) + .saturating_add(Weight::from_parts(0, 42428)) + // Standard Error: 1_291 + .saturating_add(Weight::from_parts(619_254, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(3)) + } + /// Storage: `Scheduler::Agenda` (r:1 w:1) + /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) + /// Storage: `Scheduler::Retries` (r:0 w:1) + /// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`) + /// The range of component `s` is `[1, 50]`. + fn schedule_retry(s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `156` + // Estimated: `42428` + // Minimum execution time: 10_790_000 picoseconds. + Weight::from_parts(11_339_780, 0) + .saturating_add(Weight::from_parts(0, 42428)) + // Standard Error: 310 + .saturating_add(Weight::from_parts(15_874, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(2)) } -} \ No newline at end of file + /// Storage: `Scheduler::Agenda` (r:1 w:0) + /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) + /// Storage: `Scheduler::Retries` (r:0 w:1) + /// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`) + fn set_retry() -> Weight { + // Proof Size summary in bytes: + // Measured: `8966` + // Estimated: `42428` + // Minimum execution time: 26_751_000 picoseconds. + Weight::from_parts(27_160_000, 0) + .saturating_add(Weight::from_parts(0, 42428)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) + } + /// Storage: `Scheduler::Lookup` (r:1 w:0) + /// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`) + /// Storage: `Scheduler::Agenda` (r:1 w:0) + /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) + /// Storage: `Scheduler::Retries` (r:0 w:1) + /// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`) + fn set_retry_named() -> Weight { + // Proof Size summary in bytes: + // Measured: `9644` + // Estimated: `42428` + // Minimum execution time: 33_320_000 picoseconds. + Weight::from_parts(33_790_000, 0) + .saturating_add(Weight::from_parts(0, 42428)) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(1)) + } + /// Storage: `Scheduler::Agenda` (r:1 w:0) + /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) + /// Storage: `Scheduler::Retries` (r:0 w:1) + /// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`) + fn cancel_retry() -> Weight { + // Proof Size summary in bytes: + // Measured: `8978` + // Estimated: `42428` + // Minimum execution time: 25_490_000 picoseconds. + Weight::from_parts(25_950_000, 0) + .saturating_add(Weight::from_parts(0, 42428)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) + } + /// Storage: `Scheduler::Lookup` (r:1 w:0) + /// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`) + /// Storage: `Scheduler::Agenda` (r:1 w:0) + /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) + /// Storage: `Scheduler::Retries` (r:0 w:1) + /// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`) + fn cancel_retry_named() -> Weight { + // Proof Size summary in bytes: + // Measured: `9656` + // Estimated: `42428` + // Minimum execution time: 31_860_000 picoseconds. + Weight::from_parts(32_420_000, 0) + .saturating_add(Weight::from_parts(0, 42428)) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(1)) + } +} diff --git a/runtime/src/weights/pallet_treasury.rs b/runtime/src/weights/pallet_treasury.rs index dc327bbd3..4fdd033ee 100644 --- a/runtime/src/weights/pallet_treasury.rs +++ b/runtime/src/weights/pallet_treasury.rs @@ -56,67 +56,22 @@ impl pallet_treasury::WeightInfo for WeightInfo { /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) fn spend_local() -> Weight { // Proof Size summary in bytes: - // Measured: `42` + // Measured: `76` // Estimated: `1887` - // Minimum execution time: 15_810_000 picoseconds. - Weight::from_parts(16_737_000, 0) + // Minimum execution time: 12_520_000 picoseconds. + Weight::from_parts(12_910_000, 0) .saturating_add(Weight::from_parts(0, 1887)) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(3)) } - /// Storage: `Treasury::ProposalCount` (r:1 w:1) - /// Proof: `Treasury::ProposalCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `Treasury::Proposals` (r:0 w:1) - /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) - fn propose_spend() -> Weight { - // Proof Size summary in bytes: - // Measured: `143` - // Estimated: `1489` - // Minimum execution time: 31_569_000 picoseconds. - Weight::from_parts(32_868_000, 0) - .saturating_add(Weight::from_parts(0, 1489)) - .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().writes(2)) - } - /// Storage: `Treasury::Proposals` (r:1 w:1) - /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - fn reject_proposal() -> Weight { - // Proof Size summary in bytes: - // Measured: `301` - // Estimated: `3593` - // Minimum execution time: 45_203_000 picoseconds. - Weight::from_parts(47_055_000, 0) - .saturating_add(Weight::from_parts(0, 3593)) - .saturating_add(T::DbWeight::get().reads(2)) - .saturating_add(T::DbWeight::get().writes(2)) - } - /// Storage: `Treasury::Proposals` (r:1 w:0) - /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) - /// Storage: `Treasury::Approvals` (r:1 w:1) - /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`) - /// The range of component `p` is `[0, 99]`. - fn approve_proposal(p: u32, ) -> Weight { - // Proof Size summary in bytes: - // Measured: `463 + p * (8 ±0)` - // Estimated: `3573` - // Minimum execution time: 10_833_000 picoseconds. - Weight::from_parts(14_353_526, 0) - .saturating_add(Weight::from_parts(0, 3573)) - // Standard Error: 2_918 - .saturating_add(Weight::from_parts(90_132, 0).saturating_mul(p.into())) - .saturating_add(T::DbWeight::get().reads(2)) - .saturating_add(T::DbWeight::get().writes(1)) - } /// Storage: `Treasury::Approvals` (r:1 w:1) /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`) fn remove_approval() -> Weight { // Proof Size summary in bytes: - // Measured: `127` + // Measured: `161` // Estimated: `1887` - // Minimum execution time: 8_338_000 picoseconds. - Weight::from_parts(8_774_000, 0) + // Minimum execution time: 6_870_000 picoseconds. + Weight::from_parts(7_210_000, 0) .saturating_add(Weight::from_parts(0, 1887)) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) @@ -127,75 +82,89 @@ impl pallet_treasury::WeightInfo for WeightInfo { /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`) /// Storage: `Treasury::Proposals` (r:99 w:99) /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:198 w:198) + /// Storage: `System::Account` (r:99 w:99) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// Storage: `Bounties::BountyApprovals` (r:1 w:1) /// Proof: `Bounties::BountyApprovals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`) /// The range of component `p` is `[0, 99]`. fn on_initialize_proposals(p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `475 + p * (253 ±0)` - // Estimated: `1887 + p * (5206 ±0)` - // Minimum execution time: 40_944_000 picoseconds. - Weight::from_parts(52_948_321, 0) + // Measured: `70 + p * (157 ±0)` + // Estimated: `1887 + p * (2603 ±0)` + // Minimum execution time: 34_150_000 picoseconds. + Weight::from_parts(30_791_832, 0) .saturating_add(Weight::from_parts(0, 1887)) - // Standard Error: 30_336 - .saturating_add(Weight::from_parts(42_834_231, 0).saturating_mul(p.into())) + // Standard Error: 10_350 + .saturating_add(Weight::from_parts(23_389_161, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3)) - .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into()))) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(p.into()))) .saturating_add(T::DbWeight::get().writes(3)) - .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into()))) - .saturating_add(Weight::from_parts(0, 5206).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(p.into()))) + .saturating_add(Weight::from_parts(0, 2603).saturating_mul(p.into())) } + /// Storage: `AssetRate::ConversionRateToNative` (r:1 w:0) + /// Proof: `AssetRate::ConversionRateToNative` (`max_values`: None, `max_size`: Some(1238), added: 3713, mode: `MaxEncodedLen`) /// Storage: `Treasury::SpendCount` (r:1 w:1) /// Proof: `Treasury::SpendCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `Treasury::Spends` (r:0 w:1) - /// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`) + /// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(1853), added: 4328, mode: `MaxEncodedLen`) fn spend() -> Weight { // Proof Size summary in bytes: - // Measured: `42` - // Estimated: `1489` - // Minimum execution time: 13_303_000 picoseconds. - Weight::from_parts(13_968_000, 0) - .saturating_add(Weight::from_parts(0, 1489)) - .saturating_add(T::DbWeight::get().reads(1)) + // Measured: `148` + // Estimated: `4703` + // Minimum execution time: 21_711_000 picoseconds. + Weight::from_parts(22_110_000, 0) + .saturating_add(Weight::from_parts(0, 4703)) + .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } /// Storage: `Treasury::Spends` (r:1 w:1) - /// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(1853), added: 4328, mode: `MaxEncodedLen`) + /// Storage: `XcmPallet::QueryCounter` (r:1 w:1) + /// Proof: `XcmPallet::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0) + /// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`) + /// Storage: `XcmPallet::SupportedVersion` (r:1 w:0) + /// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) + /// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1) + /// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`) + /// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1) + /// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`) + /// Storage: `XcmPallet::Queries` (r:0 w:1) + /// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`) fn payout() -> Weight { // Proof Size summary in bytes: - // Measured: `199` - // Estimated: `3593` - // Minimum execution time: 65_504_000 picoseconds. - Weight::from_parts(66_371_000, 0) - .saturating_add(Weight::from_parts(0, 3593)) - .saturating_add(T::DbWeight::get().reads(2)) - .saturating_add(T::DbWeight::get().writes(2)) + // Measured: `326` + // Estimated: `5318` + // Minimum execution time: 51_281_000 picoseconds. + Weight::from_parts(52_120_000, 0) + .saturating_add(Weight::from_parts(0, 5318)) + .saturating_add(T::DbWeight::get().reads(6)) + .saturating_add(T::DbWeight::get().writes(5)) } /// Storage: `Treasury::Spends` (r:1 w:1) - /// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`) + /// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(1853), added: 4328, mode: `MaxEncodedLen`) + /// Storage: `XcmPallet::Queries` (r:1 w:1) + /// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`) fn check_status() -> Weight { // Proof Size summary in bytes: - // Measured: `160` - // Estimated: `3534` - // Minimum execution time: 14_880_000 picoseconds. - Weight::from_parts(15_567_000, 0) - .saturating_add(Weight::from_parts(0, 3534)) - .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().writes(1)) + // Measured: `240` + // Estimated: `5318` + // Minimum execution time: 25_011_000 picoseconds. + Weight::from_parts(25_420_000, 0) + .saturating_add(Weight::from_parts(0, 5318)) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) } /// Storage: `Treasury::Spends` (r:1 w:1) - /// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`) + /// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(1853), added: 4328, mode: `MaxEncodedLen`) fn void_spend() -> Weight { // Proof Size summary in bytes: - // Measured: `160` - // Estimated: `3534` - // Minimum execution time: 13_825_000 picoseconds. - Weight::from_parts(14_161_000, 0) - .saturating_add(Weight::from_parts(0, 3534)) + // Measured: `212` + // Estimated: `5318` + // Minimum execution time: 14_960_000 picoseconds. + Weight::from_parts(15_320_000, 0) + .saturating_add(Weight::from_parts(0, 5318)) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } diff --git a/scripts/create-test-keyshares/Cargo.toml b/scripts/create-test-keyshares/Cargo.toml index 7b08991ea..f10278e21 100644 --- a/scripts/create-test-keyshares/Cargo.toml +++ b/scripts/create-test-keyshares/Cargo.toml @@ -14,7 +14,7 @@ entropy-testing-utils={ version="0.3.0-rc.1", path="../../crates/testing-utils" tokio ={ version="1.41", features=["macros", "fs", "rt-multi-thread", "io-util", "process"] } entropy-shared ={ version="0.3.0-rc.1", path="../../crates/shared" } entropy-kvdb ={ version="0.3.0-rc.1", path="../../crates/kvdb", default-features=false } -sp-core ="31.0.0" +sp-core = "34.0.0" # Unreleased version of Synedrion with support for child key derivations. synedrion={ version="0.2.0-beta.0" } From 2c7a071ce0d79d7e64f318a9ada2886c75be48ef Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Wed, 30 Oct 2024 16:31:35 -0400 Subject: [PATCH 03/22] blocks --- Cargo.lock | 48 ++++++ node/cli/Cargo.toml | 3 + node/cli/src/command.rs | 18 +-- node/cli/src/rpc.rs | 26 ++- node/cli/src/service.rs | 347 +++++++++++++++++++++++++++------------- runtime/Cargo.toml | 8 + runtime/src/lib.rs | 77 ++++++++- 7 files changed, 394 insertions(+), 133 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e317e0586..c4a245e57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3414,12 +3414,14 @@ dependencies = [ "sc-mixnet 0.15.0", "sc-network 0.45.0", "sc-network-common 0.44.0", + "sc-network-statement", "sc-network-sync 0.44.0", "sc-offchain", "sc-rpc 40.0.0", "sc-rpc-api 0.44.0", "sc-rpc-spec-v2 0.45.0", "sc-service 0.46.0", + "sc-statement-store", "sc-storage-monitor", "sc-sync-state-rpc", "sc-sysinfo 38.0.0", @@ -3437,6 +3439,7 @@ dependencies = [ "sp-consensus-grandpa 21.0.0", "sp-core 34.0.0", "sp-inherents 34.0.0", + "sp-io 38.0.0", "sp-keyring 39.0.0", "sp-keystore 0.40.0", "sp-runtime 39.0.2", @@ -3601,6 +3604,7 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", + "pallet-mixnet", "pallet-multisig", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", @@ -3621,6 +3625,7 @@ dependencies = [ "pallet-staking", "pallet-staking-extension", "pallet-staking-reward-curve", + "pallet-statement", "pallet-sudo", "pallet-timestamp", "pallet-tips", @@ -3641,11 +3646,13 @@ dependencies = [ "sp-genesis-builder 0.15.1", "sp-inherents 34.0.0", "sp-io 38.0.0", + "sp-mixnet 0.12.0", "sp-npos-elections", "sp-offchain 34.0.0", "sp-runtime 39.0.2", "sp-session 36.0.0", "sp-staking 36.0.0", + "sp-statement-store 18.0.0", "sp-std", "sp-storage", "sp-transaction-pool 34.0.0", @@ -14235,6 +14242,27 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-network-statement" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32361db9fa362076ba1ec432e9744b0253be8fe693ed07725f79fd377e2faaf1" +dependencies = [ + "array-bytes 6.2.3", + "async-channel 1.9.0", + "futures", + "log", + "parity-scale-codec", + "sc-network 0.45.0", + "sc-network-common 0.44.0", + "sc-network-sync 0.44.0", + "sc-network-types", + "sp-consensus 0.40.0", + "sp-runtime 39.0.2", + "sp-statement-store 18.0.0", + "substrate-prometheus-endpoint", +] + [[package]] name = "sc-network-sync" version = "0.37.0" @@ -14784,6 +14812,26 @@ dependencies = [ "sp-core 34.0.0", ] +[[package]] +name = "sc-statement-store" +version = "19.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cc47300d1179d412a64c57962968a52734c9df140dc898d608c1828a71159f" +dependencies = [ + "log", + "parity-db", + "parking_lot 0.12.3", + "sc-client-api 37.0.0", + "sc-keystore 33.0.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-statement-store 18.0.0", + "substrate-prometheus-endpoint", + "tokio", +] + [[package]] name = "sc-storage-monitor" version = "0.22.0" diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index 79813c84c..1e33a7d52 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -62,6 +62,8 @@ sc-transaction-pool = { version = "37.0.0" } sc-transaction-pool-api = { version = "37.0.0" } sc-rpc-spec-v2 = { version = "0.45.0" } sc-mixnet = { version = "0.15.0" } +sc-statement-store = { version = "19.0.1" } +sc-network-statement = { version = "0.27.0" } # Substrate Primitives grandpa-primitives = { version = "21.0.0", package = "sp-consensus-grandpa" } @@ -80,6 +82,7 @@ sp-timestamp = { version = "34.0.0" } sp-transaction-storage-proof= { version = "34.0.0" } substrate-frame-rpc-system = { version = "39.0.0" } sp-statement-store = { version = "18.0.0" } +sp-io = { version = "38.0.0" } # FRAME Dependencies frame-benchmarking = { version = "38.0.0", default-features = false, optional = true, features = ["std"] } diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs index 28df64740..fde3b971b 100644 --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -104,21 +104,21 @@ pub fn run() -> sc_cli::Result<()> { let runner = cli.create_runner(cmd)?; runner.async_run(|config| { let PartialComponents { client, task_manager, import_queue, .. } = - service::new_partial(&config)?; + service::new_partial(&config, None)?; Ok((cmd.run(client, import_queue), task_manager)) }) }, Some(Subcommand::ExportBlocks(cmd)) => { let runner = cli.create_runner(cmd)?; runner.async_run(|config| { - let PartialComponents { client, task_manager, .. } = service::new_partial(&config)?; + let PartialComponents { client, task_manager, .. } = service::new_partial(&config, None)?; Ok((cmd.run(client, config.database), task_manager)) }) }, Some(Subcommand::ExportState(cmd)) => { let runner = cli.create_runner(cmd)?; runner.async_run(|config| { - let PartialComponents { client, task_manager, .. } = service::new_partial(&config)?; + let PartialComponents { client, task_manager, .. } = service::new_partial(&config, None)?; Ok((cmd.run(client, config.chain_spec), task_manager)) }) }, @@ -126,7 +126,7 @@ pub fn run() -> sc_cli::Result<()> { let runner = cli.create_runner(cmd)?; runner.async_run(|config| { let PartialComponents { client, task_manager, import_queue, .. } = - service::new_partial(&config)?; + service::new_partial(&config, None)?; Ok((cmd.run(client, import_queue), task_manager)) }) }, @@ -138,7 +138,7 @@ pub fn run() -> sc_cli::Result<()> { let runner = cli.create_runner(cmd)?; runner.async_run(|config| { let PartialComponents { client, task_manager, backend, .. } = - service::new_partial(&config)?; + service::new_partial(&config, None)?; let aux_revert = Box::new(|client, _, blocks| { grandpa::revert(client, blocks)?; Ok(()) @@ -164,7 +164,7 @@ pub fn run() -> sc_cli::Result<()> { cmd.run_with_spec::, sp_statement_store::runtime_api::HostFunctions>(Some(config.chain_spec)) }, BenchmarkCmd::Block(cmd) => { - let PartialComponents { client, .. } = service::new_partial(&config)?; + let PartialComponents { client, .. } = service::new_partial(&config, None)?; cmd.run(client) }, #[cfg(not(feature = "runtime-benchmarks"))] @@ -174,14 +174,14 @@ pub fn run() -> sc_cli::Result<()> { #[cfg(feature = "runtime-benchmarks")] BenchmarkCmd::Storage(cmd) => { let PartialComponents { client, backend, .. } = - service::new_partial(&config)?; + service::new_partial(&config, None)?; let db = backend.expose_db(); let storage = backend.expose_storage(); cmd.run(config, client, db, storage) }, BenchmarkCmd::Overhead(cmd) => { - let PartialComponents { client, .. } = service::new_partial(&config)?; + let PartialComponents { client, .. } = service::new_partial(&config, None)?; let ext_builder = RemarkBuilder::new(client.clone()); cmd.run( @@ -193,7 +193,7 @@ pub fn run() -> sc_cli::Result<()> { ) }, BenchmarkCmd::Extrinsic(cmd) => { - let PartialComponents { client, .. } = service::new_partial(&config)?; + let PartialComponents { client, .. } = service::new_partial(&config, None)?; // Register the *Remark* and *TKA* builders. let ext_factory = ExtrinsicFactory(vec![ Box::new(RemarkBuilder::new(client.clone())), diff --git a/node/cli/src/rpc.rs b/node/cli/src/rpc.rs index 59138f942..d1aae74b0 100644 --- a/node/cli/src/rpc.rs +++ b/node/cli/src/rpc.rs @@ -105,11 +105,15 @@ pub struct FullDeps { pub grandpa: GrandpaDeps, /// Backend used by the node. pub backend: Arc, + /// Mixnet API. + pub mixnet_api: Option, + /// Shared statement store reference. + pub statement_store: Arc, } /// Instantiate all Full RPC extensions. pub fn create_full( - FullDeps { client, pool, select_chain, chain_spec, babe, grandpa, .. }: FullDeps, + FullDeps { client, pool, select_chain, chain_spec, babe, grandpa, statement_store, mixnet_api, backend, .. }: FullDeps, ) -> Result> where C: ProvideRuntimeApi @@ -124,7 +128,7 @@ where C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, C::Api: BabeApi, C::Api: BlockBuilder, - P: TransactionPool + Sync + Send + 'static, + P: TransactionPool + 'static, SC: SelectChain + 'static, B: sc_client_api::Backend + Send + Sync + 'static, B::State: sc_client_api::StateBackend>, @@ -132,13 +136,16 @@ where use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; use sc_consensus_babe_rpc::{Babe, BabeApiServer}; use sc_consensus_grandpa_rpc::{Grandpa, GrandpaApiServer}; - use sc_rpc::dev::{Dev, DevApiServer}; + use sc_rpc::{ + dev::{Dev, DevApiServer}, + mixnet::MixnetApiServer, + statement::StatementApiServer, + }; use sc_rpc_spec_v2::chain_spec::{ChainSpec, ChainSpecApiServer}; use sc_sync_state_rpc::{SyncState, SyncStateApiServer}; use substrate_frame_rpc_system::{System, SystemApiServer}; let mut io = RpcModule::new(()); - let BabeDeps { keystore, babe_worker_handle } = babe; let GrandpaDeps { shared_voter_state, @@ -152,11 +159,14 @@ where let genesis_hash = client.hash(0).ok().flatten().expect("Genesis block exists; qed"); let properties = chain_spec.properties(); - io.merge(ChainSpec::new(chain_name, genesis_hash, properties).into_rpc())?; io.merge(System::new(client.clone(), pool).into_rpc())?; - // Making synchronous calls in light client freezes the browser currently, - // more context: https://github.com/paritytech/substrate/pull/3480 - // These RPCs should use an asynchronous caller instead. + let statement_store = sc_rpc::statement::StatementStore::new(statement_store).into_rpc(); + io.merge(statement_store)?; + + if let Some(mixnet_api) = mixnet_api { + let mixnet = sc_rpc::mixnet::Mixnet::new(mixnet_api).into_rpc(); + io.merge(mixnet)?; + } io.merge(TransactionPayment::new(client.clone()).into_rpc())?; io.merge( Babe::new(client.clone(), babe_worker_handle.clone(), keystore, select_chain).into_rpc(), diff --git a/node/cli/src/service.rs b/node/cli/src/service.rs index c8898f229..2ebf6b017 100644 --- a/node/cli/src/service.rs +++ b/node/cli/src/service.rs @@ -45,6 +45,7 @@ use sc_executor::NativeElseWasmExecutor; use sc_network::{ event::Event, service::traits::NetworkService, NetworkBackend, NetworkEventStream, }; +use sc_statement_store::Store as StatementStore; use sc_network_sync::{service::network::Network, SyncingService}; use sc_offchain::OffchainDb; use sc_service::{ @@ -57,9 +58,25 @@ use sp_runtime::traits::Block as BlockT; use std::path::Path; use crate::cli::Cli; + +/// Host functions required for kitchensink runtime and Substrate node. +#[cfg(not(feature = "runtime-benchmarks"))] +pub type HostFunctions = + (sp_io::SubstrateHostFunctions, sp_statement_store::runtime_api::HostFunctions); + +/// Host functions required for kitchensink runtime and Substrate node. +#[cfg(feature = "runtime-benchmarks")] +pub type HostFunctions = ( + sp_io::SubstrateHostFunctions, + sp_statement_store::runtime_api::HostFunctions, + frame_benchmarking::benchmarking::HostFunctions, +); + +/// A specialized `WasmExecutor` intended to use across substrate node. It provides all required +/// HostFunctions. +pub type RuntimeExecutor = sc_executor::WasmExecutor; /// The full client type definition. -pub type FullClient = - sc_service::TFullClient>; +pub type FullClient = sc_service::TFullClient; type FullBackend = sc_service::TFullBackend; type FullSelectChain = sc_consensus::LongestChain; type FullGrandpaBlockImport = @@ -93,110 +110,125 @@ impl sc_executor::NativeExecutionDispatch for ExecutorDispatch { } /// Creates a new partial node. -#[allow(clippy::type_complexity)] pub fn new_partial( - config: &Configuration, + config: &Configuration, + mixnet_config: Option<&sc_mixnet::Config>, ) -> Result< - sc_service::PartialComponents< - FullClient, - FullBackend, - FullSelectChain, - sc_consensus::DefaultImportQueue, - sc_transaction_pool::FullPool, - ( - impl Fn( - sc_rpc::SubscriptionTaskExecutor, - ) -> Result, sc_service::Error>, - ( - sc_consensus_babe::BabeBlockImport, - grandpa::LinkHalf, - sc_consensus_babe::BabeLink, - ), - grandpa::SharedVoterState, - Option, - ), - >, - ServiceError, + sc_service::PartialComponents< + FullClient, + FullBackend, + FullSelectChain, + sc_consensus::DefaultImportQueue, + sc_transaction_pool::FullPool, + ( + impl Fn( + sc_rpc::SubscriptionTaskExecutor, + ) -> Result, sc_service::Error>, + ( + sc_consensus_babe::BabeBlockImport< + Block, + FullClient, + FullGrandpaBlockImport, + >, + grandpa::LinkHalf, + sc_consensus_babe::BabeLink, + ), + grandpa::SharedVoterState, + Option, + Arc, + Option, + ), + >, + ServiceError, > { - let telemetry = config - .telemetry_endpoints - .clone() - .filter(|x| !x.is_empty()) - .map(|endpoints| -> Result<_, sc_telemetry::Error> { - let worker = TelemetryWorker::new(16)?; - let telemetry = worker.handle().new_telemetry(endpoints); - Ok((worker, telemetry)) - }) - .transpose()?; - - let executor = sc_service::new_native_or_wasm_executor(config); - - let (client, backend, keystore_container, task_manager) = - sc_service::new_full_parts::( - config, - telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), - executor, - )?; - let client = Arc::new(client); - - let telemetry = telemetry.map(|(worker, telemetry)| { - task_manager.spawn_handle().spawn("telemetry", None, worker.run()); - telemetry - }); - - let select_chain = sc_consensus::LongestChain::new(backend.clone()); - - let transaction_pool = sc_transaction_pool::BasicPool::new_full( - config.transaction_pool.clone(), - config.role.is_authority().into(), - config.prometheus_registry(), - task_manager.spawn_essential_handle(), - client.clone(), - ); - - let (grandpa_block_import, grandpa_link) = grandpa::block_import( - client.clone(), - GRANDPA_JUSTIFICATION_PERIOD, - #[allow(clippy::redundant_clone)] - &(client.clone() as Arc<_>), - select_chain.clone(), - telemetry.as_ref().map(|x| x.handle()), - )?; - let justification_import = grandpa_block_import.clone(); - - let (block_import, babe_link) = sc_consensus_babe::block_import( - sc_consensus_babe::configuration(&*client)?, - grandpa_block_import, - client.clone(), - )?; - - let slot_duration = babe_link.config().slot_duration(); - let (import_queue, babe_worker_handle) = sc_consensus_babe::import_queue( - sc_consensus_babe::ImportQueueParams { - link: babe_link.clone(), - block_import: block_import.clone(), - justification_import: Some(Box::new(justification_import)), - client: client.clone(), - select_chain: select_chain.clone(), - create_inherent_data_providers: move |_, ()| async move { - let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - - let slot = - sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration( - *timestamp, - slot_duration, - ); - - Ok((slot, timestamp)) - }, - spawner: &task_manager.spawn_essential_handle(), - registry: config.prometheus_registry(), - telemetry: telemetry.as_ref().map(|x| x.handle()), - offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()), - }, - )?; - - let import_setup = (block_import, grandpa_link, babe_link); + let telemetry = config + .telemetry_endpoints + .clone() + .filter(|x| !x.is_empty()) + .map(|endpoints| -> Result<_, sc_telemetry::Error> { + let worker = TelemetryWorker::new(16)?; + let telemetry = worker.handle().new_telemetry(endpoints); + Ok((worker, telemetry)) + }) + .transpose()?; + + let executor = sc_service::new_wasm_executor(&config.executor); + + let (client, backend, keystore_container, task_manager) = + sc_service::new_full_parts::( + config, + telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), + executor, + )?; + let client = Arc::new(client); + + let telemetry = telemetry.map(|(worker, telemetry)| { + task_manager.spawn_handle().spawn("telemetry", None, worker.run()); + telemetry + }); + + let select_chain = sc_consensus::LongestChain::new(backend.clone()); + + let transaction_pool = sc_transaction_pool::BasicPool::new_full( + config.transaction_pool.clone(), + config.role.is_authority().into(), + config.prometheus_registry(), + task_manager.spawn_essential_handle(), + client.clone(), + ); + + let (grandpa_block_import, grandpa_link) = grandpa::block_import( + client.clone(), + GRANDPA_JUSTIFICATION_PERIOD, + &(client.clone() as Arc<_>), + select_chain.clone(), + telemetry.as_ref().map(|x| x.handle()), + )?; + let justification_import = grandpa_block_import.clone(); + + let (block_import, babe_link) = sc_consensus_babe::block_import( + sc_consensus_babe::configuration(&*client)?, + grandpa_block_import, + client.clone(), + )?; + + let slot_duration = babe_link.config().slot_duration(); + let (import_queue, babe_worker_handle) = + sc_consensus_babe::import_queue(sc_consensus_babe::ImportQueueParams { + link: babe_link.clone(), + block_import: block_import.clone(), + justification_import: Some(Box::new(justification_import)), + client: client.clone(), + select_chain: select_chain.clone(), + create_inherent_data_providers: move |_, ()| async move { + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = + sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration( + *timestamp, + slot_duration, + ); + + Ok((slot, timestamp)) + }, + spawner: &task_manager.spawn_essential_handle(), + registry: config.prometheus_registry(), + telemetry: telemetry.as_ref().map(|x| x.handle()), + offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()), + })?; + + let import_setup = (block_import, grandpa_link, babe_link); + + let statement_store = sc_statement_store::Store::new_shared( + &config.data_path, + Default::default(), + client.clone(), + keystore_container.local_keystore(), + config.prometheus_registry(), + &task_manager.spawn_handle(), + ) + .map_err(|e| ServiceError::Other(format!("Statement store error: {:?}", e)))?; + let (mixnet_api, mixnet_api_backend) = mixnet_config.map(sc_mixnet::Api::new).unzip(); let (rpc_extensions_builder, rpc_setup) = { let (_, grandpa_link, _) = &import_setup; @@ -217,6 +249,7 @@ pub fn new_partial( let keystore = keystore_container.keystore(); let chain_spec = config.chain_spec.cloned_box(); let backend = backend.clone(); + let rpc_statement_store = statement_store.clone(); let rpc_extensions_builder = move |subscription_executor| { let deps = crate::rpc::FullDeps { @@ -236,6 +269,8 @@ pub fn new_partial( finality_provider: finality_proof_provider.clone(), }, backend: backend.clone(), + mixnet_api: mixnet_api.as_ref().cloned(), + statement_store: rpc_statement_store.clone(), }; crate::rpc::create_full(deps).map_err(Into::into) @@ -252,7 +287,7 @@ pub fn new_partial( select_chain, import_queue, transaction_pool, - other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry), + other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry, statement_store, mixnet_api_backend), }) } @@ -279,11 +314,25 @@ pub fn new_full_base::Hash>>( mixnet_config: Option, disable_hardware_benchmarks: bool, with_startup_data: impl FnOnce( - &sc_consensus_babe::BabeBlockImport, - &sc_consensus_babe::BabeLink, - ), + &sc_consensus_babe::BabeBlockImport< + Block, + FullClient, + FullGrandpaBlockImport, + >, + &sc_consensus_babe::BabeLink, + ), tss_server_endpoint: Option, ) -> Result { + let is_offchain_indexing_enabled = config.offchain_worker.indexing_enabled; + let role = config.role; + let force_authoring = config.force_authoring; + // let backoff_authoring_blocks: = + // Some(sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging::default()); + let name = config.network.node_name.clone(); + let enable_grandpa = !config.disable_grandpa; + let prometheus_registry = config.prometheus_registry().cloned(); + let enable_offchain_worker = config.offchain_worker.enabled; + let hwbench = (!disable_hardware_benchmarks) .then_some(config.database.path().map(|database_path| { let _ = std::fs::create_dir_all(database_path); @@ -299,20 +348,22 @@ pub fn new_full_base::Hash>>( keystore_container, select_chain, transaction_pool, - other: (rpc_builder, import_setup, rpc_setup, mut telemetry), - } = new_partial(&config)?; + other: (rpc_builder, import_setup, rpc_setup, mut telemetry, statement_store, mixnet_api_backend), + } = new_partial(&config, mixnet_config.as_ref())?; let metrics = N::register_notification_metrics( config.prometheus_config.as_ref().map(|cfg| &cfg.registry), ); let shared_voter_state = rpc_setup; let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht; - let mut net_config = sc_network::config::FullNetworkConfiguration::<_, _, N>::new( &config.network, config.prometheus_config.as_ref().map(|cfg| cfg.registry.clone()), ); + let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht; + let auth_disc_public_addresses = config.network.public_addresses.clone(); + let peer_store_handle = net_config.peer_store_handle(); let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"); let grandpa_protocol_name = grandpa::protocol_standard_name(&genesis_hash, &config.chain_spec); @@ -324,12 +375,35 @@ pub fn new_full_base::Hash>>( ); net_config.add_notification_protocol(grandpa_protocol_config); + let (statement_handler_proto, statement_config) = + sc_network_statement::StatementHandlerPrototype::new::<_, _, N>( + genesis_hash, + config.chain_spec.fork_id(), + metrics.clone(), + Arc::clone(&peer_store_handle), + ); + net_config.add_notification_protocol(statement_config); + + let mixnet_protocol_name = + sc_mixnet::protocol_name(genesis_hash.as_ref(), config.chain_spec.fork_id()); + let mixnet_notification_service = mixnet_config.as_ref().map(|mixnet_config| { + let (config, notification_service) = sc_mixnet::peers_set_config::<_, N>( + mixnet_protocol_name.clone(), + mixnet_config, + metrics.clone(), + Arc::clone(&peer_store_handle), + ); + net_config.add_notification_protocol(config); + notification_service + }); + + let warp_sync = Arc::new(grandpa::warp_proof::NetworkProvider::new( backend.clone(), import_setup.1.shared_authority_set().clone(), Vec::default(), )); - + println!("test here 1"); let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) = sc_service::build_network(sc_service::BuildNetworkParams { config: &config, @@ -344,8 +418,27 @@ pub fn new_full_base::Hash>>( metrics, })?; + if let Some(mixnet_config) = mixnet_config { + let mixnet = sc_mixnet::run( + mixnet_config, + mixnet_api_backend.expect("Mixnet API backend created if mixnet enabled"), + client.clone(), + sync_service.clone(), + network.clone(), + mixnet_protocol_name, + transaction_pool.clone(), + Some(keystore_container.keystore()), + mixnet_notification_service + .expect("`NotificationService` exists since mixnet was enabled; qed"), + ); + task_manager.spawn_handle().spawn("mixnet", None, mixnet); + } + + println!("test here 3"); + if config.offchain_worker.enabled { use futures::FutureExt; + println!("test here 4"); task_manager.spawn_handle().spawn( "offchain-workers-runner", @@ -396,6 +489,8 @@ pub fn new_full_base::Hash>>( ); log::info!("Threshold Signing Sever (TSS) location changed to {}", endpoint); } + println!("test here 5"); + } let role = config.role.clone(); @@ -405,6 +500,7 @@ pub fn new_full_base::Hash>>( let name = config.network.node_name.clone(); let enable_grandpa = !config.disable_grandpa; let prometheus_registry = config.prometheus_registry().cloned(); + println!("test here 6"); let rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams { config, @@ -420,6 +516,7 @@ pub fn new_full_base::Hash>>( sync_service: sync_service.clone(), telemetry: telemetry.as_mut(), })?; + println!("test here 7"); if let Some(hwbench) = hwbench { sc_sysinfo::print_hwbench(&hwbench); @@ -497,10 +594,10 @@ pub fn new_full_base::Hash>>( let babe = sc_consensus_babe::start_babe(babe_config)?; task_manager.spawn_essential_handle().spawn_blocking( - "babe-proposer", - Some("block-authoring"), - babe, - ); + "babe-proposer", + Some("block-authoring"), + babe, + ); } // Spawn authority discovery module. @@ -579,6 +676,26 @@ pub fn new_full_base::Hash>>( ); } + // Spawn statement protocol worker + let statement_protocol_executor = { + let spawn_handle = task_manager.spawn_handle(); + Box::new(move |fut| { + spawn_handle.spawn("network-statement-validator", Some("networking"), fut); + }) + }; + let statement_handler = statement_handler_proto.build( + network.clone(), + sync_service.clone(), + statement_store.clone(), + prometheus_registry.as_ref(), + statement_protocol_executor, + )?; + task_manager.spawn_handle().spawn( + "network-statement-handler", + Some("networking"), + statement_handler.run(), + ); + network_starter.start_network(); Ok(NewFullBase { task_manager, diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 763ef36d7..b75164162 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -43,6 +43,8 @@ sp-storage = { version = "21.0.0", default-features = false, optional sp-transaction-pool = { version = "34.0.0", default-features = false } sp-version = { version = "37.0.0", default-features = false } sp-genesis-builder = { version = "0.15.1", default-features = false } +sp-statement-store = { version = "18.0.0", default-features = false} +sp-mixnet = { version = "0.12.0", default-features = false} # FRAME Dependencies frame-benchmarking = { version = "38.0.0", default-features = false, optional = true } @@ -93,6 +95,8 @@ pallet-transaction-storage = { version = "37.0.0", default-fea pallet-treasury = { version = "37.0.0", default-features = false } pallet-utility = { version = "38.0.0", default-features = false } pallet-vesting = { version = "38.0.0", default-features = false } +pallet-statement = { version = "20.0.0", default-features = false } +pallet-mixnet = { version = "0.14.0", default-features = false } # Entropy Pallets pallet-programs ={ version='0.3.0-rc.1', path='../pallets/programs', default-features=false } @@ -160,6 +164,8 @@ std=[ "pallet-slashing/std", "pallet-staking-extension/std", "pallet-staking/std", + "pallet-statement/std", + "pallet-mixnet/std", "pallet-sudo/std", "pallet-timestamp/std", "pallet-tips/std", @@ -181,10 +187,12 @@ std=[ "sp-io/std", "sp-npos-elections/std", "sp-offchain/std", + "sp-mixnet/std", "sp-runtime/std", "sp-session/std", "sp-staking/std", "sp-std/std", + "sp-statement-store/std", "sp-transaction-pool/std", "sp-version/std", "substrate-wasm-builder", diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index ffe573547..a10dca1d7 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -1517,6 +1517,49 @@ impl pallet_nomination_pools::Config for Runtime { type WeightInfo = weights::pallet_nomination_pools::WeightInfo; } +parameter_types! { + pub StatementCost: Balance = 1 * DOLLARS; + pub StatementByteCost: Balance = 100 * MILLICENTS; + pub const MinAllowedStatements: u32 = 4; + pub const MaxAllowedStatements: u32 = 10; + pub const MinAllowedBytes: u32 = 1024; + pub const MaxAllowedBytes: u32 = 4096; +} + +impl pallet_statement::Config for Runtime { + type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type StatementCost = StatementCost; + type ByteCost = StatementByteCost; + type MinAllowedStatements = MinAllowedStatements; + type MaxAllowedStatements = MaxAllowedStatements; + type MinAllowedBytes = MinAllowedBytes; + type MaxAllowedBytes = MaxAllowedBytes; +} + +parameter_types! { + pub const MixnetNumCoverToCurrentBlocks: BlockNumber = 3; + pub const MixnetNumRequestsToCurrentBlocks: BlockNumber = 3; + pub const MixnetNumCoverToPrevBlocks: BlockNumber = 3; + pub const MixnetNumRegisterStartSlackBlocks: BlockNumber = 3; + pub const MixnetNumRegisterEndSlackBlocks: BlockNumber = 3; + pub const MixnetRegistrationPriority: TransactionPriority = ImOnlineUnsignedPriority::get() - 1; +} + +impl pallet_mixnet::Config for Runtime { + type MaxAuthorities = MaxAuthorities; + type MaxExternalAddressSize = ConstU32<128>; + type MaxExternalAddressesPerMixnode = ConstU32<16>; + type NextSessionRotation = Babe; + type NumCoverToCurrentBlocks = MixnetNumCoverToCurrentBlocks; + type NumRequestsToCurrentBlocks = MixnetNumRequestsToCurrentBlocks; + type NumCoverToPrevBlocks = MixnetNumCoverToPrevBlocks; + type NumRegisterStartSlackBlocks = MixnetNumRegisterStartSlackBlocks; + type NumRegisterEndSlackBlocks = MixnetNumRegisterEndSlackBlocks; + type RegistrationPriority = MixnetRegistrationPriority; + type MinMixnodes = ConstU32<7>; // Low to allow small testing networks +} + parameter_types! { /// This is intentionally low for testing. /// @@ -1652,6 +1695,11 @@ construct_runtime!( Parameters: pallet_parameters = 56, Oracle: pallet_oracle = 57, Attestation: pallet_attestation = 58, + + + Statement: pallet_statement = 60, + Mixnet: pallet_mixnet = 61, + } ); @@ -1807,6 +1855,15 @@ impl_runtime_apis! { } } + impl sp_statement_store::runtime_api::ValidateStatement for Runtime { + fn validate_statement( + source: sp_statement_store::runtime_api::StatementSource, + statement: sp_statement_store::Statement, + ) -> Result { + Statement::validate_statement(source, statement) + } +} + impl sp_offchain::OffchainWorkerApi for Runtime { fn offchain_worker(header: &::Header) { Executive::offchain_worker(header) @@ -1916,7 +1973,7 @@ impl_runtime_apis! { } fn get_preset(id: &Option) -> Option> { - None + get_preset::(id, |_| None) } fn preset_names() -> Vec { @@ -1943,6 +2000,24 @@ impl_runtime_apis! { } } +impl sp_mixnet::runtime_api::MixnetApi for Runtime { + fn session_status() -> sp_mixnet::types::SessionStatus { + Mixnet::session_status() + } + + fn prev_mixnodes() -> Result, sp_mixnet::types::MixnodesErr> { + Mixnet::prev_mixnodes() + } + + fn current_mixnodes() -> Result, sp_mixnet::types::MixnodesErr> { + Mixnet::current_mixnodes() + } + + fn maybe_register(session_index: sp_mixnet::types::SessionIndex, mixnode: sp_mixnet::types::Mixnode) -> bool { + Mixnet::maybe_register(session_index, mixnode) + } +} + impl sp_session::SessionKeys for Runtime { fn generate_session_keys(seed: Option>) -> Vec { From e39cbcf94a6d698910430c66b937ae410b828696 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Wed, 30 Oct 2024 18:37:11 -0400 Subject: [PATCH 04/22] update tests --- crates/client/entropy_metadata.scale | Bin 209375 -> 308626 bytes .../src/helpers/tests.rs | 2 +- .../src/user/tests.rs | 10 +++++----- node/cli/src/service.rs | 6 ------ 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/crates/client/entropy_metadata.scale b/crates/client/entropy_metadata.scale index c8e04d4635263100651d3b91fb5a7e923f53f639..323f66e3c7fb15cb1c2595d6212a34892e7b3969 100644 GIT binary patch literal 308626 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ž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 delta 32949 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::Hash>>( import_setup.1.shared_authority_set().clone(), Vec::default(), )); - println!("test here 1"); let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) = sc_service::build_network(sc_service::BuildNetworkParams { config: &config, @@ -434,11 +433,9 @@ pub fn new_full_base::Hash>>( task_manager.spawn_handle().spawn("mixnet", None, mixnet); } - println!("test here 3"); if config.offchain_worker.enabled { use futures::FutureExt; - println!("test here 4"); task_manager.spawn_handle().spawn( "offchain-workers-runner", @@ -489,7 +486,6 @@ pub fn new_full_base::Hash>>( ); log::info!("Threshold Signing Sever (TSS) location changed to {}", endpoint); } - println!("test here 5"); } @@ -500,7 +496,6 @@ pub fn new_full_base::Hash>>( let name = config.network.node_name.clone(); let enable_grandpa = !config.disable_grandpa; let prometheus_registry = config.prometheus_registry().cloned(); - println!("test here 6"); let rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams { config, @@ -516,7 +511,6 @@ pub fn new_full_base::Hash>>( sync_service: sync_service.clone(), telemetry: telemetry.as_mut(), })?; - println!("test here 7"); if let Some(hwbench) = hwbench { sc_sysinfo::print_hwbench(&hwbench); From f8a87fd333dd514de2358adce150e1d496f1c5de Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Thu, 31 Oct 2024 13:16:40 -0400 Subject: [PATCH 05/22] add unsafe force node key generation --- crates/testing-utils/src/node_proc.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/testing-utils/src/node_proc.rs b/crates/testing-utils/src/node_proc.rs index 9fd860329..fade79357 100644 --- a/crates/testing-utils/src/node_proc.rs +++ b/crates/testing-utils/src/node_proc.rs @@ -129,6 +129,7 @@ impl TestNodeProcessBuilder { { let mut cmd = process::Command::new(&self.node_path); cmd.env("RUST_LOG", "error").arg(&self.chain_type).arg("--tmp"); + cmd.arg("--unsafe-force-node-key-generation"); if self.force_authoring { cmd.arg("--force-authoring"); } From ace167db7c40a421f84d85b0461eb36ec8a2e1f9 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Thu, 31 Oct 2024 15:27:44 -0400 Subject: [PATCH 06/22] remove mixnet and statment store --- Cargo.lock | 26 -------- crates/testing-utils/src/node_proc.rs | 1 + node/cli/Cargo.toml | 2 - node/cli/src/cli.rs | 4 -- node/cli/src/command.rs | 18 +++--- node/cli/src/rpc.rs | 14 +---- node/cli/src/service.rs | 87 +-------------------------- runtime/Cargo.toml | 8 --- runtime/src/lib.rs | 75 ----------------------- 9 files changed, 14 insertions(+), 221 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c4a245e57..71c4ffb03 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3411,7 +3411,6 @@ dependencies = [ "sc-consensus-grandpa-rpc", "sc-consensus-slots", "sc-executor 0.40.1", - "sc-mixnet 0.15.0", "sc-network 0.45.0", "sc-network-common 0.44.0", "sc-network-statement", @@ -3421,7 +3420,6 @@ dependencies = [ "sc-rpc-api 0.44.0", "sc-rpc-spec-v2 0.45.0", "sc-service 0.46.0", - "sc-statement-store", "sc-storage-monitor", "sc-sync-state-rpc", "sc-sysinfo 38.0.0", @@ -3604,7 +3602,6 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", - "pallet-mixnet", "pallet-multisig", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", @@ -3625,7 +3622,6 @@ dependencies = [ "pallet-staking", "pallet-staking-extension", "pallet-staking-reward-curve", - "pallet-statement", "pallet-sudo", "pallet-timestamp", "pallet-tips", @@ -3646,13 +3642,11 @@ dependencies = [ "sp-genesis-builder 0.15.1", "sp-inherents 34.0.0", "sp-io 38.0.0", - "sp-mixnet 0.12.0", "sp-npos-elections", "sp-offchain 34.0.0", "sp-runtime 39.0.2", "sp-session 36.0.0", "sp-staking 36.0.0", - "sp-statement-store 18.0.0", "sp-std", "sp-storage", "sp-transaction-pool 34.0.0", @@ -14812,26 +14806,6 @@ dependencies = [ "sp-core 34.0.0", ] -[[package]] -name = "sc-statement-store" -version = "19.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cc47300d1179d412a64c57962968a52734c9df140dc898d608c1828a71159f" -dependencies = [ - "log", - "parity-db", - "parking_lot 0.12.3", - "sc-client-api 37.0.0", - "sc-keystore 33.0.0", - "sp-api 34.0.0", - "sp-blockchain 37.0.1", - "sp-core 34.0.0", - "sp-runtime 39.0.2", - "sp-statement-store 18.0.0", - "substrate-prometheus-endpoint", - "tokio", -] - [[package]] name = "sc-storage-monitor" version = "0.22.0" diff --git a/crates/testing-utils/src/node_proc.rs b/crates/testing-utils/src/node_proc.rs index fade79357..645977c16 100644 --- a/crates/testing-utils/src/node_proc.rs +++ b/crates/testing-utils/src/node_proc.rs @@ -130,6 +130,7 @@ impl TestNodeProcessBuilder { let mut cmd = process::Command::new(&self.node_path); cmd.env("RUST_LOG", "error").arg(&self.chain_type).arg("--tmp"); cmd.arg("--unsafe-force-node-key-generation"); + cmd.arg("--public-addr"); if self.force_authoring { cmd.arg("--force-authoring"); } diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index 1e33a7d52..0b291d705 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -61,8 +61,6 @@ sc-telemetry = { version = "25.0.0" } sc-transaction-pool = { version = "37.0.0" } sc-transaction-pool-api = { version = "37.0.0" } sc-rpc-spec-v2 = { version = "0.45.0" } -sc-mixnet = { version = "0.15.0" } -sc-statement-store = { version = "19.0.1" } sc-network-statement = { version = "0.27.0" } # Substrate Primitives diff --git a/node/cli/src/cli.rs b/node/cli/src/cli.rs index b42d17993..1f2114026 100644 --- a/node/cli/src/cli.rs +++ b/node/cli/src/cli.rs @@ -42,10 +42,6 @@ pub struct Cli { #[clap(flatten)] pub run: sc_cli::RunCmd, - #[allow(missing_docs)] - #[clap(flatten)] - pub mixnet_params: sc_cli::MixnetParams, - /// Sets the URL of the Threshold Signing Server (TSS) to use. /// /// The format should be in the form of `scheme://hostname:port`. diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs index fde3b971b..28df64740 100644 --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -104,21 +104,21 @@ pub fn run() -> sc_cli::Result<()> { let runner = cli.create_runner(cmd)?; runner.async_run(|config| { let PartialComponents { client, task_manager, import_queue, .. } = - service::new_partial(&config, None)?; + service::new_partial(&config)?; Ok((cmd.run(client, import_queue), task_manager)) }) }, Some(Subcommand::ExportBlocks(cmd)) => { let runner = cli.create_runner(cmd)?; runner.async_run(|config| { - let PartialComponents { client, task_manager, .. } = service::new_partial(&config, None)?; + let PartialComponents { client, task_manager, .. } = service::new_partial(&config)?; Ok((cmd.run(client, config.database), task_manager)) }) }, Some(Subcommand::ExportState(cmd)) => { let runner = cli.create_runner(cmd)?; runner.async_run(|config| { - let PartialComponents { client, task_manager, .. } = service::new_partial(&config, None)?; + let PartialComponents { client, task_manager, .. } = service::new_partial(&config)?; Ok((cmd.run(client, config.chain_spec), task_manager)) }) }, @@ -126,7 +126,7 @@ pub fn run() -> sc_cli::Result<()> { let runner = cli.create_runner(cmd)?; runner.async_run(|config| { let PartialComponents { client, task_manager, import_queue, .. } = - service::new_partial(&config, None)?; + service::new_partial(&config)?; Ok((cmd.run(client, import_queue), task_manager)) }) }, @@ -138,7 +138,7 @@ pub fn run() -> sc_cli::Result<()> { let runner = cli.create_runner(cmd)?; runner.async_run(|config| { let PartialComponents { client, task_manager, backend, .. } = - service::new_partial(&config, None)?; + service::new_partial(&config)?; let aux_revert = Box::new(|client, _, blocks| { grandpa::revert(client, blocks)?; Ok(()) @@ -164,7 +164,7 @@ pub fn run() -> sc_cli::Result<()> { cmd.run_with_spec::, sp_statement_store::runtime_api::HostFunctions>(Some(config.chain_spec)) }, BenchmarkCmd::Block(cmd) => { - let PartialComponents { client, .. } = service::new_partial(&config, None)?; + let PartialComponents { client, .. } = service::new_partial(&config)?; cmd.run(client) }, #[cfg(not(feature = "runtime-benchmarks"))] @@ -174,14 +174,14 @@ pub fn run() -> sc_cli::Result<()> { #[cfg(feature = "runtime-benchmarks")] BenchmarkCmd::Storage(cmd) => { let PartialComponents { client, backend, .. } = - service::new_partial(&config, None)?; + service::new_partial(&config)?; let db = backend.expose_db(); let storage = backend.expose_storage(); cmd.run(config, client, db, storage) }, BenchmarkCmd::Overhead(cmd) => { - let PartialComponents { client, .. } = service::new_partial(&config, None)?; + let PartialComponents { client, .. } = service::new_partial(&config)?; let ext_builder = RemarkBuilder::new(client.clone()); cmd.run( @@ -193,7 +193,7 @@ pub fn run() -> sc_cli::Result<()> { ) }, BenchmarkCmd::Extrinsic(cmd) => { - let PartialComponents { client, .. } = service::new_partial(&config, None)?; + let PartialComponents { client, .. } = service::new_partial(&config)?; // Register the *Remark* and *TKA* builders. let ext_factory = ExtrinsicFactory(vec![ Box::new(RemarkBuilder::new(client.clone())), diff --git a/node/cli/src/rpc.rs b/node/cli/src/rpc.rs index d1aae74b0..e07168e31 100644 --- a/node/cli/src/rpc.rs +++ b/node/cli/src/rpc.rs @@ -105,15 +105,11 @@ pub struct FullDeps { pub grandpa: GrandpaDeps, /// Backend used by the node. pub backend: Arc, - /// Mixnet API. - pub mixnet_api: Option, - /// Shared statement store reference. - pub statement_store: Arc, } /// Instantiate all Full RPC extensions. pub fn create_full( - FullDeps { client, pool, select_chain, chain_spec, babe, grandpa, statement_store, mixnet_api, backend, .. }: FullDeps, + FullDeps { client, pool, select_chain, chain_spec, babe, grandpa, backend, .. }: FullDeps, ) -> Result> where C: ProvideRuntimeApi @@ -138,8 +134,6 @@ where use sc_consensus_grandpa_rpc::{Grandpa, GrandpaApiServer}; use sc_rpc::{ dev::{Dev, DevApiServer}, - mixnet::MixnetApiServer, - statement::StatementApiServer, }; use sc_rpc_spec_v2::chain_spec::{ChainSpec, ChainSpecApiServer}; use sc_sync_state_rpc::{SyncState, SyncStateApiServer}; @@ -160,13 +154,7 @@ where let properties = chain_spec.properties(); io.merge(System::new(client.clone(), pool).into_rpc())?; - let statement_store = sc_rpc::statement::StatementStore::new(statement_store).into_rpc(); - io.merge(statement_store)?; - if let Some(mixnet_api) = mixnet_api { - let mixnet = sc_rpc::mixnet::Mixnet::new(mixnet_api).into_rpc(); - io.merge(mixnet)?; - } io.merge(TransactionPayment::new(client.clone()).into_rpc())?; io.merge( Babe::new(client.clone(), babe_worker_handle.clone(), keystore, select_chain).into_rpc(), diff --git a/node/cli/src/service.rs b/node/cli/src/service.rs index a49c8035e..b0440e245 100644 --- a/node/cli/src/service.rs +++ b/node/cli/src/service.rs @@ -45,7 +45,6 @@ use sc_executor::NativeElseWasmExecutor; use sc_network::{ event::Event, service::traits::NetworkService, NetworkBackend, NetworkEventStream, }; -use sc_statement_store::Store as StatementStore; use sc_network_sync::{service::network::Network, SyncingService}; use sc_offchain::OffchainDb; use sc_service::{ @@ -112,7 +111,6 @@ impl sc_executor::NativeExecutionDispatch for ExecutorDispatch { /// Creates a new partial node. pub fn new_partial( config: &Configuration, - mixnet_config: Option<&sc_mixnet::Config>, ) -> Result< sc_service::PartialComponents< FullClient, @@ -135,8 +133,6 @@ pub fn new_partial( ), grandpa::SharedVoterState, Option, - Arc, - Option, ), >, ServiceError, @@ -219,17 +215,6 @@ pub fn new_partial( let import_setup = (block_import, grandpa_link, babe_link); - let statement_store = sc_statement_store::Store::new_shared( - &config.data_path, - Default::default(), - client.clone(), - keystore_container.local_keystore(), - config.prometheus_registry(), - &task_manager.spawn_handle(), - ) - .map_err(|e| ServiceError::Other(format!("Statement store error: {:?}", e)))?; - let (mixnet_api, mixnet_api_backend) = mixnet_config.map(sc_mixnet::Api::new).unzip(); - let (rpc_extensions_builder, rpc_setup) = { let (_, grandpa_link, _) = &import_setup; @@ -249,7 +234,6 @@ pub fn new_partial( let keystore = keystore_container.keystore(); let chain_spec = config.chain_spec.cloned_box(); let backend = backend.clone(); - let rpc_statement_store = statement_store.clone(); let rpc_extensions_builder = move |subscription_executor| { let deps = crate::rpc::FullDeps { @@ -269,8 +253,6 @@ pub fn new_partial( finality_provider: finality_proof_provider.clone(), }, backend: backend.clone(), - mixnet_api: mixnet_api.as_ref().cloned(), - statement_store: rpc_statement_store.clone(), }; crate::rpc::create_full(deps).map_err(Into::into) @@ -287,7 +269,7 @@ pub fn new_partial( select_chain, import_queue, transaction_pool, - other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry, statement_store, mixnet_api_backend), + other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry), }) } @@ -311,7 +293,6 @@ pub struct NewFullBase { /// Creates a full service from the configuration. pub fn new_full_base::Hash>>( config: Configuration, - mixnet_config: Option, disable_hardware_benchmarks: bool, with_startup_data: impl FnOnce( &sc_consensus_babe::BabeBlockImport< @@ -348,8 +329,8 @@ pub fn new_full_base::Hash>>( keystore_container, select_chain, transaction_pool, - other: (rpc_builder, import_setup, rpc_setup, mut telemetry, statement_store, mixnet_api_backend), - } = new_partial(&config, mixnet_config.as_ref())?; + other: (rpc_builder, import_setup, rpc_setup, mut telemetry), + } = new_partial(&config)?; let metrics = N::register_notification_metrics( config.prometheus_config.as_ref().map(|cfg| &cfg.registry), @@ -375,29 +356,6 @@ pub fn new_full_base::Hash>>( ); net_config.add_notification_protocol(grandpa_protocol_config); - let (statement_handler_proto, statement_config) = - sc_network_statement::StatementHandlerPrototype::new::<_, _, N>( - genesis_hash, - config.chain_spec.fork_id(), - metrics.clone(), - Arc::clone(&peer_store_handle), - ); - net_config.add_notification_protocol(statement_config); - - let mixnet_protocol_name = - sc_mixnet::protocol_name(genesis_hash.as_ref(), config.chain_spec.fork_id()); - let mixnet_notification_service = mixnet_config.as_ref().map(|mixnet_config| { - let (config, notification_service) = sc_mixnet::peers_set_config::<_, N>( - mixnet_protocol_name.clone(), - mixnet_config, - metrics.clone(), - Arc::clone(&peer_store_handle), - ); - net_config.add_notification_protocol(config); - notification_service - }); - - let warp_sync = Arc::new(grandpa::warp_proof::NetworkProvider::new( backend.clone(), import_setup.1.shared_authority_set().clone(), @@ -417,22 +375,6 @@ pub fn new_full_base::Hash>>( metrics, })?; - if let Some(mixnet_config) = mixnet_config { - let mixnet = sc_mixnet::run( - mixnet_config, - mixnet_api_backend.expect("Mixnet API backend created if mixnet enabled"), - client.clone(), - sync_service.clone(), - network.clone(), - mixnet_protocol_name, - transaction_pool.clone(), - Some(keystore_container.keystore()), - mixnet_notification_service - .expect("`NotificationService` exists since mixnet was enabled; qed"), - ); - task_manager.spawn_handle().spawn("mixnet", None, mixnet); - } - if config.offchain_worker.enabled { use futures::FutureExt; @@ -670,26 +612,6 @@ pub fn new_full_base::Hash>>( ); } - // Spawn statement protocol worker - let statement_protocol_executor = { - let spawn_handle = task_manager.spawn_handle(); - Box::new(move |fut| { - spawn_handle.spawn("network-statement-validator", Some("networking"), fut); - }) - }; - let statement_handler = statement_handler_proto.build( - network.clone(), - sync_service.clone(), - statement_store.clone(), - prometheus_registry.as_ref(), - statement_protocol_executor, - )?; - task_manager.spawn_handle().spawn( - "network-statement-handler", - Some("networking"), - statement_handler.run(), - ); - network_starter.start_network(); Ok(NewFullBase { task_manager, @@ -703,14 +625,12 @@ pub fn new_full_base::Hash>>( /// Builds a new service for a full client. pub fn new_full(config: Configuration, cli: Cli) -> Result { - let mixnet_config = cli.mixnet_params.config(config.role.is_authority()); let database_path = config.database.path().map(Path::to_path_buf); let task_manager = match config.network.network_backend { sc_network::config::NetworkBackendType::Libp2p => { let task_manager = new_full_base::>( config, - mixnet_config, cli.no_hardware_benchmarks, |_, _| (), cli.tss_server_endpoint, @@ -721,7 +641,6 @@ pub fn new_full(config: Configuration, cli: Cli) -> Result { let task_manager = new_full_base::( config, - mixnet_config, cli.no_hardware_benchmarks, |_, _| (), cli.tss_server_endpoint, diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index b75164162..763ef36d7 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -43,8 +43,6 @@ sp-storage = { version = "21.0.0", default-features = false, optional sp-transaction-pool = { version = "34.0.0", default-features = false } sp-version = { version = "37.0.0", default-features = false } sp-genesis-builder = { version = "0.15.1", default-features = false } -sp-statement-store = { version = "18.0.0", default-features = false} -sp-mixnet = { version = "0.12.0", default-features = false} # FRAME Dependencies frame-benchmarking = { version = "38.0.0", default-features = false, optional = true } @@ -95,8 +93,6 @@ pallet-transaction-storage = { version = "37.0.0", default-fea pallet-treasury = { version = "37.0.0", default-features = false } pallet-utility = { version = "38.0.0", default-features = false } pallet-vesting = { version = "38.0.0", default-features = false } -pallet-statement = { version = "20.0.0", default-features = false } -pallet-mixnet = { version = "0.14.0", default-features = false } # Entropy Pallets pallet-programs ={ version='0.3.0-rc.1', path='../pallets/programs', default-features=false } @@ -164,8 +160,6 @@ std=[ "pallet-slashing/std", "pallet-staking-extension/std", "pallet-staking/std", - "pallet-statement/std", - "pallet-mixnet/std", "pallet-sudo/std", "pallet-timestamp/std", "pallet-tips/std", @@ -187,12 +181,10 @@ std=[ "sp-io/std", "sp-npos-elections/std", "sp-offchain/std", - "sp-mixnet/std", "sp-runtime/std", "sp-session/std", "sp-staking/std", "sp-std/std", - "sp-statement-store/std", "sp-transaction-pool/std", "sp-version/std", "substrate-wasm-builder", diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index a10dca1d7..535525021 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -1517,49 +1517,6 @@ impl pallet_nomination_pools::Config for Runtime { type WeightInfo = weights::pallet_nomination_pools::WeightInfo; } -parameter_types! { - pub StatementCost: Balance = 1 * DOLLARS; - pub StatementByteCost: Balance = 100 * MILLICENTS; - pub const MinAllowedStatements: u32 = 4; - pub const MaxAllowedStatements: u32 = 10; - pub const MinAllowedBytes: u32 = 1024; - pub const MaxAllowedBytes: u32 = 4096; -} - -impl pallet_statement::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type StatementCost = StatementCost; - type ByteCost = StatementByteCost; - type MinAllowedStatements = MinAllowedStatements; - type MaxAllowedStatements = MaxAllowedStatements; - type MinAllowedBytes = MinAllowedBytes; - type MaxAllowedBytes = MaxAllowedBytes; -} - -parameter_types! { - pub const MixnetNumCoverToCurrentBlocks: BlockNumber = 3; - pub const MixnetNumRequestsToCurrentBlocks: BlockNumber = 3; - pub const MixnetNumCoverToPrevBlocks: BlockNumber = 3; - pub const MixnetNumRegisterStartSlackBlocks: BlockNumber = 3; - pub const MixnetNumRegisterEndSlackBlocks: BlockNumber = 3; - pub const MixnetRegistrationPriority: TransactionPriority = ImOnlineUnsignedPriority::get() - 1; -} - -impl pallet_mixnet::Config for Runtime { - type MaxAuthorities = MaxAuthorities; - type MaxExternalAddressSize = ConstU32<128>; - type MaxExternalAddressesPerMixnode = ConstU32<16>; - type NextSessionRotation = Babe; - type NumCoverToCurrentBlocks = MixnetNumCoverToCurrentBlocks; - type NumRequestsToCurrentBlocks = MixnetNumRequestsToCurrentBlocks; - type NumCoverToPrevBlocks = MixnetNumCoverToPrevBlocks; - type NumRegisterStartSlackBlocks = MixnetNumRegisterStartSlackBlocks; - type NumRegisterEndSlackBlocks = MixnetNumRegisterEndSlackBlocks; - type RegistrationPriority = MixnetRegistrationPriority; - type MinMixnodes = ConstU32<7>; // Low to allow small testing networks -} - parameter_types! { /// This is intentionally low for testing. /// @@ -1695,11 +1652,6 @@ construct_runtime!( Parameters: pallet_parameters = 56, Oracle: pallet_oracle = 57, Attestation: pallet_attestation = 58, - - - Statement: pallet_statement = 60, - Mixnet: pallet_mixnet = 61, - } ); @@ -1855,15 +1807,6 @@ impl_runtime_apis! { } } - impl sp_statement_store::runtime_api::ValidateStatement for Runtime { - fn validate_statement( - source: sp_statement_store::runtime_api::StatementSource, - statement: sp_statement_store::Statement, - ) -> Result { - Statement::validate_statement(source, statement) - } -} - impl sp_offchain::OffchainWorkerApi for Runtime { fn offchain_worker(header: &::Header) { Executive::offchain_worker(header) @@ -2000,24 +1943,6 @@ impl_runtime_apis! { } } -impl sp_mixnet::runtime_api::MixnetApi for Runtime { - fn session_status() -> sp_mixnet::types::SessionStatus { - Mixnet::session_status() - } - - fn prev_mixnodes() -> Result, sp_mixnet::types::MixnodesErr> { - Mixnet::prev_mixnodes() - } - - fn current_mixnodes() -> Result, sp_mixnet::types::MixnodesErr> { - Mixnet::current_mixnodes() - } - - fn maybe_register(session_index: sp_mixnet::types::SessionIndex, mixnode: sp_mixnet::types::Mixnode) -> bool { - Mixnet::maybe_register(session_index, mixnode) - } -} - impl sp_session::SessionKeys for Runtime { fn generate_session_keys(seed: Option>) -> Vec { From dcc186c2e8411e888223a2be9bcf235ecffc8663 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Thu, 31 Oct 2024 18:10:13 -0400 Subject: [PATCH 07/22] clean --- crates/client/src/tests.rs | 2 +- crates/testing-utils/src/node_proc.rs | 1 - .../src/user/tests.rs | 13 +- node/cli/src/rpc.rs | 11 +- node/cli/src/service.rs | 234 +++++++++--------- pallets/attestation/src/mock.rs | 1 + pallets/propagation/src/mock.rs | 5 +- pallets/registry/src/mock.rs | 5 +- pallets/slashing/src/mock.rs | 1 + pallets/staking/src/mock.rs | 1 + pallets/staking/src/tests.rs | 8 +- runtime/src/lib.rs | 23 +- scripts/update-substrate.sh | 1 + 13 files changed, 155 insertions(+), 151 deletions(-) diff --git a/crates/client/src/tests.rs b/crates/client/src/tests.rs index 819bf8bae..ff5ede617 100644 --- a/crates/client/src/tests.rs +++ b/crates/client/src/tests.rs @@ -182,7 +182,7 @@ async fn test_remove_program_reference_counter() { verifying_key, &program_owner, BoundedVec(vec![ProgramInstance { - program_pointer: H256([0; 32]), + program_pointer: subxt::utils::H256([0; 32]), program_config: vec![], }]), ) diff --git a/crates/testing-utils/src/node_proc.rs b/crates/testing-utils/src/node_proc.rs index 645977c16..fade79357 100644 --- a/crates/testing-utils/src/node_proc.rs +++ b/crates/testing-utils/src/node_proc.rs @@ -130,7 +130,6 @@ impl TestNodeProcessBuilder { let mut cmd = process::Command::new(&self.node_path); cmd.env("RUST_LOG", "error").arg(&self.chain_type).arg("--tmp"); cmd.arg("--unsafe-force-node-key-generation"); - cmd.arg("--public-addr"); if self.force_authoring { cmd.arg("--force-authoring"); } diff --git a/crates/threshold-signature-server/src/user/tests.rs b/crates/threshold-signature-server/src/user/tests.rs index e25f4b5bf..50070a0da 100644 --- a/crates/threshold-signature-server/src/user/tests.rs +++ b/crates/threshold-signature-server/src/user/tests.rs @@ -260,8 +260,14 @@ async fn test_signature_requests_fail_on_different_conditions() { verifying_key.as_slice().try_into().unwrap(), &two.pair(), OtherBoundedVec(vec![ - OtherProgramInstance { program_pointer: subxt::utils::H256(program_hash.into()), program_config: vec![] }, - OtherProgramInstance { program_pointer: subxt::utils::H256(program_hash.into()), program_config: vec![] }, + OtherProgramInstance { + program_pointer: subxt::utils::H256(program_hash.into()), + program_config: vec![], + }, + OtherProgramInstance { + program_pointer: subxt::utils::H256(program_hash.into()), + program_config: vec![], + }, ]), ) .await @@ -1200,7 +1206,8 @@ async fn test_device_key_proxy() { }; // check to make sure config data stored properly - let program_query = entropy::storage().programs().programs(subxt::utils::H256(DEVICE_KEY_HASH.0)); + let program_query = + entropy::storage().programs().programs(subxt::utils::H256(DEVICE_KEY_HASH.0)); let program_data = query_chain(&entropy_api, &rpc, program_query, None).await.unwrap().unwrap(); let schema_config_device_key_proxy = schema_for!(UserConfig); let schema_aux_data_device_key_proxy = schema_for!(AuxData); diff --git a/node/cli/src/rpc.rs b/node/cli/src/rpc.rs index e07168e31..0a85e9c64 100644 --- a/node/cli/src/rpc.rs +++ b/node/cli/src/rpc.rs @@ -109,7 +109,12 @@ pub struct FullDeps { /// Instantiate all Full RPC extensions. pub fn create_full( - FullDeps { client, pool, select_chain, chain_spec, babe, grandpa, backend, .. }: FullDeps, + FullDeps { client, pool, select_chain, chain_spec, babe, grandpa, backend, .. }: FullDeps< + C, + P, + SC, + B, + >, ) -> Result> where C: ProvideRuntimeApi @@ -132,9 +137,7 @@ where use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; use sc_consensus_babe_rpc::{Babe, BabeApiServer}; use sc_consensus_grandpa_rpc::{Grandpa, GrandpaApiServer}; - use sc_rpc::{ - dev::{Dev, DevApiServer}, - }; + use sc_rpc::dev::{Dev, DevApiServer}; use sc_rpc_spec_v2::chain_spec::{ChainSpec, ChainSpecApiServer}; use sc_sync_state_rpc::{SyncState, SyncStateApiServer}; use substrate_frame_rpc_system::{System, SystemApiServer}; diff --git a/node/cli/src/service.rs b/node/cli/src/service.rs index b0440e245..0d71dd810 100644 --- a/node/cli/src/service.rs +++ b/node/cli/src/service.rs @@ -61,14 +61,14 @@ use crate::cli::Cli; /// Host functions required for kitchensink runtime and Substrate node. #[cfg(not(feature = "runtime-benchmarks"))] pub type HostFunctions = - (sp_io::SubstrateHostFunctions, sp_statement_store::runtime_api::HostFunctions); + (sp_io::SubstrateHostFunctions, sp_statement_store::runtime_api::HostFunctions); /// Host functions required for kitchensink runtime and Substrate node. #[cfg(feature = "runtime-benchmarks")] pub type HostFunctions = ( - sp_io::SubstrateHostFunctions, - sp_statement_store::runtime_api::HostFunctions, - frame_benchmarking::benchmarking::HostFunctions, + sp_io::SubstrateHostFunctions, + sp_statement_store::runtime_api::HostFunctions, + frame_benchmarking::benchmarking::HostFunctions, ); /// A specialized `WasmExecutor` intended to use across substrate node. It provides all required @@ -110,110 +110,106 @@ impl sc_executor::NativeExecutionDispatch for ExecutorDispatch { /// Creates a new partial node. pub fn new_partial( - config: &Configuration, + config: &Configuration, ) -> Result< - sc_service::PartialComponents< - FullClient, - FullBackend, - FullSelectChain, - sc_consensus::DefaultImportQueue, - sc_transaction_pool::FullPool, - ( - impl Fn( - sc_rpc::SubscriptionTaskExecutor, - ) -> Result, sc_service::Error>, - ( - sc_consensus_babe::BabeBlockImport< - Block, - FullClient, - FullGrandpaBlockImport, - >, - grandpa::LinkHalf, - sc_consensus_babe::BabeLink, - ), - grandpa::SharedVoterState, - Option, - ), - >, - ServiceError, + sc_service::PartialComponents< + FullClient, + FullBackend, + FullSelectChain, + sc_consensus::DefaultImportQueue, + sc_transaction_pool::FullPool, + ( + impl Fn( + sc_rpc::SubscriptionTaskExecutor, + ) -> Result, sc_service::Error>, + ( + sc_consensus_babe::BabeBlockImport, + grandpa::LinkHalf, + sc_consensus_babe::BabeLink, + ), + grandpa::SharedVoterState, + Option, + ), + >, + ServiceError, > { - let telemetry = config - .telemetry_endpoints - .clone() - .filter(|x| !x.is_empty()) - .map(|endpoints| -> Result<_, sc_telemetry::Error> { - let worker = TelemetryWorker::new(16)?; - let telemetry = worker.handle().new_telemetry(endpoints); - Ok((worker, telemetry)) - }) - .transpose()?; - - let executor = sc_service::new_wasm_executor(&config.executor); - - let (client, backend, keystore_container, task_manager) = - sc_service::new_full_parts::( - config, - telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), - executor, - )?; - let client = Arc::new(client); - - let telemetry = telemetry.map(|(worker, telemetry)| { - task_manager.spawn_handle().spawn("telemetry", None, worker.run()); - telemetry - }); - - let select_chain = sc_consensus::LongestChain::new(backend.clone()); - - let transaction_pool = sc_transaction_pool::BasicPool::new_full( - config.transaction_pool.clone(), - config.role.is_authority().into(), - config.prometheus_registry(), - task_manager.spawn_essential_handle(), - client.clone(), - ); - - let (grandpa_block_import, grandpa_link) = grandpa::block_import( - client.clone(), - GRANDPA_JUSTIFICATION_PERIOD, - &(client.clone() as Arc<_>), - select_chain.clone(), - telemetry.as_ref().map(|x| x.handle()), - )?; - let justification_import = grandpa_block_import.clone(); - - let (block_import, babe_link) = sc_consensus_babe::block_import( - sc_consensus_babe::configuration(&*client)?, - grandpa_block_import, - client.clone(), - )?; - - let slot_duration = babe_link.config().slot_duration(); - let (import_queue, babe_worker_handle) = - sc_consensus_babe::import_queue(sc_consensus_babe::ImportQueueParams { - link: babe_link.clone(), - block_import: block_import.clone(), - justification_import: Some(Box::new(justification_import)), - client: client.clone(), - select_chain: select_chain.clone(), - create_inherent_data_providers: move |_, ()| async move { - let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - - let slot = + let telemetry = config + .telemetry_endpoints + .clone() + .filter(|x| !x.is_empty()) + .map(|endpoints| -> Result<_, sc_telemetry::Error> { + let worker = TelemetryWorker::new(16)?; + let telemetry = worker.handle().new_telemetry(endpoints); + Ok((worker, telemetry)) + }) + .transpose()?; + + let executor = sc_service::new_wasm_executor(&config.executor); + + let (client, backend, keystore_container, task_manager) = + sc_service::new_full_parts::( + config, + telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), + executor, + )?; + let client = Arc::new(client); + + let telemetry = telemetry.map(|(worker, telemetry)| { + task_manager.spawn_handle().spawn("telemetry", None, worker.run()); + telemetry + }); + + let select_chain = sc_consensus::LongestChain::new(backend.clone()); + + let transaction_pool = sc_transaction_pool::BasicPool::new_full( + config.transaction_pool.clone(), + config.role.is_authority().into(), + config.prometheus_registry(), + task_manager.spawn_essential_handle(), + client.clone(), + ); + + let (grandpa_block_import, grandpa_link) = grandpa::block_import( + client.clone(), + GRANDPA_JUSTIFICATION_PERIOD, + &(client.clone() as Arc<_>), + select_chain.clone(), + telemetry.as_ref().map(|x| x.handle()), + )?; + let justification_import = grandpa_block_import.clone(); + + let (block_import, babe_link) = sc_consensus_babe::block_import( + sc_consensus_babe::configuration(&*client)?, + grandpa_block_import, + client.clone(), + )?; + + let slot_duration = babe_link.config().slot_duration(); + let (import_queue, babe_worker_handle) = + sc_consensus_babe::import_queue(sc_consensus_babe::ImportQueueParams { + link: babe_link.clone(), + block_import: block_import.clone(), + justification_import: Some(Box::new(justification_import)), + client: client.clone(), + select_chain: select_chain.clone(), + create_inherent_data_providers: move |_, ()| async move { + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *timestamp, slot_duration, ); - Ok((slot, timestamp)) - }, - spawner: &task_manager.spawn_essential_handle(), - registry: config.prometheus_registry(), - telemetry: telemetry.as_ref().map(|x| x.handle()), - offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()), - })?; + Ok((slot, timestamp)) + }, + spawner: &task_manager.spawn_essential_handle(), + registry: config.prometheus_registry(), + telemetry: telemetry.as_ref().map(|x| x.handle()), + offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()), + })?; - let import_setup = (block_import, grandpa_link, babe_link); + let import_setup = (block_import, grandpa_link, babe_link); let (rpc_extensions_builder, rpc_setup) = { let (_, grandpa_link, _) = &import_setup; @@ -295,24 +291,20 @@ pub fn new_full_base::Hash>>( config: Configuration, disable_hardware_benchmarks: bool, with_startup_data: impl FnOnce( - &sc_consensus_babe::BabeBlockImport< - Block, - FullClient, - FullGrandpaBlockImport, - >, - &sc_consensus_babe::BabeLink, - ), + &sc_consensus_babe::BabeBlockImport, + &sc_consensus_babe::BabeLink, + ), tss_server_endpoint: Option, ) -> Result { let is_offchain_indexing_enabled = config.offchain_worker.indexing_enabled; - let role = config.role; - let force_authoring = config.force_authoring; - // let backoff_authoring_blocks: = - // Some(sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging::default()); - let name = config.network.node_name.clone(); - let enable_grandpa = !config.disable_grandpa; - let prometheus_registry = config.prometheus_registry().cloned(); - let enable_offchain_worker = config.offchain_worker.enabled; + let role = config.role; + let force_authoring = config.force_authoring; + // let backoff_authoring_blocks: = + // Some(sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging::default()); + let name = config.network.node_name.clone(); + let enable_grandpa = !config.disable_grandpa; + let prometheus_registry = config.prometheus_registry().cloned(); + let enable_offchain_worker = config.offchain_worker.enabled; let hwbench = (!disable_hardware_benchmarks) .then_some(config.database.path().map(|database_path| { @@ -343,7 +335,7 @@ pub fn new_full_base::Hash>>( ); let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht; - let auth_disc_public_addresses = config.network.public_addresses.clone(); + let auth_disc_public_addresses = config.network.public_addresses.clone(); let peer_store_handle = net_config.peer_store_handle(); let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"); @@ -375,7 +367,6 @@ pub fn new_full_base::Hash>>( metrics, })?; - if config.offchain_worker.enabled { use futures::FutureExt; @@ -428,7 +419,6 @@ pub fn new_full_base::Hash>>( ); log::info!("Threshold Signing Sever (TSS) location changed to {}", endpoint); } - } let role = config.role.clone(); @@ -530,10 +520,10 @@ pub fn new_full_base::Hash>>( let babe = sc_consensus_babe::start_babe(babe_config)?; task_manager.spawn_essential_handle().spawn_blocking( - "babe-proposer", - Some("block-authoring"), - babe, - ); + "babe-proposer", + Some("block-authoring"), + babe, + ); } // Spawn authority discovery module. diff --git a/pallets/attestation/src/mock.rs b/pallets/attestation/src/mock.rs index e9485f086..2c33f94d8 100644 --- a/pallets/attestation/src/mock.rs +++ b/pallets/attestation/src/mock.rs @@ -271,6 +271,7 @@ impl pallet_staking::Config for Test { type TargetList = pallet_staking::UseValidatorsMap; type UnixTime = pallet_timestamp::Pallet; type VoterList = BagsList; + type DisablingStrategy = pallet_staking::UpToLimitDisablingStrategy; type WeightInfo = (); } diff --git a/pallets/propagation/src/mock.rs b/pallets/propagation/src/mock.rs index 21c660c2a..20f6f4682 100644 --- a/pallets/propagation/src/mock.rs +++ b/pallets/propagation/src/mock.rs @@ -263,6 +263,7 @@ impl pallet_staking::Config for Test { type TargetList = pallet_staking::UseValidatorsMap; type UnixTime = pallet_timestamp::Pallet; type VoterList = BagsList; + type DisablingStrategy = pallet_staking::UpToLimitDisablingStrategy; type WeightInfo = (); } @@ -397,7 +398,9 @@ pub fn new_test_ext() -> sp_io::TestExternalities { let stakers = vec![1, 2]; let keys: Vec<_> = stakers.iter().cloned().map(|i| (i, i, UintAuthorityId(i).into())).collect(); - pallet_session::GenesisConfig:: { keys }.assimilate_storage(&mut t).unwrap(); + pallet_session::GenesisConfig:: { keys, non_authority_keys: vec![] } + .assimilate_storage(&mut t) + .unwrap(); t.into() } diff --git a/pallets/registry/src/mock.rs b/pallets/registry/src/mock.rs index 43a61af66..b937243c8 100644 --- a/pallets/registry/src/mock.rs +++ b/pallets/registry/src/mock.rs @@ -260,6 +260,7 @@ impl pallet_staking::Config for Test { type TargetList = pallet_staking::UseValidatorsMap; type UnixTime = pallet_timestamp::Pallet; type VoterList = BagsList; + type DisablingStrategy = pallet_staking::UpToLimitDisablingStrategy; type WeightInfo = (); } @@ -384,7 +385,9 @@ pub fn new_test_ext() -> sp_io::TestExternalities { let stakers = vec![1, 2, 5]; let keys: Vec<_> = stakers.iter().cloned().map(|i| (i, i, UintAuthorityId(i).into())).collect(); - pallet_session::GenesisConfig:: { keys }.assimilate_storage(&mut t).unwrap(); + pallet_session::GenesisConfig:: { keys, non_authority_keys: vec![] } + .assimilate_storage(&mut t) + .unwrap(); pallet_parameters::GenesisConfig:: { request_limit: 5u32, max_instructions_per_programs: 5u64, diff --git a/pallets/slashing/src/mock.rs b/pallets/slashing/src/mock.rs index d76287a80..19d83f9b7 100644 --- a/pallets/slashing/src/mock.rs +++ b/pallets/slashing/src/mock.rs @@ -186,6 +186,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities { let session_genesis = pallet_session::GenesisConfig:: { // (AccountId, ValidatorId, SessionKey) keys: (0..=num_validators).map(|id| (id, id, UintAuthorityId(id))).collect(), + non_authority_keys: vec![], }; let _ = session_genesis.assimilate_storage(&mut storage); diff --git a/pallets/staking/src/mock.rs b/pallets/staking/src/mock.rs index e45462db3..a1279cd9e 100644 --- a/pallets/staking/src/mock.rs +++ b/pallets/staking/src/mock.rs @@ -327,6 +327,7 @@ impl pallet_staking::Config for Test { type TargetList = pallet_staking::UseValidatorsMap; type UnixTime = pallet_timestamp::Pallet; type VoterList = BagsList; + type DisablingStrategy = pallet_staking::UpToLimitDisablingStrategy; type WeightInfo = (); } diff --git a/pallets/staking/src/tests.rs b/pallets/staking/src/tests.rs index 98faa0d24..ac5a7dda6 100644 --- a/pallets/staking/src/tests.rs +++ b/pallets/staking/src/tests.rs @@ -327,13 +327,13 @@ fn it_deletes_when_no_bond_left() { assert_eq!(tss_account, 3); assert_eq!(Staking::threshold_to_stash(3).unwrap(), 2); - let mut lock = Balances::locks(2); + let mut lock = Balances::locks(&2u64); assert_eq!(lock[0].amount, 100); assert_eq!(lock.len(), 1); assert_ok!(FrameStaking::unbond(RuntimeOrigin::signed(2), 50u64,)); - lock = Balances::locks(2); + lock = Balances::locks(&2u64); assert_eq!(lock[0].amount, 100); assert_eq!(lock.len(), 1); println!(":{:?}", FrameStaking::ledger(1.into())); @@ -351,7 +351,7 @@ fn it_deletes_when_no_bond_left() { amount: 50, })); - lock = Balances::locks(2); + lock = Balances::locks(&2u64); assert_eq!(lock[0].amount, 50); assert_eq!(lock.len(), 1); @@ -366,7 +366,7 @@ fn it_deletes_when_no_bond_left() { // make sure node info removed event happens System::assert_last_event(RuntimeEvent::Staking(crate::Event::NodeInfoRemoved(2))); - lock = Balances::locks(2); + lock = Balances::locks(&2u64); assert_eq!(lock.len(), 0); assert_eq!(Staking::threshold_server(2), None); assert_eq!(Staking::threshold_to_stash(3), None); diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 535525021..778ee3b37 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -36,8 +36,8 @@ #![recursion_limit = "512"] use codec::{Decode, Encode, MaxEncodedLen}; use frame_election_provider_support::{ - bounds::ElectionBoundsBuilder, generate_solution_type, onchain, BalancingConfig, - ElectionDataProvider, ExtendedBalance, NposSolution, SequentialPhragmen, VoteWeight, + bounds::ElectionBoundsBuilder, onchain, BalancingConfig, ElectionDataProvider, NposSolution, + SequentialPhragmen, VoteWeight, }; use frame_support::{ construct_runtime, @@ -47,14 +47,14 @@ use frame_support::{ parameter_types, sp_runtime::RuntimeDebug, traits::{ - fungible::{self, Credit, HoldConsideration}, + fungible::{self, HoldConsideration}, tokens::{ - imbalance::ResolveTo, nonfungibles_v2::Inspect, pay::PayAssetFromAccount, GetSalary, - Pay, PayFromAccount, PaymentStatus, Preservation, UnityAssetBalanceConversion, + nonfungibles_v2::Inspect, GetSalary, Pay, PaymentStatus, Preservation, + UnityAssetBalanceConversion, }, - ConstU16, ConstU32, Contains, Currency, EitherOf, EitherOfDiverse, EqualPrivilegeOnly, - Imbalance, InstanceFilter, KeyOwnerProofSystem, LinearStoragePrice, LockIdentifier, - OnUnbalanced, WithdrawReasons, + ConstU32, Contains, Currency, EitherOfDiverse, EqualPrivilegeOnly, Imbalance, + InstanceFilter, KeyOwnerProofSystem, LinearStoragePrice, LockIdentifier, OnUnbalanced, + WithdrawReasons, }, weights::{ constants::{ @@ -89,7 +89,6 @@ use sp_api::impl_runtime_apis; use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId; pub use sp_consensus_babe::AuthorityId as BabeId; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; -use sp_genesis_builder::PresetId; use sp_inherents::{CheckInherentsResult, InherentData}; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; @@ -105,11 +104,7 @@ use sp_runtime::{ ApplyExtrinsicResult, DispatchError, FixedPointNumber, FixedU128, Perbill, Percent, Permill, Perquintill, }; -use sp_std::{ - cmp::Ordering, - collections::{btree_map::BTreeMap, vec_deque::VecDeque}, - prelude::*, -}; +use sp_std::prelude::*; #[cfg(any(feature = "std", test))] use sp_version::NativeVersion; use sp_version::RuntimeVersion; diff --git a/scripts/update-substrate.sh b/scripts/update-substrate.sh index 35f0d032c..e0998ba36 100755 --- a/scripts/update-substrate.sh +++ b/scripts/update-substrate.sh @@ -9,6 +9,7 @@ dir=( runtime node/cli pallets/* + crates/* ) for d in ${dir[@]} From d87c0ac2792da0bc1317fdae78e49ec4e46a8094 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Thu, 31 Oct 2024 18:29:28 -0400 Subject: [PATCH 08/22] clean --- crates/client/Cargo.toml | 8 +- crates/kvdb/Cargo.toml | 2 +- crates/protocol/Cargo.toml | 4 +- crates/shared/Cargo.toml | 6 +- crates/test-cli/Cargo.toml | 4 +- crates/testing-utils/Cargo.toml | 4 +- crates/threshold-signature-server/Cargo.toml | 4 +- node/cli/Cargo.toml | 112 ++++++++-------- node/cli/src/chain_spec/mod.rs | 2 +- node/cli/src/rpc.rs | 13 +- node/cli/src/service.rs | 35 +---- pallets/attestation/Cargo.toml | 34 ++--- pallets/oracle/Cargo.toml | 14 +- pallets/parameters/Cargo.toml | 18 +-- pallets/programs/Cargo.toml | 18 +-- pallets/propagation/Cargo.toml | 38 +++--- pallets/registry/Cargo.toml | 34 ++--- pallets/slashing/Cargo.toml | 34 ++--- pallets/staking/Cargo.toml | 34 ++--- pallets/transaction-pause/Cargo.toml | 16 +-- runtime/Cargo.toml | 134 +++++++++---------- runtime/src/impls.rs | 1 - runtime/src/lib.rs | 7 +- scripts/create-test-keyshares/Cargo.toml | 2 +- 24 files changed, 265 insertions(+), 313 deletions(-) diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml index 6b98b8cc6..0b63e03ba 100644 --- a/crates/client/Cargo.toml +++ b/crates/client/Cargo.toml @@ -13,11 +13,11 @@ sha3 ="0.10.8" serde ={ version="1.0", default-features=false, features=["derive"] } entropy-shared={ version="0.3.0-rc.1", path="../shared", default-features=false } subxt ={ version="0.38.0", default-features=false, features=["jsonrpsee"] } -subxt-core ={ version="0.38.0", default-features=false} +subxt-core ={ version="0.38.0", default-features=false } num ="0.4.3" thiserror ="1.0.65" futures ="0.3" -sp-core = { version = "34.0.0", default-features = false, features = ["full_crypto", "serde"] } +sp-core ={ version="34.0.0", default-features=false, features=["full_crypto", "serde"] } tracing ="0.1.37" rand ={ version="0.8", default-features=false } @@ -39,7 +39,7 @@ tokio ={ version="1.41", features=["time"] } [dev-dependencies] serial_test ="3.1.1" -sp-keyring = "39.0.0" +sp-keyring ="39.0.0" entropy-testing-utils={ path="../testing-utils" } [features] @@ -50,7 +50,7 @@ native=[ "subxt/native", "subxt/substrate-compat", ] -wasm=["entropy-shared/wasm", "entropy-shared/user-wasm", "subxt/web",] +wasm=["entropy-shared/wasm", "entropy-shared/user-wasm", "subxt/web"] # This adds full client functionality. It is behind a feature flag because it is not needed by # entropy-tss diff --git a/crates/kvdb/Cargo.toml b/crates/kvdb/Cargo.toml index cf8f832f8..eaa249c0d 100644 --- a/crates/kvdb/Cargo.toml +++ b/crates/kvdb/Cargo.toml @@ -16,7 +16,7 @@ thiserror="1.0.65" hex ="0.4.3" # Substrate -sp-core= { version = "34.0.0", default-features = false } +sp-core={ version="34.0.0", default-features=false } # Crypto zeroize ={ version="1.8", features=["zeroize_derive"], default-features=false } diff --git a/crates/protocol/Cargo.toml b/crates/protocol/Cargo.toml index fbef4b74a..c483dd898 100644 --- a/crates/protocol/Cargo.toml +++ b/crates/protocol/Cargo.toml @@ -14,7 +14,7 @@ entropy-shared ={ version="0.3.0-rc.1", path="../shared", default-features=f synedrion ={ version="0.2.0-beta.0" } serde ={ version="1.0", features=["derive"], default-features=false } subxt ={ version="0.38.0", default-features=false } -sp-core = { version = "34.0.0", default-features = false, features = ["full_crypto", "serde"] } +sp-core ={ version="34.0.0", default-features=false, features=["full_crypto", "serde"] } tokio ={ version="1.41", features=["sync", "rt", "macros"] } x25519-dalek ={ version="2.0.1", features=["static_secrets"] } futures ="0.3" @@ -48,7 +48,7 @@ schnorrkel ={ version="0.11.4", default-features=false, features=["std" [dev-dependencies] serial_test="3.1.1" -sp-keyring = "39.0.0" +sp-keyring ="39.0.0" anyhow ="1.0.91" num_cpus ="1.16.0" diff --git a/crates/shared/Cargo.toml b/crates/shared/Cargo.toml index 80a79df57..82f456088 100644 --- a/crates/shared/Cargo.toml +++ b/crates/shared/Cargo.toml @@ -17,11 +17,11 @@ strum ="0.26.3" strum_macros="0.26.4" blake2 ={ version="0.10.4", default-features=false } -sp-runtime = { version = "39.0.1", default-features = false, optional = true, features = ["serde"] } -sp-std = { version = "14.0.0", default-features = false } +sp-runtime ={ version="39.0.1", default-features=false, optional=true, features=["serde"] } +sp-std ={ version="14.0.0", default-features=false } lazy_static={ version="1.5.0", features=["spin_no_std"] } hex-literal="0.4.1" -sp-core = { version = "34.0.0", default-features = false } +sp-core ={ version="34.0.0", default-features=false } subxt ={ version="0.38.0", default-features=false, optional=true } [features] diff --git a/crates/test-cli/Cargo.toml b/crates/test-cli/Cargo.toml index 517146806..e0c700ff3 100644 --- a/crates/test-cli/Cargo.toml +++ b/crates/test-cli/Cargo.toml @@ -13,11 +13,11 @@ entropy-client={ version="0.3.0-rc.1", path="../client" } clap ={ version="4.5.20", features=["derive"] } colored ="2.0.4" subxt ="0.38.0" -sp-core = "34.0.0" +sp-core ="34.0.0" anyhow ="1.0.91" tokio ={ version="1.41", features=["macros", "rt-multi-thread", "io-util", "process"] } hex ="0.4.3" bincode ="1.3.3" x25519-dalek ="2.0.1" -sp-runtime = { version = "39.0.1", default-features = false } +sp-runtime ={ version="39.0.1", default-features=false } entropy-shared={ version="0.3.0-rc.1", path="../shared" } diff --git a/crates/testing-utils/Cargo.toml b/crates/testing-utils/Cargo.toml index 38818d69c..7fdf20127 100644 --- a/crates/testing-utils/Cargo.toml +++ b/crates/testing-utils/Cargo.toml @@ -10,9 +10,9 @@ edition ='2021' [dependencies] subxt="0.38.0" -sp-keyring= "39.0.0" +sp-keyring="39.0.0" project-root="0.2.2" -sp-core= { version = "34.0.0", default-features = false } +sp-core={ version="34.0.0", default-features=false } parity-scale-codec="3.6.12" lazy_static="1.5.0" hex-literal="0.4.1" diff --git a/crates/threshold-signature-server/Cargo.toml b/crates/threshold-signature-server/Cargo.toml index c2f206f56..5881cf401 100644 --- a/crates/threshold-signature-server/Cargo.toml +++ b/crates/threshold-signature-server/Cargo.toml @@ -37,7 +37,7 @@ axum ={ version="0.7.7", features=["ws"] } # Substrate subxt ="0.38.0" parity-scale-codec="3.6.12" -sp-core = { version = "34.0.0", default-features = false } +sp-core ={ version="34.0.0", default-features=false } # Entropy entropy-shared={ version="0.3.0-rc.1", path="../shared" } @@ -81,7 +81,7 @@ configfs-tsm ={ version="0.0.1", optional=true } serial_test ="3.1.1" hex-literal ="0.4.1" project-root="0.2.2" -sp-keyring = "39.0.0" +sp-keyring ="39.0.0" more-asserts="0.3.1" lazy_static ="1.5.0" blake3 ="1.5.4" diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index 0b291d705..05bcf3887 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -27,70 +27,70 @@ itertools ="0.13.0" jsonrpsee ={ version="0.24.3" } lazy_static ={ version="1.5.0", features=["spin_no_std"] } log ="0.4.22" -pallet-im-online= { version = "37.0.0" } +pallet-im-online={ version="37.0.0" } rand ="0.8.5" serde ={ version="1.0.213", features=["derive"] } serde_json ='1.0.132' # Substrate Client -grandpa = { version = "0.30.0", package = "sc-consensus-grandpa" } -sc-authority-discovery = { version = "0.45.0" } -sc-basic-authorship = { version = "0.45.0" } -sc-chain-spec = { version = "38.0.0" } -sc-cli = { version = "0.47.0", optional = true } -sc-client-api = { version = "37.0.0" } -sc-consensus = { version = "0.44.0" } -sc-consensus-babe = { version = "0.45.0" } -sc-consensus-babe-rpc = { version = "0.45.0" } -sc-consensus-epochs = { version = "0.44.0" } -sc-consensus-grandpa-rpc= { version = "0.30.0" } -sc-consensus-slots = { version = "0.44.0" } -sc-executor = { version = "0.40.1" } -sc-network = { version = "0.45.0" } -sc-network-common = { version = "0.44.0" } -sc-network-sync = { version = "0.44.0" } -sc-offchain = { version = "40.0.0" } -sc-rpc = { version = "40.0.0" } -sc-rpc-api = { version = "0.44.0" } -sc-service = { version = "0.46.0" } -sc-storage-monitor = { version = "0.22.0" } -sc-sync-state-rpc = { version = "0.45.0" } -sc-sysinfo = { version = "38.0.0" } -sc-telemetry = { version = "25.0.0" } -sc-transaction-pool = { version = "37.0.0" } -sc-transaction-pool-api = { version = "37.0.0" } -sc-rpc-spec-v2 = { version = "0.45.0" } -sc-network-statement = { version = "0.27.0" } +grandpa ={ version="0.30.0", package="sc-consensus-grandpa" } +sc-authority-discovery ={ version="0.45.0" } +sc-basic-authorship ={ version="0.45.0" } +sc-chain-spec ={ version="38.0.0" } +sc-cli ={ version="0.47.0", optional=true } +sc-client-api ={ version="37.0.0" } +sc-consensus ={ version="0.44.0" } +sc-consensus-babe ={ version="0.45.0" } +sc-consensus-babe-rpc ={ version="0.45.0" } +sc-consensus-epochs ={ version="0.44.0" } +sc-consensus-grandpa-rpc={ version="0.30.0" } +sc-consensus-slots ={ version="0.44.0" } +sc-executor ={ version="0.40.1" } +sc-network ={ version="0.45.0" } +sc-network-common ={ version="0.44.0" } +sc-network-sync ={ version="0.44.0" } +sc-offchain ={ version="40.0.0" } +sc-rpc ={ version="40.0.0" } +sc-rpc-api ={ version="0.44.0" } +sc-service ={ version="0.46.0" } +sc-storage-monitor ={ version="0.22.0" } +sc-sync-state-rpc ={ version="0.45.0" } +sc-sysinfo ={ version="38.0.0" } +sc-telemetry ={ version="25.0.0" } +sc-transaction-pool ={ version="37.0.0" } +sc-transaction-pool-api ={ version="37.0.0" } +sc-rpc-spec-v2 ={ version="0.45.0" } +sc-network-statement ={ version="0.27.0" } # Substrate Primitives -grandpa-primitives = { version = "21.0.0", package = "sp-consensus-grandpa" } -sp-api = { version = "34.0.0" } -sp-authority-discovery = { version = "34.0.0" } -sp-block-builder = { version = "34.0.0" } -sp-blockchain = { version = "37.0.1" } -sp-consensus = { version = "0.40.0" } -sp-consensus-babe = { version = "0.40.0" } -sp-core = { version = "34.0.0" } -sp-inherents = { version = "34.0.0" } -sp-keyring = { version = "39.0.0" } -sp-keystore = { version = "0.40.0" } -sp-runtime = { version = "39.0.1" } -sp-timestamp = { version = "34.0.0" } -sp-transaction-storage-proof= { version = "34.0.0" } -substrate-frame-rpc-system = { version = "39.0.0" } -sp-statement-store = { version = "18.0.0" } -sp-io = { version = "38.0.0" } +grandpa-primitives ={ version="21.0.0", package="sp-consensus-grandpa" } +sp-api ={ version="34.0.0" } +sp-authority-discovery ={ version="34.0.0" } +sp-block-builder ={ version="34.0.0" } +sp-blockchain ={ version="37.0.1" } +sp-consensus ={ version="0.40.0" } +sp-consensus-babe ={ version="0.40.0" } +sp-core ={ version="34.0.0" } +sp-inherents ={ version="34.0.0" } +sp-keyring ={ version="39.0.0" } +sp-keystore ={ version="0.40.0" } +sp-runtime ={ version="39.0.1" } +sp-timestamp ={ version="34.0.0" } +sp-transaction-storage-proof={ version="34.0.0" } +substrate-frame-rpc-system ={ version="39.0.0" } +sp-statement-store ={ version="18.0.0" } +sp-io ={ version="38.0.0" } # FRAME Dependencies -frame-benchmarking = { version = "38.0.0", default-features = false, optional = true, features = ["std"] } -frame-benchmarking-cli = { version = "43.0.0", optional = true } -frame-system = { version = "38.0.0" } -frame-system-rpc-runtime-api= { version = "34.0.0" } +frame-benchmarking ={ version="38.0.0", default-features=false, optional=true, features=["std"] } +frame-benchmarking-cli ={ version="43.0.0", optional=true } +frame-system ={ version="38.0.0" } +frame-system-rpc-runtime-api={ version="34.0.0" } # Substrate Pallets -pallet-transaction-payment = { version = "38.0.0" } -pallet-transaction-payment-rpc= { version = "41.0.0" } +pallet-transaction-payment ={ version="38.0.0" } +pallet-transaction-payment-rpc={ version="41.0.0" } # Entropy Dependencies entropy-runtime={ version="0.3.0-rc.1", path="../../runtime" } @@ -104,13 +104,13 @@ project-root="0.2.2" [build-dependencies] clap={ version="4.5.20", optional=true } -pallet-balances = { version = "39.0.0" } -substrate-build-script-utils= { version = "11.0.0" } -try-runtime-cli = { version = "0.42.0" } +pallet-balances ={ version="39.0.0" } +substrate-build-script-utils={ version="11.0.0" } +try-runtime-cli ={ version="0.42.0" } [dev-dependencies] tempfile ="3.13.0" -sp-tracing= { version = "17.0.1" } +sp-tracing={ version="17.0.1" } [features] default=["cli"] diff --git a/node/cli/src/chain_spec/mod.rs b/node/cli/src/chain_spec/mod.rs index c467c72bd..7b324f5ad 100644 --- a/node/cli/src/chain_spec/mod.rs +++ b/node/cli/src/chain_spec/mod.rs @@ -35,7 +35,7 @@ pub mod dev; pub mod integration_tests; pub mod testnet; -pub use entropy_runtime::{AccountId, RuntimeGenesisConfig, Signature}; +pub use entropy_runtime::{AccountId, Signature}; use entropy_runtime::{Block, SessionKeys}; use grandpa_primitives::AuthorityId as GrandpaId; diff --git a/node/cli/src/rpc.rs b/node/cli/src/rpc.rs index 0a85e9c64..433884a4f 100644 --- a/node/cli/src/rpc.rs +++ b/node/cli/src/rpc.rs @@ -53,7 +53,6 @@ use jsonrpsee::RpcModule; use sc_client_api::AuxStore; use sc_consensus_babe::BabeWorkerHandle; use sc_rpc::SubscriptionTaskExecutor; -pub use sc_rpc_api::DenyUnsafe; use sc_transaction_pool_api::TransactionPool; use sp_api::ProvideRuntimeApi; use sp_block_builder::BlockBuilder; @@ -109,12 +108,7 @@ pub struct FullDeps { /// Instantiate all Full RPC extensions. pub fn create_full( - FullDeps { client, pool, select_chain, chain_spec, babe, grandpa, backend, .. }: FullDeps< - C, - P, - SC, - B, - >, + FullDeps { client, pool, select_chain, chain_spec, babe, grandpa, .. }: FullDeps, ) -> Result> where C: ProvideRuntimeApi @@ -138,7 +132,6 @@ where use sc_consensus_babe_rpc::{Babe, BabeApiServer}; use sc_consensus_grandpa_rpc::{Grandpa, GrandpaApiServer}; use sc_rpc::dev::{Dev, DevApiServer}; - use sc_rpc_spec_v2::chain_spec::{ChainSpec, ChainSpecApiServer}; use sc_sync_state_rpc::{SyncState, SyncStateApiServer}; use substrate_frame_rpc_system::{System, SystemApiServer}; @@ -152,10 +145,6 @@ where finality_provider, } = grandpa; - let chain_name = chain_spec.name().to_string(); - let genesis_hash = client.hash(0).ok().flatten().expect("Genesis block exists; qed"); - let properties = chain_spec.properties(); - io.merge(System::new(client.clone(), pool).into_rpc())?; io.merge(TransactionPayment::new(client.clone()).into_rpc())?; diff --git a/node/cli/src/service.rs b/node/cli/src/service.rs index 0d71dd810..2ce28ac8e 100644 --- a/node/cli/src/service.rs +++ b/node/cli/src/service.rs @@ -41,11 +41,10 @@ use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE; use futures::prelude::*; use sc_client_api::{Backend, BlockBackend}; use sc_consensus_babe::{self, SlotProportion}; -use sc_executor::NativeElseWasmExecutor; use sc_network::{ event::Event, service::traits::NetworkService, NetworkBackend, NetworkEventStream, }; -use sc_network_sync::{service::network::Network, SyncingService}; +use sc_network_sync::SyncingService; use sc_offchain::OffchainDb; use sc_service::{ config::Configuration, error::Error as ServiceError, RpcHandlers, TaskManager, WarpSyncConfig, @@ -88,26 +87,6 @@ pub type TransactionPool = sc_transaction_pool::FullPool; /// imported and generated. const GRANDPA_JUSTIFICATION_PERIOD: u32 = 512; -// Our native executor instance. -pub struct ExecutorDispatch; - -impl sc_executor::NativeExecutionDispatch for ExecutorDispatch { - /// Only enable the benchmarking host functions when we actually want to benchmark. - #[cfg(feature = "runtime-benchmarks")] - type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; - /// Otherwise we only use the default Substrate host functions. - #[cfg(not(feature = "runtime-benchmarks"))] - type ExtendHostFunctions = (); - - fn dispatch(method: &str, data: &[u8]) -> Option> { - entropy_runtime::api::dispatch(method, data) - } - - fn native_version() -> sc_executor::NativeVersion { - entropy_runtime::native_version() - } -} - /// Creates a new partial node. pub fn new_partial( config: &Configuration, @@ -296,16 +275,6 @@ pub fn new_full_base::Hash>>( ), tss_server_endpoint: Option, ) -> Result { - let is_offchain_indexing_enabled = config.offchain_worker.indexing_enabled; - let role = config.role; - let force_authoring = config.force_authoring; - // let backoff_authoring_blocks: = - // Some(sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging::default()); - let name = config.network.node_name.clone(); - let enable_grandpa = !config.disable_grandpa; - let prometheus_registry = config.prometheus_registry().cloned(); - let enable_offchain_worker = config.offchain_worker.enabled; - let hwbench = (!disable_hardware_benchmarks) .then_some(config.database.path().map(|database_path| { let _ = std::fs::create_dir_all(database_path); @@ -328,14 +297,12 @@ pub fn new_full_base::Hash>>( config.prometheus_config.as_ref().map(|cfg| &cfg.registry), ); let shared_voter_state = rpc_setup; - let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht; let mut net_config = sc_network::config::FullNetworkConfiguration::<_, _, N>::new( &config.network, config.prometheus_config.as_ref().map(|cfg| cfg.registry.clone()), ); let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht; - let auth_disc_public_addresses = config.network.public_addresses.clone(); let peer_store_handle = net_config.peer_store_handle(); let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"); diff --git a/pallets/attestation/Cargo.toml b/pallets/attestation/Cargo.toml index dcb6dcfae..2710521e8 100644 --- a/pallets/attestation/Cargo.toml +++ b/pallets/attestation/Cargo.toml @@ -12,15 +12,15 @@ publish =false codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] } scale-info ={ version="2.11", default-features=false, features=["derive"] } log ={ version="0.4.22", default-features=false } -frame-support = { version = "38.0.0", default-features = false } -frame-system = { version = "38.0.0", default-features = false } -sp-io = { version = "38.0.0", default-features = false } -sp-core = { version = "34.0.0", default-features = false } -sp-runtime = { version = "39.0.1", default-features = false } -sp-staking = { version = "36.0.0", default-features = false } -frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } -sp-std = { version = "14.0.0", default-features = false } -pallet-session = { version = "38.0.0", default-features = false, optional = true } +frame-support ={ version="38.0.0", default-features=false } +frame-system ={ version="38.0.0", default-features=false } +sp-io ={ version="38.0.0", default-features=false } +sp-core ={ version="34.0.0", default-features=false } +sp-runtime ={ version="39.0.1", default-features=false } +sp-staking ={ version="36.0.0", default-features=false } +frame-benchmarking={ version="38.0.0", default-features=false, optional=true } +sp-std ={ version="14.0.0", default-features=false } +pallet-session ={ version="38.0.0", default-features=false, optional=true } rand_chacha ={ version="0.3", default-features=false } pallet-parameters={ version="0.3.0-rc.1", path="../parameters", default-features=false } @@ -31,14 +31,14 @@ pallet-staking-extension={ version="0.3.0-rc.1", path="../staking", default-feat tdx-quote="0.0.1" [dev-dependencies] -pallet-session = { version = "38.0.0", default-features = false } -pallet-staking = { version = "38.0.0", default-features = false } -pallet-balances = { version = "39.0.0", default-features = false } -pallet-bags-list = { version = "37.0.0", default-features = false } -pallet-timestamp = { version = "37.0.0", default-features = false } -sp-npos-elections = { version = "34.0.0", default-features = false } -frame-election-provider-support= { version = "38.0.0", default-features = false } -pallet-staking-reward-curve = { version = "12.0.0" } +pallet-session ={ version="38.0.0", default-features=false } +pallet-staking ={ version="38.0.0", default-features=false } +pallet-balances ={ version="39.0.0", default-features=false } +pallet-bags-list ={ version="37.0.0", default-features=false } +pallet-timestamp ={ version="37.0.0", default-features=false } +sp-npos-elections ={ version="34.0.0", default-features=false } +frame-election-provider-support={ version="38.0.0", default-features=false } +pallet-staking-reward-curve ={ version="12.0.0" } tdx-quote ={ version="0.0.1", features=["mock"] } rand_core ="0.6.4" diff --git a/pallets/oracle/Cargo.toml b/pallets/oracle/Cargo.toml index 2b8efa0e3..aae4754e7 100644 --- a/pallets/oracle/Cargo.toml +++ b/pallets/oracle/Cargo.toml @@ -12,15 +12,15 @@ publish =false codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] } scale-info={ version="2.11", default-features=false, features=["derive"] } -frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } -frame-support = { version = "38.0.0", default-features = false } -frame-system = { version = "38.0.0", default-features = false } -sp-runtime = { version = "39.0.1", default-features = false } -sp-std = { version = "14.0.0", default-features = false } +frame-benchmarking={ version="38.0.0", default-features=false, optional=true } +frame-support ={ version="38.0.0", default-features=false } +frame-system ={ version="38.0.0", default-features=false } +sp-runtime ={ version="39.0.1", default-features=false } +sp-std ={ version="14.0.0", default-features=false } [dev-dependencies] -sp-core= { version = "34.0.0" } -sp-io = { version = "38.0.0" } +sp-core={ version="34.0.0" } +sp-io ={ version="38.0.0" } [features] default=["std"] diff --git a/pallets/parameters/Cargo.toml b/pallets/parameters/Cargo.toml index 61ca7f519..90d788222 100644 --- a/pallets/parameters/Cargo.toml +++ b/pallets/parameters/Cargo.toml @@ -12,21 +12,21 @@ publish =false codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] } scale-info={ version="2.11", default-features=false, features=["derive"] } -frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } -frame-support = { version = "38.0.0", default-features = false } -frame-system = { version = "38.0.0", default-features = false } -sp-runtime = { version = "39.0.1", default-features = false } -sp-std = { version = "14.0.0", default-features = false } -pallet-session = { version = "38.0.0", default-features = false } +frame-benchmarking={ version="38.0.0", default-features=false, optional=true } +frame-support ={ version="38.0.0", default-features=false } +frame-system ={ version="38.0.0", default-features=false } +sp-runtime ={ version="39.0.1", default-features=false } +sp-std ={ version="14.0.0", default-features=false } +pallet-session ={ version="38.0.0", default-features=false } entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", features=[ "wasm-no-std", ], default-features=false } [dev-dependencies] -sp-core = { version = "34.0.0" } -sp-io = { version = "38.0.0" } -sp-staking= { version = "36.0.0", default-features = false } +sp-core ={ version="34.0.0" } +sp-io ={ version="38.0.0" } +sp-staking={ version="36.0.0", default-features=false } [features] default=["std"] diff --git a/pallets/programs/Cargo.toml b/pallets/programs/Cargo.toml index 5a6e4175b..94443c62c 100644 --- a/pallets/programs/Cargo.toml +++ b/pallets/programs/Cargo.toml @@ -16,17 +16,17 @@ codec ={ package="parity-scale-codec", version="3.6.3", default-features=fal scale-info={ version="2.11", default-features=false, features=["derive"] } log ={ version="0.4.22", default-features=false } -frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } -frame-support = { version = "38.0.0", default-features = false } -frame-system = { version = "38.0.0", default-features = false } -sp-io = { version = "38.0.0", default-features = false } -sp-runtime = { version = "39.0.1", default-features = false } -sp-staking = { version = "36.0.0", default-features = false } -sp-std = { version = "14.0.0", default-features = false } +frame-benchmarking={ version="38.0.0", default-features=false, optional=true } +frame-support ={ version="38.0.0", default-features=false } +frame-system ={ version="38.0.0", default-features=false } +sp-io ={ version="38.0.0", default-features=false } +sp-runtime ={ version="39.0.1", default-features=false } +sp-staking ={ version="36.0.0", default-features=false } +sp-std ={ version="14.0.0", default-features=false } [dev-dependencies] -pallet-balances= { version = "39.0.0" } -sp-core = { version = "34.0.0", default-features = false } +pallet-balances={ version="39.0.0" } +sp-core ={ version="34.0.0", default-features=false } [features] default=['std'] diff --git a/pallets/propagation/Cargo.toml b/pallets/propagation/Cargo.toml index 245a865c5..a351c1f14 100644 --- a/pallets/propagation/Cargo.toml +++ b/pallets/propagation/Cargo.toml @@ -16,15 +16,15 @@ codec ={ package="parity-scale-codec", version="3.6.3", default-features=fal log ={ version="0.4.22", default-features=false } scale-info={ version="2.11", default-features=false, features=["derive"] } -frame-benchmarking = { version = "38.0.0", default-features = false, optional = true } -frame-support = { version = "38.0.0", default-features = false } -frame-system = { version = "38.0.0", default-features = false } -pallet-authorship = { version = "38.0.0", default-features = false } -sp-application-crypto= { version = "38.0.0", default-features = false } -sp-core = { version = "34.0.0", default-features = false } -sp-io = { version = "38.0.0", default-features = false } -sp-runtime = { version = "39.0.1", default-features = false } -sp-staking = { version = "36.0.0", default-features = false } +frame-benchmarking ={ version="38.0.0", default-features=false, optional=true } +frame-support ={ version="38.0.0", default-features=false } +frame-system ={ version="38.0.0", default-features=false } +pallet-authorship ={ version="38.0.0", default-features=false } +sp-application-crypto={ version="38.0.0", default-features=false } +sp-core ={ version="34.0.0", default-features=false } +sp-io ={ version="38.0.0", default-features=false } +sp-runtime ={ version="39.0.1", default-features=false } +sp-staking ={ version="36.0.0", default-features=false } entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", default-features=false, features=[ "wasm-no-std", @@ -37,16 +37,16 @@ pallet-attestation={ version="0.3.0-rc.1", path="../attestation", default-featur [dev-dependencies] parking_lot="0.12.3" -frame-election-provider-support= { version = "38.0.0", default-features = false } -pallet-babe = { version = "38.0.0", default-features = false } -pallet-bags-list = { version = "37.0.0", default-features = false } -pallet-balances = { version = "39.0.0", default-features = false } -pallet-session = { version = "38.0.0", default-features = false } -pallet-staking = { version = "38.0.0", default-features = false } -pallet-staking-reward-curve = { version = "12.0.0" } -pallet-timestamp = { version = "37.0.0", default-features = false } -sp-keystore = { version = "0.40.0" } -sp-npos-elections = { version = "34.0.0", default-features = false } +frame-election-provider-support={ version="38.0.0", default-features=false } +pallet-babe ={ version="38.0.0", default-features=false } +pallet-bags-list ={ version="37.0.0", default-features=false } +pallet-balances ={ version="39.0.0", default-features=false } +pallet-session ={ version="38.0.0", default-features=false } +pallet-staking ={ version="38.0.0", default-features=false } +pallet-staking-reward-curve ={ version="12.0.0" } +pallet-timestamp ={ version="37.0.0", default-features=false } +sp-keystore ={ version="0.40.0" } +sp-npos-elections ={ version="34.0.0", default-features=false } pallet-parameters ={ version="0.3.0-rc.1", path="../parameters", default-features=false } [features] diff --git a/pallets/registry/Cargo.toml b/pallets/registry/Cargo.toml index a02ed5cb9..5d9645c59 100644 --- a/pallets/registry/Cargo.toml +++ b/pallets/registry/Cargo.toml @@ -19,15 +19,15 @@ scale-info={ version="2.11", default-features=false, features=["derive"] } synedrion ={ version="0.2.0-beta.0", default-features=false } rand ={ version="0.8.5", default-features=false, features=["alloc"] } -frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } -frame-support = { version = "38.0.0", default-features = false } -frame-system = { version = "38.0.0", default-features = false } -pallet-authorship = { version = "38.0.0", default-features = false } -pallet-session = { version = "38.0.0", default-features = false } -pallet-staking = { version = "38.0.0", default-features = false } -sp-core = { version = "34.0.0", default-features = false } -sp-runtime = { version = "39.0.1", default-features = false } -sp-std = { version = "14.0.0", default-features = false } +frame-benchmarking={ version="38.0.0", default-features=false, optional=true } +frame-support ={ version="38.0.0", default-features=false } +frame-system ={ version="38.0.0", default-features=false } +pallet-authorship ={ version="38.0.0", default-features=false } +pallet-session ={ version="38.0.0", default-features=false } +pallet-staking ={ version="38.0.0", default-features=false } +sp-core ={ version="34.0.0", default-features=false } +sp-runtime ={ version="39.0.1", default-features=false } +sp-std ={ version="14.0.0", default-features=false } entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", features=[ "wasm-no-std", @@ -37,14 +37,14 @@ pallet-staking-extension={ version="0.3.0-rc.1", path="../staking", default-feat pallet-parameters={ version="0.3.0-rc.1", path="../parameters", default-features=false } [dev-dependencies] -frame-election-provider-support= { version = "38.0.0", default-features = false } -pallet-bags-list = { version = "37.0.0", default-features = false } -pallet-balances = { version = "39.0.0", default-features = false } -pallet-staking-reward-curve = { version = "12.0.0" } -pallet-timestamp = { version = "37.0.0", default-features = false } -sp-io = { version = "38.0.0", default-features = false } -sp-npos-elections = { version = "34.0.0", default-features = false } -sp-staking = { version = "36.0.0", default-features = false } +frame-election-provider-support={ version="38.0.0", default-features=false } +pallet-bags-list ={ version="37.0.0", default-features=false } +pallet-balances ={ version="39.0.0", default-features=false } +pallet-staking-reward-curve ={ version="12.0.0" } +pallet-timestamp ={ version="37.0.0", default-features=false } +sp-io ={ version="38.0.0", default-features=false } +sp-npos-elections ={ version="34.0.0", default-features=false } +sp-staking ={ version="36.0.0", default-features=false } [features] diff --git a/pallets/slashing/Cargo.toml b/pallets/slashing/Cargo.toml index a23e397bc..b3f1724be 100644 --- a/pallets/slashing/Cargo.toml +++ b/pallets/slashing/Cargo.toml @@ -16,25 +16,25 @@ codec ={ package="parity-scale-codec", version="3.6.3", default-features=fal scale-info={ version="2.11", default-features=false, features=["derive"] } log ={ version="0.4.22", default-features=false } -frame-benchmarking = { version = "38.0.0", default-features = false, optional = true } -frame-support = { version = "38.0.0", default-features = false } -frame-system = { version = "38.0.0", default-features = false } -sp-application-crypto= { version = "38.0.0", default-features = false } -sp-io = { version = "38.0.0", default-features = false } -sp-runtime = { version = "39.0.1", default-features = false } -sp-staking = { version = "36.0.0", default-features = false } -sp-std = { version = "14.0.0", default-features = false } +frame-benchmarking ={ version="38.0.0", default-features=false, optional=true } +frame-support ={ version="38.0.0", default-features=false } +frame-system ={ version="38.0.0", default-features=false } +sp-application-crypto={ version="38.0.0", default-features=false } +sp-io ={ version="38.0.0", default-features=false } +sp-runtime ={ version="39.0.1", default-features=false } +sp-staking ={ version="36.0.0", default-features=false } +sp-std ={ version="14.0.0", default-features=false } [dev-dependencies] -frame-election-provider-support= { version = "38.0.0", default-features = false } -pallet-bags-list = { version = "37.0.0", default-features = false } -pallet-balances = { version = "39.0.0", default-features = false } -pallet-session = { version = "38.0.0", default-features = false } -pallet-staking = { version = "38.0.0", default-features = false } -pallet-staking-reward-curve = { version = "12.0.0", default-features = false } -pallet-timestamp = { version = "37.0.0", default-features = false } -sp-core = { version = "34.0.0", default-features = false } -sp-npos-elections = { version = "34.0.0", default-features = false } +frame-election-provider-support={ version="38.0.0", default-features=false } +pallet-bags-list ={ version="37.0.0", default-features=false } +pallet-balances ={ version="39.0.0", default-features=false } +pallet-session ={ version="38.0.0", default-features=false } +pallet-staking ={ version="38.0.0", default-features=false } +pallet-staking-reward-curve ={ version="12.0.0", default-features=false } +pallet-timestamp ={ version="37.0.0", default-features=false } +sp-core ={ version="34.0.0", default-features=false } +sp-npos-elections ={ version="34.0.0", default-features=false } [features] default=['std'] diff --git a/pallets/staking/Cargo.toml b/pallets/staking/Cargo.toml index f6716e222..3d966d550 100644 --- a/pallets/staking/Cargo.toml +++ b/pallets/staking/Cargo.toml @@ -18,16 +18,16 @@ log ={ version="0.4.22", default-features=false } serde ={ version="1.0.213", default-features=false } rand_chacha={ version="0.3", default-features=false } -frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } -frame-support = { version = "38.0.0", default-features = false } -frame-system = { version = "38.0.0", default-features = false } -pallet-session = { version = "38.0.0", default-features = false } -pallet-staking = { version = "38.0.0", default-features = false } -sp-core = { version = "34.0.0", default-features = false } -sp-runtime = { version = "39.0.1", default-features = false } -sp-staking = { version = "36.0.0", default-features = false } -sp-std = { version = "14.0.0", default-features = false } -sp-consensus-babe = { version = "0.40.0", default-features = false } +frame-benchmarking={ version="38.0.0", default-features=false, optional=true } +frame-support ={ version="38.0.0", default-features=false } +frame-system ={ version="38.0.0", default-features=false } +pallet-session ={ version="38.0.0", default-features=false } +pallet-staking ={ version="38.0.0", default-features=false } +sp-core ={ version="34.0.0", default-features=false } +sp-runtime ={ version="39.0.1", default-features=false } +sp-staking ={ version="36.0.0", default-features=false } +sp-std ={ version="14.0.0", default-features=false } +sp-consensus-babe ={ version="0.40.0", default-features=false } pallet-parameters={ version="0.3.0-rc.1", path="../parameters", default-features=false } entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", features=[ @@ -39,13 +39,13 @@ entropy-shared={ version="0.3.0-rc.1", path="../../crates/shared", features=[ tdx-quote={ version="0.0.1", features=["mock"], optional=true } [dev-dependencies] -frame-election-provider-support= { version = "38.0.0", default-features = false } -pallet-bags-list = { version = "37.0.0", default-features = false } -pallet-balances = { version = "39.0.0", default-features = false } -pallet-staking-reward-curve = { version = "12.0.0" } -pallet-timestamp = { version = "37.0.0", default-features = false } -sp-io = { version = "38.0.0", default-features = false } -sp-npos-elections = { version = "34.0.0", default-features = false } +frame-election-provider-support={ version="38.0.0", default-features=false } +pallet-bags-list ={ version="37.0.0", default-features=false } +pallet-balances ={ version="39.0.0", default-features=false } +pallet-staking-reward-curve ={ version="12.0.0" } +pallet-timestamp ={ version="37.0.0", default-features=false } +sp-io ={ version="38.0.0", default-features=false } +sp-npos-elections ={ version="34.0.0", default-features=false } rand_core="0.6.4" tdx-quote={ version="0.0.1", features=["mock"] } diff --git a/pallets/transaction-pause/Cargo.toml b/pallets/transaction-pause/Cargo.toml index 9aba4f0bc..838e092b2 100644 --- a/pallets/transaction-pause/Cargo.toml +++ b/pallets/transaction-pause/Cargo.toml @@ -12,18 +12,18 @@ publish =false codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] } scale-info={ version="2.11", default-features=false, features=["derive"] } -frame-benchmarking= { version = "38.0.0", default-features = false, optional = true } -frame-support = { version = "38.0.0", default-features = false } -frame-system = { version = "38.0.0", default-features = false } -sp-runtime = { version = "39.0.1", default-features = false } -sp-std = { version = "14.0.0", default-features = false } +frame-benchmarking={ version="38.0.0", default-features=false, optional=true } +frame-support ={ version="38.0.0", default-features=false } +frame-system ={ version="38.0.0", default-features=false } +sp-runtime ={ version="39.0.1", default-features=false } +sp-std ={ version="14.0.0", default-features=false } [dev-dependencies] smallvec="1.13.2" -pallet-balances= { version = "39.0.0" } -sp-core = { version = "34.0.0" } -sp-io = { version = "38.0.0" } +pallet-balances={ version="39.0.0" } +sp-core ={ version="34.0.0" } +sp-io ={ version="38.0.0" } pallet-programs={ version="0.3.0-rc.1", default-features=false, path="../programs" } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 763ef36d7..5aafe434a 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -26,73 +26,73 @@ scale-info={ version="2.11", default-features=false, features=["derive"] } static_assertions="1.1.0" # Substrate Primitives -sp-api = { version = "34.0.0", default-features = false } -sp-authority-discovery= { version = "34.0.0", default-features = false } -sp-block-builder = { version = "34.0.0", default-features = false } -sp-consensus-babe = { version = "0.40.0", default-features = false } -sp-core = { version = "34.0.0", default-features = false } -sp-inherents = { version = "34.0.0", default-features = false } -sp-io = { version = "38.0.0", default-features = false } -sp-npos-elections = { version = "34.0.0", default-features = false } -sp-offchain = { version = "34.0.0", default-features = false } -sp-runtime = { version = "39.0.1", default-features = false } -sp-session = { version = "36.0.0", default-features = false } -sp-staking = { version = "36.0.0", default-features = false } -sp-std = { version = "14.0.0", default-features = false } -sp-storage = { version = "21.0.0", default-features = false, optional = true } -sp-transaction-pool = { version = "34.0.0", default-features = false } -sp-version = { version = "37.0.0", default-features = false } -sp-genesis-builder = { version = "0.15.1", default-features = false } +sp-api ={ version="34.0.0", default-features=false } +sp-authority-discovery={ version="34.0.0", default-features=false } +sp-block-builder ={ version="34.0.0", default-features=false } +sp-consensus-babe ={ version="0.40.0", default-features=false } +sp-core ={ version="34.0.0", default-features=false } +sp-inherents ={ version="34.0.0", default-features=false } +sp-io ={ version="38.0.0", default-features=false } +sp-npos-elections ={ version="34.0.0", default-features=false } +sp-offchain ={ version="34.0.0", default-features=false } +sp-runtime ={ version="39.0.1", default-features=false } +sp-session ={ version="36.0.0", default-features=false } +sp-staking ={ version="36.0.0", default-features=false } +sp-std ={ version="14.0.0", default-features=false } +sp-storage ={ version="21.0.0", default-features=false, optional=true } +sp-transaction-pool ={ version="34.0.0", default-features=false } +sp-version ={ version="37.0.0", default-features=false } +sp-genesis-builder ={ version="0.15.1", default-features=false } # FRAME Dependencies -frame-benchmarking = { version = "38.0.0", default-features = false, optional = true } -frame-election-provider-support= { version = "38.0.0", default-features = false } -frame-executive = { version = "38.0.0", default-features = false } -frame-support = { version = "38.0.0", default-features = false } -frame-system = { version = "38.0.0", default-features = false } -frame-system-benchmarking = { version = "38.0.0", default-features = false, optional = true } -frame-system-rpc-runtime-api = { version = "34.0.0", default-features = false } -frame-try-runtime = { version = "0.44.0", default-features = false, optional = true } +frame-benchmarking ={ version="38.0.0", default-features=false, optional=true } +frame-election-provider-support={ version="38.0.0", default-features=false } +frame-executive ={ version="38.0.0", default-features=false } +frame-support ={ version="38.0.0", default-features=false } +frame-system ={ version="38.0.0", default-features=false } +frame-system-benchmarking ={ version="38.0.0", default-features=false, optional=true } +frame-system-rpc-runtime-api ={ version="34.0.0", default-features=false } +frame-try-runtime ={ version="0.44.0", default-features=false, optional=true } # Substrate Pallets -pallet-authority-discovery = { version = "38.0.0", default-features = false } -pallet-authorship = { version = "38.0.0", default-features = false } -pallet-babe = { version = "38.0.0", default-features = false } -pallet-bags-list = { version = "37.0.0", default-features = false } -pallet-balances = { version = "39.0.0", default-features = false } -pallet-bounties = { version = "37.0.0", default-features = false } -pallet-collective = { version = "38.0.0", default-features = false } -pallet-democracy = { version = "38.0.0", default-features = false } -pallet-election-provider-multi-phase = { version = "37.0.0", default-features = false } -pallet-election-provider-support-benchmarking= { version = "37.0.0", default-features = false, optional = true } -pallet-elections-phragmen = { version = "39.0.0", default-features = false } -pallet-grandpa = { version = "38.0.0", default-features = false } -pallet-identity = { version = "38.0.0", default-features = false } -pallet-im-online = { version = "37.0.0", default-features = false } -pallet-indices = { version = "38.0.0", default-features = false } -pallet-membership = { version = "38.0.0", default-features = false } -pallet-multisig = { version = "38.0.0", default-features = false } -pallet-nomination-pools = { version = "35.0.0", default-features = false } -pallet-nomination-pools-benchmarking = { version = "36.0.0", default-features = false, optional = true } -pallet-offences = { version = "37.0.0", default-features = false } -pallet-offences-benchmarking = { version = "38.0.0", default-features = false, optional = true } -pallet-preimage = { version = "38.0.0", default-features = false } -pallet-proxy = { version = "38.0.0", default-features = false } -pallet-recovery = { version = "38.0.0", default-features = false } -pallet-scheduler = { version = "39.0.0", default-features = false } -pallet-session-benchmarking = { version = "38.0.0", default-features = false, optional = true } -pallet-session = { version = "38.0.0", default-features = false, features = ["historical"] } -pallet-staking = { version = "38.0.0", default-features = false } -pallet-staking-reward-curve = { version = "12.0.0", default-features = false } -pallet-sudo = { version = "38.0.0", default-features = false, optional = true } -pallet-timestamp = { version = "37.0.0", default-features = false } -pallet-tips = { version = "37.0.0", default-features = false } -pallet-transaction-payment = { version = "38.0.0", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { version = "38.0.0", default-features = false } -pallet-transaction-storage = { version = "37.0.0", default-features = false } -pallet-treasury = { version = "37.0.0", default-features = false } -pallet-utility = { version = "38.0.0", default-features = false } -pallet-vesting = { version = "38.0.0", default-features = false } +pallet-authority-discovery ={ version="38.0.0", default-features=false } +pallet-authorship ={ version="38.0.0", default-features=false } +pallet-babe ={ version="38.0.0", default-features=false } +pallet-bags-list ={ version="37.0.0", default-features=false } +pallet-balances ={ version="39.0.0", default-features=false } +pallet-bounties ={ version="37.0.0", default-features=false } +pallet-collective ={ version="38.0.0", default-features=false } +pallet-democracy ={ version="38.0.0", default-features=false } +pallet-election-provider-multi-phase ={ version="37.0.0", default-features=false } +pallet-election-provider-support-benchmarking={ version="37.0.0", default-features=false, optional=true } +pallet-elections-phragmen ={ version="39.0.0", default-features=false } +pallet-grandpa ={ version="38.0.0", default-features=false } +pallet-identity ={ version="38.0.0", default-features=false } +pallet-im-online ={ version="37.0.0", default-features=false } +pallet-indices ={ version="38.0.0", default-features=false } +pallet-membership ={ version="38.0.0", default-features=false } +pallet-multisig ={ version="38.0.0", default-features=false } +pallet-nomination-pools ={ version="35.0.0", default-features=false } +pallet-nomination-pools-benchmarking ={ version="36.0.0", default-features=false, optional=true } +pallet-offences ={ version="37.0.0", default-features=false } +pallet-offences-benchmarking ={ version="38.0.0", default-features=false, optional=true } +pallet-preimage ={ version="38.0.0", default-features=false } +pallet-proxy ={ version="38.0.0", default-features=false } +pallet-recovery ={ version="38.0.0", default-features=false } +pallet-scheduler ={ version="39.0.0", default-features=false } +pallet-session-benchmarking ={ version="38.0.0", default-features=false, optional=true } +pallet-session ={ version="38.0.0", default-features=false, features=["historical"] } +pallet-staking ={ version="38.0.0", default-features=false } +pallet-staking-reward-curve ={ version="12.0.0", default-features=false } +pallet-sudo ={ version="38.0.0", default-features=false, optional=true } +pallet-timestamp ={ version="37.0.0", default-features=false } +pallet-tips ={ version="37.0.0", default-features=false } +pallet-transaction-payment ={ version="38.0.0", default-features=false } +pallet-transaction-payment-rpc-runtime-api ={ version="38.0.0", default-features=false } +pallet-transaction-storage ={ version="37.0.0", default-features=false } +pallet-treasury ={ version="37.0.0", default-features=false } +pallet-utility ={ version="38.0.0", default-features=false } +pallet-vesting ={ version="38.0.0", default-features=false } # Entropy Pallets pallet-programs ={ version='0.3.0-rc.1', path='../pallets/programs', default-features=false } @@ -110,16 +110,16 @@ entropy-shared={ version="0.3.0-rc.1", path="../crates/shared", default-features ] } [build-dependencies] -substrate-wasm-builder= { version = "24.0.1", optional = true } +substrate-wasm-builder={ version="24.0.1", optional=true } [features] default=["std"] with-tracing=["frame-executive/with-tracing"] std=[ "codec/std", - "frame-benchmarking?/std", - "frame-system-benchmarking?/std", - "frame-election-provider-support/std", + "frame-benchmarking?/std", + "frame-system-benchmarking?/std", + "frame-election-provider-support/std", "frame-executive/std", "frame-support/std", "frame-system-rpc-runtime-api/std", diff --git a/runtime/src/impls.rs b/runtime/src/impls.rs index 2e3d88218..b5eaa9baa 100644 --- a/runtime/src/impls.rs +++ b/runtime/src/impls.rs @@ -31,7 +31,6 @@ //! Some configurable implementations as associated type for the substrate runtime. use frame_support::traits::{Currency, OnUnbalanced}; -use sp_std::prelude::*; use crate::{Authorship, Balances, NegativeImbalance}; diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 778ee3b37..128272376 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -36,7 +36,7 @@ #![recursion_limit = "512"] use codec::{Decode, Encode, MaxEncodedLen}; use frame_election_provider_support::{ - bounds::ElectionBoundsBuilder, onchain, BalancingConfig, ElectionDataProvider, NposSolution, + bounds::ElectionBoundsBuilder, onchain, BalancingConfig, ElectionDataProvider, SequentialPhragmen, VoteWeight, }; use frame_support::{ @@ -48,10 +48,7 @@ use frame_support::{ sp_runtime::RuntimeDebug, traits::{ fungible::{self, HoldConsideration}, - tokens::{ - nonfungibles_v2::Inspect, GetSalary, Pay, PaymentStatus, Preservation, - UnityAssetBalanceConversion, - }, + tokens::{Pay, PaymentStatus, Preservation, UnityAssetBalanceConversion}, ConstU32, Contains, Currency, EitherOfDiverse, EqualPrivilegeOnly, Imbalance, InstanceFilter, KeyOwnerProofSystem, LinearStoragePrice, LockIdentifier, OnUnbalanced, WithdrawReasons, diff --git a/scripts/create-test-keyshares/Cargo.toml b/scripts/create-test-keyshares/Cargo.toml index f10278e21..8106d0da5 100644 --- a/scripts/create-test-keyshares/Cargo.toml +++ b/scripts/create-test-keyshares/Cargo.toml @@ -14,7 +14,7 @@ entropy-testing-utils={ version="0.3.0-rc.1", path="../../crates/testing-utils" tokio ={ version="1.41", features=["macros", "fs", "rt-multi-thread", "io-util", "process"] } entropy-shared ={ version="0.3.0-rc.1", path="../../crates/shared" } entropy-kvdb ={ version="0.3.0-rc.1", path="../../crates/kvdb", default-features=false } -sp-core = "34.0.0" +sp-core ="34.0.0" # Unreleased version of Synedrion with support for child key derivations. synedrion={ version="0.2.0-beta.0" } From f531cb0b50faa19b03b41ff2a3fc20942508d2e2 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Fri, 1 Nov 2024 10:50:26 -0400 Subject: [PATCH 09/22] clean --- crates/client/src/tests.rs | 2 +- runtime/src/impls.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/client/src/tests.rs b/crates/client/src/tests.rs index ff5ede617..072c2b9ad 100644 --- a/crates/client/src/tests.rs +++ b/crates/client/src/tests.rs @@ -23,7 +23,7 @@ use entropy_testing_utils::{ test_node_process_testing_state, ChainSpecType, }; use serial_test::serial; -use sp_core::{sr25519, Pair, H256}; +use sp_core::{sr25519, Pair}; use sp_keyring::AccountKeyring; use subxt::{tx::PairSigner, utils::AccountId32}; diff --git a/runtime/src/impls.rs b/runtime/src/impls.rs index b5eaa9baa..9f89cd488 100644 --- a/runtime/src/impls.rs +++ b/runtime/src/impls.rs @@ -47,7 +47,7 @@ impl OnUnbalanced for Author { mod multiplier_tests { use frame_support::{ dispatch::DispatchClass, - weights::{Weight, WeightToFee, WeightToFeePolynomial}, + weights::{Weight, WeightToFee}, }; use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment}; use sp_runtime::{ From 88345b2ef6a65b488e245da537870509c670c4cf Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Fri, 1 Nov 2024 11:01:12 -0400 Subject: [PATCH 10/22] fmt --- node/cli/src/service.rs | 13 ++++++------- runtime/src/lib.rs | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/node/cli/src/service.rs b/node/cli/src/service.rs index 2ce28ac8e..b9d6046d8 100644 --- a/node/cli/src/service.rs +++ b/node/cli/src/service.rs @@ -87,6 +87,7 @@ pub type TransactionPool = sc_transaction_pool::FullPool; /// imported and generated. const GRANDPA_JUSTIFICATION_PERIOD: u32 = 512; +#[allow(clippy::type_complexity)] /// Creates a new partial node. pub fn new_partial( config: &Configuration, @@ -388,7 +389,7 @@ pub fn new_full_base::Hash>>( } } - let role = config.role.clone(); + let role = config.role; let force_authoring = config.force_authoring; let backoff_authoring_blocks = Some(sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging::default()); @@ -586,24 +587,22 @@ pub fn new_full(config: Configuration, cli: Cli) -> Result { - let task_manager = new_full_base::>( + new_full_base::>( config, cli.no_hardware_benchmarks, |_, _| (), cli.tss_server_endpoint, ) - .map(|NewFullBase { task_manager, .. }| task_manager)?; - task_manager + .map(|NewFullBase { task_manager, .. }| task_manager)? }, sc_network::config::NetworkBackendType::Litep2p => { - let task_manager = new_full_base::( + new_full_base::( config, cli.no_hardware_benchmarks, |_, _| (), cli.tss_server_endpoint, ) - .map(|NewFullBase { task_manager, .. }| task_manager)?; - task_manager + .map(|NewFullBase { task_manager, .. }| task_manager)? }, }; diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 128272376..6a61c25e3 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -79,6 +79,7 @@ use pallet_im_online::sr25519::AuthorityId as ImOnlineId; use pallet_session::historical as pallet_session_historical; #[cfg(any(feature = "std", test))] pub use pallet_staking::StakerStatus; +#[allow(deprecated)] pub use pallet_transaction_payment::{CurrencyAdapter, Multiplier, TargetedFeeAdjustment}; use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo}; use scale_info::TypeInfo; From 6606ae4f633e9254915950171f911f0e29bf2059 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Fri, 1 Nov 2024 19:12:00 -0400 Subject: [PATCH 11/22] tests --- node/cli/src/main.rs | 1 - pallets/parameters/src/lib.rs | 12 +++--- runtime/src/lib.rs | 77 ----------------------------------- 3 files changed, 6 insertions(+), 84 deletions(-) diff --git a/node/cli/src/main.rs b/node/cli/src/main.rs index 2a2c51be5..5b4c7c572 100644 --- a/node/cli/src/main.rs +++ b/node/cli/src/main.rs @@ -34,7 +34,6 @@ #![warn(missing_docs)] mod chain_spec; -#[macro_use] mod service; mod benchmarking; mod cli; diff --git a/pallets/parameters/src/lib.rs b/pallets/parameters/src/lib.rs index 4be3c7614..8a649dd4a 100644 --- a/pallets/parameters/src/lib.rs +++ b/pallets/parameters/src/lib.rs @@ -85,12 +85,12 @@ pub mod module { #[pallet::genesis_build] impl BuildGenesisConfig for GenesisConfig { fn build(&self) { - assert!(self.threshold > 0, "Threhsold too low"); - assert!(self.total_signers >= self.threshold, "Threshold is larger then signer"); - assert!( - !self.accepted_mrtd_values.is_empty(), - "At least one accepted MRTD value is required" - ); + // assert!(self.threshold > 0, "Threhsold too low"); + // assert!(self.total_signers >= self.threshold, "Threshold is larger then signer"); + // assert!( + // !self.accepted_mrtd_values.is_empty(), + // "At least one accepted MRTD value is required" + // ); RequestLimit::::put(self.request_limit); MaxInstructionsPerPrograms::::put(self.max_instructions_per_programs); let signer_info = SignersSize { diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 6a61c25e3..cb6227c72 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -258,83 +258,6 @@ impl OnUnbalanced for DealWithFees { } } -// pub struct DealWithFees; -// impl OnUnbalanced::AccountId, Balances>> -// for DealWithFees -// { -// fn on_unbalanceds( -// mut fees_then_tips: impl Iterator< -// Item = fungible::Credit<::AccountId, Balances>, -// >, -// ) { -// if let Some(fees) = fees_then_tips.next() { -// FeeUnbalancedAmount::mutate(|a| *a += fees.peek()); -// if let Some(tips) = fees_then_tips.next() { -// TipUnbalancedAmount::mutate(|a| *a += tips.peek()); -// } -// } -// } -// } - -// pub struct DealWithFees; -// impl OnUnbalanced::AccountId, Balances>> for DealWithFees { -// fn on_unbalanceds( -// mut fees_then_tips: impl Iterator< -// Item = fungible::Credit<::AccountId, Balances>, -// >, -// ) { -// if let Some(fees) = fees_then_tips.next() { -// // for fees, 80% to treasury, 20% to author -// let mut split = fees.ration(80, 20); -// if let Some(tips) = fees_then_tips.next() { -// // for tips, if any, 80% to treasury, 20% to author (though this can be anything) -// tips.ration_merge_into(80, 20, &mut split); -// } -// Treasury::on_unbalanced(split.0); -// Author::on_unbalanced(split.1); -// } -// } -// } - -// pub struct ToAuthor(sp_std::marker::PhantomData); -// impl OnUnbalanced>> for ToAuthor -// where -// R: pallet_balances::Config + pallet_authorship::Config, -// ::AccountId: From, -// ::AccountId: Into, -// { -// fn on_nonzero_unbalanced( -// amount: Credit<::AccountId, pallet_balances::Pallet>, -// ) { -// if let Some(author) = >::author() { -// let _ = >::resolve(&author, amount); -// } -// } -// } - -// pub struct DealWithFees(core::marker::PhantomData); -// impl OnUnbalanced>> for DealWithFees -// where -// R: pallet_balances::Config + pallet_authorship::Config + pallet_treasury::Config, -// ::AccountId: From, -// ::AccountId: Into, -// { -// fn on_unbalanceds( -// mut fees_then_tips: impl Iterator>>, -// ) { -// if let Some(fees) = fees_then_tips.next() { -// // for fees, 80% to treasury, 20% to author -// let mut split = fees.ration(80, 20); -// if let Some(tips) = fees_then_tips.next() { -// // for tips, if any, 100% to author -// tips.merge_into(&mut split.1); -// } -// ResolveTo::, pallet_balances::Pallet>::on_unbalanced(split.0); -// as OnUnbalanced<_>>::on_unbalanced(split.1); -// } -// } -// } - /// We assume that ~10% of the block weight is consumed by `on_initialize` handlers. /// This is used to limit the maximal weight of a single extrinsic. const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10); From cfdee8a1981302f46d5e401a0a6205e5c1d0a367 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Mon, 4 Nov 2024 13:00:47 -0500 Subject: [PATCH 12/22] fmt --- crates/client/entropy_metadata.scale | Bin 308626 -> 302421 bytes node/cli/src/main.rs | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/client/entropy_metadata.scale b/crates/client/entropy_metadata.scale index 323f66e3c7fb15cb1c2595d6212a34892e7b3969..ec2b69eb825f23430d8691d227a2f892f9965d52 100644 GIT binary patch delta 14034 zcmb_@4Omsh*6?0y=KO30JqXC*PeDb&Uyh1`f~kl~<_`)gCE^K=dI~tok4lP2rA0)~vN=c>LR5CtmJlDRh-Odmd67E#I=fCWN3l%bg`I1%h0wTt%gsz|$14mwHyX z^GZ}LfDeW3O%wQRYttKkAzQV+&u7|HR1_So_{)zIlmP9%=f^^@_R919AXNM8`93{^ zsl;qkLg`~dB~t6Ydl5u8E#LiLfS9KIzfLyyijj5WP@$x7Yht1@OxxeM2pn4QO9Scm z#irqj38?siy~tBs=qyM;;F$^x^{j9eJ4@Z3qHCxDh0daUXQ`*S+)JY*Xn%TX?wllq z#Mvt(W%2@-d)e~R2?`MDn%q)Psk7jZN~4NhC9dLCuKYhJRFbqQO)-$7-PJTWViH2; z99QuacgYH8Y2NbG0%u7{a@nYn6BK0(Fp+bqok&QMbn{v!bMOG!JDX;kj22QOw$(}XInd8RIaTXM~N=s%JyO+6(Xymp$LU^lamNzwU zX%k!eH@)^|D0VjV-?x%Mby1(_M#Zg7d^^f-yM11HNvW%lE77Pe`DC$n`t{cukL79)eHcY6SmwHY6v0DHz6LjaG>}J{e2n>>7z{B6&6X2` zAWnPj#3q{S#$!(H*}wOp9%bzT|A?Y_b{r?%KL+v)lW)*NKOVxfOwdXL%++50xF63p z!2tqtw3L&5AxF#oBv*U&WHgEQvy-b)DbzmvBpp_2k)I|(Rnvk`qv0CRbn0t>jZND> ztB|;`&*PVrp*1}p%2BaFlxOKuS5dyJxEz6yH1Q<`p3({g+dTRz5Wm!2TvD35+~p*i zG6ef{Bd5UV5?7w5DF5aXr3|%W7_7bi`4o~5@3g|ro zp6*Ka^(E*eYhphx>tvwm{+|wa;ME9D)AJQNd?y^2AN?fG>S|!jH+y=p@Mytr_@z4vh{j?)QRi)(H+y$i@;{jACDdsXz$r)8zn1Tgw9YfEY18B{141ZO3|SxF$-Ap$8Pyod@VgW$3xxGV{1X-R@BlHe*T zlner3L;zHqnUqR{LP`@=rcg2{{3V6Iq%eD%kRrxlrcg2nLM1_{B(Qi1q}(x@DU=L? z7)cN#3FIL`Ovt&wVN9W95I7`(gHiuX^-{)LFcY4!ur~md(o>eY|mT#j$D<-5ve{5!=@jIMM{XUxxF@p~28@CedR_+nn@k6BYZkbzbgaFVJlT2YmiaJ3 ze3J#)a8gW}4^!wb0Kt>-=b`|2MMo#a|f6~ zW-cv)=Z(zv#Smbo`Q4Kb`#R5-buQ?R=b2vZf_uz_bi4+3J)!`%nS2yF9ZA0-ts(tb zDLjYN!AL`}jDiRGbJN!Nf{aw*L_rYArNZUrZ zOkXi$8%!kd;cf64$1DH;nsK|L0W)ksVUxm04(bSnMe`G>}BWc{YdG2LJ&eF1C+Dp-N zq_By!r>sg0Ww|w!M{*_3+uN`%y*X~~tqV#SCe|E)+5QfrjbXBl1TF&nnO&SaK>KBz zPK!BEE|j!4;G$f@B5E3o&@&Ihqbekce;p-@!f+UBeIA1L-?w_{AGbk|Yoh<{eJJux zkGYG3p}+V6!~>*=j$<$$CW**)7y@Y`y`5CpBr*0l?8G##eY$v{`0Y6Kz-TUdeh9rG zT~u8JQpz8ahV#ws+7IEdWhRFL@@m9|&mcs<^COr6q!jj?fJ1V1w|@qK`U4-s7S;(k zPSM=^0Fz&lYqf9D>^V)!mWE3;T72a};+fA$4H)KLn0VuJP~o(G))S) z$2iQCL!Sg0;^0MaEX?L$n?lW!KVINk<}A1l`>l4}c^$G9yFI1X!5~+m)7^zQdBw67 zxl7$e%Us1Pirqz}?c%me5Z>o{g^1GC?$T0M@imN+!KLDk&Z1Q&6?Yr0uujFDWvruY zp3RkPF81_dA>#Zc2#L)hJSeug&egQioCJ^;LcmC_(0QOR0~o~>w;1{Z*el7ERLll$ z3|CeXU@?HPTqz^KY5}p>DSk6zGMh-yH-68PG`TcL%W)?1iY` zT~yZF3sJxI1ci7Z>UTFmb}vNzHV_o*g{a#`g2KEI37~l@f#F_|M9@M|gcl-a4iFUS zg@~C}g8CTHC}QRiL4CatF>_cn{0IvxHM;tVXLLal<~e8sauAL8~Ea!{)OZf@c0?W>OPU%!VCjRcd8c zT5MKDikSr%St(=I%g9Orvp^#&<;jALtQ02eZDge+S%{I9Vq|tBD`m(+jcl{bh8fwG zN|_Hg@=|mx!pKUwu}C8;g~s|A*~2p1*T}X}7PGk0&b!(+PDrnb&-G5#mA2S@|Dej+E&s|ka} zj-Q}g%vlZ-U3vK>&aS5e@o<*vvPlN-=ecP8$v8Qsd)!3@572M<4=j+1r?wo!>h_?; zr+4(@SKz2TmPz@C>id6%Pk%=wEu7}}@gJQ^OMeaVxog0BPDY8hwq1YNidkgoaP9rV z5dCKrLnWDHL?6~2Cv*a0b`MnXGS?sT!~3rxhxfR~QYV2Rf)RRk4;(@oS#J))OrUC_ zdvC0fL7Um0P|?&IC*oBuCWca>aW=&WPYAZ&i0dz2u;UZI$L$Zr%HQGi#xNXUk;s2U z<3O@mevQW87?}^h#^5P1iBAXOaNm%`!toeDC3lU-KHi=O=xYYyBb@`%qvG)0PCyWl zsE-?hUv`>_64OUyIWU<1Y0fo4VuJ&_ORLO*14y7ciS3f_%oweIJQj<6ZH?9|lW=Ee z!)9Bt%UR$%L2lxxzy3et@tib&wx!@8GHhB?aCs-QvnF5^LV)m0q%nEpfO_jh46=H0 zar$r5@xg8cJUEZ)2J0`*LytUPqvqoeVPvZfo$M(qDlPXK>=2PxMnPClv5%Fh3-B4L z^X~%PLnncFuN>cGaV9^l>T$bRJcC*Ez4u@OgJJra3Vf(DyrWlF z;f!nB=eq~-ZC^>4_~2nwy={hB?F zZiJ{;csvCq3F3n~T5Sp9yE>YZ1krm7#zK;Q%N9H)jVs$$l9cfY_a91TPOgsy0~MyP z+logz#~_w$M>CCU*>-#zV3I!kX?$05Zt&Xkd0ZkzV*n5CCZ7+7nM74O3l$3+Z~{6E zAWU3sKtJ(X1NO&+>zEOkbRF>XI*ln^G0*Iw3X=>>s5rd`3o*?k+7~jrp1+s$9T|O_ zn(!`|sb6fuK*S7_HtVTqG3amDfmtT4XnVNW-h$o42py+Ew!T`Yg@!pM?bko|7Q@uoI&0TKNdbWg!mLIUY@U-F# ztT2(~6f9<0*nrq7lh=IOXu57bRncL~$$O1gHc}1=td=$6#mqM`Fs{bb_3)`R-E?5o zQYGrPR*X1^5u*N0455Iv9imHrIyou?FHT3UOfr$ zi$D>32qQ=SKgNKS-G(d%HuwbB*hO#+hT!6DN~4q;LCt#GA>0RkEwaE*u}3KfOcW^& z6+?2Es_%UV#{jlopN-y!e2unsY4nguMrG|{)?ti*Y;pHt9NzP=2_ojYoF$&35{gI| z1R>(}!`QD|o9y|JNohB@?0v%5;K?oxo-pXg24-W#WM_esQ~}r(D_Gt6*<$SxjO%t% zwsFFwoc6ZS;cMe!mo_>~;>RNxZ$D%DeH&+JL8Rx4M~{$JJ!2B{-a`kTHHl5{VFEvI zg00%ld&9)Z_s|As1)X7`f*r+hJZ~t>Dcvs0t~*T1WpCG4d|jK&*H`BiU)NV}>iTMz zuCJOzU>lC3oi(cshcYlXR*F@Z^DKW|j==MOQ-k0R_g z@LRpyqrd=dSAMX_{D}5d1Ks>-ldcAd`#wTDPw~~z;`^!k(T~u^$-h1QF|L7DG5;hk zB&T=pNgRx61{-2xcV_Y5)n#buqVFd-6k^0}pU_U7DH=Y(~hU? zuCVeMpz!%%BcHC2su@4H(yUODMyyRKqYRdtm2&aTDcs+!!ocshQv~&YPUC$+#Pn$C z2zG|-h^vjVBuwOdM*6Z^-}xC%QlUm%_!?t`lqA0=n9^wEn$3wy zvp8@LhhU3Y#Ai@|0M6qKzypTFN45GU{!o{RZ6WTU%=&f!b{tJfo7V*eOGhy@*iU?X z5mRMwF!B?R*UDKrPJ+&Rd%kc9C(6dD=j`5>4WbVA zFXf7tyv?j!HR}{aT}Owem=wVr;`=?EwE^gv%HXAJs4UTkK- zOiovXv3Hf_FLTM^m24E<16fWWMbqNb^9kXW*8EbB+{sczgQ_iFC0Wy@-)f^(+i41) zP!0*K6(0t&LEY<&0{b?LvdueZJB&tBcKI6F-K7!2b-6XDx7=jh)Kg<*+|*0H?c#$V zcDK4)cDKu-G)-SoNa3yZaP8C<($^fD;}i+DGh#ouR zTo<97xmhS@yh1r+5swUDhGKbn0E;9g|M37eC$fWqEtT|&0*Qsr@;hC*^eV>f$#>^n zN&S6UYVqPb^Ce z`h$8Pro^#DqfB&VNs1h-ifZjD2ou>%zq?bCq|~9ma3r!+46usdqS3C$4`!9vJ=ka_ z)M}^LIu$#DBdy*=98D{wQ&~lB8OCY@qlpwFDW+~ziK8lU-YUa z^%xdM&P}hetPfCl*BC;URW#0{Av}`EP9v#@g7Hkq@VhCQ&A}Wi`NF;R!en+8!0F}C z<>S!Zg+rHUoWS;Wb4w0g6wkAIo#UEYn2zMQWTcYovv4wd1j@YmpC_}~)^bT5uT)4> zJXDE$Q%Uz$c?mA3vRSZEY)EHeV(}DqJ1O;+DQo~#)0HFbqiV@YZ&7_K8+@zXrzotD z*lA%T&lnmtpHyaz^+v11MplQN1XfEu8$Vb_(Lh6tHaqDKqq{fKSU)ldzD#4&=)!Wy zROTSaC|Ny~Ht8<$%2XDG^;R)w8VeE^r?O$b+lo9YyMG$#fqL=6G&YDT8@0|&W1H#9 z)5t$QosFQOyg8j6AZNsnFTkee-UB_WCe;mdPf#m*M-ema{9&ECo* zZl&&9u8(|Xvu`F2{K3!<{K3$htu*#lId=JjhpY-ETKG09IBcv2)@C)VXq^HOffj7H z>Lqj8eJ0lKMH_JmVP8nIdcrFG<|aI86`Qi9rm<>Q=-&FYu|^_}dFP~~%M$63T^>`; z81;PmEb4alGT>RO2*@E-`{Nz#@1pot7P93Ch8w4RkFKZuMXOF^et{VI!y~vSwmnM~ba=SR-WJ6I^MO6!i>*hOIBlh;Ew+B2TKn+$y)krl) zjZ=rIbfdP}MGGy`#fDH+$jIlpXa+-NKAEn_4Ad7cHn4lN3VvjFDoV6U?~sD@K}*?o z8<`3Q#b>LSd}|0%^yH1MqVrq|ZR_r<**G>#z3y~aMBZvPk}QcWt63jRFxnAERxOIx|<}PT*Gc9H{r}07B@d#?WzjX)SFac8dW1zIFsn+x=P9l zO09Gazk#Pg2GLq)-_4Z`)VM<8DyCP3Ug8W9xsLS{o66Zh$Px|ZwAHf3v2qqlkWu1y z58F>DBmdPsY&KacW7pE2a*CX_Y_P+r-ngT)k+yUqjl)Il8$ak)6-umty-1;l#`UC5tHh`4 zSB0gY3&=Rn+h>`1If&w zohtTjV3w)%CRj*s4_s+0JoM_*Q?%5*OvXX!1r{l{8`!D4nVmW>J9XYJdRDR6+-*0= z;(ihZJ;(G;vDvJ&s#+uu z3n(u36f5x9wTGrT;=YY+D3psAH8ozn6=raI8nceh0%n* zv5Af4^=8;9iq29*C-4C>l1ODgz~b?$S>!!n)cfuMHc{JZ4x{)sWiu#hJn=!6Mvlg& z2Wi14iN8O{MqrjjYqbQ4@M;!9`(acyvEdR+s_8Up7LQlcfq7UQtR}jX7V)F}UbKjq zhX@@Y=08NTOc3|WPnvj1BD2Jo4^aa-!nT=>;e}Rs-U!mm|uBq?3dLSFyd zPZ;!^$Jt_v?(45U!IlG2#cW~YNr^hQu+f3h2n+4;lM6g~cYEJKmkblnZ(#??Ln;uo ztI|Z|R+h`tu^q*Rt;AlucxEe$7oTornfmx`G^Cz62ueg&sk?xD289&E>L=L@nxcd9 zQz3dj#fH;o!c(jQD^Ps?Bn#5ppQ3Ys_Rg<6*sD;Xzw$JD3TUzx>}1(cqc`qk5%geJ zy#E(=4}H?>$@|%@|GS=@04UU7eU8!9ezSh>3v?1gt$z5gj2>9F2(5v|QYhio26h|0 zfKvA`a%Eb@f|uCO*iJ#QCiWbjHi=)FsOQTjF?b&xC%g2y`xw3IP(}WJb_>}7f7wqa zO@MxQKO1VIgXez_5Cf6=%GV@&6}tZ$(jptCfBPo;6HuuAk++xyiL)(l)7cCu`U`DL zr4Wz4ubr70r0cJI#12`=ysJ9J{t1w!J3nI{U|HsD{lkB(emhlzd`p3hF3Kb8!R(OoVUeQG!EKzgX9m;3R}X1Pnvfjo*lh(UqWom)5q`4lke&j#{ns>sCQ zAYOv1MXNd*Ean9h(*KVrggZMIQiiInDUDO-_CLSSTWBJ|WDLfI&Yy8q=$+4(; zE6CLpzh#iHrp57KY9=R+Pb7EY={S;VhJHDY)2p>Cv0w;KwkFZ@Ut%Cze`*L{jigZm zhx3=I@crTZKH9@`NAMG*r()yzNRr(h@q8409*yU>kr!|(o|m#Riz?KhjOIsa;n)-SH}vk1l+_M;R<7?F%jt<#x*naxzha~S)f65} zvp+J0FD5Vg5RJpOJZh3?jiPrTjVb&aJkRwV6L2@>j-Wk|}-FN3BdU98FAiW?ls;!ldkh5Rz@>F4Na4c%8+ zwSaEH;`Q5UsW|noZs$v-Yd32VpJ1iGEU2cj6pAMn@qsjBuPmZDDHH2*`10Tw6Vw17 zJ=wV|b2Q^dgf=Fn;uIGcL^DwxQ@4@p{@ku3js54FU^hp6awt_bB6xt|rH}E^cGE8uY zu$Qf4l%aIDw8FW}YbTN7duIcG7SwDLy#`Z&PPSF|@@U&tE2wgEb4>KeU6J#6FYU8R zC&eJ?A+@TGQ}{M?;~DO+Modgy?#jEHHc{SuS8)khUjeEu(ZFS{@nM2hTfBjp<|=ZP zxJyFS(O!y~6ti>6b1YIF9cxe+ZbOWE|4;++9+7eC{Yz4pJBtS|b7dAgi%Oh%(#Z40 z28XHlJJfhvD%}VAMXd62prnhXkMLw#cYl6_k6~pvNt}9wH_>`~>`~HY>Egtr{0ma7 z`yb;+SduzZY^)}X2dz}CrE8MZ*gNIn zolAeBwS07$epI7570b8q!BD1aTX=sA_UFlWyUKGttBYL4xhv#NUWHnvzqggop)**I zc#4zQs#X4Q)La+6F)WHI6&dv`SoGh?!{ouelc)BmQTbcG;*u!0s7mFb;(1wKBM$E5 zmAxu3-dR?^|mHz{R8)#hs delta 20125 zcmb_^4SZC^)%Tr`{R#&1cfD4 z?8Bp|ait@*RB7e0*oTia;uR|@)u^bbR8i?8TB=m3qEf{cE&Bdv?ryRHeEYn=-^=fk zJ2UspnKNf*&N*}D%pQH>vU@(c%+}-%xCUg!b=p2*L&s8*G1|!pcuTq7 z>|U++eAhjG-5*@q1yxwIAloZZs33$BC zrE_I|ibjeX-1WXTRaUps-R35wIs!4H=ff;_8z3|4SGby+-HiY#jety-B_VeszUnPL zkJsl3v}I9}8~Gd@KMr3;HwT;QOdi{bJy_hs@oY-2y`fq%f3jXxzOb%(&fLoB3u-mu zY;Xl!Ikcyl>)iFF!Qv@XG%bPhR1-N^NfIfsJ7NOh3Sl}C1R8&x62je}_8k*R zS$OJ>VR_}0G+-wB%vCXIQe=572>3kB%QdYGRjf{}94`yiD#CZ~xRF-U@LloAUF^S3 z5>nN5>fveD%c>;ic~rxraeHyGRulewPfB>f?yJb6@XvRT#NUIv^NMS!7Ee-}y}l+_ zV=X0eY2|ub+&-6_-#tYmnq1A8PF`P|38U32WMz9wi7UKzPbU7}ws_l+LKM(fFDCV;lX?& zn$EJqAm#DXy{qLMZKGfy{%GnCT}L%M=vF&*YVAldyW;vr$%a9{``tZ^Zld7_E*lj7 z?Y=a!IjlcDyzAqAH!{*8mV8BqcdgjpNF&An{QX=?wuUR88XEZ+zT>Gd+1#Z+T}q?i z8xEEd$7VD`JE+zX?*4<`@4?gsZGOl$u2qJ=_`}Vzxo2Kl9De25biRd>9pS_mZVX@j zTqfU7$^LNGq1tfwb3^F?6KF>FP7IURJ+0y4&es-)x4oRf7jZ>pZFul2>9p1?-|~u1J!UfbuudG|y|2}Uw;Ucy z6D*3Vq*ryGY*7T%hPS+`lS~DX{8}c@vXGsMu6tg~BsnM!k%Dmk>o@Tt3)+zkh(D6e zODyDgxcueC;qZ~s80!4jmxMF^IFeUb$PrcfSAQIZnIv1yc|*sXk*S?XdCammNAo5N zIjS&py_v&XE##o8S9&y?2QB1)${akZ(>6=^%pVqq%iqf4>!Lt^cq_GEYL#bAvm5HD zT>&JU*<8Ix1C?pomhii8Rr0Nr+%3F&NJ{w1w{^0!YsuSLXZ#%@T6gf_Rqc^aF66XTE zHIl!~j<2P=sBk_>(?Q2j(ivX=UgnT}l;oE;HhNdP8)PGXDbhRDy2;Pi_J#Mq7bN?; zu6RGp$bqhB|FWErgCgrAk|w@uB95-A4`;C0f^gM`iCx_v-G#z%%_lC9VSF+xqnk!V z`?&mCEK#jnF2*Fa7!QSqd^$aXA^h%V$z6AUdV_4D{3|lp(%|+7%+}(0GG!KZ8f^%2?CHSYXjLXQ6K`xgk!qFWA;EcyDB zoaaZWU7;D8JKwc>fwwUzg&^k($T2A;b$_Jfn8=5ECdUMX;rP&TbeW{C@&?@gai@CI zg5-t@$=z3JkT-gHTYOlK(k1^M%0G6l6V6N-Eq=ZX0=J{XfJ zY>&wlZH~!I*ourMJ3voR4G%CfJ6y^{}Mp*h^8?O zj{?Y)0GSd%>QVqm#?fr1;ZXoN5+FwcShSFWknE%dOv9rfiX=plgs_?@B#&ts)9@&O zatTl_0c<9KWIU~88Xg5uB>}1=fYdf1LJkJ4VHzF?6;6%>17ml(D-qf zlmVA-xjW#G7HB)g*A|jJaF@i_$uvBeP})AG?Gt%c5+M6Uc?B72d~78H66^;UX^=Ll zAYYRtV_*_#v5_)yYdX0dFJ}h%GdXCS$si6J={CL{PVTc^P-D;K`0i40a{KUg5Y%C`a)L zV`4ehdfWlofrC^#$mFaZB8q2_0rqZL=+q9$KIDpeBxknEfjEY>PN$)r`@$0$Du z0wBRp%31}yUtpfPO$nN3KU(NRtM$@jJzvX(}_irj_dOJody z{)R+LjrXo6-&ru^$Cr>tBT7L0)j6iq$sCw4-UxzQOQ`AlN}U^U6Lbx=N&IJihzLq^jCE~c&l*~qV7Lx#(I>$5aJ z{GI1Av?e}ULv98J;cg=%Xc`a4PakZI{ZBHF!w?MJNea+P=bdCcIwopEB(1l!;BGQs z((tc#au#o~b_~ZWBR8GydT(<>Op#V5?s%M3v2t+m z%wr@uDc;r6GGak=&nlNuG8GSeNmAk~pkSZ`c{wb5vze-xW-t{lY$m2is}jH4Pv*qW zQ#h(5jvA5h1gVWO>Xs+Sw{ls8o+M{zTo(3u=58tcXJ3+W=hNga2U#SB9D;43HYy{8 z_Yi4{>_Q%UiRcmT-v)fJqJ~7i7=L@2oI=HcHg9w|y*BmL8`PoL>Gx9^iC#c;wSmb^wvBLs_muMtpSgkC2r2svwfe1yQ@ zD>HV#Np>>47rsO4NE&8V@qG7kk3ZmZ`Anfh;^A$HEZdKdLHq)^-~W*PB;!)Rsiqz= zS9ZSca(NotMB`^9ZPFP|rbafz$|(XX8NQq(Pm^o8ySGY40CsA? z?dvJgT1~;E2Ql}QkjK1>3i+U#U2VJ#J7O{5b8Z3{AXl_>^hhz^I!lyGe;zQk!s zvdvIF*R~Ij5NeC6!QiiDnL@ z?8CRq%p7RhkK8~rR}$jd0c4X@b{vT52BFDj4#XV9w-hr6V!DwVWadE3A>>lc9EdrL zT$-5!F-MRaZ011BQRLFi9EdrFT!xt|=DFH&WHZeySaSloAu2Z>#GFKKsF?#Xr^H8J zkcDc*pq3?b<#;jl6iGE&pdCp$R>~N*tI>f~D@!|MsWe~hYGjn5YF9&{3{JZm24z~> z)fgxv(yj(TnTvMCeU<GDPzT}TtOD`KnhD0L%xFOipp^V zZmFA;gu?#Yk>PXu>w|8eDWr_lugS|wvr8lBU*C{-F9E0wq=Dzj+fgxRu{hAt>GzD}Vd zY_c$82pvf>MN2nLGj1G0VW$>|>BH!|BunVSVeFd>L(h(7dM4B<6fF4u2NxDps zNjEYJsjmm0DtWGmJ}66+%JR8gjXy-8}K7c-5UQMf^%f*Htp*w)Md0o1MkaO*>g|tcC3?uffK_d+AG2qHIa- zHL$xX4fOhXLTU~F&*_VfC>N_AqDvIxfOBy3VH-N*@{b2`?Ac|fT9luhdP*-5^cG!Hd4TFA_( zxhnm8S9yJM^Bi-AwFMC6!N3Z25*K3|^GD5kZr=#qrOS4`4Q_pz*QW-j~w+*v9R->a1yYP)-EmES`qh*WhlDerez)n_#1bUw<%DJozda z7b@-{Dq>}4L}=J#As5utv`rVbdjSNWQLzR#C(d}v8ycW+Ks4EGftz#0$~AQ@!KIC! zdQS9NYv!sXoINe2Znv+_(*RR+E>hBmJri?Jp{TJ1o6MZ3nb0w&U6si*p3dzRWRA3beJj{g>LSU3%}bRglN&7c zr#F%v@-r^TKD0_t)0>%7kE zK_@kBmj!1@Y2wo-pwBvGM<$KhXE6(7$4Loci z`PccD#Z1-1V(I}}IRI9Qjt}O6t#-t$`RD;Ut6$H_1DsI`-^izEZ{wU@2u#MozPs(9lMG?TQ8Gk>6Y{m)xS#(cNS?``&L+IjhXl7ql5rspi0 zMUca^AjM%d2Ph#1lfx?Vo`t{b)n}q)AHBXv(hyCBce97lpg(IhscCKK2|fpqW+?-%X2nmX+Km_B3JJ zS=UXSvbeRIj;C2xr6|{j0uHsP;C_LZ_@0zO_DgfQwqAhZ_@UD9g0{dcC%YV z=}{=Ot>WNOIv+A8=`ET)ahsLv)2e-Lca^Kf&Sw#gUq_tSoNq@p^@r}TYIx+f#i{K? zg6^_vyF|-d^zpb(RsMJ?yz1lLrne-4=tAinh`M}1)qZj4ZF(a;U=4SS){U#*p}I5) z&isWA6aRSv@dn*yy8mD3GRPBEF8)Fn!J&=xwGcQ{KAVa#-|PMUuiudXB4ByosEp_xtNhX zE9=BNE!d`=lL(PNuh0-%szwA!UW4mc?z;1{4pIp*ur}k9lkqY2qLZrE@ zztL-GqD?gYjV`9iHgWiGw2Efg#M7V9AvD`2-v0!AUHl21J|vNo(J=H@dFrKQfl!JD zMEWdO9!-DW3fUxCb!=3c&769fwqB8!h7%~vrjNBuBq(yIt2!S1lunf`f)a?aPwBLj z90h9OA8KRGO2noW*uvkGq#Na@smmf)JouMXXtq*-Gv%lwsYHDIce!_3zR@vbCTzn2j`aJo{5MQ06b*#o_`l}82t4DDxq@IB! zwc_3H=x+EWZ~vbDjJUT9V-3W!<)>_v6Hd_)5s#Vl|9WJl6wwsNMr`>fOQKCSq3BG!m6>9CtKMSWTRMVWtjuoDala2 zxnjg7ZL*2}Pry{(V`U|bY!;^+O!{A=G~_04i5aCWvggUgnA)|?dm2C!@h=Yj!jIz43*uGcUQcMf1bvyjswJDE*~1o0%Z zGQ1v6W<#YsiOPkzv#Jjeo##YSih^92!ixK!v5}0cd>({dNHf9sWeQuu2@z)|vVtLr z5lh1Y3Ze_bf^%IsGBk%>%uZ)HG{GLezbQ@JbUAYv_op+Q6DF$4QmEcZ0S(I}}*wrg2-kusFk(`>u+xTG2P4rPl8&9RHGban?HYbPzDeHa@k zPQOL_iC<;0%aXCS`UVwh+E}|dl*LBU0x140Ryeo_bm!JI``oQTL}<7h(7}MGex*B5 zBCZ_9rob7nei$ph6s96OY@$r@F`&kmfJCT+BD+@BhbxE_ypSsr6kI7+j8zA56?SPC zr5cY7XCd0JQlYA{r$WNWflHnj;eAaE@8^lzMzW59HIg&)?Ajt#rxtZ;%{s0~9d}F} zmuMNq*2lSJ9hY76*hSWGnrtMDX5(pGlfnRn+$yda!+rw^^W_*e8ZSwLxkB2EC6}|s z975&kE7)!bmF9ewL)wk|^4Smq;UXbbe>U0Si5YCl*J0z>Ylu7(e=lSLhnM2^A`E?p zJv@6uiV5(25j#W37FB!D)(F|#V#wZVS0-Azs4iyrIJQaZx5C+Ld|u4{2Z3jzsT6Lb z4<t0=@-*IaCA%6Y-)4d$1Iu#k0GnZh&8GB#L&I!xz zlpQnatYnJ(L(jobGMR!8=X)j!BM#-q67XZ$j8A5;cpJ4ijB~TtEf!{p`6hljj~UeA z5FNjTE##fg?x%S}4+|O|oVN(icEmVuZpB_nIc%<7#BL&VtXW@8`GVdw?2oxOunJn@fD0$n zc=QIghYl=rT(rvew%w((;f9s$1BQ0WvnCdeS6BR@A#S z$cOe8Hi@|)@q6|?$6DAp9Gu3tvLV!?(1@w6EP3!YIszUO#Nhfp^`yxmRaYchPk38d zN=mDP6e}}43WNpGWY*u)$_nxiQstZ?9klo4nOH1I5~+)z=Ugks6ls+s1@uAT^s#HO zKe@rja;{tFh}AA_j*H}I8>&H$wgYay+aGKU*m*VCz$?f`z}n}m;!MW(S#B)4a0TySlmB=W6!5B8DtXBMJN`$S%Bwi^Typ8-~%Y z0M_0X@kW4+DcIuZJM-HqrhYMcwH2+YKXjWz!vk^9PK&keA}`415A1NjifLZq_Q8-* z$E`4s6j}R%Y(oCdKK|HdtHo2=bAMog zH|WEBAn{2mL>y={X1fEcy}p%TYSOg`N@$dEJNx=jvtLqkAj;nTG1MGDI)u^K|8Ges zzRuO?Y3QK?$8rR*)@$H@0-4T8oRuz1{GPS$NP%|X-{PHGS=zj+FKQC6PjfXyTtVoc zHxkCL6;?KzUOdbVuTS>#p!jSRlv%e(UCpv{4)vLP2QQv`2hm;h7ST{^;MHHd8Wvcm zcxp9Eher9+YF0h)B8QQNXsI>OD?3DJ4JMxgyDBafVH@y~AF~j#`ze~1bF@#x$1ZO8 znAz|#v*Byo*yy_BeTL{(j8Hkw2h{?&wRgIdqm!WcM4tvE-~~2Y1nwl-p-7){NLNj= z7T z@N33=(-QRe77{Ht0yfv@UWMs0bB4!{k!yC>2d?sYn^dU`Rf~%iMV2@WMM7L;C@eDk zF|u?Mkj7Y`CkfAuzUJ{EI zEl$G&6<{wuWz{m{!kK)q`0Gu~2}AN9H?dr@ON_V~>hF}8D_>{C%{OBQTPFVdW|$_e z;`5u?4A^Le>)1qo%t{^%lkutIr|Yo0I4yRpWBIheCf;7BYS`AZ>q&*cYics?6%Eox zR5W7X;H~f@TFFKp60UPJO}xGy>%Uffv!2Z%P2!pmyMk`Ag%8@2#9bja2wLFb5UAQJ z-VDKhJ0+|eSUzF`CvE^-f?ceTZ|qC9%Hj&~(grq`c*H;Dt4)k-N8u*%qjn(Z5Vy9o z34FVq{KoW*zS9otxl{b3oz-ySAipqOm&<IlZXu;Q-~8JpR&(Eoql%=V(|9e1+2;jIWHcFF^pe9Qnij@rhm(-}dSLIN!5gl6jfkmtu^&0SZ$CRq&%0(bG491zGGHSmT1HL4(}*3r1|Ga| zH=Bi_9om6cr&!s+@*oj^-oe(99Y*Rs3<7DFxc*-DBOx!EQ1y!H;uVXVWt#rXDrShD=qEe0NEXYtAL9z)c_R-^NMwh9NI#^@95 zG{IIV=l4_ikuJGX4@ufD%ZG6uf*d=$|J6h73qKSp51e&g*^EXP3(801TqCXZs%zh)0YUq1OYyAcl6w11$r z!=m;dY?bW{BQI)jnEvS>3>O=Yi!=XZzXs%%bLp#pl_rEYbFkq-%na{vBos&9NCj|DIW4ecSf^iWg7> zg~jS8h)~L1^WXe!K)r@PLEQ!1|aQ&$F;6;3B&p z_rohF9(*MkOe&2Z_vbiynkP0m`A-Mn zQqsRh>!uTt{+b? zKoIWE=0_p!ZXL@oWXf|?x`<6I%%&mm#EO879CDdO!CK8s@4GGY?OD#0SQPU0J+%nNOivcH`;EoFhWoVsw{+MN&TJP2t(nV^lK*5O4u)nZk>myKLpCuaQg( z@qi;0;`kIk1Y>*fN zWN#I3&fu4moX0Boa*9z{aW!8Ff61Fy^U2U_&Y657Mrh_tUQP;(|D1_?!x$T*lD~*m zvf&!O7Gmt%YxwgdeUm*;b5?s={6zh=tG`gpmcq@(yVvp#1fv+uv-!Pp!Lzw=@ky6T zVqCIFpNFZj#h5;iFOyD{N9OY>_7V%(gl=sYU(DwtF?xd*V0?CpcNXv!nCIoyd?49n z)Kqg%e@NY@m-0in@Fq5`;16R#7kKzh7`*#R`3TB~PK4BX2eFtDO}V z(g905I^8!KW1IO5Mu|iCTlxFgwHwtw{t)7?9O4^4pYMQ&eiz6|b{I7Q3=b5~^+7&H zZq08C^4)S*K4BFvaCi`r1Tg5nmQ}nAOKbNke#2nghU-RYwqt^pD_6G5JZjJ&Rfn(U z|3xO@Qru|(h4}PRE5;-DO?}20quC2)1j z#J2au`81%KKa$+7Q2BuqNR;gvHa6&9$pXwEwYnRE@^X6tiC{7#wI(YL z^&w0lh_VTL)izz-n~gAKOtb1!6YkLJ!InJIZqY^;%jFa4n@6s`2Dy-*6p3fppimSy zJ}4OwnSXf;Q3-yz*zl+Y(*NSzAS-`rvNW>%q+>=d72MU5ub%FY^6MBcg+lKMkIGvU zi+OM~YHF_A7nw*-wFvp2MP~+24P8`U&BC50@@_=nSl>Onn*8V`HsBi1Ci=DR=H-DE z(WPuMOL+)nQDi2lXf=KGlD?Rh}y4CvEZ(S@y<_i*$dYVIOz zXfdY2xwC_zXy>F)p-)?B7q%5x;qgI^OW(&2_e`Sc+eoA8mAt#+_9agCWv^8(r$ZdPE4&fSg)cW%pVmegOjC;W6+IR7N~Jc@ODSKMxmQCp2k;XwW~cE( z8g0GOIKmetH>Ff_eHs<-xoS>Hq!84rJ&}n3aVb6WP_vO~rI=u<+B~gH;|K8*6&6dm zBV+1xDXtf^xa+S&gfVzn;cynKvg$RFl1hg&UzJ=Pa^se~$6w_rG(oDsJUEX7ZSx$3 zqZNocFInWcHCN?KUrDXw)+KP4;|g%hQNdhSoBY8am*ZBqqu4negB_m%IV~yBS}DI< zpYO)c#5DU=_aYy3aegfyfqlcUoA?B_jRwUHH}NiP7zW&oo#{GJeKY?Hw#*aP@t0VW zqg`N=5ytlGzV&=E>u|J+x7PC?$9Wv;2X8tY+u^R_r;~O#?142+j?qedsULPJ+-c0( z08>4reD3&Vq8{^(&s4s06!rf8k3H3|4h1?LvA-&W6M!Xpw7%*CObPQhj`Co7M1Ds? zFP~c}=d8!H8hSu<)r>{WX;JqR?0B{rcl?Co+_`|4LKD~F*ab1RE%H}|4m!Gx4R`Z& zD&D`17hwlkwV7XK-0)NW0LM<`+uN~++94+1!Kd>h4*r~Y<_X_M-my+$q7x(Z@a8np-@8zEpe!`JMji#UR>lis{ zJhzoEBsoov_(pfL^OQrIffxZ_Tir6ZyRHF05ans~+v9_40ug}IqT+sD9vUInjyq7^ z;&B#7w5#GVeA(w5{2BdfOm8`fO*>IqIXyC57GG$47E04dg$KiEg3%SnAMZgCS%J#5 ziJAzZs3{d)S9wz-DElCJ^#6+FLL!R$N@{yyv}39h&S+G&BTg?3J)>7&AOd@|_oXdL zZ4u0GX-32fd1*tt*&(O1@)*)F@5DkZEhVRw0xbrl2gA z5$YEzAsstMsCp%Wq{xb>HV7fFzFdkMC1;|)mlZ>eYYFT^8APifF_xa@`o^HLJkgII zc|x!~WL?)%oGhSTJ?vG80ubJphpG!0QTcOG4H6e5o$5n_jvrtG2h}o$xefLAqExaH zsr=C}9c!#dJT`b?oVG!^G%wFpopFcOxSCoT-IKITqK}n)1vr?clq!tH7A!UFP_cqd zWN6s0dijI=&l?*-Bng0JZgK@+`}cg6f+^@9os$<`6DIUzY2|}a4PKbVU=>Dd znXA$7UeXXd(R5E!le sc_cli::Result<()> { command::run() From 6ddc26e0b405269953fc4b4b6370ac5442f79663 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Mon, 4 Nov 2024 13:18:06 -0500 Subject: [PATCH 13/22] wasm compilation --- crates/shared/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/shared/Cargo.toml b/crates/shared/Cargo.toml index 82f456088..86a915c10 100644 --- a/crates/shared/Cargo.toml +++ b/crates/shared/Cargo.toml @@ -26,8 +26,8 @@ subxt ={ version="0.38.0", default-features=false, optional=true } [features] default =["std"] -std =["codec/std", "scale-info/std", "serde/std", "sp-runtime/std", "sp-std/std"] -wasm =["codec/std", "scale-info/std", "serde/std", "sp-std/std"] +std =["codec/std", "scale-info/std", "serde/std", "sp-runtime/std", "sp-std/std", "sp-core/std"] +wasm =["codec/std", "scale-info/std", "serde/std", "sp-std/std", "sp-core/std"] wasm-no-std=["sp-runtime"] user-native=["dep:subxt", "subxt/native"] user-wasm =["dep:subxt", "subxt/web"] From 5dcbd974d666eb7c662a6429bfe878b9f247c2fb Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Mon, 4 Nov 2024 14:11:00 -0500 Subject: [PATCH 14/22] add public address --- crates/testing-utils/src/node_proc.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/testing-utils/src/node_proc.rs b/crates/testing-utils/src/node_proc.rs index fade79357..9d276fef0 100644 --- a/crates/testing-utils/src/node_proc.rs +++ b/crates/testing-utils/src/node_proc.rs @@ -130,6 +130,7 @@ impl TestNodeProcessBuilder { let mut cmd = process::Command::new(&self.node_path); cmd.env("RUST_LOG", "error").arg(&self.chain_type).arg("--tmp"); cmd.arg("--unsafe-force-node-key-generation"); + cmd.arg("--public-addr=/ip4/0.0.0.0/tcp/30333"); if self.force_authoring { cmd.arg("--force-authoring"); } From 11c9e4e8db5d338c95f74056a84e5f5fcb64227c Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Mon, 4 Nov 2024 14:18:13 -0500 Subject: [PATCH 15/22] changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72ef94fb8..5dbe9fdad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,10 +16,13 @@ At the moment this project **does not** adhere to `AttestationHandler` config type was added to the Staking Extension pallet. The `KeyProvider` and `AttestationQueue` config types were removed from the Attestation pallet. - In [#1134](https://github.com/entropyxyz/entropy-core/pull/1134/) the ```no-sync``` option was removed +- In [#1138](https://github.com/entropyxyz/entropy-core/pull/1138/) the substreate version was updated, this could cause changes to the chainspec file as well requires a stratagery for command line argument ```--public-addr``` and for handling ```node-key-generation``` + ### Changed - Use correct key rotation endpoint in OCW ([#1104](https://github.com/entropyxyz/entropy-core/pull/1104)) - Change attestation flow to be pull based ([#1109](https://github.com/entropyxyz/entropy-core/pull/1109/)) - Remove declare synced ([#1134](https://github.com/entropyxyz/entropy-core/pull/1134/)) +- Update substrate version ([#1138](https://github.com/entropyxyz/entropy-core/pull/1138/)) ## [0.3.0-rc.1](https://github.com/entropyxyz/entropy-core/compare/release/v0.2.0...release/v0.3.0-rc.1) - 2024-10-04 From da6c661e0e310c5255ebd15991fcdfa2a41aeca7 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Mon, 4 Nov 2024 14:30:10 -0500 Subject: [PATCH 16/22] cargo toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 6b6e30a4d..ae1c23e06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,3 @@ [workspace] resolver="2" -members =['crates/*', 'node/*', 'pallets/*', 'runtime'] +members =['crates/*', 'node/*', 'pallets/*', 'runtime', 'scripts/create-test-keyshares'] From b1e708130ae0131083bf566885e74c2cba88048e Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Mon, 4 Nov 2024 14:30:22 -0500 Subject: [PATCH 17/22] cargo toml --- Cargo.lock | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 60bf5915f..8005ffa89 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3496,6 +3496,19 @@ dependencies = [ "x25519-dalek 2.0.1", ] +[[package]] +name = "entropy-create-test-keyshares" +version = "0.3.0-rc.1" +dependencies = [ + "entropy-kvdb", + "entropy-shared", + "entropy-testing-utils", + "entropy-tss", + "sp-core 34.0.0", + "synedrion", + "tokio", +] + [[package]] name = "entropy-kvdb" version = "0.3.0-rc.1" From 640637f44f203e4b746835ab6ddb3aa24bc49864 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Wed, 4 Dec 2024 13:43:33 -0500 Subject: [PATCH 18/22] compiling --- Cargo.lock | 29 ++++++++++++++++++++++++----- runtime/Cargo.toml | 2 +- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8005ffa89..f3096fe1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -771,7 +771,7 @@ dependencies = [ "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", - "substrate-wasm-builder", + "substrate-wasm-builder 24.0.1", ] [[package]] @@ -795,7 +795,7 @@ dependencies = [ "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", - "substrate-wasm-builder", + "substrate-wasm-builder 24.0.1", ] [[package]] @@ -3678,7 +3678,7 @@ dependencies = [ "sp-transaction-pool 34.0.0", "sp-version 37.0.0", "static_assertions", - "substrate-wasm-builder", + "substrate-wasm-builder 18.0.1", ] [[package]] @@ -10873,7 +10873,7 @@ dependencies = [ "staging-parachain-info", "staging-xcm", "staging-xcm-executor", - "substrate-wasm-builder", + "substrate-wasm-builder 24.0.1", ] [[package]] @@ -10904,7 +10904,7 @@ dependencies = [ "staging-parachain-info", "staging-xcm", "staging-xcm-executor", - "substrate-wasm-builder", + "substrate-wasm-builder 24.0.1", ] [[package]] @@ -18293,6 +18293,25 @@ dependencies = [ "sp-runtime 35.0.0", ] +[[package]] +name = "substrate-wasm-builder" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a39a20e17c24ede36b5bd5e7543a4cef8d8a0daf6e1a046dc31832b837a54a0" +dependencies = [ + "build-helper", + "cargo_metadata", + "console", + "filetime", + "parity-wasm", + "sp-maybe-compressed-blob", + "strum 0.24.1", + "tempfile", + "toml 0.8.19", + "walkdir", + "wasm-opt", +] + [[package]] name = "substrate-wasm-builder" version = "24.0.1" diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 5aafe434a..cd38084a2 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -110,7 +110,7 @@ entropy-shared={ version="0.3.0-rc.1", path="../crates/shared", default-features ] } [build-dependencies] -substrate-wasm-builder={ version="24.0.1", optional=true } +substrate-wasm-builder={ version="18.0.0", optional=true } [features] default=["std"] From fbb182df54b0aaf04fd1c43bd177d21f3d6f3a18 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Wed, 4 Dec 2024 14:11:12 -0500 Subject: [PATCH 19/22] update wasm builder --- Cargo.lock | 28 +++++++++++++++++++++++++--- runtime/Cargo.toml | 2 +- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f3096fe1d..a585f771e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3678,7 +3678,7 @@ dependencies = [ "sp-transaction-pool 34.0.0", "sp-version 37.0.0", "static_assertions", - "substrate-wasm-builder 18.0.1", + "substrate-wasm-builder 19.0.0", ] [[package]] @@ -11769,6 +11769,12 @@ dependencies = [ "log", ] +[[package]] +name = "polkavm-common" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92c99f7eee94e7be43ba37eef65ad0ee8cbaf89b7c00001c3f6d2be985cb1817" + [[package]] name = "polkavm-common" version = "0.9.0" @@ -11850,6 +11856,21 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "polkavm-linker" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdec1451cb18261d5d01de82acc15305e417fb59588cdcb3127d3dcc9672b925" +dependencies = [ + "gimli 0.28.1", + "hashbrown 0.14.5", + "log", + "object 0.32.2", + "polkavm-common 0.8.0", + "regalloc2 0.9.3", + "rustc-demangle", +] + [[package]] name = "polkavm-linker" version = "0.9.2" @@ -18295,15 +18316,16 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" -version = "18.0.1" +version = "19.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a39a20e17c24ede36b5bd5e7543a4cef8d8a0daf6e1a046dc31832b837a54a0" +checksum = "d182ae093d473b5947e32c392b10fb12125318c4470ff8adf32b0cbf2e9e6611" dependencies = [ "build-helper", "cargo_metadata", "console", "filetime", "parity-wasm", + "polkavm-linker 0.8.2", "sp-maybe-compressed-blob", "strum 0.24.1", "tempfile", diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index cd38084a2..916dccc89 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -110,7 +110,7 @@ entropy-shared={ version="0.3.0-rc.1", path="../crates/shared", default-features ] } [build-dependencies] -substrate-wasm-builder={ version="18.0.0", optional=true } +substrate-wasm-builder={ version="19.0.0", optional=true } [features] default=["std"] From 849d470a5829bdcf447eb46ed262f42e4fbb0822 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Wed, 4 Dec 2024 14:41:11 -0500 Subject: [PATCH 20/22] fix --- Cargo.lock | 790 +++---------------- crates/threshold-signature-server/Cargo.toml | 4 +- 2 files changed, 107 insertions(+), 687 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0c45c5b91..9ca5a3720 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1621,7 +1621,7 @@ dependencies = [ "sp-io 38.0.0", "sp-keyring 39.0.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -1981,7 +1981,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", "terminal_size", ] @@ -2924,38 +2924,14 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", -] - [[package]] name = "darling" version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", + "darling_core", + "darling_macro", ] [[package]] @@ -2968,28 +2944,17 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", + "strsim", "syn 2.0.90", ] -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core 0.14.4", - "quote", - "syn 1.0.109", -] - [[package]] name = "darling_macro" version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.10", + "darling_core", "quote", "syn 2.0.90", ] @@ -3518,7 +3483,7 @@ dependencies = [ "sp-runtime 39.0.2", "sp-statement-store 18.0.0", "sp-timestamp 34.0.0", - "sp-tracing 17.0.1", + "sp-tracing", "sp-transaction-storage-proof 34.0.0", "substrate-build-script-utils", "substrate-frame-rpc-system", @@ -3550,7 +3515,7 @@ dependencies = [ "sha3", "sp-core 34.0.0", "sp-keyring 39.0.0", - "subxt 0.38.0", + "subxt", "subxt-core", "synedrion", "tdx-quote", @@ -3647,7 +3612,7 @@ dependencies = [ "snow", "sp-core 34.0.0", "sp-keyring 39.0.0", - "subxt 0.38.0", + "subxt", "synedrion", "thiserror 2.0.4", "tokio", @@ -3738,7 +3703,7 @@ dependencies = [ "sp-session 36.0.0", "sp-staking 36.0.0", "sp-std", - "sp-storage 21.0.0", + "sp-storage", "sp-transaction-pool 34.0.0", "sp-version 37.0.0", "static_assertions", @@ -3761,7 +3726,7 @@ dependencies = [ "sp-std", "strum 0.26.3", "strum_macros 0.26.4", - "subxt 0.38.0", + "subxt", ] [[package]] @@ -3780,7 +3745,7 @@ dependencies = [ "serde_json", "sp-core 34.0.0", "sp-runtime 39.0.2", - "subxt 0.38.0", + "subxt", "tokio", "x25519-dalek 2.0.1", ] @@ -3803,7 +3768,7 @@ dependencies = [ "rand_core 0.6.4", "sp-core 34.0.0", "sp-keyring 39.0.0", - "subxt 0.38.0", + "subxt", "synedrion", "tdx-quote", "tokio", @@ -3858,10 +3823,10 @@ dependencies = [ "sha2 0.10.8", "sha3", "snow", - "sp-core 31.0.0", + "sp-core 34.0.0", "sp-keyring 39.0.0", "strum 0.26.3", - "subxt 0.35.3", + "subxt", "synedrion", "tdx-quote", "thiserror 2.0.4", @@ -4059,16 +4024,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "pin-project-lite 0.2.15", -] - [[package]] name = "event-listener" version = "5.3.1" @@ -4374,7 +4329,7 @@ dependencies = [ "sp-io 38.0.0", "sp-runtime 39.0.2", "sp-runtime-interface 28.0.0", - "sp-storage 21.0.0", + "sp-storage", "static_assertions", ] @@ -4422,9 +4377,9 @@ dependencies = [ "sp-keystore 0.40.0", "sp-runtime 39.0.2", "sp-state-machine 0.43.0", - "sp-storage 21.0.0", + "sp-storage", "sp-trie 37.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "thiserror 1.0.69", "thousands", ] @@ -4452,9 +4407,9 @@ checksum = "02d3379df61ff3dd871e2dde7d1bcdc0263e613c21c7579b149fd4f0ad9b1dc2" dependencies = [ "frame-metadata 17.0.0", "parity-scale-codec", - "scale-decode 0.14.0", + "scale-decode", "scale-info", - "scale-type-resolver 0.2.0", + "scale-type-resolver", "sp-crypto-hashing", ] @@ -4503,18 +4458,7 @@ dependencies = [ "sp-core 34.0.0", "sp-io 38.0.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", -] - -[[package]] -name = "frame-metadata" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" -dependencies = [ - "cfg-if", - "parity-scale-codec", - "scale-info", + "sp-tracing", ] [[package]] @@ -4616,7 +4560,7 @@ dependencies = [ "sp-staking 30.0.0", "sp-state-machine 0.39.0", "sp-std", - "sp-tracing 17.0.1", + "sp-tracing", "sp-weights", "static_assertions", "tt-call", @@ -4658,7 +4602,7 @@ dependencies = [ "sp-staking 36.0.0", "sp-state-machine 0.43.0", "sp-std", - "sp-tracing 17.0.1", + "sp-tracing", "sp-weights", "static_assertions", "tt-call", @@ -6233,7 +6177,6 @@ version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad" dependencies = [ - "jsonrpsee-client-transport 0.22.5", "jsonrpsee-core 0.22.5", "jsonrpsee-http-client", "jsonrpsee-proc-macros 0.22.5", @@ -8330,12 +8273,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" -[[package]] -name = "no-std-net" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" - [[package]] name = "nodrop" version = "0.1.14" @@ -9018,7 +8955,7 @@ dependencies = [ "sp-core 34.0.0", "sp-io 38.0.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", ] [[package]] @@ -9307,7 +9244,7 @@ dependencies = [ "staging-xcm", "staging-xcm-builder", "wasm-instrument", - "wasmi 0.32.3", + "wasmi", ] [[package]] @@ -9339,7 +9276,7 @@ dependencies = [ "sp-io 38.0.0", "sp-keystore 0.40.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -9858,7 +9795,7 @@ dependencies = [ "sp-io 38.0.0", "sp-runtime 39.0.2", "sp-staking 36.0.0", - "sp-tracing 17.0.1", + "sp-tracing", ] [[package]] @@ -10264,7 +10201,7 @@ dependencies = [ "sp-io 38.0.0", "sp-keystore 0.40.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -10651,7 +10588,7 @@ dependencies = [ "sp-inherents 34.0.0", "sp-io 38.0.0", "sp-runtime 39.0.2", - "sp-storage 21.0.0", + "sp-storage", "sp-timestamp 34.0.0", ] @@ -10999,7 +10936,7 @@ dependencies = [ "sp-core 34.0.0", "sp-io 38.0.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", "staging-parachain-info", "staging-xcm", "staging-xcm-executor", @@ -11507,7 +11444,7 @@ dependencies = [ "frame-benchmarking", "parity-scale-codec", "polkadot-primitives 16.0.0", - "sp-tracing 17.0.1", + "sp-tracing", ] [[package]] @@ -11773,20 +11710,20 @@ dependencies = [ "sp-state-machine 0.43.0", "sp-statement-store 18.0.0", "sp-std", - "sp-storage 21.0.0", + "sp-storage", "sp-timestamp 34.0.0", - "sp-tracing 17.0.1", + "sp-tracing", "sp-transaction-pool 34.0.0", "sp-transaction-storage-proof 34.0.0", "sp-trie 37.0.0", "sp-version 37.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "sp-weights", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", - "substrate-bip39 0.6.0", + "substrate-bip39", "testnet-parachains-constants", "xcm-runtime-apis", ] @@ -11819,7 +11756,7 @@ dependencies = [ "sp-offchain 34.0.0", "sp-runtime 39.0.2", "sp-session 36.0.0", - "sp-storage 21.0.0", + "sp-storage", "sp-transaction-pool 34.0.0", "sp-version 37.0.0", ] @@ -11893,15 +11830,6 @@ dependencies = [ "polkavm-assembler 0.10.0", ] -[[package]] -name = "polkavm-derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79fa916f7962348bd1bb1a65a83401675e6fc86c51a0fdbcf92a3108e58e6125" -dependencies = [ - "polkavm-derive-impl-macro 0.8.0", -] - [[package]] name = "polkavm-derive" version = "0.9.1" @@ -11920,18 +11848,6 @@ dependencies = [ "polkavm-derive-impl-macro 0.10.0", ] -[[package]] -name = "polkavm-derive-impl" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c10b2654a8a10a83c260bfb93e97b262cf0017494ab94a65d389e0eda6de6c9c" -dependencies = [ - "polkavm-common 0.8.0", - "proc-macro2", - "quote", - "syn 2.0.90", -] - [[package]] name = "polkavm-derive-impl" version = "0.9.0" @@ -11956,16 +11872,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "polkavm-derive-impl-macro" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e85319a0d5129dc9f021c62607e0804f5fb777a05cdda44d750ac0732def66" -dependencies = [ - "polkavm-derive-impl 0.8.0", - "syn 2.0.90", -] - [[package]] name = "polkavm-derive-impl-macro" version = "0.9.0" @@ -13457,17 +13363,6 @@ dependencies = [ "wait-timeout", ] -[[package]] -name = "ruzstd" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" -dependencies = [ - "byteorder", - "derive_more 0.99.18", - "twox-hash", -] - [[package]] name = "ruzstd" version = "0.6.0" @@ -13550,7 +13445,7 @@ checksum = "97e78771bbc491d4d601afbbf01f5718d6d724d0d971c8581cf5b4c62a9502f7" dependencies = [ "log", "sp-core 32.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "thiserror 1.0.69", ] @@ -13562,7 +13457,7 @@ checksum = "b975ee3a95eaacb611e7b415737a7fa2db4d8ad7b880cc1b97371b04e95c7903" dependencies = [ "log", "sp-core 34.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "thiserror 1.0.69", ] @@ -13704,7 +13599,7 @@ dependencies = [ "sp-io 38.0.0", "sp-runtime 39.0.2", "sp-state-machine 0.43.0", - "sp-tracing 17.0.1", + "sp-tracing", ] [[package]] @@ -13838,7 +13733,7 @@ dependencies = [ "sp-runtime 35.0.0", "sp-state-machine 0.39.0", "sp-statement-store 14.0.0", - "sp-storage 21.0.0", + "sp-storage", "sp-trie 33.0.0", "substrate-prometheus-endpoint", ] @@ -13866,7 +13761,7 @@ dependencies = [ "sp-runtime 39.0.2", "sp-state-machine 0.43.0", "sp-statement-store 18.0.0", - "sp-storage 21.0.0", + "sp-storage", "sp-trie 37.0.0", "substrate-prometheus-endpoint", ] @@ -14160,7 +14055,7 @@ dependencies = [ "sp-runtime-interface 27.0.0", "sp-trie 33.0.0", "sp-version 33.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "tracing", ] @@ -14184,7 +14079,7 @@ dependencies = [ "sp-runtime-interface 28.0.0", "sp-trie 37.0.0", "sp-version 37.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "tracing", ] @@ -14197,7 +14092,7 @@ dependencies = [ "polkavm 0.9.3", "sc-allocator 27.0.0", "sp-maybe-compressed-blob", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "thiserror 1.0.69", "wasm-instrument", ] @@ -14211,7 +14106,7 @@ dependencies = [ "polkavm 0.9.3", "sc-allocator 29.0.0", "sp-maybe-compressed-blob", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "thiserror 1.0.69", "wasm-instrument", ] @@ -14225,7 +14120,7 @@ dependencies = [ "log", "polkavm 0.9.3", "sc-executor-common 0.33.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", ] [[package]] @@ -14237,7 +14132,7 @@ dependencies = [ "log", "polkavm 0.9.3", "sc-executor-common 0.35.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", ] [[package]] @@ -14255,7 +14150,7 @@ dependencies = [ "sc-allocator 27.0.0", "sc-executor-common 0.33.0", "sp-runtime-interface 27.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "wasmtime 8.0.1", ] @@ -14274,7 +14169,7 @@ dependencies = [ "sc-allocator 29.0.0", "sc-executor-common 0.35.0", "sp-runtime-interface 28.0.0", - "sp-wasm-interface 21.0.1", + "sp-wasm-interface", "wasmtime 8.0.1", ] @@ -15089,7 +14984,7 @@ dependencies = [ "sp-runtime 35.0.0", "sp-session 31.0.0", "sp-state-machine 0.39.0", - "sp-storage 21.0.0", + "sp-storage", "sp-transaction-pool 30.0.0", "sp-transaction-storage-proof 30.0.0", "sp-trie 33.0.0", @@ -15154,7 +15049,7 @@ dependencies = [ "sp-runtime 39.0.2", "sp-session 36.0.0", "sp-state-machine 0.43.0", - "sp-storage 21.0.0", + "sp-storage", "sp-transaction-pool 34.0.0", "sp-transaction-storage-proof 34.0.0", "sp-trie 37.0.0", @@ -15335,7 +15230,7 @@ dependencies = [ "sp-core 32.0.0", "sp-rpc 30.0.0", "sp-runtime 35.0.0", - "sp-tracing 17.0.1", + "sp-tracing", "thiserror 1.0.69", "tracing", "tracing-log 0.1.4", @@ -15365,7 +15260,7 @@ dependencies = [ "sp-core 34.0.0", "sp-rpc 32.0.0", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", "thiserror 1.0.69", "tracing", "tracing-log 0.2.0", @@ -15406,7 +15301,7 @@ dependencies = [ "sp-core 32.0.0", "sp-crypto-hashing", "sp-runtime 35.0.0", - "sp-tracing 17.0.1", + "sp-tracing", "sp-transaction-pool 30.0.0", "substrate-prometheus-endpoint", "thiserror 1.0.69", @@ -15434,7 +15329,7 @@ dependencies = [ "sp-core 34.0.0", "sp-crypto-hashing", "sp-runtime 39.0.2", - "sp-tracing 17.0.1", + "sp-tracing", "sp-transaction-pool 34.0.0", "substrate-prometheus-endpoint", "thiserror 1.0.69", @@ -15490,18 +15385,6 @@ dependencies = [ "sp-arithmetic", ] -[[package]] -name = "scale-bits" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662d10dcd57b1c2a3c41c9cf68f71fb09747ada1ea932ad961aca7e2ca28315f" -dependencies = [ - "parity-scale-codec", - "scale-info", - "scale-type-resolver 0.1.1", - "serde", -] - [[package]] name = "scale-bits" version = "0.6.0" @@ -15510,25 +15393,10 @@ checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54" dependencies = [ "parity-scale-codec", "scale-info", - "scale-type-resolver 0.2.0", + "scale-type-resolver", "serde", ] -[[package]] -name = "scale-decode" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc79ba56a1c742f5aeeed1f1801f3edf51f7e818f0a54582cac6f131364ea7b" -dependencies = [ - "derive_more 0.99.18", - "parity-scale-codec", - "primitive-types 0.12.2", - "scale-bits 0.5.0", - "scale-decode-derive 0.11.1", - "scale-type-resolver 0.1.1", - "smallvec", -] - [[package]] name = "scale-decode" version = "0.14.0" @@ -15538,51 +15406,24 @@ dependencies = [ "derive_more 1.0.0", "parity-scale-codec", "primitive-types 0.13.1", - "scale-bits 0.6.0", - "scale-decode-derive 0.14.0", - "scale-type-resolver 0.2.0", + "scale-bits", + "scale-decode-derive", + "scale-type-resolver", "smallvec", ] -[[package]] -name = "scale-decode-derive" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5398fdb3c7bea3cb419bac4983aadacae93fe1a7b5f693f4ebd98c3821aad7a5" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "scale-decode-derive" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ed9401effa946b493f9f84dc03714cca98119b230497df6f3df6b84a2b03648" dependencies = [ - "darling 0.20.10", + "darling", "proc-macro2", "quote", "syn 2.0.90", ] -[[package]] -name = "scale-encode" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628800925a33794fb5387781b883b5e14d130fece9af5a63613867b8de07c5c7" -dependencies = [ - "derive_more 0.99.18", - "parity-scale-codec", - "primitive-types 0.12.2", - "scale-bits 0.5.0", - "scale-encode-derive 0.6.0", - "scale-type-resolver 0.1.1", - "smallvec", -] - [[package]] name = "scale-encode" version = "0.8.0" @@ -15592,32 +15433,19 @@ dependencies = [ "derive_more 1.0.0", "parity-scale-codec", "primitive-types 0.13.1", - "scale-bits 0.6.0", - "scale-encode-derive 0.8.0", - "scale-type-resolver 0.2.0", + "scale-bits", + "scale-encode-derive", + "scale-type-resolver", "smallvec", ] -[[package]] -name = "scale-encode-derive" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a304e1af7cdfbe7a24e08b012721456cc8cecdedadc14b3d10513eada63233c" -dependencies = [ - "darling 0.14.4", - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "scale-encode-derive" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "102fbc6236de6c53906c0b262f12c7aa69c2bdc604862c12728f5f4d370bc137" dependencies = [ - "darling 0.20.10", + "darling", "proc-macro-crate 3.2.0", "proc-macro2", "quote", @@ -15650,16 +15478,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "scale-type-resolver" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10b800069bfd43374e0f96f653e0d46882a2cb16d6d961ac43bea80f26c76843" -dependencies = [ - "scale-info", - "smallvec", -] - [[package]] name = "scale-type-resolver" version = "0.2.0" @@ -15670,19 +15488,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "scale-typegen" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d470fa75e71b12b3244a4113adc4bc49891f3daba2054703cacd06256066397e" -dependencies = [ - "proc-macro2", - "quote", - "scale-info", - "syn 2.0.90", - "thiserror 1.0.69", -] - [[package]] name = "scale-typegen" version = "0.9.0" @@ -15696,27 +15501,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "scale-value" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07ccfee963104335c971aaf8b7b0e749be8569116322df23f1f75c4ca9e4a28" -dependencies = [ - "base58", - "blake2 0.10.6", - "derive_more 0.99.18", - "either", - "frame-metadata 15.1.0", - "parity-scale-codec", - "scale-bits 0.5.0", - "scale-decode 0.11.1", - "scale-encode 0.6.0", - "scale-info", - "scale-type-resolver 0.1.1", - "serde", - "yap", -] - [[package]] name = "scale-value" version = "0.17.0" @@ -15728,11 +15512,11 @@ dependencies = [ "derive_more 1.0.0", "either", "parity-scale-codec", - "scale-bits 0.6.0", - "scale-decode 0.14.0", - "scale-encode 0.8.0", + "scale-bits", + "scale-decode", + "scale-encode", "scale-info", - "scale-type-resolver 0.2.0", + "scale-type-resolver", "serde", "yap", ] @@ -16380,61 +16164,6 @@ dependencies = [ "futures-lite", ] -[[package]] -name = "smoldot" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d1eaa97d77be4d026a1e7ffad1bb3b78448763b357ea6f8188d3e6f736a9b9" -dependencies = [ - "arrayvec 0.7.6", - "async-lock", - "atomic-take", - "base64 0.21.7", - "bip39", - "blake2-rfc", - "bs58 0.5.1", - "chacha20 0.9.1", - "crossbeam-queue", - "derive_more 0.99.18", - "ed25519-zebra 4.0.3", - "either", - "event-listener 4.0.3", - "fnv", - "futures-lite", - "futures-util", - "hashbrown 0.14.5", - "hex", - "hmac 0.12.1", - "itertools 0.12.1", - "libm", - "libsecp256k1", - "merlin", - "no-std-net", - "nom", - "num-bigint", - "num-rational", - "num-traits", - "pbkdf2", - "pin-project", - "poly1305 0.8.0", - "rand", - "rand_chacha", - "ruzstd 0.5.0", - "schnorrkel", - "serde", - "serde_json", - "sha2 0.10.8", - "sha3", - "siphasher 1.0.1", - "slab", - "smallvec", - "soketto 0.7.1", - "twox-hash", - "wasmi 0.31.2", - "x25519-dalek 2.0.1", - "zeroize", -] - [[package]] name = "smoldot" version = "0.18.0" @@ -16473,7 +16202,7 @@ dependencies = [ "poly1305 0.8.0", "rand", "rand_chacha", - "ruzstd 0.6.0", + "ruzstd", "schnorrkel", "serde", "serde_json", @@ -16484,47 +16213,11 @@ dependencies = [ "smallvec", "soketto 0.8.1", "twox-hash", - "wasmi 0.32.3", + "wasmi", "x25519-dalek 2.0.1", "zeroize", ] -[[package]] -name = "smoldot-light" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5496f2d116b7019a526b1039ec2247dd172b8670633b1a64a614c9ea12c9d8c7" -dependencies = [ - "async-channel 2.3.1", - "async-lock", - "base64 0.21.7", - "blake2-rfc", - "derive_more 0.99.18", - "either", - "event-listener 4.0.3", - "fnv", - "futures-channel", - "futures-lite", - "futures-util", - "hashbrown 0.14.5", - "hex", - "itertools 0.12.1", - "log", - "lru 0.12.5", - "no-std-net", - "parking_lot 0.12.3", - "pin-project", - "rand", - "rand_chacha", - "serde", - "serde_json", - "siphasher 1.0.1", - "slab", - "smol", - "smoldot 0.16.0", - "zeroize", -] - [[package]] name = "smoldot-light" version = "0.16.2" @@ -16557,7 +16250,7 @@ dependencies = [ "siphasher 1.0.1", "slab", "smol", - "smoldot 0.18.0", + "smoldot", "zeroize", ] @@ -17352,53 +17045,6 @@ dependencies = [ "sp-timestamp 34.0.0", ] -[[package]] -name = "sp-core" -version = "31.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d7a0fd8f16dcc3761198fc83be12872f823b37b749bc72a3a6a1f702509366" -dependencies = [ - "array-bytes 6.2.3", - "bitflags 1.3.2", - "blake2 0.10.6", - "bounded-collections", - "bs58 0.5.1", - "dyn-clonable", - "ed25519-zebra 3.1.0", - "futures", - "hash-db", - "hash256-std-hasher", - "impl-serde 0.4.0", - "itertools 0.10.5", - "k256", - "libsecp256k1", - "log", - "merlin", - "parity-bip39", - "parity-scale-codec", - "parking_lot 0.12.3", - "paste", - "primitive-types 0.12.2", - "rand", - "scale-info", - "schnorrkel", - "secp256k1", - "secrecy 0.8.0", - "serde", - "sp-crypto-hashing", - "sp-debug-derive", - "sp-externalities 0.27.0", - "sp-runtime-interface 26.0.0", - "sp-std", - "sp-storage 20.0.0", - "ss58-registry", - "substrate-bip39 0.5.0", - "thiserror 1.0.69", - "tracing", - "w3f-bls", - "zeroize", -] - [[package]] name = "sp-core" version = "32.0.0" @@ -17437,9 +17083,9 @@ dependencies = [ "sp-externalities 0.28.0", "sp-runtime-interface 27.0.0", "sp-std", - "sp-storage 21.0.0", + "sp-storage", "ss58-registry", - "substrate-bip39 0.6.0", + "substrate-bip39", "thiserror 1.0.69", "tracing", "w3f-bls", @@ -17484,9 +17130,9 @@ dependencies = [ "sp-externalities 0.29.0", "sp-runtime-interface 28.0.0", "sp-std", - "sp-storage 21.0.0", + "sp-storage", "ss58-registry", - "substrate-bip39 0.6.0", + "substrate-bip39", "thiserror 1.0.69", "tracing", "w3f-bls", @@ -17569,18 +17215,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "sp-externalities" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d6a4572eadd4a63cff92509a210bf425501a0c5e76574b30a366ac77653787" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std", - "sp-storage 20.0.0", -] - [[package]] name = "sp-externalities" version = "0.28.0" @@ -17589,7 +17223,7 @@ checksum = "33abaec4be69b1613796bbf430decbbcaaf978756379e2016e683a4d6379cd02" dependencies = [ "environmental", "parity-scale-codec", - "sp-storage 21.0.0", + "sp-storage", ] [[package]] @@ -17600,7 +17234,7 @@ checksum = "a904407d61cb94228c71b55a9d3708e9d6558991f9e83bd42bd91df37a159d30" dependencies = [ "environmental", "parity-scale-codec", - "sp-storage 21.0.0", + "sp-storage", ] [[package]] @@ -17676,7 +17310,7 @@ dependencies = [ "sp-runtime-interface 27.0.0", "sp-state-machine 0.39.0", "sp-std", - "sp-tracing 17.0.1", + "sp-tracing", "sp-trie 33.0.0", "tracing", "tracing-core", @@ -17703,7 +17337,7 @@ dependencies = [ "sp-keystore 0.40.0", "sp-runtime-interface 28.0.0", "sp-state-machine 0.43.0", - "sp-tracing 17.0.1", + "sp-tracing", "sp-trie 37.0.0", "tracing", "tracing-core", @@ -17939,26 +17573,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "sp-runtime-interface" -version = "26.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a675ea4858333d4d755899ed5ed780174aa34fec15953428d516af5452295" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "polkavm-derive 0.8.0", - "primitive-types 0.12.2", - "sp-externalities 0.27.0", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-storage 20.0.0", - "sp-tracing 16.0.0", - "sp-wasm-interface 20.0.0", - "static_assertions", -] - [[package]] name = "sp-runtime-interface" version = "27.0.0" @@ -17973,9 +17587,9 @@ dependencies = [ "sp-externalities 0.28.0", "sp-runtime-interface-proc-macro", "sp-std", - "sp-storage 21.0.0", - "sp-tracing 17.0.1", - "sp-wasm-interface 21.0.1", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] @@ -17993,9 +17607,9 @@ dependencies = [ "sp-externalities 0.29.0", "sp-runtime-interface-proc-macro", "sp-std", - "sp-storage 21.0.0", - "sp-tracing 17.0.1", - "sp-wasm-interface 21.0.1", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] @@ -18183,20 +17797,6 @@ version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834" -[[package]] -name = "sp-storage" -version = "20.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dba5791cb3978e95daf99dad919ecb3ec35565604e88cd38d805d9d4981e8bd" -dependencies = [ - "impl-serde 0.4.0", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive", - "sp-std", -] - [[package]] name = "sp-storage" version = "21.0.0" @@ -18236,19 +17836,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "sp-tracing" -version = "16.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0351810b9d074df71c4514c5228ed05c250607cba131c1c9d1526760ab69c05c" -dependencies = [ - "parity-scale-codec", - "sp-std", - "tracing", - "tracing-core", - "tracing-subscriber 0.2.25", -] - [[package]] name = "sp-tracing" version = "17.0.1" @@ -18407,20 +17994,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "sp-wasm-interface" -version = "20.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef97172c42eb4c6c26506f325f48463e9bc29b2034a587f1b9e48c751229bee" -dependencies = [ - "anyhow", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-std", - "wasmtime 8.0.1", -] - [[package]] name = "sp-wasm-interface" version = "21.0.1" @@ -18684,12 +18257,6 @@ dependencies = [ "serde", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -18740,19 +18307,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "substrate-bip39" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2b564c293e6194e8b222e52436bcb99f60de72043c7f845cf6c4406db4df121" -dependencies = [ - "hmac 0.12.1", - "pbkdf2", - "schnorrkel", - "sha2 0.10.8", - "zeroize", -] - [[package]] name = "substrate-bip39" version = "0.6.0" @@ -18873,42 +18427,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "subxt" -version = "0.35.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd68bef23f4de5e513ab4c29af69053e232b098f9c87ab552d7ea153b4a1fbc5" -dependencies = [ - "async-trait", - "base58", - "blake2 0.10.6", - "derivative", - "either", - "frame-metadata 16.0.0", - "futures", - "hex", - "impl-serde 0.4.0", - "instant", - "jsonrpsee 0.22.5", - "parity-scale-codec", - "primitive-types 0.12.2", - "scale-bits 0.5.0", - "scale-decode 0.11.1", - "scale-encode 0.6.0", - "scale-info", - "scale-value 0.14.1", - "serde", - "serde_json", - "sp-crypto-hashing", - "subxt-lightclient 0.35.3", - "subxt-macro 0.35.3", - "subxt-metadata 0.35.3", - "thiserror 1.0.69", - "tokio-util", - "tracing", - "url", -] - [[package]] name = "subxt" version = "0.38.0" @@ -18928,17 +18446,17 @@ dependencies = [ "parity-scale-codec", "polkadot-sdk", "primitive-types 0.13.1", - "scale-bits 0.6.0", - "scale-decode 0.14.0", - "scale-encode 0.8.0", + "scale-bits", + "scale-decode", + "scale-encode", "scale-info", - "scale-value 0.17.0", + "scale-value", "serde", "serde_json", "subxt-core", - "subxt-lightclient 0.38.0", - "subxt-macro 0.38.0", - "subxt-metadata 0.38.0", + "subxt-lightclient", + "subxt-macro", + "subxt-metadata", "thiserror 1.0.69", "tokio", "tokio-util", @@ -18948,27 +18466,6 @@ dependencies = [ "web-time", ] -[[package]] -name = "subxt-codegen" -version = "0.35.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d9e2b256b71d31a2629e44eb9cbfd944eb7d577c9e0c8e9802cc3c3943af2d9" -dependencies = [ - "frame-metadata 16.0.0", - "heck 0.4.1", - "hex", - "jsonrpsee 0.22.5", - "parity-scale-codec", - "proc-macro2", - "quote", - "scale-info", - "scale-typegen 0.2.1", - "subxt-metadata 0.35.3", - "syn 2.0.90", - "thiserror 1.0.69", - "tokio", -] - [[package]] name = "subxt-codegen" version = "0.38.0" @@ -18981,8 +18478,8 @@ dependencies = [ "proc-macro2", "quote", "scale-info", - "scale-typegen 0.9.0", - "subxt-metadata 0.38.0", + "scale-typegen", + "subxt-metadata", "syn 2.0.90", "thiserror 1.0.69", ] @@ -19005,31 +18502,14 @@ dependencies = [ "parity-scale-codec", "polkadot-sdk", "primitive-types 0.13.1", - "scale-bits 0.6.0", - "scale-decode 0.14.0", - "scale-encode 0.8.0", + "scale-bits", + "scale-decode", + "scale-encode", "scale-info", - "scale-value 0.17.0", + "scale-value", "serde", "serde_json", - "subxt-metadata 0.38.0", - "tracing", -] - -[[package]] -name = "subxt-lightclient" -version = "0.35.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f1ac12e3be7aafea4d037730a57da4f22f2e9c73955666081ffa2697c6f1" -dependencies = [ - "futures", - "futures-util", - "serde", - "serde_json", - "smoldot-light 0.14.0", - "thiserror 1.0.69", - "tokio", - "tokio-stream", + "subxt-metadata", "tracing", ] @@ -19048,8 +18528,8 @@ dependencies = [ "send_wrapper 0.6.0", "serde", "serde_json", - "smoldot 0.18.0", - "smoldot-light 0.16.2", + "smoldot", + "smoldot-light", "thiserror 1.0.69", "tokio", "tokio-stream", @@ -19060,51 +18540,22 @@ dependencies = [ "web-time", ] -[[package]] -name = "subxt-macro" -version = "0.35.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98dc84d7e6a0abd7ed407cce0bf60d7d58004f699460cffb979640717d1ab506" -dependencies = [ - "darling 0.20.10", - "parity-scale-codec", - "proc-macro-error", - "quote", - "scale-typegen 0.2.1", - "subxt-codegen 0.35.3", - "syn 2.0.90", -] - [[package]] name = "subxt-macro" version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "228db9a5c95a6d8dc6152b4d6cdcbabc4f60821dd3f482a4f8791e022b7caadb" dependencies = [ - "darling 0.20.10", + "darling", "parity-scale-codec", "proc-macro-error2", "quote", - "scale-typegen 0.9.0", - "subxt-codegen 0.38.0", + "scale-typegen", + "subxt-codegen", "subxt-utils-fetchmetadata", "syn 2.0.90", ] -[[package]] -name = "subxt-metadata" -version = "0.35.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc10c54028d079a9f1be65188707cd29e5ffd8d0031a2b1346a0941d57b7ab7e" -dependencies = [ - "derive_more 0.99.18", - "frame-metadata 16.0.0", - "hashbrown 0.14.5", - "parity-scale-codec", - "scale-info", - "sp-crypto-hashing", -] - [[package]] name = "subxt-metadata" version = "0.38.0" @@ -20651,19 +20102,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmi" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" -dependencies = [ - "smallvec", - "spin 0.9.8", - "wasmi_arena", - "wasmi_core 0.13.0", - "wasmparser-nostd", -] - [[package]] name = "wasmi" version = "0.32.3" @@ -20677,16 +20115,10 @@ dependencies = [ "smallvec", "spin 0.9.8", "wasmi_collections", - "wasmi_core 0.32.3", + "wasmi_core", "wasmparser-nostd", ] -[[package]] -name = "wasmi_arena" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" - [[package]] name = "wasmi_collections" version = "0.32.3" @@ -20698,18 +20130,6 @@ dependencies = [ "string-interner", ] -[[package]] -name = "wasmi_core" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" -dependencies = [ - "downcast-rs", - "libm", - "num-traits", - "paste", -] - [[package]] name = "wasmi_core" version = "0.32.3" diff --git a/crates/threshold-signature-server/Cargo.toml b/crates/threshold-signature-server/Cargo.toml index d77656b79..c01faf724 100644 --- a/crates/threshold-signature-server/Cargo.toml +++ b/crates/threshold-signature-server/Cargo.toml @@ -35,9 +35,9 @@ reqwest={ version="0.12.9", features=["json", "stream"] } axum ={ version="0.7.9", features=["ws"] } # Substrate -subxt ="0.35.3" +subxt ="0.38.0" parity-scale-codec="3.6.8" -sp-core ={ version="31.0.0", default-features=false } +sp-core ={ version="34.0.0", default-features=false } # Entropy entropy-shared ={ version="0.3.0", path="../shared" } From 85c52985f0e8f4ce143c0aee44d06f26d2a4ca98 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Wed, 4 Dec 2024 14:45:09 -0500 Subject: [PATCH 21/22] fmt --- crates/testing-utils/Cargo.toml | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/crates/testing-utils/Cargo.toml b/crates/testing-utils/Cargo.toml index 0f35cbdc5..d4ea2e004 100644 --- a/crates/testing-utils/Cargo.toml +++ b/crates/testing-utils/Cargo.toml @@ -9,26 +9,24 @@ repository ='https://github.com/entropyxyz/entropy-core' edition ='2021' [dependencies] -subxt="0.38.0" -sp-keyring="39.0.0" -project-root="0.2.2" -sp-core={ version="34.0.0", default-features=false } +subxt ="0.38.0" +sp-keyring ="39.0.0" +project-root ="0.2.2" +sp-core ={ version="34.0.0", default-features=false } parity-scale-codec="3.6.8" -lazy_static="1.5.0" -hex-literal="0.4.1" -tokio={ version="1.41", features=["macros", "fs", "rt-multi-thread", "io-util", "process"] } +lazy_static ="1.5.0" +hex-literal ="0.4.1" +tokio ={ version="1.41", features=["macros", "fs", "rt-multi-thread", "io-util", "process"] } axum ={ version="0.7.9" } -entropy-shared={ version="0.3.0", path="../shared" } -entropy-kvdb={ version="0.3.0", path="../kvdb", default-features=false } -entropy-tss={ version="0.3.0", path="../threshold-signature-server", features=[ - "test_helpers", -] } -entropy-protocol={ version="0.3.0", path="../protocol" } +entropy-shared ={ version="0.3.0", path="../shared" } +entropy-kvdb ={ version="0.3.0", path="../kvdb", default-features=false } +entropy-tss ={ version="0.3.0", path="../threshold-signature-server", features=["test_helpers"] } +entropy-protocol ={ version="0.3.0", path="../protocol" } synedrion ="0.2.0" -hex="0.4.3" -rand_core="0.6.4" -rand="0.8.5" -tdx-quote={ version="0.0.1", features=["mock"] } +hex ="0.4.3" +rand_core ="0.6.4" +rand ="0.8.5" +tdx-quote ={ version="0.0.1", features=["mock"] } # Logging tracing ="0.1.41" From d0875d34983461cd1d6a99a7a470ffa9d53826f7 Mon Sep 17 00:00:00 2001 From: Jesse Abramowitz Date: Wed, 4 Dec 2024 18:15:26 -0500 Subject: [PATCH 22/22] fix tests --- crates/client/src/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/client/src/tests.rs b/crates/client/src/tests.rs index aa4d21fa2..88840a1a9 100644 --- a/crates/client/src/tests.rs +++ b/crates/client/src/tests.rs @@ -53,7 +53,7 @@ async fn test_change_endpoint() { let quote = { let signing_key = tdx_quote::SigningKey::random(&mut OsRng); - let public_key = sr25519::Public(tss_account_id.0); + let public_key = sr25519::Public::from(tss_account_id.0); let input_data = QuoteInputData::new(public_key, x25519_public_key, nonce, QuoteContext::ChangeEndpoint);