From 3c75079ed627ec83db88ca78d2ea4d4da6b3d8af Mon Sep 17 00:00:00 2001 From: Qinxuan Chen Date: Tue, 4 Jul 2023 03:31:30 +0800 Subject: [PATCH] deps: update substrate to polkadot-v0.9.43 (#1078) * deps: update substrate to polkadot-v0.9.42 - update substrate to 16b2e644487f7f767eeefd4debf11a7948bfa4db - update rust toolchain to 1.68.2 * Enable `insecure_zero_ed` feature of `pallet-balances` to fix tests of `pallet-evm`, since `ExistentialDeposit: u64 = 0` is configured in the mock impl of `pallet-evm`. * fix precompile tests * update some deps * update evm to 0.39.1 * make clippy happy * update substrate to polkadot-v0.9.43 * update rust-toolchain to 1.69.0 and update some deps * format * update ACCOUNT_BASIC_PROOF_SIZE constant * improve db feature * improve db features * typo * fix tests * improve some trait bound --------- Co-authored-by: tgmichel --- .github/workflows/docs.yml | 2 +- .github/workflows/rust.yml | 6 +- Cargo.lock | 1003 +++++++++-------- Cargo.toml | 4 +- client/db/src/kv/mod.rs | 2 +- client/db/src/lib.rs | 6 +- client/db/src/sql/mod.rs | 10 +- client/mapping-sync/src/sql/mod.rs | 103 +- client/rpc-core/src/txpool.rs | 2 +- client/rpc/Cargo.toml | 4 +- client/rpc/src/eth/filter.rs | 36 +- client/rpc/src/txpool.rs | 30 +- frame/base-fee/src/lib.rs | 2 - frame/dynamic-fee/src/lib.rs | 2 +- frame/evm/Cargo.toml | 5 +- frame/evm/src/lib.rs | 7 +- primitives/account/Cargo.toml | 9 +- primitives/account/src/lib.rs | 6 +- primitives/evm/Cargo.toml | 8 +- primitives/evm/src/lib.rs | 34 +- primitives/self-contained/Cargo.toml | 7 +- .../self-contained/src/unchecked_extrinsic.rs | 4 +- primitives/storage/Cargo.toml | 5 +- primitives/storage/src/lib.rs | 2 +- rust-toolchain.toml | 4 +- template/node/src/eth.rs | 11 +- template/node/src/service.rs | 11 +- template/runtime/Cargo.toml | 3 +- template/runtime/src/lib.rs | 30 +- ts-tests/tests/util.ts | 4 +- 30 files changed, 757 insertions(+), 605 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3d24170dbf..0a688f038d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -16,7 +16,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-11-16 + toolchain: nightly-2023-05-23 target: wasm32-unknown-unknown override: true components: rust-docs diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index a40b4ef118..be5e560e10 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -20,7 +20,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-11-16 + toolchain: nightly-2023-05-23 target: wasm32-unknown-unknown override: true - name: Install protoc @@ -39,7 +39,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-11-16 + toolchain: nightly-2023-05-23 target: wasm32-unknown-unknown override: true - name: Install protoc @@ -72,7 +72,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-11-16 + toolchain: nightly-2023-05-23 target: wasm32-unknown-unknown override: true components: rustfmt, clippy diff --git a/Cargo.lock b/Cargo.lock index 2ddbe95f0a..d07e7ef7d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,22 +12,13 @@ dependencies = [ "regex", ] -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli 0.26.2", -] - [[package]] name = "addr2line" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli 0.27.1", + "gimli", ] [[package]] @@ -193,15 +184,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" dependencies = [ "utf8parse", ] @@ -381,6 +372,12 @@ version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" +[[package]] +name = "array-bytes" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b1c5a481ec30a5abd8dfbd94ab5cf1bb4e9a66be7f1b3b322f2f1170c200fd" + [[package]] name = "arrayref" version = "0.3.6" @@ -466,12 +463,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "asn1_der" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" - [[package]] name = "assert_matches" version = "1.5.0" @@ -593,12 +584,12 @@ version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ - "addr2line 0.19.0", + "addr2line", "cc", "cfg-if", "libc", "miniz_oxide", - "object 0.30.3", + "object", "rustc-demangle", ] @@ -650,7 +641,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "hash-db 0.16.0", "log", @@ -667,9 +658,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.64.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" dependencies = [ "bitflags", "cexpr", @@ -677,12 +668,13 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", + "prettyplease 0.2.6", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 1.0.107", + "syn 2.0.16", ] [[package]] @@ -871,9 +863,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bzip2-sys" @@ -949,9 +941,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.10.3" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db" +checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" dependencies = [ "smallvec", ] @@ -1016,7 +1008,7 @@ checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" dependencies = [ "core2", "multibase", - "multihash", + "multihash 0.16.3", "serde", "unsigned-varint", ] @@ -1092,7 +1084,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1206,28 +1198,27 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "cranelift-bforest" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc42ba2e232e5b20ff7dc299a812d53337dadce9a7e39a238e6a5cb82d2e57b" +checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "253531aca9b6f56103c9420369db3263e784df39aa1c90685a1f69cfbba0623e" +checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220" dependencies = [ - "arrayvec 0.7.2", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", "cranelift-isle", - "gimli 0.26.2", - "hashbrown 0.12.3", + "gimli", + "hashbrown 0.13.2", "log", "regalloc2", "smallvec", @@ -1236,33 +1227,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f2154365e2bff1b1b8537a7181591fdff50d8e27fa6e40d5c69c3bad0ca7c8" +checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687e14e3f5775248930e0d5a84195abef8b829958e9794bf8d525104993612b4" +checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8" [[package]] name = "cranelift-entity" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1" +checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8483c2db6f45fe9ace984e5adc5d058102227e4c62e5aa2054e16b0275fd3a6e" +checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d" dependencies = [ "cranelift-codegen", "log", @@ -1272,15 +1263,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9793158837678902446c411741d87b43f57dadfb944f2440db4287cda8cbd59" +checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba" [[package]] name = "cranelift-native" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72668c7755f2b880665cb422c8ad2d56db58a88b9bebfef0b73edc2277c13c49" +checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00" dependencies = [ "cranelift-codegen", "libc", @@ -1289,9 +1280,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3852ce4b088b44ac4e29459573943009a70d1b192c8d77ef949b4e814f656fc1" +checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2310,7 +2301,7 @@ dependencies = [ "jsonrpsee", "libsecp256k1", "log", - "lru", + "lru 0.8.1", "pallet-evm", "parity-scale-codec", "prometheus", @@ -2519,7 +2510,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "parity-scale-codec", ] @@ -2642,7 +2633,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-support", "frame-support-procedural", @@ -2667,10 +2658,10 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "Inflector", - "array-bytes", + "array-bytes 4.2.0", "chrono", "clap", "comfy-table", @@ -2714,7 +2705,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-support", "frame-system", @@ -2742,7 +2733,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "bitflags", "environmental", @@ -2761,6 +2752,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-core-hashing-proc-macro", + "sp-debug-derive", "sp-inherents", "sp-io", "sp-runtime", @@ -2775,7 +2767,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "Inflector", "cfg-expr", @@ -2785,36 +2777,37 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ + "cfg-if", "frame-support", "log", "parity-scale-codec", @@ -2831,7 +2824,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-benchmarking", "frame-support", @@ -2846,7 +2839,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "parity-scale-codec", "sp-api", @@ -3081,7 +3074,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -3214,21 +3207,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" dependencies = [ "fallible-iterator", "indexmap", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" - [[package]] name = "glob" version = "0.3.1" @@ -3790,9 +3777,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -3928,9 +3915,9 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7a749456510c45f795e8b04a6a3e0976d0139213ecbf465843830ad55e2217" +checksum = "b644c70b92285f66bfc2032922a79000ea30af7bc2ab31902992a5dcb9b434f6" dependencies = [ "kvdb", "num_cpus", @@ -3985,22 +3972,24 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libp2p" -version = "0.50.0" +version = "0.51.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0a0d2f693675f49ded13c5d510c48b78069e23cbd9108d7ccd59f6dc568819" +checksum = "f210d259724eae82005b5c48078619b7745edb7b76de370b03f8ba59ea103097" dependencies = [ "bytes", "futures", "futures-timer", "getrandom 0.2.8", "instant", + "libp2p-allow-block-list", + "libp2p-connection-limits", "libp2p-core", "libp2p-dns", "libp2p-identify", + "libp2p-identity", "libp2p-kad", "libp2p-mdns", "libp2p-metrics", - "libp2p-mplex", "libp2p-noise", "libp2p-ping", "libp2p-quic", @@ -4012,50 +4001,66 @@ dependencies = [ "libp2p-websocket", "libp2p-yamux", "multiaddr", - "parking_lot 0.12.1", "pin-project", - "smallvec", +] + +[[package]] +name = "libp2p-allow-block-list" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "510daa05efbc25184458db837f6f9a5143888f1caa742426d92e1833ddd38a50" +dependencies = [ + "libp2p-core", + "libp2p-identity", + "libp2p-swarm", + "void", +] + +[[package]] +name = "libp2p-connection-limits" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4caa33f1d26ed664c4fe2cca81a08c8e07d4c1c04f2f4ac7655c2dd85467fda0" +dependencies = [ + "libp2p-core", + "libp2p-identity", + "libp2p-swarm", + "void", ] [[package]] name = "libp2p-core" -version = "0.38.0" +version = "0.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f" +checksum = "3c1df63c0b582aa434fb09b2d86897fa2b419ffeccf934b36f87fcedc8e835c2" dependencies = [ - "asn1_der", - "bs58", - "ed25519-dalek", "either", "fnv", "futures", "futures-timer", "instant", + "libp2p-identity", "log", "multiaddr", - "multihash", + "multihash 0.17.0", "multistream-select", "once_cell", "parking_lot 0.12.1", "pin-project", - "prost", - "prost-build", + "quick-protobuf", "rand 0.8.5", "rw-stream-sink", - "sec1 0.3.0", - "sha2 0.10.6", "smallvec", "thiserror", "unsigned-varint", "void", - "zeroize", ] [[package]] name = "libp2p-dns" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5" +checksum = "146ff7034daae62077c415c2376b8057368042df6ab95f5432ad5e88568b1554" dependencies = [ "futures", "libp2p-core", @@ -4067,30 +4072,49 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.41.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf" +checksum = "5455f472243e63b9c497ff320ded0314254a9eb751799a39c283c6f20b793f3c" dependencies = [ "asynchronous-codec", + "either", "futures", "futures-timer", "libp2p-core", + "libp2p-identity", "libp2p-swarm", "log", - "lru", - "prost", - "prost-build", - "prost-codec", + "lru 0.10.0", + "quick-protobuf", + "quick-protobuf-codec", "smallvec", "thiserror", "void", ] +[[package]] +name = "libp2p-identity" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1" +dependencies = [ + "bs58", + "ed25519-dalek", + "log", + "multiaddr", + "multihash 0.17.0", + "quick-protobuf", + "rand 0.8.5", + "sha2 0.10.6", + "thiserror", + "zeroize", +] + [[package]] name = "libp2p-kad" -version = "0.42.1" +version = "0.43.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2766dcd2be8c87d5e1f35487deb22d765f49c6ae1251b3633efe3b25698bd3d2" +checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff" dependencies = [ "arrayvec 0.7.2", "asynchronous-codec", @@ -4101,10 +4125,10 @@ dependencies = [ "futures-timer", "instant", "libp2p-core", + "libp2p-identity", "libp2p-swarm", "log", - "prost", - "prost-build", + "quick-protobuf", "rand 0.8.5", "sha2 0.10.6", "smallvec", @@ -4116,14 +4140,15 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.42.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b" +checksum = "19983e1f949f979a928f2c603de1cf180cc0dc23e4ac93a62651ccb18341460b" dependencies = [ "data-encoding", "futures", "if-watch", "libp2p-core", + "libp2p-identity", "libp2p-swarm", "log", "rand 0.8.5", @@ -4136,9 +4161,9 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad8a64f29da86005c86a4d2728b8a0719e9b192f4092b609fd8790acb9dec55" +checksum = "a42ec91e227d7d0dafa4ce88b333cdf5f277253873ab087555c92798db2ddd46" dependencies = [ "libp2p-core", "libp2p-identify", @@ -4148,38 +4173,20 @@ dependencies = [ "prometheus-client", ] -[[package]] -name = "libp2p-mplex" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace" -dependencies = [ - "asynchronous-codec", - "bytes", - "futures", - "libp2p-core", - "log", - "nohash-hasher", - "parking_lot 0.12.1", - "rand 0.8.5", - "smallvec", - "unsigned-varint", -] - [[package]] name = "libp2p-noise" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e" +checksum = "9c3673da89d29936bc6435bafc638e2f184180d554ce844db65915113f86ec5e" dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures", "libp2p-core", + "libp2p-identity", "log", "once_cell", - "prost", - "prost-build", + "quick-protobuf", "rand 0.8.5", "sha2 0.10.6", "snow", @@ -4191,10 +4198,11 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "929fcace45a112536e22b3dcfd4db538723ef9c3cb79f672b98be2cc8e25f37f" +checksum = "3e57759c19c28a73ef1eb3585ca410cefb72c1a709fcf6de1612a378e4219202" dependencies = [ + "either", "futures", "futures-timer", "instant", @@ -4207,15 +4215,16 @@ dependencies = [ [[package]] name = "libp2p-quic" -version = "0.7.0-alpha" +version = "0.7.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59" +checksum = "c6b26abd81cd2398382a1edfe739b539775be8a90fa6914f39b2ab49571ec735" dependencies = [ "bytes", "futures", "futures-timer", "if-watch", "libp2p-core", + "libp2p-identity", "libp2p-tls", "log", "parking_lot 0.12.1", @@ -4228,27 +4237,25 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884" +checksum = "7ffdb374267d42dc5ed5bc53f6e601d4a64ac5964779c6e40bb9e4f14c1e30d5" dependencies = [ "async-trait", - "bytes", "futures", "instant", "libp2p-core", + "libp2p-identity", "libp2p-swarm", - "log", "rand 0.8.5", "smallvec", - "unsigned-varint", ] [[package]] name = "libp2p-swarm" -version = "0.41.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0" +checksum = "903b3d592d7694e56204d211f29d31bc004be99386644ba8731fc3e3ef27b296" dependencies = [ "either", "fnv", @@ -4256,21 +4263,20 @@ dependencies = [ "futures-timer", "instant", "libp2p-core", + "libp2p-identity", "libp2p-swarm-derive", "log", - "pin-project", "rand 0.8.5", "smallvec", - "thiserror", "tokio", "void", ] [[package]] name = "libp2p-swarm-derive" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400" +checksum = "0fba456131824ab6acd4c7bf61e9c0f0a3014b5fc9868ccb8e10d344594cdc4f" dependencies = [ "heck", "quote", @@ -4279,9 +4285,9 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d" +checksum = "33d33698596d7722d85d3ab0c86c2c322254fce1241e91208e3679b4eb3026cf" dependencies = [ "futures", "futures-timer", @@ -4295,13 +4301,14 @@ dependencies = [ [[package]] name = "libp2p-tls" -version = "0.1.0-alpha" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7905ce0d040576634e8a3229a7587cc8beab83f79db6023800f1792895defa8" +checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781" dependencies = [ "futures", "futures-rustls", "libp2p-core", + "libp2p-identity", "rcgen 0.10.0", "ring", "rustls 0.20.8", @@ -4313,9 +4320,9 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069" +checksum = "77dff9d32353a5887adb86c8afc1de1a94d9e8c3bc6df8b2201d7cdf5c848f43" dependencies = [ "futures", "js-sys", @@ -4327,9 +4334,9 @@ dependencies = [ [[package]] name = "libp2p-webrtc" -version = "0.4.0-alpha" +version = "0.4.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a" +checksum = "dba48592edbc2f60b4bc7c10d65445b0c3964c07df26fdf493b6880d33be36f8" dependencies = [ "async-trait", "asynchronous-codec", @@ -4339,12 +4346,12 @@ dependencies = [ "hex", "if-watch", "libp2p-core", + "libp2p-identity", "libp2p-noise", "log", - "multihash", - "prost", - "prost-build", - "prost-codec", + "multihash 0.17.0", + "quick-protobuf", + "quick-protobuf-codec", "rand 0.8.5", "rcgen 0.9.3", "serde", @@ -4358,9 +4365,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54" +checksum = "111273f7b3d3510524c752e8b7a5314b7f7a1fee7e68161c01a7d72cbb06db9f" dependencies = [ "either", "futures", @@ -4377,23 +4384,22 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.42.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29" +checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda" dependencies = [ "futures", "libp2p-core", "log", - "parking_lot 0.12.1", "thiserror", "yamux", ] [[package]] name = "librocksdb-sys" -version = "0.10.0+7.9.2" +version = "0.11.0+8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe4d5874f5ff2bc616e55e8c6086d478fcda13faf9495768a4aa1c22042d30b" +checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" dependencies = [ "bindgen", "bzip2-sys", @@ -4547,6 +4553,15 @@ dependencies = [ "hashbrown 0.12.3", ] +[[package]] +name = "lru" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e" +dependencies = [ + "hashbrown 0.13.2", +] + [[package]] name = "lru-cache" version = "0.1.2" @@ -4672,6 +4687,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + [[package]] name = "memory-db" version = "0.32.0" @@ -4755,15 +4779,16 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.16.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e" +checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd" dependencies = [ "arrayref", "byteorder", "data-encoding", + "log", "multibase", - "multihash", + "multihash 0.17.0", "percent-encoding", "serde", "static_assertions", @@ -4799,6 +4824,19 @@ dependencies = [ "unsigned-varint", ] +[[package]] +name = "multihash" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" +dependencies = [ + "core2", + "digest 0.10.6", + "multihash-derive", + "sha2 0.10.6", + "unsigned-varint", +] + [[package]] name = "multihash-derive" version = "0.8.1" @@ -5101,19 +5139,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.15", -] - -[[package]] -name = "object" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -dependencies = [ - "crc32fast", - "hashbrown 0.12.3", - "indexmap", - "memchr", + "syn 2.0.16", ] [[package]] @@ -5122,6 +5148,9 @@ version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ + "crc32fast", + "hashbrown 0.13.2", + "indexmap", "memchr", ] @@ -5145,9 +5174,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opaque-debug" @@ -5241,7 +5270,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-support", "frame-system", @@ -5257,7 +5286,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-support", "frame-system", @@ -5271,7 +5300,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-benchmarking", "frame-support", @@ -5295,7 +5324,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-benchmarking", "frame-support", @@ -5324,7 +5353,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-support", "frame-system", @@ -5343,9 +5372,9 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "binary-merkle-tree", "frame-support", "frame-system", @@ -5568,7 +5597,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-benchmarking", "frame-support", @@ -5607,7 +5636,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-benchmarking", "frame-support", @@ -5621,10 +5650,25 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-root-testing" +version = "1.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-support", "frame-system", @@ -5645,8 +5689,9 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", @@ -5659,7 +5704,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-benchmarking", "frame-support", @@ -5677,7 +5722,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-support", "frame-system", @@ -5693,7 +5738,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5709,7 +5754,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5721,7 +5766,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-benchmarking", "frame-support", @@ -5847,6 +5892,12 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "partial_sort" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156" + [[package]] name = "paste" version = "1.0.11" @@ -6127,6 +6178,16 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "prettyplease" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b69d39aab54d069e7f2fe8cb970493e7834601ca2d8c65fd7bbd183578080d1" +dependencies = [ + "proc-macro2", + "syn 2.0.16", +] + [[package]] name = "primitive-types" version = "0.12.1" @@ -6183,7 +6244,7 @@ checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -6211,21 +6272,21 @@ dependencies = [ [[package]] name = "prometheus-client" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c" +checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e" dependencies = [ "dtoa", "itoa", "parking_lot 0.12.1", - "prometheus-client-derive-text-encode", + "prometheus-client-derive-encode", ] [[package]] -name = "prometheus-client-derive-text-encode" -version = "0.3.0" +name = "prometheus-client-derive-encode" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" +checksum = "72b6a5217beb0ad503ee7fa752d451c905113d70721b937126158f3106a48cc1" dependencies = [ "proc-macro2", "quote", @@ -6255,7 +6316,7 @@ dependencies = [ "log", "multimap", "petgraph", - "prettyplease", + "prettyplease 0.1.23", "prost", "prost-types", "regex", @@ -6264,19 +6325,6 @@ dependencies = [ "which", ] -[[package]] -name = "prost-codec" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc34979ff898b6e141106178981ce2596c387ea6e62533facfc61a37fc879c0" -dependencies = [ - "asynchronous-codec", - "bytes", - "prost", - "thiserror", - "unsigned-varint", -] - [[package]] name = "prost-derive" version = "0.11.6" @@ -6315,6 +6363,28 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-protobuf" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f" +dependencies = [ + "byteorder", +] + +[[package]] +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", +] + [[package]] name = "quicksink" version = "0.1.2" @@ -6534,9 +6604,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" +checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621" dependencies = [ "fxhash", "log", @@ -6570,18 +6640,6 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" -[[package]] -name = "region" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" -dependencies = [ - "bitflags", - "libc", - "mach", - "winapi", -] - [[package]] name = "remove_dir_all" version = "0.5.3" @@ -6670,9 +6728,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015439787fce1e75d55f279078d33ff14b4af5d93d995e8838ee4631301c8a99" +checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" dependencies = [ "libc", "librocksdb-sys", @@ -6893,7 +6951,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "log", "sp-core", @@ -6904,7 +6962,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "futures", "futures-timer", @@ -6927,7 +6985,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6942,7 +7000,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -6961,25 +7019,25 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "chrono", "clap", "fdlimit", "futures", - "libp2p", + "libp2p-identity", "log", "names", "parity-scale-codec", @@ -7012,7 +7070,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "fnv", "futures", @@ -7031,6 +7089,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-state-machine", + "sp-statement-store", "sp-storage", "substrate-prometheus-endpoint", ] @@ -7038,7 +7097,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "hash-db 0.16.0", "kvdb", @@ -7064,12 +7123,12 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-trait", "futures", "futures-timer", - "libp2p", + "libp2p-identity", "log", "mockall", "parking_lot 0.12.1", @@ -7089,7 +7148,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-trait", "futures", @@ -7118,7 +7177,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-trait", "fork-tree", @@ -7154,7 +7213,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7167,10 +7226,10 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "ahash 0.8.3", - "array-bytes", + "array-bytes 4.2.0", "async-trait", "dyn-clone", "finality-grandpa", @@ -7207,11 +7266,12 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "assert_matches", "async-trait", "futures", + "futures-timer", "jsonrpsee", "log", "parity-scale-codec", @@ -7241,7 +7301,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-trait", "futures", @@ -7264,13 +7324,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "lru", + "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", - "sc-executor-wasmi", "sc-executor-wasmtime", "sp-api", "sp-core", @@ -7282,39 +7341,24 @@ dependencies = [ "sp-version", "sp-wasm-interface", "tracing", - "wasmi", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", "sp-wasm-interface", "thiserror", "wasm-instrument", - "wasmi", -] - -[[package]] -name = "sc-executor-wasmi" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" -dependencies = [ - "log", - "sc-allocator", - "sc-executor-common", - "sp-runtime-interface", - "sp-wasm-interface", - "wasmi", ] [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "anyhow", "cfg-if", @@ -7332,7 +7376,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "ansi_term", "futures", @@ -7348,10 +7392,9 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "array-bytes", - "async-trait", + "array-bytes 4.2.0", "parking_lot 0.12.1", "serde_json", "sp-application-crypto", @@ -7363,9 +7406,9 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "async-channel", "async-trait", "asynchronous-codec", @@ -7378,7 +7421,7 @@ dependencies = [ "libp2p", "linked_hash_set", "log", - "lru", + "lru 0.8.1", "mockall", "parity-scale-codec", "parking_lot 0.12.1", @@ -7408,11 +7451,12 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ + "async-channel", "cid", "futures", - "libp2p", + "libp2p-identity", "log", "prost", "prost-build", @@ -7428,15 +7472,15 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "async-trait", "bitflags", "bytes", "futures", "futures-timer", - "libp2p", + "libp2p-identity", "parity-scale-codec", "prost-build", "sc-consensus", @@ -7456,14 +7500,14 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "ahash 0.8.3", "futures", "futures-timer", "libp2p", "log", - "lru", + "lru 0.8.1", "sc-network", "sc-network-common", "sc-peerset", @@ -7475,11 +7519,12 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", + "async-channel", "futures", - "libp2p", + "libp2p-identity", "log", "parity-scale-codec", "prost", @@ -7497,16 +7542,17 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", + "async-channel", "async-trait", "fork-tree", "futures", "futures-timer", "libp2p", "log", - "lru", + "lru 0.8.1", "mockall", "parity-scale-codec", "prost", @@ -7531,9 +7577,9 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "futures", "libp2p", "log", @@ -7551,9 +7597,9 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "bytes", "fnv", "futures", @@ -7582,20 +7628,23 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "futures", - "libp2p", + "libp2p-identity", "log", + "parking_lot 0.12.1", + "partial_sort", "sc-utils", "serde_json", + "sp-arithmetic", "wasm-timer", ] [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7604,7 +7653,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "futures", "jsonrpsee", @@ -7627,6 +7676,7 @@ dependencies = [ "sp-rpc", "sp-runtime", "sp-session", + "sp-statement-store", "sp-version", "tokio", ] @@ -7634,7 +7684,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -7653,7 +7703,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "http", "jsonrpsee", @@ -7668,9 +7718,9 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "futures", "futures-util", "hex", @@ -7694,7 +7744,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-trait", "directories", @@ -7760,7 +7810,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "log", "parity-scale-codec", @@ -7771,7 +7821,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "clap", "fs4", @@ -7787,7 +7837,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "futures", "libc", @@ -7806,7 +7856,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "chrono", "futures", @@ -7825,7 +7875,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "ansi_term", "atty", @@ -7856,18 +7906,18 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-trait", "futures", @@ -7894,7 +7944,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-trait", "futures", @@ -7908,7 +7958,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-channel", "futures", @@ -8366,7 +8416,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "hash-db 0.16.0", "log", @@ -8386,7 +8436,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "Inflector", "blake2", @@ -8394,13 +8444,13 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "parity-scale-codec", "scale-info", @@ -8413,7 +8463,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "integer-sqrt", "num-traits", @@ -8427,7 +8477,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "parity-scale-codec", "sp-api", @@ -8439,11 +8489,11 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "futures", "log", - "lru", + "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "sp-api", @@ -8457,7 +8507,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-trait", "futures", @@ -8472,7 +8522,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-trait", "parity-scale-codec", @@ -8490,7 +8540,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-trait", "parity-scale-codec", @@ -8511,7 +8561,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "lazy_static", "parity-scale-codec", @@ -8530,7 +8580,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "finality-grandpa", "log", @@ -8548,7 +8598,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "parity-scale-codec", "scale-info", @@ -8560,9 +8610,9 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "bitflags", "blake2", "bounded-collections", @@ -8604,7 +8654,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "blake2b_simd", "byteorder", @@ -8618,18 +8668,18 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "proc-macro2", "quote", "sp-core-hashing", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -8638,17 +8688,17 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "environmental", "parity-scale-codec", @@ -8659,7 +8709,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -8674,7 +8724,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "bytes", "ed25519", @@ -8700,7 +8750,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "lazy_static", "sp-core", @@ -8711,7 +8761,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "futures", "parity-scale-codec", @@ -8725,7 +8775,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "thiserror", "zstd 0.12.3+zstd.1.5.2", @@ -8734,7 +8784,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -8745,7 +8795,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -8763,7 +8813,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "sp-api", "sp-core", @@ -8773,7 +8823,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "backtrace", "lazy_static", @@ -8783,7 +8833,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "rustc-hash", "serde", @@ -8793,7 +8843,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "either", "hash256-std-hasher", @@ -8815,7 +8865,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -8833,19 +8883,19 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "parity-scale-codec", "scale-info", @@ -8859,7 +8909,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "parity-scale-codec", "scale-info", @@ -8872,7 +8922,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "hash-db 0.16.0", "log", @@ -8889,15 +8939,33 @@ dependencies = [ "tracing", ] +[[package]] +name = "sp-statement-store" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" +dependencies = [ + "log", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-externalities", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "thiserror", +] + [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8910,7 +8978,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-trait", "futures-timer", @@ -8925,7 +8993,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "parity-scale-codec", "sp-std", @@ -8937,7 +9005,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "sp-api", "sp-runtime", @@ -8946,7 +9014,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "async-trait", "log", @@ -8962,7 +9030,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "ahash 0.8.3", "hash-db 0.16.0", @@ -8985,7 +9053,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9002,18 +9070,18 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -9027,7 +9095,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "parity-scale-codec", "scale-info", @@ -9327,7 +9395,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "platforms 2.0.0", ] @@ -9335,7 +9403,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -9354,7 +9422,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "hyper", "log", @@ -9366,9 +9434,9 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "async-trait", "futures", "parity-scale-codec", @@ -9392,16 +9460,20 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ - "cfg-if", + "array-bytes 6.1.0", + "frame-executive", "frame-support", "frame-system", "frame-system-rpc-runtime-api", "log", "memory-db", "pallet-babe", + "pallet-balances", "pallet-beefy-mmr", + "pallet-root-testing", + "pallet-sudo", "pallet-timestamp", "parity-scale-codec", "sc-service", @@ -9415,6 +9487,7 @@ dependencies = [ "sp-consensus-beefy", "sp-consensus-grandpa", "sp-core", + "sp-debug-derive", "sp-externalities", "sp-inherents", "sp-io", @@ -9435,7 +9508,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "futures", "parity-scale-codec", @@ -9455,7 +9528,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +source = "git+https://github.com/paritytech/substrate?branch=master#3c8666b1906680ad9461a6c46fe17439629ab082" dependencies = [ "ansi_term", "build-helper", @@ -9497,9 +9570,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", @@ -9582,22 +9655,22 @@ checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.16", ] [[package]] @@ -9752,7 +9825,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -9849,9 +9922,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.3.5" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" dependencies = [ "bitflags", "bytes", @@ -10082,7 +10155,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.6", - "rand 0.8.5", + "rand 0.7.3", "static_assertions", ] @@ -10289,9 +10362,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -10299,24 +10372,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.16", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -10326,9 +10399,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -10336,22 +10409,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-instrument" @@ -10364,9 +10437,9 @@ dependencies = [ [[package]] name = "wasm-opt" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a303793cbc01fb96551badfc7367db6007396bba6bac97936b3c8b6f7fdb41" +checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c" dependencies = [ "anyhow", "libc", @@ -10380,9 +10453,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c9deb56f8a9f2ec177b3bd642a8205621835944ed5da55f2388ef216aca5a4" +checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445" dependencies = [ "anyhow", "cxx", @@ -10392,15 +10465,14 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4432e28b542738a9776cedf92e8a99d8991c7b4667ee2c7ccddfb479dd2856a7" +checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14" dependencies = [ "anyhow", "cc", "cxx", "cxx-build", - "regex", ] [[package]] @@ -10449,14 +10521,13 @@ dependencies = [ "memory_units", "num-rational", "num-traits", - "region", ] [[package]] name = "wasmparser" -version = "0.100.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" +checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" dependencies = [ "indexmap", "url", @@ -10464,9 +10535,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6" +checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9" dependencies = [ "anyhow", "bincode", @@ -10474,7 +10545,7 @@ dependencies = [ "indexmap", "libc", "log", - "object 0.29.0", + "object", "once_cell", "paste", "psm", @@ -10487,26 +10558,26 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-asm-macros" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc" +checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ceb3adf61d654be0be67fffdce42447b0880481348785be5fe40b5dd7663a4c" +checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213" dependencies = [ "anyhow", - "base64 0.13.1", + "base64 0.21.0", "bincode", "directories-next", "file-per-thread-logger", @@ -10515,15 +10586,15 @@ dependencies = [ "serde", "sha2 0.10.6", "toml 0.5.11", - "windows-sys 0.42.0", + "windows-sys 0.45.0", "zstd 0.11.2+zstd.1.5.2", ] [[package]] name = "wasmtime-cranelift" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c366bb8647e01fd08cb5589976284b00abfded5529b33d7e7f3f086c68304a4" +checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04" dependencies = [ "anyhow", "cranelift-codegen", @@ -10531,27 +10602,43 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.26.2", + "gimli", "log", - "object 0.29.0", + "object", "target-lexicon", "thiserror", "wasmparser", + "wasmtime-cranelift-shared", + "wasmtime-environ", +] + +[[package]] +name = "wasmtime-cranelift-shared" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd041e382ef5aea1b9fc78442394f1a4f6d676ce457e7076ca4cb3f397882f8b" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-native", + "gimli", + "object", + "target-lexicon", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7" +checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" dependencies = [ "anyhow", "cranelift-entity", - "gimli 0.26.2", + "gimli", "indexmap", "log", - "object 0.29.0", + "object", "serde", "target-lexicon", "thiserror", @@ -10561,18 +10648,18 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa" +checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" dependencies = [ - "addr2line 0.17.0", + "addr2line", "anyhow", "bincode", "cfg-if", "cpp_demangle", - "gimli 0.26.2", + "gimli", "log", - "object 0.29.0", + "object", "rustc-demangle", "serde", "target-lexicon", @@ -10580,36 +10667,36 @@ dependencies = [ "wasmtime-jit-debug", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-jit-debug" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2" +checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846" dependencies = [ - "object 0.29.0", + "object", "once_cell", "rustix 0.36.13", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c" +checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd" dependencies = [ "cfg-if", "libc", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-runtime" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b" +checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441" dependencies = [ "anyhow", "cc", @@ -10619,21 +10706,21 @@ dependencies = [ "log", "mach", "memfd", - "memoffset 0.6.5", + "memoffset 0.8.0", "paste", "rand 0.8.5", "rustix 0.36.13", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-types" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568" +checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" dependencies = [ "cranelift-entity", "serde", @@ -11251,9 +11338,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] diff --git a/Cargo.toml b/Cargo.toml index 8ac7d45844..cc61da1eee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,7 @@ hex = { version = "0.4.3", default-features = false, features = ["alloc"] } hex-literal = "0.4.1" impl-serde = { version = "0.4.0", default-features = false } jsonrpsee = "0.16.2" -kvdb-rocksdb = "0.18.0" +kvdb-rocksdb = "0.19.0" libsecp256k1 = { version = "0.7.1", default-features = false } log = { version = "0.4.17", default-features = false } parity-db = "0.4.8" @@ -59,7 +59,7 @@ parking_lot = "0.12.1" rlp = { version = "0.5", default-features = false } scale-codec = { package = "parity-scale-codec", version = "3.2.1", default-features = false, features = ["derive"] } scale-info = { version = "2.3.1", default-features = false, features = ["derive"] } -serde = { version = "1.0", features = ["derive"] } +serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] } serde_json = "1.0" sqlx = { version = "0.7.0-alpha.3", default-features = false, features = ["macros"] } thiserror = "1.0" diff --git a/client/db/src/kv/mod.rs b/client/db/src/kv/mod.rs index 54ad5ba407..01c9e61e10 100644 --- a/client/db/src/kv/mod.rs +++ b/client/db/src/kv/mod.rs @@ -89,7 +89,7 @@ impl crate::BackendReader for Backend { _to_block: u64, _addresses: Vec, _topics: Vec>>, - ) -> Result, String> { + ) -> Result>, String> { Err("KeyValue db does not index logs".into()) } diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs index 2e4ed76aff..fb3b8c2230 100644 --- a/client/db/src/lib.rs +++ b/client/db/src/lib.rs @@ -45,8 +45,8 @@ pub struct TransactionMetadata { } #[derive(Debug, Eq, PartialEq)] -pub struct FilteredLog { - pub substrate_block_hash: H256, +pub struct FilteredLog { + pub substrate_block_hash: Block::Hash, pub ethereum_block_hash: H256, pub block_number: u32, pub ethereum_storage_schema: fp_storage::EthereumStorageSchema, @@ -72,7 +72,7 @@ pub trait BackendReader { to_block: u64, addresses: Vec, topics: Vec>>, - ) -> Result, String>; + ) -> Result>, String>; fn is_indexed(&self) -> bool; } diff --git a/client/db/src/sql/mod.rs b/client/db/src/sql/mod.rs index 6a29a67b21..2cbf0c7f97 100644 --- a/client/db/src/sql/mod.rs +++ b/client/db/src/sql/mod.rs @@ -857,7 +857,7 @@ impl> BackendReader for Backend { to_block: u64, addresses: Vec, topics: Vec>>, - ) -> Result, String> { + ) -> Result>, String> { let mut unique_topics: [HashSet; 4] = [ HashSet::new(), HashSet::new(), @@ -899,7 +899,7 @@ impl> BackendReader for Backend { }); log::debug!(target: "frontier-sql", "Query: {sql:?} - {log_key}"); - let mut out: Vec = vec![]; + let mut out: Vec> = vec![]; let mut rows = query.fetch(&mut *conn); let maybe_err = loop { match rows.try_next().await { @@ -1057,7 +1057,7 @@ mod test { pub to_block: u64, pub addresses: Vec, pub topics: Vec>>, - pub expected_result: Vec, + pub expected_result: Vec>, } #[derive(Debug, Clone)] @@ -1097,7 +1097,7 @@ mod test { log_3_badc_2_0_bob: Log, } - impl From for FilteredLog { + impl From for FilteredLog { fn from(value: Log) -> Self { Self { substrate_block_hash: value.substrate_block_hash, @@ -1385,7 +1385,7 @@ mod test { async fn run_test_case( backend: super::Backend, test_case: &TestFilter, - ) -> Result, String> { + ) -> Result>, String> { backend .filter_logs( test_case.from_block, diff --git a/client/mapping-sync/src/sql/mod.rs b/client/mapping-sync/src/sql/mod.rs index f4fd2e7786..c07d8cd62d 100644 --- a/client/mapping-sync/src/sql/mod.rs +++ b/client/mapping-sync/src/sql/mod.rs @@ -488,7 +488,7 @@ mod test { use sp_core::{H160, H256, U256}; use sp_io::hashing::twox_128; use sp_runtime::{ - generic::{Digest, Header}, + generic::{DigestItem, Header}, traits::BlakeTwo256, }; use substrate_test_runtime_client::{ @@ -519,7 +519,7 @@ mod test { [twox_128(module), twox_128(storage)].concat().to_vec() } - fn ethereum_digest() -> Digest { + fn ethereum_digest() -> DigestItem { let partial_header = ethereum::PartialHeader { parent_hash: H256::random(), beneficiary: H160::default(), @@ -537,13 +537,11 @@ mod test { }; let ethereum_transactions: Vec = vec![]; let ethereum_block = ethereum::Block::new(partial_header, ethereum_transactions, vec![]); - Digest { - logs: vec![sp_runtime::generic::DigestItem::Consensus( - fp_consensus::FRONTIER_ENGINE_ID, - fp_consensus::PostLog::Hashes(fp_consensus::Hashes::from_block(ethereum_block)) - .encode(), - )], - } + DigestItem::Consensus( + fp_consensus::FRONTIER_ENGINE_ID, + fp_consensus::PostLog::Hashes(fp_consensus::Hashes::from_block(ethereum_block)) + .encode(), + ) } #[tokio::test] @@ -595,7 +593,10 @@ mod test { let mut logs: Vec<(i32, fc_db::sql::Log)> = vec![]; for block_number in 1..11 { // New block including pallet ethereum block digest - let mut builder = client.new_block(ethereum_digest()).unwrap(); + let mut builder = client.new_block(Default::default()).unwrap(); + builder + .push_deposit_log_digest_item(ethereum_digest()) + .expect("deposit log"); // Addresses let address_1 = H160::repeat_byte(0x01); let address_2 = H160::repeat_byte(0x02); @@ -828,7 +829,10 @@ mod test { let mut logs: Vec<(i32, fc_db::sql::Log)> = vec![]; for block_number in 1..11 { // New block including pallet ethereum block digest - let mut builder = client.new_block(ethereum_digest()).unwrap(); + let mut builder = client.new_block(Default::default()).unwrap(); + builder + .push_deposit_log_digest_item(ethereum_digest()) + .expect("deposit log"); // Addresses let address_1 = H160::random(); let address_2 = H160::random(); @@ -1036,9 +1040,12 @@ mod test { let mut hashes_to_be_orphaned: Vec = vec![]; for block_number in 1..11 { // New block including pallet ethereum block digest - let builder = client - .new_block_at(parent_hash, ethereum_digest(), false) + let mut builder = client + .new_block_at(parent_hash, Default::default(), false) .unwrap(); + builder + .push_deposit_log_digest_item(ethereum_digest()) + .expect("deposit log"); let block = builder.build().unwrap().block; let block_hash = block.header.hash(); executor::block_on(client.import(BlockOrigin::Own, block)).unwrap(); @@ -1070,9 +1077,12 @@ mod test { parent_hash = common_ancestor; for _ in 1..11 { // New block including pallet ethereum block digest - let builder = client - .new_block_at(parent_hash, ethereum_digest(), false) + let mut builder = client + .new_block_at(parent_hash, Default::default(), false) .unwrap(); + builder + .push_deposit_log_digest_item(ethereum_digest()) + .expect("deposit log"); let block = builder.build().unwrap().block; let block_hash = block.header.hash(); executor::block_on(client.import(BlockOrigin::Own, block)).unwrap(); @@ -1169,9 +1179,12 @@ mod test { .expect("genesis hash"); let mut best_block_hashes: Vec = vec![]; for _block_number in 1..=5 { - let builder = client - .new_block_at(parent_hash, ethereum_digest(), false) + let mut builder = client + .new_block_at(parent_hash, Default::default(), false) .unwrap(); + builder + .push_deposit_log_digest_item(ethereum_digest()) + .expect("deposit log"); let block = builder.build().unwrap().block; let block_hash = block.header.hash(); executor::block_on(client.import(BlockOrigin::Own, block)).unwrap(); @@ -1343,9 +1356,12 @@ mod test { .expect("genesis hash"); let mut best_block_hashes: Vec = vec![]; for _block_number in 1..=3 { - let builder = client - .new_block_at(parent_hash, ethereum_digest(), false) + let mut builder = client + .new_block_at(parent_hash, Default::default(), false) .unwrap(); + builder + .push_deposit_log_digest_item(ethereum_digest()) + .expect("deposit log"); let block = builder.build().unwrap().block; let block_hash = block.header.hash(); @@ -1446,9 +1462,12 @@ mod test { .expect("genesis hash"); let mut best_block_hashes: Vec = vec![]; for _block_number in 1..=3 { - let builder = client - .new_block_at(parent_hash, ethereum_digest(), false) + let mut builder = client + .new_block_at(parent_hash, Default::default(), false) .unwrap(); + builder + .push_deposit_log_digest_item(ethereum_digest()) + .expect("deposit log"); let block = builder.build().unwrap().block; let block_hash = block.header.hash(); @@ -1458,9 +1477,12 @@ mod test { } // create non-best block - let builder = client - .new_block_at(best_block_hashes[0], ethereum_digest(), false) + let mut builder = client + .new_block_at(best_block_hashes[0], Default::default(), false) .unwrap(); + builder + .push_deposit_log_digest_item(ethereum_digest()) + .expect("deposit log"); let block = builder.build().unwrap().block; executor::block_on(client.import(BlockOrigin::Own, block)).unwrap(); @@ -1557,9 +1579,12 @@ mod test { .expect("genesis hash"); let mut best_block_hashes: Vec = vec![]; for _block_number in 1..=3 { - let builder = client - .new_block_at(parent_hash, ethereum_digest(), false) + let mut builder = client + .new_block_at(parent_hash, Default::default(), false) .unwrap(); + builder + .push_deposit_log_digest_item(ethereum_digest()) + .expect("deposit log"); let block = builder.build().unwrap().block; let block_hash = block.header.hash(); @@ -1660,9 +1685,12 @@ mod test { .expect("genesis hash"); let mut best_block_hashes: Vec = vec![]; for _block_number in 1..=3 { - let builder = client - .new_block_at(parent_hash, ethereum_digest(), false) + let mut builder = client + .new_block_at(parent_hash, Default::default(), false) .unwrap(); + builder + .push_deposit_log_digest_item(ethereum_digest()) + .expect("deposit log"); let block = builder.build().unwrap().block; let block_hash = block.header.hash(); @@ -1672,9 +1700,12 @@ mod test { } // create non-best block - let builder = client - .new_block_at(best_block_hashes[0], ethereum_digest(), false) + let mut builder = client + .new_block_at(best_block_hashes[0], Default::default(), false) .unwrap(); + builder + .push_deposit_log_digest_item(ethereum_digest()) + .expect("deposit log"); let block = builder.build().unwrap().block; executor::block_on(client.import(BlockOrigin::Own, block)).unwrap(); @@ -1771,9 +1802,12 @@ mod test { .expect("genesis hash"); let mut best_block_hashes: Vec = vec![]; for _block_number in 1..=3 { - let builder = client - .new_block_at(parent_hash, ethereum_digest(), false) + let mut builder = client + .new_block_at(parent_hash, Default::default(), false) .unwrap(); + builder + .push_deposit_log_digest_item(ethereum_digest()) + .expect("deposit log"); let block = builder.build().unwrap().block; let block_hash = block.header.hash(); @@ -1874,9 +1908,12 @@ mod test { .expect("genesis hash"); let mut best_block_hashes: Vec = vec![]; for _block_number in 1..=3 { - let builder = client - .new_block_at(parent_hash, ethereum_digest(), false) + let mut builder = client + .new_block_at(parent_hash, Default::default(), false) .unwrap(); + builder + .push_deposit_log_digest_item(ethereum_digest()) + .expect("deposit log"); let block = builder.build().unwrap().block; let block_hash = block.header.hash(); diff --git a/client/rpc-core/src/txpool.rs b/client/rpc-core/src/txpool.rs index 3cea401121..0701d664f5 100644 --- a/client/rpc-core/src/txpool.rs +++ b/client/rpc-core/src/txpool.rs @@ -20,7 +20,7 @@ use ethereum_types::U256; use jsonrpsee::{core::RpcResult, proc_macros::rpc}; -// Frontier + use crate::types::*; /// TxPool rpc interface diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index e0b83bc73a..6c43f3d8cf 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -18,7 +18,7 @@ futures = { workspace = true } hex = { workspace = true } jsonrpsee = { workspace = true, features = ["server", "macros"] } libsecp256k1 = { workspace = true } -log = "0.4.17" +log = { workspace = true } lru = "0.8.1" prometheus = { version = "0.13.1", default-features = false } rand = "0.8" @@ -62,7 +62,7 @@ pallet-evm = { workspace = true } tempfile = "3.3.0" # Substrate sc-block-builder = { workspace = true } -sc-client-db = { workspace = true } +sc-client-db = { workspace = true, features = ["rocksdb"] } sp-consensus = { workspace = true } substrate-test-runtime-client = { workspace = true } diff --git a/client/rpc/src/eth/filter.rs b/client/rpc/src/eth/filter.rs index c0dd08ab8f..21bde32018 100644 --- a/client/rpc/src/eth/filter.rs +++ b/client/rpc/src/eth/filter.rs @@ -32,14 +32,15 @@ use sp_runtime::{ traits::{Block as BlockT, NumberFor, One, Saturating, UniqueSaturatedInto}, }; // Frontier -use crate::{eth::cache::EthBlockDataCacheTask, frontier_backend_client, internal_err, TxPool}; use fc_rpc_core::{types::*, EthFilterApiServer}; use fp_rpc::{EthereumRuntimeRPCApi, TransactionStatus}; -pub struct EthFilter { +use crate::{eth::cache::EthBlockDataCacheTask, frontier_backend_client, internal_err, TxPool}; + +pub struct EthFilter { client: Arc, backend: Arc + Send + Sync>, - tx_pool: TxPool, + tx_pool: TxPool, filter_pool: FilterPool, max_stored_filters: usize, max_past_logs: u32, @@ -47,11 +48,11 @@ pub struct EthFilter { _marker: PhantomData, } -impl EthFilter { +impl EthFilter { pub fn new( client: Arc, backend: Arc + Send + Sync>, - tx_pool: TxPool, + tx_pool: TxPool, filter_pool: FilterPool, max_stored_filters: usize, max_past_logs: u32, @@ -70,12 +71,13 @@ impl EthFilter { } } -impl EthFilter +impl EthFilter where - A: ChainApi + 'static, - B: BlockT, - C: HeaderBackend + ProvideRuntimeApi + 'static, + B: BlockT, + C: ProvideRuntimeApi, C::Api: EthereumRuntimeRPCApi, + C: HeaderBackend + 'static, + A: ChainApi + 'static, { fn create_filter(&self, filter_type: FilterType) -> RpcResult { let block_number = @@ -125,13 +127,14 @@ where } #[async_trait] -impl EthFilterApiServer for EthFilter +impl EthFilterApiServer for EthFilter where - A: ChainApi + 'static, - B: BlockT, - C: HeaderBackend + ProvideRuntimeApi + StorageProvider + 'static, + B: BlockT, + C: ProvideRuntimeApi, C::Api: EthereumRuntimeRPCApi, + C: HeaderBackend + StorageProvider + 'static, BE: Backend + 'static, + A: ChainApi + 'static, { fn new_filter(&self, filter: Filter) -> RpcResult { self.create_filter(FilterType::Log(filter)) @@ -519,9 +522,10 @@ async fn filter_range_logs_indexed( to: NumberFor, ) -> RpcResult<()> where - B: BlockT, - C: HeaderBackend + ProvideRuntimeApi + StorageProvider + 'static, + B: BlockT, + C: ProvideRuntimeApi, C::Api: EthereumRuntimeRPCApi, + C: HeaderBackend + StorageProvider + 'static, BE: Backend + 'static, { use std::time::Instant; @@ -570,7 +574,7 @@ where let timer_post = Instant::now(); use std::collections::BTreeMap; - let mut statuses_cache: BTreeMap>> = BTreeMap::new(); + let mut statuses_cache: BTreeMap>> = BTreeMap::new(); for log in logs.iter() { let substrate_hash = log.substrate_block_hash; diff --git a/client/rpc/src/txpool.rs b/client/rpc/src/txpool.rs index e808e8e0c6..b11ad5fb78 100644 --- a/client/rpc/src/txpool.rs +++ b/client/rpc/src/txpool.rs @@ -38,13 +38,13 @@ use fp_rpc::{EthereumRuntimeRPCApi, TxPoolResponse}; use crate::{internal_err, public_key}; -pub struct TxPool { +pub struct TxPool { client: Arc, graph: Arc>, _marker: PhantomData, } -impl Clone for TxPool { +impl Clone for TxPool { fn clone(&self) -> Self { Self { client: self.client.clone(), @@ -54,13 +54,13 @@ impl Clone for TxPool { } } -impl TxPool +impl TxPool where - A: ChainApi + 'static, - B: BlockT + Send + Sync + 'static, - C: Send + Sync + 'static, - C: HeaderBackend + ProvideRuntimeApi, + B: BlockT, + C: ProvideRuntimeApi, C::Api: EthereumRuntimeRPCApi, + C: HeaderBackend + 'static, + A: ChainApi + 'static, { /// Use the transaction graph interface to get the extrinsics currently in the ready and future /// queues. @@ -81,7 +81,7 @@ where TransactionV2::EIP1559(t) => t.nonce, }; let from_address = match public_key(txn) { - Ok(pk) => H160::from(H256::from_slice(keccak_256(&pk).as_slice())), + Ok(pk) => H160::from(H256::from(keccak_256(&pk))), Err(_e) => H160::default(), }; pending @@ -98,7 +98,7 @@ where TransactionV2::EIP1559(t) => t.nonce, }; let from_address = match public_key(txn) { - Ok(pk) => H160::from(H256::from_slice(keccak_256(&pk).as_slice())), + Ok(pk) => H160::from(H256::from(keccak_256(&pk))), Err(_e) => H160::default(), }; queued @@ -141,7 +141,7 @@ where } } -impl TxPool { +impl TxPool { pub fn new(client: Arc, graph: Arc>) -> Self { Self { client, @@ -151,13 +151,13 @@ impl TxPool { } } -impl TxPoolApiServer for TxPool +impl TxPoolApiServer for TxPool where - A: ChainApi + 'static, - B: BlockT + Send + Sync + 'static, - C: Send + Sync + 'static, - C: HeaderBackend + ProvideRuntimeApi, + B: BlockT, + C: ProvideRuntimeApi, C::Api: EthereumRuntimeRPCApi, + C: HeaderBackend + 'static, + A: ChainApi + 'static, { fn content(&self) -> RpcResult>> { self.map_build::() diff --git a/frame/base-fee/src/lib.rs b/frame/base-fee/src/lib.rs index a05dda2265..46df021b78 100644 --- a/frame/base-fee/src/lib.rs +++ b/frame/base-fee/src/lib.rs @@ -59,7 +59,6 @@ pub mod pallet { _marker: PhantomData, } - #[cfg(feature = "std")] impl GenesisConfig { pub fn new(base_fee_per_gas: U256, elasticity: Permill) -> Self { Self { @@ -70,7 +69,6 @@ pub mod pallet { } } - #[cfg(feature = "std")] impl Default for GenesisConfig { fn default() -> Self { Self { diff --git a/frame/dynamic-fee/src/lib.rs b/frame/dynamic-fee/src/lib.rs index 388cf8f5f0..e7201aea1a 100644 --- a/frame/dynamic-fee/src/lib.rs +++ b/frame/dynamic-fee/src/lib.rs @@ -85,7 +85,7 @@ pub mod pallet { } #[pallet::genesis_config] - #[cfg_attr(feature = "std", derive(Default))] + #[derive(Default)] pub struct GenesisConfig { pub min_gas_price: U256, } diff --git a/frame/evm/Cargo.toml b/frame/evm/Cargo.toml index e6398eba0a..61e577346c 100644 --- a/frame/evm/Cargo.toml +++ b/frame/evm/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] environmental = { workspace = true, optional = true } evm = { workspace = true, features = ["with-codec"] } -hex = { workspace = true } +hex = { workspace = true, optional = true } hex-literal = { workspace = true } impl-trait-for-tuples = "0.2.2" log = { workspace = true } @@ -34,6 +34,7 @@ fp-account = { workspace = true } fp-evm = { workspace = true } [dev-dependencies] +hex = { workspace = true } # Substrate pallet-balances = { workspace = true, features = ["default", "insecure_zero_ed"] } pallet-evm-precompile-simple = { workspace = true, features = ["default"] } @@ -45,7 +46,6 @@ std = [ "environmental?/std", "evm/std", "evm/with-serde", - "hex/std", "log/std", "rlp/std", "scale-codec/std", @@ -63,6 +63,7 @@ std = [ "fp-evm/std", ] runtime-benchmarks = [ + "hex", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs index c3ef12460d..fb3a0388f8 100644 --- a/frame/evm/src/lib.rs +++ b/frame/evm/src/lib.rs @@ -90,10 +90,9 @@ use sp_runtime::{ traits::{BadOrigin, Saturating, UniqueSaturatedInto, Zero}, AccountId32, DispatchErrorWithPostInfo, }; -use sp_std::{cmp::min, vec::Vec}; +use sp_std::{cmp::min, collections::btree_map::BTreeMap, vec::Vec}; // Frontier use fp_account::AccountId20; -#[cfg(feature = "std")] use fp_evm::GenesisAccount; pub use fp_evm::{ Account, CallInfo, CreateInfo, ExecutionInfoV2 as ExecutionInfo, FeeCalculator, @@ -513,9 +512,9 @@ pub mod pallet { } #[pallet::genesis_config] - #[cfg_attr(feature = "std", derive(Default))] + #[derive(Default)] pub struct GenesisConfig { - pub accounts: std::collections::BTreeMap, + pub accounts: BTreeMap, } #[pallet::genesis_build] diff --git a/primitives/account/Cargo.toml b/primitives/account/Cargo.toml index 13c33d5ace..7fe7c853a4 100644 --- a/primitives/account/Cargo.toml +++ b/primitives/account/Cargo.toml @@ -34,7 +34,7 @@ std = [ "log/std", "scale-codec/std", "scale-info/std", - "serde", + "serde/std", # Substrate "sp-core/std", "sp-io/std", @@ -42,3 +42,10 @@ std = [ "sp-runtime-interface/std", "sp-std/std", ] +serde = [ + "dep:serde", + "impl-serde", + "scale-info/serde", + "sp-core/serde", + "sp-runtime/serde", +] diff --git a/primitives/account/src/lib.rs b/primitives/account/src/lib.rs index d6e4c981d4..9e2d10c4e2 100644 --- a/primitives/account/src/lib.rs +++ b/primitives/account/src/lib.rs @@ -31,7 +31,7 @@ use sp_runtime_interface::pass_by::PassByInner; #[derive(Encode, Decode, MaxEncodedLen, TypeInfo)] pub struct AccountId20(pub [u8; 20]); -#[cfg(feature = "std")] +#[cfg(feature = "serde")] impl_serde::impl_fixed_hash_serde!(AccountId20, 20); #[cfg(feature = "std")] @@ -114,8 +114,8 @@ impl From for AccountId20 { } } -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] -#[derive(Eq, PartialEq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)] +#[derive(Eq, PartialEq, Clone, RuntimeDebug, Encode, Decode, TypeInfo)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct EthereumSignature(ecdsa::Signature); impl sp_runtime::traits::Verify for EthereumSignature { diff --git a/primitives/evm/Cargo.toml b/primitives/evm/Cargo.toml index 20225b9750..1dd1aeaf79 100644 --- a/primitives/evm/Cargo.toml +++ b/primitives/evm/Cargo.toml @@ -26,7 +26,7 @@ default = ["std"] std = [ "evm/std", "evm/with-serde", - "serde", + "serde/std", "scale-codec/std", # Substrate "frame-support/std", @@ -34,3 +34,9 @@ std = [ "sp-runtime/std", "sp-std/std", ] +serde = [ + "dep:serde", + "scale-info/serde", + "sp-core/serde", + "sp-runtime/serde", +] diff --git a/primitives/evm/src/lib.rs b/primitives/evm/src/lib.rs index 74ca39c5da..4a4902ba27 100644 --- a/primitives/evm/src/lib.rs +++ b/primitives/evm/src/lib.rs @@ -24,11 +24,11 @@ mod validation; use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_MILLIS, Weight}; use scale_codec::{Decode, Encode}; use scale_info::TypeInfo; -#[cfg(feature = "std")] +#[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; use sp_core::{H160, H256, U256}; use sp_runtime::Perbill; -use sp_std::vec::Vec; +use sp_std::{collections::btree_map::BTreeMap, vec::Vec}; pub use evm::{ backend::{Basic as Account, Log}, @@ -47,8 +47,8 @@ pub use self::{ }, }; -#[derive(Clone, Eq, PartialEq, Default, Encode, Decode)] -#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] +#[derive(Clone, Eq, PartialEq, Default, Debug, Encode, Decode)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] /// External input from the transaction. pub struct Vicinity { /// Current transaction gas price. @@ -73,8 +73,8 @@ pub enum AccessedStorage { AccountStorages((H160, H256)), } -#[derive(Clone, Copy, Eq, PartialEq, Encode, Decode, TypeInfo)] -#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] +#[derive(Clone, Copy, Eq, PartialEq, Debug, Encode, Decode, TypeInfo)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub struct WeightInfo { pub ref_time_limit: Option, pub proof_size_limit: Option, @@ -153,8 +153,8 @@ impl WeightInfo { } } -#[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo)] -#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] +#[derive(Clone, Eq, PartialEq, Debug, Encode, Decode, TypeInfo)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub struct UsedGas { /// The used_gas as returned by the evm gasometer on exit. pub standard: U256, @@ -163,8 +163,8 @@ pub struct UsedGas { pub effective: U256, } -#[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo)] -#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] +#[derive(Clone, Eq, PartialEq, Debug, Encode, Decode, TypeInfo)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub struct ExecutionInfoV2 { pub exit_reason: ExitReason, pub value: T, @@ -176,15 +176,15 @@ pub struct ExecutionInfoV2 { pub type CallInfo = ExecutionInfoV2>; pub type CreateInfo = ExecutionInfoV2; -#[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo)] -#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] +#[derive(Clone, Eq, PartialEq, Debug, Encode, Decode, TypeInfo)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub enum CallOrCreateInfo { Call(CallInfo), Create(CreateInfo), } -#[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo)] -#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] +#[derive(Clone, Eq, PartialEq, Debug, Encode, Decode)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub struct ExecutionInfo { pub exit_reason: ExitReason, pub value: T, @@ -193,15 +193,15 @@ pub struct ExecutionInfo { } /// Account definition used for genesis block construction. -#[cfg(feature = "std")] -#[derive(Clone, Eq, PartialEq, Encode, Decode, Debug, Serialize, Deserialize)] +#[derive(Clone, Eq, PartialEq, Debug, Encode, Decode)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub struct GenesisAccount { /// Account nonce. pub nonce: U256, /// Account balance. pub balance: U256, /// Full account storage. - pub storage: std::collections::BTreeMap, + pub storage: BTreeMap, /// Account code. pub code: Vec, } diff --git a/primitives/self-contained/Cargo.toml b/primitives/self-contained/Cargo.toml index 475c8ca879..a41c5f3d97 100644 --- a/primitives/self-contained/Cargo.toml +++ b/primitives/self-contained/Cargo.toml @@ -23,11 +23,16 @@ default = ["std"] std = [ "scale-codec/std", "scale-info/std", - "serde", + "serde/std", # Substrate "frame-support/std", "sp-runtime/std", ] +serde = [ + "dep:serde", + "scale-info/serde", + "sp-runtime/serde", +] try-runtime = [ "sp-runtime/try-runtime", ] diff --git a/primitives/self-contained/src/unchecked_extrinsic.rs b/primitives/self-contained/src/unchecked_extrinsic.rs index 97032c7add..84bb15cd5b 100644 --- a/primitives/self-contained/src/unchecked_extrinsic.rs +++ b/primitives/self-contained/src/unchecked_extrinsic.rs @@ -180,7 +180,7 @@ where } } -#[cfg(feature = "std")] +#[cfg(feature = "serde")] impl serde::Serialize for UncheckedExtrinsic { @@ -192,7 +192,7 @@ impl s } } -#[cfg(feature = "std")] +#[cfg(feature = "serde")] impl<'a, Address: Decode, Signature: Decode, Call: Decode, Extra: SignedExtension> serde::Deserialize<'a> for UncheckedExtrinsic { diff --git a/primitives/storage/Cargo.toml b/primitives/storage/Cargo.toml index f688f5e8a3..b5cf89f9a2 100644 --- a/primitives/storage/Cargo.toml +++ b/primitives/storage/Cargo.toml @@ -18,5 +18,8 @@ serde = { workspace = true, optional = true } default = ["std"] std = [ "scale-codec/std", - "serde", + "serde/std", +] +serde = [ + "dep:serde", ] diff --git a/primitives/storage/src/lib.rs b/primitives/storage/src/lib.rs index 35c22af5a0..5ea72b0e51 100644 --- a/primitives/storage/src/lib.rs +++ b/primitives/storage/src/lib.rs @@ -43,7 +43,7 @@ pub const BASE_FEE_ELASTICITY: &[u8] = b"Elasticity"; /// The schema version for Pallet Ethereum's storage #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Encode, Decode)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub enum EthereumStorageSchema { Undefined, V1, diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f682bc9d54..e8e549df8a 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,8 +1,8 @@ [toolchain] # Stable -#channel = "1.68.2" # rustc 1.68.2 (9eb3afe9e 2023-03-27) +#channel = "1.69.0" # rustc 1.69.0 (84c898d65 2023-04-16) # Nightly -channel = "nightly-2022-11-16" # rustc 1.67.0-nightly (a00f8ba7f 2022-11-15) +channel = "nightly-2023-05-23" # rustc 1.71.0-nightly (8b4b20836 2023-05-22) components = ["rustfmt", "clippy"] targets = ["wasm32-unknown-unknown"] profile = "minimal" diff --git a/template/node/src/eth.rs b/template/node/src/eth.rs index cad0d627e1..33b451ac8d 100644 --- a/template/node/src/eth.rs +++ b/template/node/src/eth.rs @@ -10,7 +10,7 @@ use futures::{future, prelude::*}; use sc_client_api::{BlockchainEvents, StateBackendFor}; use sc_executor::NativeExecutionDispatch; use sc_network_sync::SyncingService; -use sc_service::{error::Error as ServiceError, BasePath, Configuration, TaskManager}; +use sc_service::{error::Error as ServiceError, Configuration, TaskManager}; use sp_api::ConstructRuntimeApi; use sp_runtime::traits::BlakeTwo256; // Frontier @@ -26,14 +26,7 @@ use crate::client::{FullBackend, FullClient}; pub type FrontierBackend = fc_db::Backend; pub fn db_config_dir(config: &Configuration) -> PathBuf { - let application = &config.impl_name; - config - .base_path - .as_ref() - .map(|base_path| base_path.config_dir(config.chain_spec.id())) - .unwrap_or_else(|| { - BasePath::from_project("", "", application).config_dir(config.chain_spec.id()) - }) + config.base_path.config_dir(config.chain_spec.id()) } /// Avalailable frontier backend types. diff --git a/template/node/src/service.rs b/template/node/src/service.rs index 2d599e5f5c..6cf1f429aa 100644 --- a/template/node/src/service.rs +++ b/template/node/src/service.rs @@ -309,6 +309,7 @@ where fee_history_cache_limit, } = new_frontier_partial(ð_config)?; + let mut net_config = sc_network::config::FullNetworkConfiguration::new(&config.network); let grandpa_protocol_name = sc_consensus_grandpa::protocol_standard_name( &client.block_hash(0)?.expect("Genesis block exists; qed"), &config.chain_spec, @@ -317,12 +318,9 @@ where let warp_sync_params = if sealing.is_some() { None } else { - config - .network - .extra_sets - .push(sc_consensus_grandpa::grandpa_peers_set_config( - grandpa_protocol_name.clone(), - )); + net_config.add_notification_protocol(sc_consensus_grandpa::grandpa_peers_set_config( + grandpa_protocol_name.clone(), + )); let warp_sync: Arc> = Arc::new(sc_consensus_grandpa::warp_proof::NetworkProvider::new( backend.clone(), @@ -335,6 +333,7 @@ where let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) = sc_service::build_network(sc_service::BuildNetworkParams { config: &config, + net_config, client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), diff --git a/template/runtime/Cargo.toml b/template/runtime/Cargo.toml index a870753908..ad52167e55 100644 --- a/template/runtime/Cargo.toml +++ b/template/runtime/Cargo.toml @@ -87,7 +87,7 @@ std = [ "frame-support/std", "frame-system/std", "frame-system-rpc-runtime-api/std", - "frame-system-benchmarking/std", + "frame-system-benchmarking?/std", "pallet-aura/std", "pallet-balances/std", "pallet-grandpa/std", @@ -118,6 +118,7 @@ runtime-benchmarks = [ "pallet-balances/runtime-benchmarks", "pallet-grandpa/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", + "pallet-sudo/runtime-benchmarks", "pallet-ethereum/runtime-benchmarks", "pallet-evm/runtime-benchmarks", "pallet-hotfix-sufficients/runtime-benchmarks", diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs index a658d16b6a..8b8f436ad0 100644 --- a/template/runtime/src/lib.rs +++ b/template/runtime/src/lib.rs @@ -264,7 +264,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type WeightInfo = pallet_balances::weights::SubstrateWeight; + type WeightInfo = pallet_balances::weights::SubstrateWeight; type Balance = Balance; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; @@ -294,6 +294,7 @@ impl pallet_transaction_payment::Config for Runtime { impl pallet_sudo::Config for Runtime { type RuntimeEvent = RuntimeEvent; type RuntimeCall = RuntimeCall; + type WeightInfo = pallet_sudo::weights::SubstrateWeight; } impl pallet_evm_chain_id::Config for Runtime {} @@ -342,7 +343,7 @@ impl pallet_evm::Config for Runtime { type FindAuthor = FindAuthorTruncated; type GasLimitPovSizeRatio = GasLimitPovSizeRatio; type Timestamp = Timestamp; - type WeightInfo = pallet_evm::weights::SubstrateWeight; + type WeightInfo = pallet_evm::weights::SubstrateWeight; } parameter_types! { @@ -391,7 +392,7 @@ impl pallet_base_fee::Config for Runtime { impl pallet_hotfix_sufficients::Config for Runtime { type AddressMapping = IdentityAddressMapping; - type WeightInfo = pallet_hotfix_sufficients::weights::SubstrateWeight; + type WeightInfo = pallet_hotfix_sufficients::weights::SubstrateWeight; } // Create the runtime by composing the FRAME pallets that were previously configured. @@ -544,7 +545,14 @@ extern crate frame_benchmarking; #[cfg(feature = "runtime-benchmarks")] mod benches { - define_benchmarks!([pallet_evm, EVM]); + define_benchmarks!( + [frame_benchmarking, BaselineBench::] + [frame_system, SystemBench::] + [pallet_balances, Balances] + [pallet_timestamp, Timestamp] + [pallet_sudo, Sudo] + [pallet_evm, EVM] + ); } impl_runtime_apis! { @@ -878,8 +886,11 @@ impl_runtime_apis! { Vec, Vec, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::{baseline, Benchmarking, BenchmarkList}; use frame_support::traits::StorageInfoTrait; + + use baseline::Pallet as BaselineBench; + use frame_system_benchmarking::Pallet as SystemBench; use pallet_hotfix_sufficients::Pallet as PalletHotfixSufficients; let mut list = Vec::::new(); @@ -893,9 +904,12 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey}; + use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey}; + use pallet_evm::Pallet as PalletEvmBench; - use pallet_hotfix_sufficients::Pallet as PalletHotfixSufficients; + use pallet_hotfix_sufficients::Pallet as PalletHotfixSufficientsBench; + + impl baseline::Config for Runtime {} impl frame_system_benchmarking::Config for Runtime {} let whitelist: Vec = vec![]; @@ -904,7 +918,7 @@ impl_runtime_apis! { let params = (&config, &whitelist); add_benchmark!(params, batches, pallet_evm, PalletEvmBench::); - add_benchmark!(params, batches, pallet_hotfix_sufficients, PalletHotfixSufficients::); + add_benchmark!(params, batches, pallet_hotfix_sufficients, PalletHotfixSufficientsBench::); if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) diff --git a/ts-tests/tests/util.ts b/ts-tests/tests/util.ts index 34a7f54c93..d31e3e68c0 100644 --- a/ts-tests/tests/util.ts +++ b/ts-tests/tests/util.ts @@ -7,7 +7,6 @@ import { NODE_BINARY_NAME, CHAIN_ID } from "./config"; export const PORT = 19931; export const RPC_PORT = 19932; -export const WS_PORT = 19933; export const DISPLAY_LOG = process.env.FRONTIER_LOG || false; export const FRONTIER_LOG = process.env.FRONTIER_LOG || "info"; @@ -82,7 +81,6 @@ export async function startFrontierNode(provider?: string): Promise<{ `-l${FRONTIER_LOG}`, `--port=${PORT}`, `--rpc-port=${RPC_PORT}`, - `--ws-port=${WS_PORT}`, `--frontier-backend-type=${FRONTIER_BACKEND_TYPE}`, `--tmp`, ]; @@ -134,7 +132,7 @@ export async function startFrontierNode(provider?: string): Promise<{ }); if (provider == "ws") { - web3 = new Web3(`ws://127.0.0.1:${WS_PORT}`); + web3 = new Web3(`ws://127.0.0.1:${RPC_PORT}`); } let ethersjs = new ethers.JsonRpcProvider(`http://127.0.0.1:${RPC_PORT}`, {