From 10ab6f3bd087c42dcd54f97619268ed34ae266c2 Mon Sep 17 00:00:00 2001 From: koushiro Date: Fri, 12 May 2023 15:44:26 +0800 Subject: [PATCH 1/8] deps: update substrate to polkadot-v0.9.42 - update substrate to 16b2e644487f7f767eeefd4debf11a7948bfa4db - update rust toolchain to 1.68.2 --- .github/workflows/docs.yml | 2 +- .github/workflows/rust.yml | 6 +- Cargo.lock | 1152 +++++++++++++------- Cargo.toml | 3 +- client/mapping-sync/Cargo.toml | 2 +- client/rpc-core/src/types/block_number.rs | 9 +- client/rpc-core/src/types/pubsub.rs | 9 +- client/rpc/Cargo.toml | 2 +- client/rpc/src/eth/cache/mod.rs | 7 +- frame/ethereum/src/mock.rs | 10 +- frame/evm/precompile/curve25519/Cargo.toml | 2 +- frame/evm/precompile/curve25519/src/lib.rs | 7 +- frame/evm/precompile/dispatch/src/mock.rs | 10 +- frame/evm/src/lib.rs | 13 +- frame/evm/src/mock.rs | 10 +- frame/evm/src/runner/stack.rs | 46 +- primitives/evm/Cargo.toml | 1 + primitives/evm/src/lib.rs | 3 +- template/node/src/cli.rs | 13 +- template/node/src/service.rs | 15 +- template/runtime/src/lib.rs | 20 +- 21 files changed, 871 insertions(+), 471 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3d24170dbf..6c894cc44d 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: 1.68.2 target: wasm32-unknown-unknown override: true components: rust-docs diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index a496baeb67..3a5c10db53 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: 1.68.2 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: 1.68.2 target: wasm32-unknown-unknown override: true - name: Install protoc @@ -70,7 +70,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-11-16 + toolchain: 1.68.2 target: wasm32-unknown-unknown override: true components: rustfmt, clippy diff --git a/Cargo.lock b/Cargo.lock index 6112a8cb78..9eb0932053 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,7 +264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" dependencies = [ "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -277,7 +277,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -313,7 +313,7 @@ checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -390,7 +390,7 @@ checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "synstructure", ] @@ -402,7 +402,7 @@ checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "synstructure", ] @@ -414,7 +414,7 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -442,22 +442,22 @@ dependencies = [ [[package]] name = "async-io" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock", "autocfg", + "cfg-if", "concurrent-queue", "futures-lite", - "libc", "log", "parking", "polling", + "rustix 0.37.3", "slab", "socket2", "waker-fn", - "windows-sys", ] [[package]] @@ -478,7 +478,7 @@ checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -520,7 +520,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -557,10 +557,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" [[package]] -name = "base58" +name = "base16ct" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" @@ -592,7 +592,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "hash-db 0.16.0", "log", @@ -624,7 +624,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn", + "syn 1.0.107", ] [[package]] @@ -848,9 +848,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a1ec454bc3eead8719cb56e15dbbfecdbc14e4b3a3ae4936cc6e31f5fc0d07" +checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", @@ -1026,7 +1026,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1070,9 +1070,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" +checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" [[package]] name = "constant_time_eq" @@ -1137,18 +1137,18 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "cranelift-bforest" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7379abaacee0f14abf3204a7606118f0465785252169d186337bcb75030815a" +checksum = "2bc42ba2e232e5b20ff7dc299a812d53337dadce9a7e39a238e6a5cb82d2e57b" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9489fa336927df749631f1008007ced2871068544f40a202ce6d93fbf2366a7b" +checksum = "253531aca9b6f56103c9420369db3263e784df39aa1c90685a1f69cfbba0623e" dependencies = [ "arrayvec 0.7.2", "bumpalo", @@ -1167,33 +1167,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bbb67da91ec721ed57cef2f7c5ef7728e1cd9bde9ffd3ef8601022e73e3239" +checksum = "72f2154365e2bff1b1b8537a7181591fdff50d8e27fa6e40d5c69c3bad0ca7c8" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418ecb2f36032f6665dc1a5e2060a143dbab41d83b784882e97710e890a7a16d" +checksum = "687e14e3f5775248930e0d5a84195abef8b829958e9794bf8d525104993612b4" [[package]] name = "cranelift-entity" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cf583f7b093f291005f9fb1323e2c37f6ee4c7909e39ce016b2e8360d461705" +checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b66bf9e916f57fbbd0f7703ec6286f4624866bf45000111627c70d272c8dda1" +checksum = "8483c2db6f45fe9ace984e5adc5d058102227e4c62e5aa2054e16b0275fd3a6e" dependencies = [ "cranelift-codegen", "log", @@ -1203,15 +1203,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "649782a39ce99798dd6b4029e2bb318a2fbeaade1b4fa25330763c10c65bc358" +checksum = "e9793158837678902446c411741d87b43f57dadfb944f2440db4287cda8cbd59" [[package]] name = "cranelift-native" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937e021e089c51f9749d09e7ad1c4f255c2f8686cb8c3df63a34b3ec9921bc41" +checksum = "72668c7755f2b880665cb422c8ad2d56db58a88b9bebfef0b73edc2277c13c49" dependencies = [ "cranelift-codegen", "libc", @@ -1220,9 +1220,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d850cf6775477747c9dfda9ae23355dd70512ffebc70cf82b85a5b111ae668b5" +checksum = "3852ce4b088b44ac4e29459573943009a70d1b192c8d77ef949b4e814f656fc1" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1319,6 +1319,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "crypto-bigint" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +dependencies = [ + "generic-array 0.14.6", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -1405,13 +1417,14 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-pre.1" +version = "4.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf" +checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.6.4", + "cfg-if", + "fiat-crypto", + "packed_simd_2", + "platforms 3.0.2", "subtle", "zeroize", ] @@ -1440,7 +1453,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.107", ] [[package]] @@ -1457,7 +1470,7 @@ checksum = "65e07508b90551e610910fa648a1878991d367064997a596135b86df30daf07e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1481,7 +1494,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.107", ] [[package]] @@ -1492,7 +1505,7 @@ checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1518,7 +1531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" dependencies = [ "data-encoding", - "syn", + "syn 1.0.107", ] [[package]] @@ -1532,6 +1545,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "der" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05e58dffcdcc8ee7b22f0c1f71a69243d7c2d9ad87b5a14361f2424a1565c219" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "der-parser" version = "7.0.0" @@ -1568,7 +1591,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1579,7 +1602,7 @@ checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1600,7 +1623,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1610,7 +1633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" dependencies = [ "derive_builder_core", - "syn", + "syn 1.0.107", ] [[package]] @@ -1621,7 +1644,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1655,6 +1678,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", + "const-oid", "crypto-common", "subtle", ] @@ -1708,7 +1732,7 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1747,7 +1771,7 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1762,10 +1786,24 @@ version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ - "der", - "elliptic-curve", - "rfc6979", - "signature", + "der 0.6.1", + "elliptic-curve 0.12.3", + "rfc6979 0.3.1", + "signature 1.6.4", +] + +[[package]] +name = "ecdsa" +version = "0.16.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" +dependencies = [ + "der 0.7.5", + "digest 0.10.6", + "elliptic-curve 0.13.4", + "rfc6979 0.4.0", + "signature 2.1.0", + "spki 0.7.2", ] [[package]] @@ -1774,7 +1812,7 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "signature", + "signature 1.6.4", ] [[package]] @@ -1817,18 +1855,37 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ - "base16ct", - "crypto-bigint", - "der", + "base16ct 0.1.1", + "crypto-bigint 0.4.9", + "der 0.6.1", "digest 0.10.6", - "ff", + "ff 0.12.1", "generic-array 0.14.6", - "group", + "group 0.12.1", "hkdf", "pem-rfc7468", - "pkcs8", + "pkcs8 0.9.0", "rand_core 0.6.4", - "sec1", + "sec1 0.3.0", + "subtle", + "zeroize", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75c71eaa367f2e5d556414a8eea812bc62985c879748d6403edabd9cb03f16e7" +dependencies = [ + "base16ct 0.2.0", + "crypto-bigint 0.5.2", + "digest 0.10.6", + "ff 0.13.0", + "generic-array 0.14.6", + "group 0.13.0", + "pkcs8 0.10.2", + "rand_core 0.6.4", + "sec1 0.7.1", "subtle", "zeroize", ] @@ -1842,7 +1899,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1875,6 +1932,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -2017,7 +2085,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2236,6 +2304,22 @@ dependencies = [ "subtle", ] +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "fiat-crypto" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" + [[package]] name = "file-per-thread-logger" version = "0.1.6" @@ -2255,7 +2339,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -2321,7 +2405,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "parity-scale-codec", ] @@ -2392,6 +2476,7 @@ dependencies = [ "evm", "frame-support", "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -2442,7 +2527,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-support", "frame-support-procedural", @@ -2467,7 +2552,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "Inflector", "array-bytes", @@ -2514,7 +2599,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-support", "frame-system", @@ -2529,9 +2614,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "15.0.0" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" +checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" dependencies = [ "cfg-if", "parity-scale-codec", @@ -2542,7 +2627,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "bitflags", "environmental", @@ -2575,44 +2660,45 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse", "frame-support-procedural-tools", "itertools", + "proc-macro-warning", "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-support", "log", @@ -2630,7 +2716,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-benchmarking", "frame-support", @@ -2645,7 +2731,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "parity-scale-codec", "sp-api", @@ -2791,12 +2877,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "fs_extra" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" - [[package]] name = "funty" version = "2.0.0" @@ -2875,7 +2955,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2951,6 +3031,7 @@ checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -3047,7 +3128,18 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ - "ff", + "ff 0.12.1", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff 0.13.0", "rand_core 0.6.4", "subtle", ] @@ -3148,6 +3240,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -3424,7 +3522,7 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -3483,12 +3581,13 @@ checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" [[package]] name = "io-lifetimes" -version = "1.0.4" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ + "hermit-abi 0.3.1", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3517,14 +3616,14 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "is-terminal" -version = "0.4.2" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.2.6", - "io-lifetimes 1.0.4", - "rustix 0.36.7", - "windows-sys", + "hermit-abi 0.3.1", + "io-lifetimes 1.0.10", + "rustix 0.37.3", + "windows-sys 0.48.0", ] [[package]] @@ -3609,7 +3708,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -3650,13 +3749,14 @@ dependencies = [ [[package]] name = "k256" -version = "0.11.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if", - "ecdsa", - "elliptic-curve", + "ecdsa 0.16.7", + "elliptic-curve 0.13.4", + "once_cell", "sha2 0.10.6", ] @@ -3690,9 +3790,9 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844" +checksum = "fe7a749456510c45f795e8b04a6a3e0976d0139213ecbf465843830ad55e2217" dependencies = [ "kvdb", "num_cpus", @@ -3733,6 +3833,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "libm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" + [[package]] name = "libm" version = "0.2.6" @@ -3798,7 +3904,7 @@ dependencies = [ "prost-build", "rand 0.8.5", "rw-stream-sink", - "sec1", + "sec1 0.3.0", "sha2 0.10.6", "smallvec", "thiserror", @@ -4030,7 +4136,7 @@ checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400" dependencies = [ "heck", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -4147,9 +4253,9 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "0.8.3+7.4.4" +version = "0.10.0+7.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "557b255ff04123fcc176162f56ed0c9cd42d8f357cf55b3fabeb60f7413741b3" +checksum = "0fe4d5874f5ff2bc616e55e8c6086d478fcda13faf9495768a4aa1c22042d30b" dependencies = [ "bindgen", "bzip2-sys", @@ -4264,6 +4370,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +[[package]] +name = "linux-raw-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" + [[package]] name = "lock_api" version = "0.4.9" @@ -4381,7 +4493,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" dependencies = [ - "rustix 0.36.7", + "rustix 0.36.13", ] [[package]] @@ -4455,14 +4567,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -4489,7 +4601,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -4548,7 +4660,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "synstructure", ] @@ -4596,7 +4708,7 @@ checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -4822,7 +4934,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -4900,8 +5012,8 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ - "ecdsa", - "elliptic-curve", + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", "sha2 0.10.6", ] @@ -4911,15 +5023,25 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ - "ecdsa", - "elliptic-curve", + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", "sha2 0.10.6", ] +[[package]] +name = "packed_simd_2" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +dependencies = [ + "cfg-if", + "libm 0.1.4", +] + [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-support", "frame-system", @@ -4935,7 +5057,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-support", "frame-system", @@ -4949,7 +5071,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-benchmarking", "frame-support", @@ -4962,7 +5084,7 @@ dependencies = [ "scale-info", "sp-application-crypto", "sp-consensus-babe", - "sp-consensus-vrf", + "sp-core", "sp-io", "sp-runtime", "sp-session", @@ -4973,7 +5095,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-benchmarking", "frame-support", @@ -5002,7 +5124,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-support", "frame-system", @@ -5021,7 +5143,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "array-bytes", "binary-merkle-tree", @@ -5171,7 +5293,7 @@ dependencies = [ name = "pallet-evm-precompile-curve25519" version = "1.0.0-dev" dependencies = [ - "curve25519-dalek 4.0.0-pre.1", + "curve25519-dalek 4.0.0-rc.1", "fp-evm", ] @@ -5245,7 +5367,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-benchmarking", "frame-support", @@ -5284,7 +5406,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-benchmarking", "frame-support", @@ -5301,7 +5423,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-support", "frame-system", @@ -5322,7 +5444,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-support", "frame-system", @@ -5336,7 +5458,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-benchmarking", "frame-support", @@ -5354,7 +5476,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-support", "frame-system", @@ -5370,7 +5492,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5386,7 +5508,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5398,7 +5520,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-benchmarking", "frame-support", @@ -5455,7 +5577,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -5494,7 +5616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.6", + "parking_lot_core 0.9.7", ] [[package]] @@ -5513,15 +5635,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -5608,7 +5730,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -5649,7 +5771,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -5676,8 +5798,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "der", - "spki", + "der 0.6.1", + "spki 0.6.0", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der 0.7.5", + "spki 0.7.2", ] [[package]] @@ -5692,18 +5824,26 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" +[[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + [[package]] name = "polling" -version = "2.5.2" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" +checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa" dependencies = [ "autocfg", + "bitflags", "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "windows-sys", + "pin-project-lite 0.2.9", + "windows-sys 0.48.0", ] [[package]] @@ -5783,7 +5923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.107", ] [[package]] @@ -5807,7 +5947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ "thiserror", - "toml", + "toml 0.5.11", ] [[package]] @@ -5819,7 +5959,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "version_check", ] @@ -5834,11 +5974,22 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-warning" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "proc-macro2" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -5877,7 +6028,7 @@ checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -5907,7 +6058,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn", + "syn 1.0.107", "tempfile", "which", ] @@ -5935,7 +6086,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -5994,9 +6145,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.23" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -6177,7 +6328,7 @@ checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -6255,11 +6406,21 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ - "crypto-bigint", + "crypto-bigint 0.4.9", "hmac 0.12.1", "zeroize", ] +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac 0.12.1", + "subtle", +] + [[package]] name = "ring" version = "0.16.20" @@ -6303,14 +6464,14 @@ checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] name = "rocksdb" -version = "0.19.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc" +checksum = "015439787fce1e75d55f279078d33ff14b4af5d93d995e8838ee4631301c8a99" dependencies = [ "libc", "librocksdb-sys", @@ -6420,25 +6581,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", - "errno", + "errno 0.2.8", "io-lifetimes 0.7.5", "libc", "linux-raw-sys 0.0.46", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] name = "rustix" -version = "0.36.7" +version = "0.36.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658" dependencies = [ "bitflags", - "errno", - "io-lifetimes 1.0.4", + "errno 0.3.1", + "io-lifetimes 1.0.10", "libc", "linux-raw-sys 0.1.4", - "windows-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustix" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" +dependencies = [ + "bitflags", + "errno 0.3.1", + "io-lifetimes 1.0.10", + "libc", + "linux-raw-sys 0.3.7", + "windows-sys 0.45.0", ] [[package]] @@ -6531,7 +6706,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "log", "sp-core", @@ -6542,7 +6717,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "futures", "futures-timer", @@ -6565,7 +6740,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6580,7 +6755,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -6599,18 +6774,18 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "array-bytes", "chrono", @@ -6650,7 +6825,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "fnv", "futures", @@ -6676,7 +6851,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "hash-db 0.16.0", "kvdb", @@ -6702,7 +6877,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-trait", "futures", @@ -6727,7 +6902,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-trait", "futures", @@ -6756,13 +6931,12 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-trait", "fork-tree", "futures", "log", - "merlin", "num-bigint", "num-rational", "num-traits", @@ -6775,7 +6949,6 @@ dependencies = [ "sc-keystore", "sc-telemetry", "scale-info", - "schnorrkel", "sp-api", "sp-application-crypto", "sp-block-builder", @@ -6783,7 +6956,6 @@ dependencies = [ "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", - "sp-consensus-vrf", "sp-core", "sp-inherents", "sp-keystore", @@ -6795,7 +6967,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6808,7 +6980,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "ahash 0.8.3", "array-bytes", @@ -6848,7 +7020,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "assert_matches", "async-trait", @@ -6882,7 +7054,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-trait", "futures", @@ -6905,7 +7077,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "lru", "parity-scale-codec", @@ -6929,7 +7101,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -6942,7 +7114,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "log", "sc-allocator", @@ -6955,14 +7127,14 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "anyhow", "cfg-if", "libc", "log", "once_cell", - "rustix 0.36.7", + "rustix 0.36.13", "sc-allocator", "sc-executor-common", "sp-runtime-interface", @@ -6973,7 +7145,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "ansi_term", "futures", @@ -6989,7 +7161,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "array-bytes", "async-trait", @@ -7004,7 +7176,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "array-bytes", "async-channel", @@ -7034,6 +7206,7 @@ dependencies = [ "serde", "serde_json", "smallvec", + "snow", "sp-arithmetic", "sp-blockchain", "sp-consensus", @@ -7048,7 +7221,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "cid", "futures", @@ -7068,7 +7241,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "array-bytes", "async-trait", @@ -7096,7 +7269,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "ahash 0.8.3", "futures", @@ -7115,7 +7288,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "array-bytes", "futures", @@ -7137,7 +7310,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "array-bytes", "async-trait", @@ -7171,7 +7344,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "array-bytes", "futures", @@ -7191,7 +7364,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "array-bytes", "bytes", @@ -7222,7 +7395,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "futures", "libp2p", @@ -7235,7 +7408,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7244,7 +7417,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "futures", "jsonrpsee", @@ -7274,7 +7447,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -7293,7 +7466,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "http", "jsonrpsee", @@ -7308,7 +7481,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "array-bytes", "futures", @@ -7334,7 +7507,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-trait", "directories", @@ -7400,7 +7573,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "log", "parity-scale-codec", @@ -7411,7 +7584,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "clap", "fs4", @@ -7427,7 +7600,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "futures", "libc", @@ -7446,7 +7619,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "chrono", "futures", @@ -7465,7 +7638,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "ansi_term", "atty", @@ -7496,18 +7669,18 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-trait", "futures", @@ -7534,7 +7707,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-trait", "futures", @@ -7548,7 +7721,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-channel", "futures", @@ -7562,9 +7735,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.3.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608" +checksum = "dfdef77228a4c05dc94211441595746732131ad7f6530c6c18f045da7b7ab937" dependencies = [ "bitvec", "cfg-if", @@ -7576,14 +7749,14 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.3.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c" +checksum = "53012eae69e5aa5c14671942a5dd47de59d4cdcff8532a6dd0e081faf1119482" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -7592,7 +7765,7 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -7674,10 +7847,24 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ - "base16ct", - "der", + "base16ct 0.1.1", + "der 0.6.1", "generic-array 0.14.6", - "pkcs8", + "pkcs8 0.9.0", + "subtle", + "zeroize", +] + +[[package]] +name = "sec1" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" +dependencies = [ + "base16ct 0.2.0", + "der 0.7.5", + "generic-array 0.14.6", + "pkcs8 0.10.2", "subtle", "zeroize", ] @@ -7773,7 +7960,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -7787,6 +7974,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "sha-1" version = "0.9.8" @@ -7880,6 +8076,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "signature" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest 0.10.6", + "rand_core 0.6.4", +] + [[package]] name = "simba" version = "0.8.0" @@ -7928,14 +8134,14 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" +checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733" dependencies = [ "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-pre.1", + "curve25519-dalek 4.0.0-rc.1", "rand_core 0.6.4", "ring", "rustc_version", @@ -7945,9 +8151,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -7973,13 +8179,15 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "hash-db 0.16.0", "log", "parity-scale-codec", + "scale-info", "sp-api-proc-macro", "sp-core", + "sp-metadata-ir", "sp-runtime", "sp-state-machine", "sp-std", @@ -7991,7 +8199,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "Inflector", "blake2", @@ -7999,13 +8207,13 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "parity-scale-codec", "scale-info", @@ -8018,7 +8226,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "integer-sqrt", "num-traits", @@ -8032,7 +8240,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "parity-scale-codec", "sp-api", @@ -8044,7 +8252,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "futures", "log", @@ -8062,7 +8270,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-trait", "futures", @@ -8077,7 +8285,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-trait", "parity-scale-codec", @@ -8095,10 +8303,9 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-trait", - "merlin", "parity-scale-codec", "scale-info", "serde", @@ -8106,7 +8313,6 @@ dependencies = [ "sp-application-crypto", "sp-consensus", "sp-consensus-slots", - "sp-consensus-vrf", "sp-core", "sp-inherents", "sp-keystore", @@ -8118,7 +8324,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "lazy_static", "parity-scale-codec", @@ -8137,7 +8343,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "finality-grandpa", "log", @@ -8155,7 +8361,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "parity-scale-codec", "scale-info", @@ -8164,29 +8370,16 @@ dependencies = [ "sp-timestamp", ] -[[package]] -name = "sp-consensus-vrf" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" -dependencies = [ - "parity-scale-codec", - "scale-info", - "schnorrkel", - "sp-core", - "sp-runtime", - "sp-std", -] - [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "array-bytes", - "base58", "bitflags", "blake2", "bounded-collections", + "bs58", "dyn-clonable", "ed25519-zebra", "futures", @@ -8199,6 +8392,7 @@ dependencies = [ "merlin", "parity-scale-codec", "parking_lot 0.12.1", + "paste", "primitive-types", "rand 0.8.5", "regex", @@ -8223,7 +8417,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "blake2b_simd", "byteorder", @@ -8237,18 +8431,18 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "proc-macro2", "quote", "sp-core-hashing", - "syn", + "syn 2.0.15", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -8257,17 +8451,17 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "environmental", "parity-scale-codec", @@ -8278,7 +8472,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -8293,7 +8487,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "bytes", "ed25519", @@ -8302,6 +8496,7 @@ dependencies = [ "libsecp256k1", "log", "parity-scale-codec", + "rustversion", "secp256k1", "sp-core", "sp-externalities", @@ -8318,7 +8513,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "lazy_static", "sp-core", @@ -8329,14 +8524,11 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ - "async-trait", "futures", - "merlin", "parity-scale-codec", "parking_lot 0.12.1", - "schnorrkel", "serde", "sp-core", "sp-externalities", @@ -8346,16 +8538,27 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "thiserror", - "zstd", + "zstd 0.12.3+zstd.1.5.2", +] + +[[package]] +name = "sp-metadata-ir" +version = "0.1.0" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" +dependencies = [ + "frame-metadata", + "parity-scale-codec", + "scale-info", + "sp-std", ] [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -8373,7 +8576,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "sp-api", "sp-core", @@ -8383,7 +8586,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "backtrace", "lazy_static", @@ -8393,7 +8596,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "rustc-hash", "serde", @@ -8403,7 +8606,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "either", "hash256-std-hasher", @@ -8425,7 +8628,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -8443,19 +8646,19 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "parity-scale-codec", "scale-info", @@ -8469,10 +8672,11 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "parity-scale-codec", "scale-info", + "serde", "sp-core", "sp-runtime", "sp-std", @@ -8481,7 +8685,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "hash-db 0.16.0", "log", @@ -8501,12 +8705,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8519,7 +8723,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-trait", "futures-timer", @@ -8534,7 +8738,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "parity-scale-codec", "sp-std", @@ -8546,7 +8750,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "sp-api", "sp-runtime", @@ -8555,7 +8759,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "async-trait", "log", @@ -8571,11 +8775,11 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "ahash 0.8.3", "hash-db 0.16.0", - "hashbrown 0.12.3", + "hashbrown 0.13.2", "lazy_static", "memory-db", "nohash-hasher", @@ -8594,7 +8798,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8611,18 +8815,18 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -8636,7 +8840,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "parity-scale-codec", "scale-info", @@ -8661,7 +8865,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", - "der", + "der 0.6.1", +] + +[[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der 0.7.5", ] [[package]] @@ -8716,7 +8930,7 @@ dependencies = [ "memchr", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -8744,7 +8958,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.107", ] [[package]] @@ -8795,15 +9009,15 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ - "platforms", + "platforms 2.0.0", ] [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -8822,7 +9036,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "hyper", "log", @@ -8834,7 +9048,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "array-bytes", "async-trait", @@ -8860,7 +9074,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "cfg-if", "frame-support", @@ -8903,7 +9117,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "futures", "parity-scale-codec", @@ -8923,7 +9137,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#ba87188cce8c0a11c9542d7363cd5ddd46db2740" +source = "git+https://github.com/paritytech/substrate?branch=master#16b2e644487f7f767eeefd4debf11a7948bfa4db" dependencies = [ "ansi_term", "build-helper", @@ -8932,7 +9146,7 @@ dependencies = [ "sp-maybe-compressed-blob", "strum", "tempfile", - "toml", + "toml 0.7.3", "walkdir", "wasm-opt", ] @@ -8963,6 +9177,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "synstructure" version = "0.12.6" @@ -8971,7 +9196,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "unicode-xid", ] @@ -9054,7 +9279,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -9083,12 +9308,11 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.5.2+5.3.0-patched" +version = "0.5.3+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3" +checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" dependencies = [ "cc", - "fs_extra", "libc", ] @@ -9185,14 +9409,13 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.24.2" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot 0.12.1", @@ -9200,18 +9423,18 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -9261,6 +9484,40 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.13" @@ -9323,7 +9580,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -9507,7 +9764,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.6", - "rand 0.7.3", + "rand 0.8.5", "static_assertions", ] @@ -9715,7 +9972,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-shared", ] @@ -9749,7 +10006,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -9852,7 +10109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" dependencies = [ "downcast-rs", - "libm", + "libm 0.2.6", "memory_units", "num-rational", "num-traits", @@ -9871,9 +10128,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e89f9819523447330ffd70367ef4a18d8c832e24e8150fe054d1d912841632" +checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6" dependencies = [ "anyhow", "bincode", @@ -9894,23 +10151,23 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-asm-macros" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd3a5e46c198032da934469f3a6e48649d1f9142438e4fd4617b68a35644b8a" +checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b389ae9b678b9c3851091a4804f4182d688d27aff7abc9aa37fa7be37d8ecffa" +checksum = "5ceb3adf61d654be0be67fffdce42447b0880481348785be5fe40b5dd7663a4c" dependencies = [ "anyhow", "base64 0.13.1", @@ -9918,19 +10175,19 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix 0.36.7", + "rustix 0.36.13", "serde", "sha2 0.10.6", - "toml", - "windows-sys", - "zstd", + "toml 0.5.11", + "windows-sys 0.42.0", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] name = "wasmtime-cranelift" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b2c92a08c0db6efffd88fdc97d7aa9c7c63b03edb0971dbca745469f820e8c" +checksum = "3c366bb8647e01fd08cb5589976284b00abfded5529b33d7e7f3f086c68304a4" dependencies = [ "anyhow", "cranelift-codegen", @@ -9949,9 +10206,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a6db9fc52985ba06ca601f2ff0ff1f526c5d724c7ac267b47326304b0c97883" +checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7" dependencies = [ "anyhow", "cranelift-entity", @@ -9968,9 +10225,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b77e3a52cd84d0f7f18554afa8060cfe564ccac61e3b0802d3fd4084772fa5f6" +checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa" dependencies = [ "addr2line 0.17.0", "anyhow", @@ -9987,36 +10244,36 @@ dependencies = [ "wasmtime-jit-debug", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-jit-debug" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0245e8a9347017c7185a72e215218a802ff561545c242953c11ba00fccc930f" +checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2" dependencies = [ "object 0.29.0", "once_cell", - "rustix 0.36.7", + "rustix 0.36.13", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d412e9340ab1c83867051d8d1d7c90aa8c9afc91da086088068e2734e25064" +checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c" dependencies = [ "cfg-if", "libc", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-runtime" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d594e791b5fdd4dbaf8cf7ae62f2e4ff85018ce90f483ca6f42947688e48827d" +checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b" dependencies = [ "anyhow", "cc", @@ -10029,18 +10286,18 @@ dependencies = [ "memoffset 0.6.5", "paste", "rand 0.8.5", - "rustix 0.36.7", + "rustix 0.36.13", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-types" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6688d6f96d4dbc1f89fab626c56c1778936d122b5f4ae7a57c2eb42b8d982e2" +checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568" dependencies = [ "cranelift-entity", "serde", @@ -10158,7 +10415,7 @@ dependencies = [ "ccm", "curve25519-dalek 3.2.0", "der-parser 8.1.0", - "elliptic-curve", + "elliptic-curve 0.12.3", "hkdf", "hmac 0.10.1", "log", @@ -10170,11 +10427,11 @@ dependencies = [ "rcgen 0.9.3", "ring", "rustls 0.19.1", - "sec1", + "sec1 0.3.0", "serde", "sha-1", "sha2 0.9.9", - "signature", + "signature 1.6.4", "subtle", "thiserror", "tokio", @@ -10299,15 +10556,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - [[package]] name = "which" version = "4.4.0" @@ -10385,21 +10633,75 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.42.1", "windows_aarch64_msvc 0.42.1", "windows_i686_gnu 0.42.1", "windows_i686_msvc 0.42.1", "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.42.1", "windows_x86_64_msvc 0.42.1", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.34.0" @@ -10412,6 +10714,12 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.34.0" @@ -10424,6 +10732,12 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.34.0" @@ -10436,6 +10750,12 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.34.0" @@ -10448,12 +10768,24 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.34.0" @@ -10466,6 +10798,21 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.10.1" @@ -10583,7 +10930,7 @@ checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "synstructure", ] @@ -10593,7 +10940,16 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.12.3+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +dependencies = [ + "zstd-safe 6.0.5+zstd.1.5.4", ] [[package]] @@ -10606,11 +10962,21 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "zstd-safe" +version = "6.0.5+zstd.1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" +dependencies = [ + "libc", + "zstd-sys", +] + [[package]] name = "zstd-sys" -version = "2.0.5+zstd.1.5.2" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index c5f5c8fa63..2e5c9fcec6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ ethereum-types = { version = "0.14.1", default-features = false } evm = { version = "0.37.0", default-features = false } impl-serde = { version = "0.4.0", default-features = false } jsonrpsee = "0.16.2" -kvdb-rocksdb = "0.17.0" +kvdb-rocksdb = "0.18.0" libsecp256k1 = { version = "0.7.1", default-features = false } log = { version = "0.4.17", default-features = false } parity-db = "0.4.6" @@ -55,6 +55,7 @@ scale-codec = { package = "parity-scale-codec", version = "3.2.1", default-featu scale-info = { version = "2.3.1", default-features = false, features = ["derive"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" +tokio = "1.28.1" # Substrate Client sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" } sc-block-builder = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/client/mapping-sync/Cargo.toml b/client/mapping-sync/Cargo.toml index ef5c8f85d9..977abb2982 100644 --- a/client/mapping-sync/Cargo.toml +++ b/client/mapping-sync/Cargo.toml @@ -32,7 +32,7 @@ sc-utils = { workspace = true } ethereum = { workspace = true, features = ["with-codec"] } ethereum-types = { workspace = true } tempfile = "3.3.0" -tokio = { version = "1.24", features = ["sync"] } +tokio = { workspace = true, features = ["sync"] } #Frontier fp-storage = { workspace = true, features = ["default"] } frontier-template-runtime = { workspace = true, features = ["default"] } diff --git a/client/rpc-core/src/types/block_number.rs b/client/rpc-core/src/types/block_number.rs index d566847717..29956257e0 100644 --- a/client/rpc-core/src/types/block_number.rs +++ b/client/rpc-core/src/types/block_number.rs @@ -25,7 +25,7 @@ use serde::{ }; /// Represents rpc api block number param. -#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)] +#[derive(Copy, Clone, Debug, Eq, PartialEq, Default, Hash)] pub enum BlockNumber { /// Hash Hash { @@ -37,6 +37,7 @@ pub enum BlockNumber { /// Number Num(u64), /// Latest block + #[default] Latest, /// Earliest block (genesis) Earliest, @@ -50,12 +51,6 @@ pub enum BlockNumber { Finalized, } -impl Default for BlockNumber { - fn default() -> Self { - BlockNumber::Latest - } -} - impl<'a> Deserialize<'a> for BlockNumber { fn deserialize(deserializer: D) -> Result where diff --git a/client/rpc-core/src/types/pubsub.rs b/client/rpc-core/src/types/pubsub.rs index ba2940b6bd..b19590cc89 100644 --- a/client/rpc-core/src/types/pubsub.rs +++ b/client/rpc-core/src/types/pubsub.rs @@ -84,20 +84,15 @@ pub enum Kind { } /// Subscription kind. -#[derive(Clone, Debug, Eq, PartialEq, Hash)] +#[derive(Clone, Debug, Eq, PartialEq, Default, Hash)] pub enum Params { /// No parameters passed. + #[default] None, /// Log parameters. Logs(Filter), } -impl Default for Params { - fn default() -> Self { - Params::None - } -} - impl<'a> Deserialize<'a> for Params { fn deserialize(deserializer: D) -> ::std::result::Result where diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index 820bdbb4ed..0ae2dd6575 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -24,7 +24,7 @@ prometheus = { version = "0.13.1", default-features = false } rand = "0.8" rlp = { workspace = true } scale-codec = { package = "parity-scale-codec", workspace = true } -tokio = { version = "1.24", features = ["sync"] } +tokio = { workspace = true, features = ["sync"] } # Substrate prometheus-endpoint = { workspace = true } diff --git a/client/rpc/src/eth/cache/mod.rs b/client/rpc/src/eth/cache/mod.rs index 42e163d6fb..a3aba1822d 100644 --- a/client/rpc/src/eth/cache/mod.rs +++ b/client/rpc/src/eth/cache/mod.rs @@ -325,7 +325,6 @@ where let reward_percentiles: Vec = { let mut percentile: f64 = 0.0; (0..201) - .into_iter() .map(|_| { let val = percentile; percentile += 0.5; @@ -364,13 +363,13 @@ where ethereum::ReceiptV3::Legacy(d) | ethereum::ReceiptV3::EIP2930(d) | ethereum::ReceiptV3::EIP1559(d) => used_gas(d.used_gas, &mut previous_cumulative_gas), }, effective_reward: match block.transactions.get(i) { - Some(ðereum::TransactionV2::Legacy(ref t)) => { + Some(ethereum::TransactionV2::Legacy(t)) => { t.gas_price.saturating_sub(base_fee).as_u64() } - Some(ðereum::TransactionV2::EIP2930(ref t)) => { + Some(ethereum::TransactionV2::EIP2930(t)) => { t.gas_price.saturating_sub(base_fee).as_u64() } - Some(ðereum::TransactionV2::EIP1559(ref t)) => t + Some(ethereum::TransactionV2::EIP1559(t)) => t .max_priority_fee_per_gas .min(t.max_fee_per_gas.saturating_sub(base_fee)) .as_u64(), diff --git a/frame/ethereum/src/mock.rs b/frame/ethereum/src/mock.rs index 90eb823d65..fdb492495d 100644 --- a/frame/ethereum/src/mock.rs +++ b/frame/ethereum/src/mock.rs @@ -95,15 +95,19 @@ parameter_types! { } impl pallet_balances::Config for Test { + type RuntimeEvent = RuntimeEvent; + type WeightInfo = (); type Balance = u64; type DustRemoval = (); - type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; - type WeightInfo = (); + type ReserveIdentifier = (); + type HoldIdentifier = (); + type FreezeIdentifier = (); type MaxLocks = MaxLocks; type MaxReserves = (); - type ReserveIdentifier = (); + type MaxHolds = (); + type MaxFreezes = (); } parameter_types! { diff --git a/frame/evm/precompile/curve25519/Cargo.toml b/frame/evm/precompile/curve25519/Cargo.toml index 99d98a24e2..08063916bd 100644 --- a/frame/evm/precompile/curve25519/Cargo.toml +++ b/frame/evm/precompile/curve25519/Cargo.toml @@ -8,7 +8,7 @@ edition = { workspace = true } repository = { workspace = true } [dependencies] -curve25519-dalek = { version = "4.0.0-pre.1", default-features = false, features = ["alloc", "u64_backend"] } +curve25519-dalek = { version = "4.0.0-rc.1", default-features = false, features = ["alloc"] } # Frontier fp-evm = { workspace = true } diff --git a/frame/evm/precompile/curve25519/src/lib.rs b/frame/evm/precompile/curve25519/src/lib.rs index 29d62149d9..5b6561fb1f 100644 --- a/frame/evm/precompile/curve25519/src/lib.rs +++ b/frame/evm/precompile/curve25519/src/lib.rs @@ -19,6 +19,7 @@ #![deny(unused_crate_dependencies)] extern crate alloc; + use alloc::vec::Vec; use curve25519_dalek::{ ristretto::{CompressedRistretto, RistrettoPoint}, @@ -54,7 +55,8 @@ impl LinearCostPrecompile for Curve25519Add { while !temp_buf.is_empty() { let mut buf = [0; 32]; buf.copy_from_slice(&temp_buf[0..32]); - let point = CompressedRistretto::from_slice(&buf); + let point = CompressedRistretto::from_slice(&buf) + .expect("buf is 32 byte vector so should never fail."); points.push(point); temp_buf = &temp_buf[32..]; } @@ -94,7 +96,8 @@ impl LinearCostPrecompile for Curve25519ScalarMul { // second 32 bytes is for the compressed ristretto point bytes let mut pt_buf = [0; 32]; pt_buf.copy_from_slice(&input[32..64]); - let point: RistrettoPoint = CompressedRistretto::from_slice(&pt_buf) + let point = CompressedRistretto::from_slice(&pt_buf) + .expect("pt_buf is 32 byte vector so should never fail.") .decompress() .unwrap_or_else(RistrettoPoint::identity); diff --git a/frame/evm/precompile/dispatch/src/mock.rs b/frame/evm/precompile/dispatch/src/mock.rs index 7f0acfe231..990b63b5c4 100644 --- a/frame/evm/precompile/dispatch/src/mock.rs +++ b/frame/evm/precompile/dispatch/src/mock.rs @@ -96,15 +96,19 @@ parameter_types! { pub const ExistentialDeposit: u64 = 0; } impl pallet_balances::Config for Test { + type RuntimeEvent = RuntimeEvent; + type WeightInfo = (); type Balance = u64; type DustRemoval = (); - type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; - type WeightInfo = (); + type ReserveIdentifier = (); + type HoldIdentifier = (); + type FreezeIdentifier = (); type MaxLocks = (); type MaxReserves = (); - type ReserveIdentifier = (); + type MaxHolds = (); + type MaxFreezes = (); } parameter_types! { diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs index a7b0a65680..d646dbc19b 100644 --- a/frame/evm/src/lib.rs +++ b/frame/evm/src/lib.rs @@ -52,7 +52,6 @@ // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] -#![cfg_attr(test, feature(assert_matches))] #![cfg_attr(feature = "runtime-benchmarks", deny(unused_crate_dependencies))] #![allow(clippy::too_many_arguments)] @@ -69,8 +68,13 @@ pub mod weights; use frame_support::{ dispatch::{DispatchResultWithPostInfo, Pays, PostDispatchInfo}, traits::{ - tokens::fungible::Inspect, Currency, ExistenceRequirement, FindAuthor, Get, Imbalance, - OnUnbalanced, SignedImbalance, Time, WithdrawReasons, + tokens::{ + currency::Currency, + fungible::Inspect, + imbalance::{Imbalance, OnUnbalanced, SignedImbalance}, + ExistenceRequirement, Fortitude, Preservation, WithdrawReasons, + }, + FindAuthor, Get, Time, }, weights::Weight, }; @@ -744,7 +748,8 @@ impl Pallet { let nonce = frame_system::Pallet::::account_nonce(&account_id); // keepalive `true` takes into account ExistentialDeposit as part of what's considered liquid balance. - let balance = T::Currency::reducible_balance(&account_id, true); + let balance = + T::Currency::reducible_balance(&account_id, Preservation::Preserve, Fortitude::Polite); ( Account { diff --git a/frame/evm/src/mock.rs b/frame/evm/src/mock.rs index 083d3fa33d..65fe2968b4 100644 --- a/frame/evm/src/mock.rs +++ b/frame/evm/src/mock.rs @@ -88,15 +88,19 @@ parameter_types! { pub const ExistentialDeposit: u64 = 0; } impl pallet_balances::Config for Test { + type RuntimeEvent = RuntimeEvent; + type WeightInfo = (); type Balance = u64; type DustRemoval = (); - type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; - type WeightInfo = (); + type ReserveIdentifier = (); + type HoldIdentifier = (); + type FreezeIdentifier = (); type MaxLocks = (); type MaxReserves = (); - type ReserveIdentifier = (); + type MaxHolds = (); + type MaxFreezes = (); } parameter_types! { diff --git a/frame/evm/src/runner/stack.rs b/frame/evm/src/runner/stack.rs index 68d5c0d8c3..ae9500a4b4 100644 --- a/frame/evm/src/runner/stack.rs +++ b/frame/evm/src/runner/stack.rs @@ -17,18 +17,16 @@ //! EVM stack-based runner. -use crate::{ - runner::Runner as RunnerT, AccountCodes, AccountStorages, AddressMapping, BalanceOf, - BlockHashMapping, Config, Error, Event, FeeCalculator, OnChargeEVMTransaction, OnCreate, - Pallet, RunnerError, -}; use evm::{ backend::Backend as BackendT, executor::stack::{Accessed, StackExecutor, StackState as StackStateT, StackSubstateMetadata}, ExitError, ExitReason, Transfer, }; -use fp_evm::{CallInfo, CreateInfo, ExecutionInfo, Log, PrecompileSet, Vicinity}; -use frame_support::traits::{Currency, ExistenceRequirement, Get, Time}; +// Substrate +use frame_support::traits::{ + tokens::{currency::Currency, ExistenceRequirement}, + Get, Time, +}; use sp_core::{H160, H256, U256}; use sp_runtime::traits::UniqueSaturatedInto; use sp_std::{ @@ -38,6 +36,14 @@ use sp_std::{ mem, vec::Vec, }; +// Frontier +use fp_evm::{CallInfo, CreateInfo, ExecutionInfo, Log, PrecompileSet, Vicinity}; + +use crate::{ + runner::Runner as RunnerT, AccountCodes, AccountStorages, AddressMapping, BalanceOf, + BlockHashMapping, Config, Error, Event, FeeCalculator, OnChargeEVMTransaction, OnCreate, + Pallet, RunnerError, +}; #[cfg(feature = "forbid-evm-reentrancy")] environmental::thread_local_impl!(static IN_EVM: environmental::RefCell = environmental::RefCell::new(false)); @@ -833,9 +839,25 @@ where #[cfg(test)] mod tests { use super::*; - use crate::mock::Test; + use crate::mock::{MockPrecompileSet, Test}; use evm::ExitSucceed; - use std::assert_matches::assert_matches; + + macro_rules! assert_matches { + ( $left:expr, $(|)? $( $pattern:pat_param )|+ $( if $guard: expr )? $(,)? ) => { + match $left { + $( $pattern )|+ $( if $guard )? => {} + ref left_val => panic!("assertion failed: `{:?}` does not match `{}`", + left_val, stringify!($($pattern)|+ $(if $guard)?)) + } + }; + ( $left:expr, $(|)? $( $pattern:pat_param )|+ $( if $guard: expr )?, $($arg:tt)+ ) => { + match $left { + $( $pattern )|+ $( if $guard )? => {} + ref left_val => panic!("assertion failed: `{:?}` does not match `{}`", + left_val, stringify!($($pattern)|+ $(if $guard)?)) + } + }; + } #[test] fn test_evm_reentrancy() { @@ -849,7 +871,7 @@ mod tests { None, None, &config, - &(), + &MockPrecompileSet, false, |_| { let res = Runner::::execute( @@ -859,7 +881,7 @@ mod tests { None, None, &config, - &(), + &MockPrecompileSet, false, |_| (ExitReason::Succeed(ExitSucceed::Stopped), ()), ); @@ -889,7 +911,7 @@ mod tests { None, None, &config, - &(), + &MockPrecompileSet, false, |_| (ExitReason::Succeed(ExitSucceed::Stopped), ()), ); diff --git a/primitives/evm/Cargo.toml b/primitives/evm/Cargo.toml index 02e1e43e0e..20225b9750 100644 --- a/primitives/evm/Cargo.toml +++ b/primitives/evm/Cargo.toml @@ -13,6 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] evm = { workspace = true, features = ["with-codec"] } scale-codec = { package = "parity-scale-codec", workspace = true } +scale-info = { workspace = true } serde = { workspace = true, optional = true } # Substrate frame-support = { workspace = true } diff --git a/primitives/evm/src/lib.rs b/primitives/evm/src/lib.rs index b7e8e38741..caf2463ede 100644 --- a/primitives/evm/src/lib.rs +++ b/primitives/evm/src/lib.rs @@ -23,6 +23,7 @@ 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")] use serde::{Deserialize, Serialize}; use sp_core::{H160, U256}; @@ -56,7 +57,7 @@ pub struct Vicinity { pub origin: H160, } -#[derive(Clone, Eq, PartialEq, Encode, Decode)] +#[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo)] #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] pub struct ExecutionInfo { pub exit_reason: ExitReason, diff --git a/template/node/src/cli.rs b/template/node/src/cli.rs index e800e2e42e..fcae8cfd87 100644 --- a/template/node/src/cli.rs +++ b/template/node/src/cli.rs @@ -1,20 +1,15 @@ use crate::service::EthConfiguration; /// Available Sealing methods. -#[derive(Debug, Copy, Clone, clap::ValueEnum)] +#[derive(Copy, Clone, Debug, Default, clap::ValueEnum)] pub enum Sealing { - // Seal using rpc method. + /// Seal using rpc method. + #[default] Manual, - // Seal when transaction is executed. + /// Seal when transaction is executed. Instant, } -impl Default for Sealing { - fn default() -> Sealing { - Sealing::Manual - } -} - #[derive(Debug, clap::Parser)] pub struct Cli { #[command(subcommand)] diff --git a/template/node/src/service.rs b/template/node/src/service.rs index b9490878f9..de24a58b8d 100644 --- a/template/node/src/service.rs +++ b/template/node/src/service.rs @@ -7,7 +7,7 @@ use futures::{channel::mpsc, prelude::*}; use prometheus_endpoint::Registry; use sc_client_api::{BlockBackend, StateBackendFor}; use sc_consensus::BasicQueue; -use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch}; +use sc_executor::NativeExecutionDispatch; use sc_network_common::sync::warp::WarpSyncParams; use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker}; @@ -94,12 +94,7 @@ where }) .transpose()?; - let executor = NativeElseWasmExecutor::::new( - config.wasm_method, - config.default_heap_pages, - config.max_runtime_instances, - config.runtime_cache_size, - ); + let executor = sc_service::new_native_or_wasm_executor(config); let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::( @@ -411,7 +406,7 @@ where client: client.clone(), backend: backend.clone(), task_manager: &mut task_manager, - keystore: keystore_container.sync_keystore(), + keystore: keystore_container.keystore(), transaction_pool: transaction_pool.clone(), rpc_builder, network: network.clone(), @@ -487,7 +482,7 @@ where create_inherent_data_providers, force_authoring, backoff_authoring_blocks: Option::<()>::None, - keystore: keystore_container.sync_keystore(), + keystore: keystore_container.keystore(), block_proposal_slot_portion: sc_consensus_aura::SlotProportion::new(2f32 / 3f32), max_block_proposal_slot_portion: None, telemetry: telemetry.as_ref().map(|x| x.handle()), @@ -505,7 +500,7 @@ where // if the node isn't actively participating in consensus then it doesn't // need a keystore, regardless of which protocol we use below. let keystore = if role.is_authority() { - Some(keystore_container.sync_keystore()) + Some(keystore_container.keystore()) } else { None }; diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs index e12e21eb61..fd61fdf536 100644 --- a/template/runtime/src/lib.rs +++ b/template/runtime/src/lib.rs @@ -263,17 +263,19 @@ parameter_types! { } impl pallet_balances::Config for Runtime { - /// The type for recording an account's balance. + type RuntimeEvent = RuntimeEvent; + type WeightInfo = pallet_balances::weights::SubstrateWeight; type Balance = Balance; type DustRemoval = (); - /// The ubiquitous event type. - type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; - type WeightInfo = pallet_balances::weights::SubstrateWeight; + type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); type MaxLocks = MaxLocks; type MaxReserves = (); - type ReserveIdentifier = [u8; 8]; + type MaxHolds = (); + type MaxFreezes = (); } parameter_types! { @@ -561,6 +563,14 @@ impl_runtime_apis! { fn metadata() -> OpaqueMetadata { OpaqueMetadata::new(Runtime::metadata().into()) } + + fn metadata_at_version(version: u32) -> Option { + Runtime::metadata_at_version(version) + } + + fn metadata_versions() -> Vec { + Runtime::metadata_versions() + } } impl sp_block_builder::BlockBuilder for Runtime { From 62086ceb8e77d8be6d8be047df26e014bd99c13e Mon Sep 17 00:00:00 2001 From: koushiro Date: Fri, 12 May 2023 21:04:52 +0800 Subject: [PATCH 2/8] 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`. --- frame/evm/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frame/evm/Cargo.toml b/frame/evm/Cargo.toml index 03b429fedc..a4dbfb4d95 100644 --- a/frame/evm/Cargo.toml +++ b/frame/evm/Cargo.toml @@ -34,7 +34,7 @@ fp-evm = { workspace = true } [dev-dependencies] # Substrate -pallet-balances = { workspace = true, features = ["default"] } +pallet-balances = { workspace = true, features = ["default", "insecure_zero_ed"] } pallet-evm-precompile-simple = { workspace = true, features = ["default"] } pallet-timestamp = { workspace = true, features = ["default"] } From c5c0ab8ffe7bcc5d7d39afb4c8f8ada4d44a2a8c Mon Sep 17 00:00:00 2001 From: koushiro Date: Fri, 12 May 2023 22:52:34 +0800 Subject: [PATCH 3/8] fix precompile tests --- frame/evm/precompile/curve25519/src/lib.rs | 6 ++---- frame/evm/precompile/dispatch/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/frame/evm/precompile/curve25519/src/lib.rs b/frame/evm/precompile/curve25519/src/lib.rs index 5b6561fb1f..7728e8be0a 100644 --- a/frame/evm/precompile/curve25519/src/lib.rs +++ b/frame/evm/precompile/curve25519/src/lib.rs @@ -55,8 +55,7 @@ impl LinearCostPrecompile for Curve25519Add { while !temp_buf.is_empty() { let mut buf = [0; 32]; buf.copy_from_slice(&temp_buf[0..32]); - let point = CompressedRistretto::from_slice(&buf) - .expect("buf is 32 byte vector so should never fail."); + let point = CompressedRistretto(buf); points.push(point); temp_buf = &temp_buf[32..]; } @@ -96,8 +95,7 @@ impl LinearCostPrecompile for Curve25519ScalarMul { // second 32 bytes is for the compressed ristretto point bytes let mut pt_buf = [0; 32]; pt_buf.copy_from_slice(&input[32..64]); - let point = CompressedRistretto::from_slice(&pt_buf) - .expect("pt_buf is 32 byte vector so should never fail.") + let point = CompressedRistretto(pt_buf) .decompress() .unwrap_or_else(RistrettoPoint::identity); diff --git a/frame/evm/precompile/dispatch/Cargo.toml b/frame/evm/precompile/dispatch/Cargo.toml index 782f3b404f..06ab329ce9 100644 --- a/frame/evm/precompile/dispatch/Cargo.toml +++ b/frame/evm/precompile/dispatch/Cargo.toml @@ -19,7 +19,7 @@ scale-codec = { package = "parity-scale-codec", workspace = true } scale-info = { workspace = true } # Substrate frame-system = { workspace = true, features = ["default"] } -pallet-balances = { workspace = true, features = ["default"] } +pallet-balances = { workspace = true, features = ["default", "insecure_zero_ed"] } pallet-timestamp = { workspace = true, features = ["default"] } pallet-utility = { workspace = true, features = ["default"] } sp-core = { workspace = true, features = ["default"] } From 5adfcbd6eaaed334bf06f88de7d6b1560730c7e6 Mon Sep 17 00:00:00 2001 From: koushiro Date: Sat, 13 May 2023 15:13:41 +0800 Subject: [PATCH 4/8] update some deps --- Cargo.lock | 86 ++++++++++------------------------ primitives/ethereum/Cargo.toml | 2 +- 2 files changed, 25 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9eb0932053..c01cd660f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -454,7 +454,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.3", + "rustix 0.37.19", "slab", "socket2", "waker-fn", @@ -1921,17 +1921,6 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - [[package]] name = "errno" version = "0.3.1" @@ -2332,14 +2321,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.19" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", "redox_syscall", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -2868,13 +2857,12 @@ dependencies = [ [[package]] name = "fs4" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea55201cc351fdb478217c0fb641b59813da9b4efe4c414a9d8f989a657d149" +checksum = "a7f5b6908aecca5812a4569056285e58c666588c9573ee59765bf1d3692699e2" dependencies = [ - "libc", - "rustix 0.35.13", - "winapi", + "rustix 0.37.19", + "windows-sys 0.48.0", ] [[package]] @@ -3573,12 +3561,6 @@ dependencies = [ "webrtc-util", ] -[[package]] -name = "io-lifetimes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" - [[package]] name = "io-lifetimes" version = "1.0.10" @@ -3621,8 +3603,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", - "io-lifetimes 1.0.10", - "rustix 0.37.3", + "io-lifetimes", + "rustix 0.37.19", "windows-sys 0.48.0", ] @@ -3819,9 +3801,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libloading" @@ -4358,12 +4340,6 @@ dependencies = [ "nalgebra", ] -[[package]] -name = "linux-raw-sys" -version = "0.0.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" - [[package]] name = "linux-raw-sys" version = "0.1.4" @@ -4918,23 +4894,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.9" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.9" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.15", ] [[package]] @@ -6574,20 +6550,6 @@ dependencies = [ "nom", ] -[[package]] -name = "rustix" -version = "0.35.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" -dependencies = [ - "bitflags", - "errno 0.2.8", - "io-lifetimes 0.7.5", - "libc", - "linux-raw-sys 0.0.46", - "windows-sys 0.42.0", -] - [[package]] name = "rustix" version = "0.36.13" @@ -6595,8 +6557,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658" dependencies = [ "bitflags", - "errno 0.3.1", - "io-lifetimes 1.0.10", + "errno", + "io-lifetimes", "libc", "linux-raw-sys 0.1.4", "windows-sys 0.45.0", @@ -6604,16 +6566,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.3" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", - "errno 0.3.1", - "io-lifetimes 1.0.10", + "errno", + "io-lifetimes", "libc", "linux-raw-sys 0.3.7", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] diff --git a/primitives/ethereum/Cargo.toml b/primitives/ethereum/Cargo.toml index b9d620c346..3b1fbfb3a2 100644 --- a/primitives/ethereum/Cargo.toml +++ b/primitives/ethereum/Cargo.toml @@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] ethereum = { workspace = true, features = ["with-codec"] } ethereum-types = { workspace = true } -num_enum = { version = "0.5.4", default-features = false } +num_enum = { version = "0.6.1", default-features = false } scale-codec = { package = "parity-scale-codec", workspace = true } # Substrate frame-support = { workspace = true } From f935557f4a057500361ce1d11e9f00f63b0d65b3 Mon Sep 17 00:00:00 2001 From: koushiro Date: Wed, 31 May 2023 10:50:05 +0800 Subject: [PATCH 5/8] update evm to 0.39.1 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 062d7af981..66ecb0fca7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1999,9 +1999,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "evm" -version = "0.39.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1099df1dac16f32a136452ad98ee0f1ff42acd3e12ce65bea4462b61d656608a" +checksum = "a49a4e11987c51220aa89dbe1a5cc877f5079fa6864c0a5b4533331db44e9365" dependencies = [ "auto_impl", "environmental", diff --git a/Cargo.toml b/Cargo.toml index 5c39828862..2f6c4cc614 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ bn = { package = "substrate-bn", version = "0.6", default-features = false } environmental = { version = "1.1.4", default-features = false } ethereum = { version = "0.14.0", default-features = false } ethereum-types = { version = "0.14.1", default-features = false } -evm = { version = "0.39.0", default-features = false } +evm = { version = "0.39.1", default-features = false } hex-literal = { version = "0.3.4" } impl-serde = { version = "0.4.0", default-features = false } jsonrpsee = "0.16.2" From 41a90efaa263bff44c547dd463e754de45a984f3 Mon Sep 17 00:00:00 2001 From: koushiro Date: Wed, 14 Jun 2023 19:15:01 +0800 Subject: [PATCH 6/8] make clippy happy --- client/db/src/sql/mod.rs | 29 +++++++++++------------------ template/node/src/eth.rs | 9 ++------- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/client/db/src/sql/mod.rs b/client/db/src/sql/mod.rs index c81df93fcf..204b8a1af2 100644 --- a/client/db/src/sql/mod.rs +++ b/client/db/src/sql/mod.rs @@ -303,8 +303,8 @@ where } None => { return Err(Error::Protocol(format!( - "Missing ethereum block for hash mismatch {expect_eth_block_hash:?}" - ))) + "Missing ethereum block for hash mismatch {expect_eth_block_hash:?}" + ))) } } } @@ -341,24 +341,17 @@ where is_canon, }) } - Err(FindLogError::NotFound) => { - return Err(Error::Protocol(format!( - "[Metadata] No logs found for hash {:?}", - hash - ))) - } - Err(FindLogError::MultipleLogs) => { - return Err(Error::Protocol(format!( - "[Metadata] Multiple logs found for hash {:?}", - hash - ))) - } + Err(FindLogError::NotFound) => Err(Error::Protocol(format!( + "[Metadata] No logs found for hash {hash:?}", + ))), + Err(FindLogError::MultipleLogs) => Err(Error::Protocol(format!( + "[Metadata] Multiple logs found for hash {hash:?}", + ))), } } else { - return Err(Error::Protocol(format!( - "[Metadata] Failed retrieving header for hash {:?}", - hash - ))); + Err(Error::Protocol(format!( + "[Metadata] Failed retrieving header for hash {hash:?}" + ))) } } diff --git a/template/node/src/eth.rs b/template/node/src/eth.rs index 8f28a4b637..f402df7368 100644 --- a/template/node/src/eth.rs +++ b/template/node/src/eth.rs @@ -37,20 +37,15 @@ pub fn db_config_dir(config: &Configuration) -> PathBuf { } /// Avalailable frontier backend types. -#[derive(Debug, Copy, Clone, clap::ValueEnum)] +#[derive(Debug, Copy, Clone, Default, clap::ValueEnum)] pub enum BackendType { /// Either RocksDb or ParityDb as per inherited from the global backend settings. + #[default] KeyValue, /// Sql database with custom log indexing. Sql, } -impl Default for BackendType { - fn default() -> BackendType { - BackendType::KeyValue - } -} - /// The ethereum-compatibility configuration used to run a node. #[derive(Clone, Debug, clap::Parser)] pub struct EthConfiguration { From 049b56e31f537e756c5f7566abfeafca1d989c61 Mon Sep 17 00:00:00 2001 From: koushiro Date: Tue, 27 Jun 2023 18:21:07 +0800 Subject: [PATCH 7/8] some trivials --- Cargo.lock | 10 ++-------- client/rpc/Cargo.toml | 2 +- client/rpc/src/txpool.rs | 3 ++- frame/ethereum/Cargo.toml | 2 +- frame/evm/Cargo.toml | 4 ++-- frame/evm/precompile/modexp/Cargo.toml | 2 +- frame/evm/src/lib.rs | 13 +++++++------ frame/evm/test-vector-support/Cargo.toml | 2 +- primitives/account/Cargo.toml | 2 +- primitives/account/src/lib.rs | 16 ++-------------- primitives/dynamic-fee/Cargo.toml | 2 +- primitives/storage/src/lib.rs | 2 +- template/node/src/chain_spec.rs | 8 +++++--- 13 files changed, 27 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a1e6ac68a..2ddbe95f0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2875,7 +2875,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "frontier-template-runtime", "futures", - "hex-literal 0.4.1", + "hex-literal", "jsonrpsee", "log", "pallet-transaction-payment", @@ -3390,12 +3390,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hex-literal" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" - [[package]] name = "hex-literal" version = "0.4.1" @@ -5429,7 +5423,7 @@ dependencies = [ "frame-support", "frame-system", "hex", - "hex-literal 0.3.4", + "hex-literal", "impl-trait-for-tuples", "log", "pallet-balances", diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index 5d071f45df..e0b83bc73a 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -15,7 +15,7 @@ ethereum = { workspace = true, features = ["with-codec"] } ethereum-types = { workspace = true } evm = { workspace = true } futures = { workspace = true } -hex = "0.4.3" +hex = { workspace = true } jsonrpsee = { workspace = true, features = ["server", "macros"] } libsecp256k1 = { workspace = true } log = "0.4.17" diff --git a/client/rpc/src/txpool.rs b/client/rpc/src/txpool.rs index ab8e7c54a3..e808e8e0c6 100644 --- a/client/rpc/src/txpool.rs +++ b/client/rpc/src/txpool.rs @@ -30,13 +30,14 @@ use sp_blockchain::HeaderBackend; use sp_core::hashing::keccak_256; use sp_runtime::traits::Block as BlockT; // Frontier -use crate::{internal_err, public_key}; use fc_rpc_core::{ types::{Get, Summary, TransactionMap, TxPoolResult, TxPoolTransaction}, TxPoolApiServer, }; use fp_rpc::{EthereumRuntimeRPCApi, TxPoolResponse}; +use crate::{internal_err, public_key}; + pub struct TxPool { client: Arc, graph: Arc>, diff --git a/frame/ethereum/Cargo.toml b/frame/ethereum/Cargo.toml index 52791e18dc..634be1081d 100644 --- a/frame/ethereum/Cargo.toml +++ b/frame/ethereum/Cargo.toml @@ -31,7 +31,7 @@ fp-storage = { workspace = true } pallet-evm = { workspace = true } [dev-dependencies] -hex = "0.4.3" +hex = { workspace = true } libsecp256k1 = { workspace = true, features = ["static-context", "hmac"] } rlp = { workspace = true } # Substrate diff --git a/frame/evm/Cargo.toml b/frame/evm/Cargo.toml index a608ad2c5c..e6398eba0a 100644 --- a/frame/evm/Cargo.toml +++ b/frame/evm/Cargo.toml @@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] environmental = { workspace = true, optional = true } evm = { workspace = true, features = ["with-codec"] } -hex = { version = "0.4.3", default-features = false, features = ["alloc"] } -hex-literal = { version = "0.3.4" } +hex = { workspace = true } +hex-literal = { workspace = true } impl-trait-for-tuples = "0.2.2" log = { workspace = true } rlp = { workspace = true } diff --git a/frame/evm/precompile/modexp/Cargo.toml b/frame/evm/precompile/modexp/Cargo.toml index 3930fe63cf..6533daec55 100644 --- a/frame/evm/precompile/modexp/Cargo.toml +++ b/frame/evm/precompile/modexp/Cargo.toml @@ -13,7 +13,7 @@ num = { version = "0.4", default-features = false, features = ["alloc"] } fp-evm = { workspace = true } [dev-dependencies] -hex = "0.4.3" +hex = { workspace = true } # Frontier pallet-evm-test-vector-support = { workspace = true } diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs index fdd27da454..c3ef12460d 100644 --- a/frame/evm/src/lib.rs +++ b/frame/evm/src/lib.rs @@ -65,6 +65,12 @@ pub mod runner; mod tests; pub mod weights; +pub use evm::{ + Config as EvmConfig, Context, ExitError, ExitFatal, ExitReason, ExitRevert, ExitSucceed, +}; +use impl_trait_for_tuples::impl_for_tuples; +use scale_info::TypeInfo; +// Substrate use frame_support::{ dispatch::{DispatchResultWithPostInfo, MaxEncodedLen, Pays, PostDispatchInfo}, traits::{ @@ -79,18 +85,13 @@ use frame_support::{ weights::Weight, }; use frame_system::RawOrigin; -use impl_trait_for_tuples::impl_for_tuples; -use scale_info::TypeInfo; use sp_core::{Decode, Encode, Hasher, H160, H256, U256}; use sp_runtime::{ traits::{BadOrigin, Saturating, UniqueSaturatedInto, Zero}, AccountId32, DispatchErrorWithPostInfo, }; use sp_std::{cmp::min, vec::Vec}; - -pub use evm::{ - Config as EvmConfig, Context, ExitError, ExitFatal, ExitReason, ExitRevert, ExitSucceed, -}; +// Frontier use fp_account::AccountId20; #[cfg(feature = "std")] use fp_evm::GenesisAccount; diff --git a/frame/evm/test-vector-support/Cargo.toml b/frame/evm/test-vector-support/Cargo.toml index bfa85744c8..479dfb2017 100644 --- a/frame/evm/test-vector-support/Cargo.toml +++ b/frame/evm/test-vector-support/Cargo.toml @@ -9,7 +9,7 @@ repository = { workspace = true } [dependencies] evm = { workspace = true, features = ["with-codec"] } -hex = "0.4.3" +hex = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } # Substrate diff --git a/primitives/account/Cargo.toml b/primitives/account/Cargo.toml index 0a6f7a0f9c..13c33d5ace 100644 --- a/primitives/account/Cargo.toml +++ b/primitives/account/Cargo.toml @@ -8,7 +8,7 @@ edition = { workspace = true } repository = { workspace = true } [dependencies] -hex = { version = "0.4.3", default-features = false } +hex = { workspace = true } impl-serde = { workspace = true, optional = true } libsecp256k1 = { workspace = true } log = { workspace = true } diff --git a/primitives/account/src/lib.rs b/primitives/account/src/lib.rs index 088951a699..d6e4c981d4 100644 --- a/primitives/account/src/lib.rs +++ b/primitives/account/src/lib.rs @@ -146,20 +146,8 @@ impl EthereumSignature { } } -#[derive( - PartialEq, - Eq, - PartialOrd, - Ord, - Clone, - Copy, - Encode, - Decode, - PassByInner, - MaxEncodedLen, - RuntimeDebug, - TypeInfo -)] +#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] +#[derive(RuntimeDebug, Encode, Decode, MaxEncodedLen, TypeInfo, PassByInner)] pub struct EthereumSigner([u8; 20]); impl From<[u8; 20]> for EthereumSigner { diff --git a/primitives/dynamic-fee/Cargo.toml b/primitives/dynamic-fee/Cargo.toml index 6ecd0fefae..2f820a040d 100644 --- a/primitives/dynamic-fee/Cargo.toml +++ b/primitives/dynamic-fee/Cargo.toml @@ -11,7 +11,7 @@ repository = { workspace = true } targets = ["x86_64-unknown-linux-gnu"] [dependencies] -async-trait = { version = "0.1", optional = true } +async-trait = { workspace = true, optional = true } # Substrate sp-core = { workspace = true } sp-inherents = { workspace = true } diff --git a/primitives/storage/src/lib.rs b/primitives/storage/src/lib.rs index db845bc2e2..35c22af5a0 100644 --- a/primitives/storage/src/lib.rs +++ b/primitives/storage/src/lib.rs @@ -42,7 +42,7 @@ pub const BASE_FEE_PER_GAS: &[u8] = b"BaseFeePerGas"; pub const BASE_FEE_ELASTICITY: &[u8] = b"Elasticity"; /// The schema version for Pallet Ethereum's storage -#[derive(Clone, Copy, Debug, Encode, Decode, PartialEq, Eq, PartialOrd, Ord)] +#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Encode, Decode)] #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] pub enum EthereumStorageSchema { Undefined, diff --git a/template/node/src/chain_spec.rs b/template/node/src/chain_spec.rs index f58201bd25..3ecf4faada 100644 --- a/template/node/src/chain_spec.rs +++ b/template/node/src/chain_spec.rs @@ -13,7 +13,7 @@ use sp_runtime::traits::{IdentifyAccount, Verify}; use sp_state_machine::BasicExternalities; // Frontier use frontier_template_runtime::{ - AccountId, EnableManualSeal, GenesisConfig, SS58Prefix, Signature, WASM_BINARY, + AccountId, Balance, EnableManualSeal, GenesisConfig, SS58Prefix, Signature, WASM_BINARY, }; // The URL for the telemetry server. @@ -77,6 +77,8 @@ fn properties() -> Properties { properties } +const UNITS: Balance = 1_000_000_000_000_000_000; + pub fn development_config(enable_manual_seal: Option) -> DevChainSpec { let wasm_binary = WASM_BINARY.expect("WASM not available"); @@ -161,6 +163,7 @@ pub fn local_testnet_config() -> ChainSpec { None, // Protocol ID None, + // Fork ID None, // Properties None, @@ -195,11 +198,10 @@ fn testnet_genesis( // Monetary balances: BalancesConfig { - // Configure endowed accounts with initial balance of 1 << 60. balances: endowed_accounts .iter() .cloned() - .map(|k| (k, 1 << 60)) + .map(|k| (k, 1_000_000 * UNITS)) .collect(), }, transaction_payment: Default::default(), From 0c4ab8bad889eacb7f00ff2560c8665c5e86f360 Mon Sep 17 00:00:00 2001 From: Wei Tang Date: Tue, 27 Jun 2023 18:41:10 +0200 Subject: [PATCH 8/8] Update client/db/src/kv/upgrade.rs --- client/db/src/kv/upgrade.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/db/src/kv/upgrade.rs b/client/db/src/kv/upgrade.rs index 42418654f8..c57e47dfb7 100644 --- a/client/db/src/kv/upgrade.rs +++ b/client/db/src/kv/upgrade.rs @@ -353,7 +353,7 @@ mod tests { Ok(Arc::new(crate::kv::Backend::::new(client, setting)?)) } - #[cfg_attr(not(any(feature = "rocksdb")), ignore)] + #[cfg_attr(not(feature = "rocksdb"), ignore)] #[test] fn upgrade_1_to_2_works() { let settings: Vec = vec![