diff --git a/Cargo.lock b/Cargo.lock index 134ebd6ac0..e64b8fbc08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -317,7 +317,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -450,13 +450,12 @@ dependencies = [ ] [[package]] -name = "beefy-merkle-tree" +name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ - "sp-api", - "sp-beefy", - "sp-runtime", + "hash-db", + "log", ] [[package]] @@ -604,6 +603,18 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +[[package]] +name = "bounded-collections" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a071c348a5ef6da1d3a87166b408170b46002382b1dda83992b5c2208cefb370" +dependencies = [ + "log", + "parity-scale-codec", + "scale-info", + "serde", +] + [[package]] name = "bs58" version = "0.4.0" @@ -647,6 +658,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + [[package]] name = "byteorder" version = "1.4.3" @@ -690,15 +707,16 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.14.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +checksum = "08a1ec454bc3eead8719cb56e15dbbfecdbc14e4b3a3ae4936cc6e31f5fc0d07" dependencies = [ "camino", "cargo-platform", "semver 1.0.16", "serde", "serde_json", + "thiserror", ] [[package]] @@ -978,18 +996,18 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "cranelift-bforest" -version = "0.88.2" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52056f6d0584484b57fa6c1a65c1fcb15f3780d8b6a758426d9e3084169b2ddd" +checksum = "91b18cf92869a6ae85cde3af4bc4beb6154efa8adef03b18db2ad413d5bce3a2" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.88.2" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fed94c8770dc25d01154c3ffa64ed0b3ba9d583736f305fed7beebe5d9cf74" +checksum = "567d9f6e919bac076f39b902a072686eaf9e6d015baa34d10a61b85105b7af59" dependencies = [ "arrayvec 0.7.2", "bumpalo", @@ -999,6 +1017,7 @@ dependencies = [ "cranelift-entity", "cranelift-isle", "gimli 0.26.2", + "hashbrown 0.12.3", "log", "regalloc2", "smallvec", @@ -1007,33 +1026,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.88.2" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c451b81faf237d11c7e4f3165eeb6bac61112762c5cfe7b4c0fb7241474358f" +checksum = "1e72b2d5ec8917b2971fe83850187373d0a186db4748a7c23a5f48691b8d92bb" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.88.2" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c940133198426d26128f08be2b40b0bd117b84771fd36798969c4d712d81fc" +checksum = "3461c0e0c2ebbeb92533aacb27e219289f60dc84134ef34fbf2d77c9eddf07ef" [[package]] name = "cranelift-entity" -version = "0.88.2" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" +checksum = "af684f7f7b01427b1942c7102673322a51b9d6f261e9663dc5e5595786775531" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.88.2" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34897538b36b216cc8dd324e73263596d51b8cf610da6498322838b2546baf8a" +checksum = "7d361ed0373cf5f086b49c499aa72227b646a64f899f32e34312f97c0fadff75" dependencies = [ "cranelift-codegen", "log", @@ -1043,15 +1062,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.88.2" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b2629a569fae540f16a76b70afcc87ad7decb38dc28fa6c648ac73b51e78470" +checksum = "cef4f8f3984d772c199a48896d2fb766f96301bf71b371e03a2b99f4f3b7b931" [[package]] name = "cranelift-native" -version = "0.88.2" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20937dab4e14d3e225c5adfc9c7106bafd4ac669bdb43027b911ff794c6fb318" +checksum = "f98e4e99a353703475d5acb402b9c13482d41d8a4008b352559bd560afb90363" dependencies = [ "cranelift-codegen", "libc", @@ -1060,9 +1079,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.88.2" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80fc2288957a94fd342a015811479de1837850924166d1f1856d8406e6f3609b" +checksum = "a1e3f4f0779a1b0f286a6ef19835d8665f88326e656a6d7d84fa9a39fa38ca32" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2052,7 +2071,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -2118,7 +2137,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "parity-scale-codec", ] @@ -2221,7 +2240,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-support", "frame-support-procedural", @@ -2246,7 +2265,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "Inflector", "array-bytes", @@ -2293,7 +2312,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-support", "frame-system", @@ -2321,7 +2340,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "bitflags", "frame-metadata", @@ -2353,7 +2372,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "Inflector", "cfg-expr", @@ -2368,7 +2387,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2380,7 +2399,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "proc-macro2", "quote", @@ -2390,7 +2409,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-support", "log", @@ -2408,7 +2427,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-benchmarking", "frame-support", @@ -2423,7 +2442,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "parity-scale-codec", "sp-api", @@ -2466,6 +2485,7 @@ dependencies = [ "sc-executor", "sc-finality-grandpa", "sc-network", + "sc-network-common", "sc-rpc", "sc-rpc-api", "sc-service", @@ -2871,6 +2891,9 @@ name = "hashbrown" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", +] [[package]] name = "heck" @@ -3223,12 +3246,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.4" @@ -3236,7 +3253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" dependencies = [ "libc", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -3270,9 +3287,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ "hermit-abi 0.2.6", - "io-lifetimes 1.0.4", - "rustix 0.36.7", - "windows-sys 0.42.0", + "io-lifetimes", + "rustix", + "windows-sys", ] [[package]] @@ -3993,20 +4010,13 @@ dependencies = [ [[package]] name = "linregress" -version = "0.4.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c601a85f5ecd1aba625247bca0031585fb1c446461b142878a16f8245ddeb8" +checksum = "475015a7f8f017edb28d2e69813be23500ad4b32cfe3421c4148efc97324ee52" dependencies = [ "nalgebra", - "statrs", ] -[[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" @@ -4130,7 +4140,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" dependencies = [ - "rustix 0.36.7", + "rustix", ] [[package]] @@ -4212,7 +4222,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -4324,9 +4334,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.27.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462fffe4002f4f2e1f6a9dcf12cc1a6fc0e15989014efc02a941d3e0f5dc2120" +checksum = "f6515c882ebfddccaa73ead7320ca28036c4bc84c9bcca3cc0cbba8efe89223a" dependencies = [ "approx", "matrixmultiply", @@ -4334,17 +4344,15 @@ dependencies = [ "num-complex", "num-rational", "num-traits", - "rand 0.8.5", - "rand_distr", "simba", "typenum", ] [[package]] name = "nalgebra-macros" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218" +checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" dependencies = [ "proc-macro2", "quote", @@ -4558,7 +4566,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -4686,7 +4693,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-support", "frame-system", @@ -4702,7 +4709,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-support", "frame-system", @@ -4716,7 +4723,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-benchmarking", "frame-support", @@ -4740,7 +4747,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-benchmarking", "frame-support", @@ -4766,6 +4773,49 @@ dependencies = [ "sp-runtime", ] +[[package]] +name = "pallet-beefy" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" +dependencies = [ + "frame-support", + "frame-system", + "pallet-authorship", + "pallet-session", + "parity-scale-codec", + "scale-info", + "serde", + "sp-beefy", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", +] + +[[package]] +name = "pallet-beefy-mmr" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" +dependencies = [ + "array-bytes", + "binary-merkle-tree", + "frame-support", + "frame-system", + "log", + "pallet-beefy", + "pallet-mmr", + "pallet-session", + "parity-scale-codec", + "scale-info", + "serde", + "sp-api", + "sp-beefy", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-dynamic-fee" version = "4.0.0-dev" @@ -4945,7 +4995,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-benchmarking", "frame-support", @@ -4981,10 +5031,27 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-mmr" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-mmr-primitives", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-support", "frame-system", @@ -5005,7 +5072,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-support", "frame-system", @@ -5019,7 +5086,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-benchmarking", "frame-support", @@ -5037,7 +5104,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-support", "frame-system", @@ -5053,7 +5120,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5069,7 +5136,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5081,7 +5148,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-support", "frame-system", @@ -5114,9 +5181,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.2.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ab01d0f889e957861bc65888d5ccbe82c158d0270136ba46820d43837cdf72" +checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -5202,7 +5269,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -5384,7 +5451,7 @@ dependencies = [ "libc", "log", "wepoll-ffi", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -5750,16 +5817,6 @@ dependencies = [ "getrandom 0.2.8", ] -[[package]] -name = "rand_distr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -5873,9 +5930,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.3.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779" +checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" dependencies = [ "fxhash", "log", @@ -5909,6 +5966,18 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +[[package]] +name = "region" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" +dependencies = [ + "bitflags", + "libc", + "mach", + "winapi", +] + [[package]] name = "remove_dir_all" version = "0.5.3" @@ -6092,20 +6161,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", - "io-lifetimes 0.7.5", - "libc", - "linux-raw-sys 0.0.46", - "windows-sys 0.42.0", -] - [[package]] name = "rustix" version = "0.36.7" @@ -6114,10 +6169,10 @@ checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" dependencies = [ "bitflags", "errno", - "io-lifetimes 1.0.4", + "io-lifetimes", "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.42.0", + "linux-raw-sys", + "windows-sys", ] [[package]] @@ -6189,6 +6244,15 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +[[package]] +name = "safe_arch" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529" +dependencies = [ + "bytemuck", +] + [[package]] name = "same-file" version = "1.0.6" @@ -6201,7 +6265,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "log", "sp-core", @@ -6212,7 +6276,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "futures", "futures-timer", @@ -6235,7 +6299,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6251,7 +6315,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -6266,7 +6330,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6277,7 +6341,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "array-bytes", "chrono", @@ -6317,7 +6381,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "fnv", "futures", @@ -6343,7 +6407,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "hash-db", "kvdb", @@ -6369,7 +6433,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "futures", @@ -6394,7 +6458,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "futures", @@ -6423,7 +6487,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "fork-tree", @@ -6441,6 +6505,7 @@ dependencies = [ "sc-consensus-slots", "sc-keystore", "sc-telemetry", + "scale-info", "schnorrkel", "sp-api", "sp-application-crypto", @@ -6461,7 +6526,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6474,7 +6539,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "assert_matches", "async-trait", @@ -6508,7 +6573,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "futures", @@ -6531,7 +6596,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "lru", "parity-scale-codec", @@ -6555,7 +6620,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -6568,7 +6633,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "log", "sc-allocator", @@ -6581,13 +6646,14 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ + "anyhow", "cfg-if", "libc", "log", "once_cell", - "rustix 0.35.13", + "rustix", "sc-allocator", "sc-executor-common", "sp-runtime-interface", @@ -6598,7 +6664,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "ahash 0.8.3", "array-bytes", @@ -6638,7 +6704,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "ansi_term", "futures", @@ -6653,7 +6719,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "array-bytes", "async-trait", @@ -6668,7 +6734,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "array-bytes", "async-trait", @@ -6683,6 +6749,7 @@ dependencies = [ "libp2p", "log", "lru", + "mockall", "parity-scale-codec", "parking_lot 0.12.1", "pin-project", @@ -6710,7 +6777,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "cid", "futures", @@ -6729,7 +6796,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "bitflags", @@ -6755,7 +6822,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "ahash 0.8.3", "futures", @@ -6773,7 +6840,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "array-bytes", "futures", @@ -6794,7 +6861,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "array-bytes", "async-trait", @@ -6826,7 +6893,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "array-bytes", "futures", @@ -6845,7 +6912,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "array-bytes", "bytes", @@ -6875,7 +6942,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "futures", "libp2p", @@ -6888,7 +6955,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -6897,7 +6964,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "futures", "jsonrpsee", @@ -6927,7 +6994,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -6946,7 +7013,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "http", "jsonrpsee", @@ -6961,7 +7028,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "array-bytes", "futures", @@ -6987,7 +7054,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "directories", @@ -7053,7 +7120,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "log", "parity-scale-codec", @@ -7064,7 +7131,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "clap", "futures", @@ -7080,7 +7147,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "futures", "libc", @@ -7099,7 +7166,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "chrono", "futures", @@ -7118,7 +7185,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "ansi_term", "atty", @@ -7149,7 +7216,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7160,7 +7227,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "futures", @@ -7187,7 +7254,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "futures", @@ -7201,7 +7268,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "backtrace", "futures", @@ -7244,7 +7311,7 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -7534,14 +7601,15 @@ dependencies = [ [[package]] name = "simba" -version = "0.5.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e82063457853d00243beda9952e910b82593e4b07ae9f721b9278a99a0d3d5c" +checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4" dependencies = [ "approx", "num-complex", "num-traits", "paste", + "wide", ] [[package]] @@ -7618,7 +7686,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "hash-db", "log", @@ -7636,7 +7704,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "blake2", "proc-macro-crate", @@ -7648,7 +7716,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "parity-scale-codec", "scale-info", @@ -7661,7 +7729,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "integer-sqrt", "num-traits", @@ -7675,8 +7743,9 @@ dependencies = [ [[package]] name = "sp-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ + "lazy_static", "parity-scale-codec", "scale-info", "serde", @@ -7687,12 +7756,13 @@ dependencies = [ "sp-mmr-primitives", "sp-runtime", "sp-std", + "strum", ] [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "parity-scale-codec", "sp-api", @@ -7704,7 +7774,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "futures", "log", @@ -7722,7 +7792,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "futures", @@ -7740,7 +7810,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "parity-scale-codec", @@ -7758,7 +7828,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "merlin", @@ -7781,7 +7851,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "parity-scale-codec", "scale-info", @@ -7793,7 +7863,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "parity-scale-codec", "scale-info", @@ -7806,12 +7876,13 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "array-bytes", "base58", "bitflags", "blake2", + "bounded-collections", "dyn-clonable", "ed25519-zebra", "futures", @@ -7848,7 +7919,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "blake2", "byteorder", @@ -7862,7 +7933,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "proc-macro2", "quote", @@ -7873,7 +7944,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -7882,7 +7953,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "proc-macro2", "quote", @@ -7892,7 +7963,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "environmental", "parity-scale-codec", @@ -7903,7 +7974,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "finality-grandpa", "log", @@ -7921,11 +7992,12 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -7935,7 +8007,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "bytes", "ed25519", @@ -7960,7 +8032,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "lazy_static", "sp-core", @@ -7971,7 +8043,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "futures", @@ -7988,7 +8060,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "thiserror", "zstd", @@ -7997,7 +8069,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -8015,7 +8087,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "sp-api", "sp-core", @@ -8025,7 +8097,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "backtrace", "lazy_static", @@ -8035,7 +8107,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "rustc-hash", "serde", @@ -8045,7 +8117,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "either", "hash256-std-hasher", @@ -8067,7 +8139,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -8085,7 +8157,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "Inflector", "proc-macro-crate", @@ -8097,7 +8169,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "parity-scale-codec", "scale-info", @@ -8111,7 +8183,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "parity-scale-codec", "scale-info", @@ -8123,7 +8195,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "hash-db", "log", @@ -8143,12 +8215,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8161,7 +8233,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "futures-timer", @@ -8176,7 +8248,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "parity-scale-codec", "sp-std", @@ -8188,7 +8260,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "sp-api", "sp-runtime", @@ -8197,7 +8269,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "async-trait", "log", @@ -8213,7 +8285,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "ahash 0.8.3", "hash-db", @@ -8236,7 +8308,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8253,7 +8325,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -8264,8 +8336,9 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ + "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", @@ -8277,7 +8350,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "parity-scale-codec", "scale-info", @@ -8360,19 +8433,6 @@ dependencies = [ "syn", ] -[[package]] -name = "statrs" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bdbb8e4e78216a85785a85d3ec3183144f98d0097b9281802c019bb07a6f05" -dependencies = [ - "approx", - "lazy_static", - "nalgebra", - "num-traits", - "rand 0.8.5", -] - [[package]] name = "strsim" version = "0.10.0" @@ -8449,7 +8509,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "platforms", ] @@ -8457,7 +8517,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -8476,7 +8536,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "hyper", "log", @@ -8488,7 +8548,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "array-bytes", "async-trait", @@ -8514,9 +8574,8 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ - "beefy-merkle-tree", "cfg-if", "frame-support", "frame-system", @@ -8524,6 +8583,7 @@ dependencies = [ "log", "memory-db", "pallet-babe", + "pallet-beefy-mmr", "pallet-timestamp", "parity-scale-codec", "sc-service", @@ -8557,7 +8617,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "futures", "parity-scale-codec", @@ -8576,7 +8636,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3bc3742d5c0c5269353d7809d9f8f91104a93273" +source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375" dependencies = [ "ansi_term", "build-helper", @@ -8853,7 +8913,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -9045,12 +9105,12 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.24.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908" +checksum = "3390c0409daaa6027d6681393316f4ccd3ff82e1590a1e4725014e3ae2bf1920" dependencies = [ "hash-db", - "hashbrown 0.12.3", + "hashbrown 0.13.2", "log", "rustc-hex", "smallvec", @@ -9509,22 +9569,24 @@ dependencies = [ "memory_units", "num-rational", "num-traits", + "region", ] [[package]] name = "wasmparser" -version = "0.89.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef" +checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" dependencies = [ "indexmap", + "url", ] [[package]] name = "wasmtime" -version = "1.0.2" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731" +checksum = "9010891d0b8e367c3be94ca35d7bc25c1de3240463bb1d61bcfc8c2233c4e0d0" dependencies = [ "anyhow", "bincode", @@ -9545,23 +9607,23 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] name = "wasmtime-asm-macros" -version = "1.0.2" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597" +checksum = "65805c663eaa8257b910666f6d4b056b5c7329750da754ba5df54f3af7dbf35c" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "1.0.2" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd849399d17d2270141cfe47fa0d91ee52d5f8ea9b98cf7ddde0d53e5f79882" +checksum = "2049ddfc1b10efc3c5591d0e84b9570ca50478f8818f3bfabb1a467918f53fb4" dependencies = [ "anyhow", "base64 0.13.1", @@ -9569,19 +9631,19 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix 0.35.13", + "rustix", "serde", - "sha2 0.9.9", + "sha2 0.10.6", "toml", - "windows-sys 0.36.1", + "windows-sys", "zstd", ] [[package]] name = "wasmtime-cranelift" -version = "1.0.2" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd91339b742ff20bfed4532a27b73c86b5bcbfedd6bea2dcdf2d64471e1b5c6" +checksum = "3f9065cad6a724fa838ec8497567e0b23acc26417bb2449f8d9d2021925c72f2" dependencies = [ "anyhow", "cranelift-codegen", @@ -9600,9 +9662,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "1.0.2" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" +checksum = "4f964bb0b91fa021b8d1b488c62cc77b346c1dae6e3ebd010050b57c1f2ca657" dependencies = [ "anyhow", "cranelift-entity", @@ -9619,9 +9681,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "1.0.2" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" +checksum = "b7a1d06f5d109539e0168fc74fa65e3948ac8dac3bb8cdbd08b62b36a0ae27b8" dependencies = [ "addr2line 0.17.0", "anyhow", @@ -9632,32 +9694,42 @@ dependencies = [ "log", "object 0.29.0", "rustc-demangle", - "rustix 0.35.13", "serde", "target-lexicon", - "thiserror", "wasmtime-environ", "wasmtime-jit-debug", + "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] name = "wasmtime-jit-debug" -version = "1.0.2" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" +checksum = "f76ef2e410329aaf8555ac6571d6fe07711be0646dcdf7ff3ab750a42ed2e583" dependencies = [ "object 0.29.0", "once_cell", - "rustix 0.35.13", + "rustix", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec1fd0f0dd79e7cc0f55b102e320d7c77ab76cd272008a8fd98e25b5777e2636" +dependencies = [ + "cfg-if", + "libc", + "windows-sys", ] [[package]] name = "wasmtime-runtime" -version = "1.0.2" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd" +checksum = "271aef9b4ca2e953a866293683f2db33cda46f6933c5e431e68d8373723d4ab6" dependencies = [ "anyhow", "cc", @@ -9670,19 +9742,18 @@ dependencies = [ "memoffset 0.6.5", "paste", "rand 0.8.5", - "rustix 0.35.13", - "thiserror", + "rustix", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] name = "wasmtime-types" -version = "1.0.2" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" +checksum = "b18144b0e45479a830ac9fcebfc71a16d90dc72d8ebd5679700eb3bfe974d7df" dependencies = [ "cranelift-entity", "serde", @@ -9961,6 +10032,16 @@ dependencies = [ "once_cell", ] +[[package]] +name = "wide" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223" +dependencies = [ + "bytemuck", + "safe_arch", +] + [[package]] name = "widestring" version = "0.5.1" @@ -10011,19 +10092,6 @@ dependencies = [ "windows_x86_64_msvc 0.34.0", ] -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - [[package]] name = "windows-sys" version = "0.42.0" @@ -10051,12 +10119,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.42.1" @@ -10069,12 +10131,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.42.1" @@ -10087,12 +10143,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.42.1" @@ -10105,12 +10155,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.42.1" @@ -10129,12 +10173,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.42.1" diff --git a/client/cli/src/frontier_db_cmd/mapping_db.rs b/client/cli/src/frontier_db_cmd/mapping_db.rs index cf12ee96d2..dfbd593d5f 100644 --- a/client/cli/src/frontier_db_cmd/mapping_db.rs +++ b/client/cli/src/frontier_db_cmd/mapping_db.rs @@ -23,7 +23,7 @@ use serde::Deserialize; // Substrate use sp_api::ProvideRuntimeApi; use sp_blockchain::HeaderBackend; -use sp_runtime::{generic::BlockId, traits::Block as BlockT}; +use sp_runtime::traits::Block as BlockT; // Frontier use fp_rpc::EthereumRuntimeRPCApi; @@ -79,11 +79,10 @@ where .block_hash(ethereum_block_hash)? .is_none() { - let id = BlockId::Hash(*substrate_block_hash); let existing_transaction_hashes: Vec = if let Some(statuses) = self .client .runtime_api() - .current_transaction_statuses(&id) + .current_transaction_statuses(*substrate_block_hash) .map_err(|e| format!("{:?}", e))? { statuses @@ -138,11 +137,10 @@ where .block_hash(ethereum_block_hash)? .is_some() { - let id = BlockId::Hash(*substrate_block_hash); let existing_transaction_hashes: Vec = if let Some(statuses) = self .client .runtime_api() - .current_transaction_statuses(&id) + .current_transaction_statuses(*substrate_block_hash) .map_err(|e| format!("{:?}", e))? { statuses diff --git a/client/cli/src/frontier_db_cmd/tests.rs b/client/cli/src/frontier_db_cmd/tests.rs index f3e22c5c99..c45367ad14 100644 --- a/client/cli/src/frontier_db_cmd/tests.rs +++ b/client/cli/src/frontier_db_cmd/tests.rs @@ -30,7 +30,7 @@ use sp_blockchain::HeaderBackend; use sp_consensus::BlockOrigin; use sp_io::hashing::twox_128; use sp_runtime::{ - generic::{Block, BlockId, Header}, + generic::{Block, Header}, traits::{BlakeTwo256, Block as BlockT}, }; use substrate_test_runtime_client::{ @@ -626,11 +626,7 @@ fn commitment_update() { // Build a block A1 and fill the pallet-ethereum status. let mut builder = client - .new_block_at( - &BlockId::Hash(client.genesis_hash()), - Default::default(), - false, - ) + .new_block_at(client.genesis_hash(), Default::default(), false) .unwrap(); builder .push_storage_change(key.clone(), Some(statuses_a1.encode())) @@ -680,11 +676,7 @@ fn commitment_update() { let tmp = tempdir().expect("create a temporary directory"); let mut builder = client - .new_block_at( - &BlockId::Hash(client.genesis_hash()), - Default::default(), - false, - ) + .new_block_at(client.genesis_hash(), Default::default(), false) .unwrap(); builder .push_storage_change(key, Some(statuses_a2.encode())) diff --git a/client/db/src/upgrade.rs b/client/db/src/upgrade.rs index 523918a9de..919f440b3e 100644 --- a/client/db/src/upgrade.rs +++ b/client/db/src/upgrade.rs @@ -337,7 +337,7 @@ mod tests { use sp_blockchain::HeaderBackend; use sp_core::H256; use sp_runtime::{ - generic::{Block, BlockId, Header}, + generic::{Block, Header}, traits::{BlakeTwo256, Block as BlockT}, }; use tempfile::tempdir; @@ -406,11 +406,7 @@ mod tests { // Keep track of the canon hash to later verify the migration replaced it. // A1 let mut builder = client - .new_block_at( - &BlockId::Hash(previous_canon_block_hash), - Default::default(), - false, - ) + .new_block_at(previous_canon_block_hash, Default::default(), false) .unwrap(); builder.push_storage_change(vec![1], None).unwrap(); let block = builder.build().unwrap().block; @@ -418,11 +414,7 @@ mod tests { executor::block_on(client.import(BlockOrigin::Own, block)).unwrap(); // A2 let mut builder = client - .new_block_at( - &BlockId::Hash(previous_canon_block_hash), - Default::default(), - false, - ) + .new_block_at(previous_canon_block_hash, Default::default(), false) .unwrap(); builder.push_storage_change(vec![2], None).unwrap(); let block = builder.build().unwrap().block; diff --git a/client/mapping-sync/src/lib.rs b/client/mapping-sync/src/lib.rs index 70d5794968..774ad93cef 100644 --- a/client/mapping-sync/src/lib.rs +++ b/client/mapping-sync/src/lib.rs @@ -28,10 +28,7 @@ use std::sync::Arc; use sc_client_api::backend::{Backend, StorageProvider}; use sp_api::{ApiExt, ProvideRuntimeApi}; use sp_blockchain::{Backend as _, HeaderBackend}; -use sp_runtime::{ - generic::BlockId, - traits::{Block as BlockT, Header as HeaderT, Zero}, -}; +use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Zero}; // Frontier use fc_storage::OverrideHandle; use fp_consensus::{FindLogError, Hashes, Log, PostLog, PreLog}; @@ -44,7 +41,7 @@ pub fn sync_block( header: &Block::Header, ) -> Result<(), String> where - C: StorageProvider + HeaderBackend, + C: HeaderBackend + StorageProvider, BE: Backend, { let substrate_block_hash = header.hash(); @@ -118,23 +115,23 @@ where C: ProvideRuntimeApi, C::Api: EthereumRuntimeRPCApi, { - let id = BlockId::Hash(header.hash()); + let substrate_block_hash = header.hash(); if let Some(api_version) = client .runtime_api() - .api_version::>(&id) + .api_version::>(substrate_block_hash) .map_err(|e| format!("{:?}", e))? { let block = if api_version > 1 { client .runtime_api() - .current_block(&id) + .current_block(substrate_block_hash) .map_err(|e| format!("{:?}", e))? } else { #[allow(deprecated)] let legacy_block = client .runtime_api() - .current_block_before_version_2(&id) + .current_block_before_version_2(substrate_block_hash) .map_err(|e| format!("{:?}", e))?; legacy_block.map(|block| block.into()) }; @@ -143,13 +140,13 @@ where .header .hash(); let mapping_commitment = fc_db::MappingCommitment:: { - block_hash: header.hash(), + block_hash: substrate_block_hash, ethereum_block_hash: block_hash, ethereum_transaction_hashes: Vec::new(), }; backend.mapping().write_hashes(mapping_commitment)?; } else { - backend.mapping().write_none(header.hash())?; + backend.mapping().write_none(substrate_block_hash)?; }; Ok(()) diff --git a/client/rpc/src/eth/block.rs b/client/rpc/src/eth/block.rs index 188dd37df6..ff44c35f50 100644 --- a/client/rpc/src/eth/block.rs +++ b/client/rpc/src/eth/block.rs @@ -27,7 +27,7 @@ use sc_transaction_pool::ChainApi; use sp_api::{HeaderT, ProvideRuntimeApi}; use sp_blockchain::HeaderBackend; use sp_core::hashing::keccak_256; -use sp_runtime::{generic::BlockId, traits::Block as BlockT}; +use sp_runtime::traits::Block as BlockT; // Frontier use fc_rpc_core::types::*; use fp_rpc::EthereumRuntimeRPCApi; @@ -70,7 +70,7 @@ where let base_fee = client .runtime_api() - .gas_price(&BlockId::Hash(substrate_hash)) + .gas_price(substrate_hash) .unwrap_or_default(); match (block, statuses) { @@ -136,7 +136,10 @@ where .current_transaction_statuses(schema, substrate_hash) .await; - let base_fee = client.runtime_api().gas_price(&id).ok(); + let base_fee = client + .runtime_api() + .gas_price(substrate_hash) + .unwrap_or_default(); match (block, statuses) { (Some(block), Some(statuses)) => { diff --git a/client/rpc/src/eth/cache/mod.rs b/client/rpc/src/eth/cache/mod.rs index 1dcd755e35..42e163d6fb 100644 --- a/client/rpc/src/eth/cache/mod.rs +++ b/client/rpc/src/eth/cache/mod.rs @@ -36,10 +36,7 @@ use sc_client_api::{ use sc_service::SpawnTaskHandle; use sp_api::ProvideRuntimeApi; use sp_blockchain::HeaderBackend; -use sp_runtime::{ - generic::BlockId, - traits::{Block as BlockT, Header as HeaderT, UniqueSaturatedInto}, -}; +use sp_runtime::traits::{Block as BlockT, Header as HeaderT, UniqueSaturatedInto}; // Frontier use fc_rpc_core::types::*; use fc_storage::{OverrideHandle, StorageOverride}; @@ -339,7 +336,7 @@ where let block = handler.current_block(hash); let mut block_number: Option = None; - let base_fee = client.runtime_api().gas_price(&BlockId::Hash(hash)).unwrap_or_default(); + let base_fee = client.runtime_api().gas_price(hash).unwrap_or_default(); let receipts = handler.current_receipts(hash); let mut result = FeeHistoryCacheItem { base_fee: if base_fee > U256::from(u64::MAX) { u64::MAX } else { base_fee.low_u64() }, diff --git a/client/rpc/src/eth/client.rs b/client/rpc/src/eth/client.rs index 17f97bdf19..82ba8948fa 100644 --- a/client/rpc/src/eth/client.rs +++ b/client/rpc/src/eth/client.rs @@ -25,10 +25,7 @@ use sc_transaction_pool::ChainApi; use sp_api::ProvideRuntimeApi; use sp_blockchain::HeaderBackend; use sp_consensus::SyncOracle; -use sp_runtime::{ - generic::BlockId, - traits::{Block as BlockT, UniqueSaturatedInto}, -}; +use sp_runtime::traits::{Block as BlockT, UniqueSaturatedInto}; // Frontier use fc_rpc_core::types::*; use fp_rpc::EthereumRuntimeRPCApi; @@ -101,7 +98,7 @@ where Ok(Some( self.client .runtime_api() - .chain_id(&BlockId::Hash(hash)) + .chain_id(hash) .map_err(|err| internal_err(format!("fetch runtime chain id failed: {:?}", err)))? .into(), )) diff --git a/client/rpc/src/eth/execute.rs b/client/rpc/src/eth/execute.rs index e377d29bb6..db73fe52f8 100644 --- a/client/rpc/src/eth/execute.rs +++ b/client/rpc/src/eth/execute.rs @@ -28,7 +28,7 @@ use sc_transaction_pool::ChainApi; use sp_api::{ApiExt, ProvideRuntimeApi}; use sp_block_builder::BlockBuilder as BlockBuilderApi; use sp_blockchain::HeaderBackend; -use sp_runtime::{generic::BlockId, traits::Block as BlockT, SaturatedConversion}; +use sp_runtime::{traits::Block as BlockT, SaturatedConversion}; // Frontier use fc_rpc_core::types::*; use fp_rpc::EthereumRuntimeRPCApi; @@ -93,40 +93,41 @@ where ) }; - let (id, api) = match frontier_backend_client::native_block_id::( + let (substrate_hash, api) = match frontier_backend_client::native_block_id::( self.client.as_ref(), self.backend.as_ref(), number, )? { - Some(id) => (id, self.client.runtime_api()), + Some(id) => { + let hash = self + .client + .expect_block_hash_from_id(&id) + .map_err(|_| crate::err(JSON_RPC_ERROR_DEFAULT, "header not found", None))?; + (hash, self.client.runtime_api()) + } None => { // Not mapped in the db, assume pending. - let id = BlockId::Hash(self.client.info().best_hash); + let hash = self.client.info().best_hash; let api = pending_runtime_api(self.client.as_ref(), self.graph.as_ref())?; - (id, api) + (hash, api) } }; - if let Err(sp_blockchain::Error::UnknownBlock(_)) = - self.client.expect_block_hash_from_id(&id) + let api_version = if let Ok(Some(api_version)) = + api.api_version::>(substrate_hash) { - return Err(crate::err(JSON_RPC_ERROR_DEFAULT, "header not found", None)); - } - - let api_version = - if let Ok(Some(api_version)) = api.api_version::>(&id) { - api_version - } else { - return Err(internal_err("failed to retrieve Runtime Api version")); - }; + api_version + } else { + return Err(internal_err("failed to retrieve Runtime Api version")); + }; let block = if api_version > 1 { - api.current_block(&id) + api.current_block(substrate_hash) .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? } else { #[allow(deprecated)] let legacy_block = api - .current_block_before_version_2(&id) + .current_block_before_version_2(substrate_hash) .map_err(|err| internal_err(format!("runtime error: {:?}", err)))?; legacy_block.map(|block| block.into()) }; @@ -150,7 +151,7 @@ where } // If gas limit is not specified in the request we either use the multiplier if supported // or fallback to the block gas limit. - None => match api.gas_limit_multiplier_support(&id) { + None => match api.gas_limit_multiplier_support(substrate_hash) { Ok(_) => max_gas_limit, _ => block_gas_limit, }, @@ -163,7 +164,7 @@ where // Legacy pre-london #[allow(deprecated)] let info = api.call_before_version_2( - &id, + substrate_hash, from.unwrap_or_default(), to, data, @@ -182,7 +183,7 @@ where // Post-london #[allow(deprecated)] let info = api.call_before_version_4( - &id, + substrate_hash, from.unwrap_or_default(), to, data, @@ -203,7 +204,7 @@ where let access_list = access_list.unwrap_or_default(); let info = api .call( - &id, + substrate_hash, from.unwrap_or_default(), to, data, @@ -234,7 +235,7 @@ where // Legacy pre-london #[allow(deprecated)] let info = api.create_before_version_2( - &id, + substrate_hash, from.unwrap_or_default(), data, value.unwrap_or_default(), @@ -249,14 +250,14 @@ where error_on_execution_failure(&info.exit_reason, &[])?; let code = api - .account_code_at(&id, info.value) + .account_code_at(substrate_hash, info.value) .map_err(|err| internal_err(format!("runtime error: {:?}", err)))?; Ok(Bytes(code)) } else if api_version >= 2 && api_version < 4 { // Post-london #[allow(deprecated)] let info = api.create_before_version_4( - &id, + substrate_hash, from.unwrap_or_default(), data, value.unwrap_or_default(), @@ -272,7 +273,7 @@ where error_on_execution_failure(&info.exit_reason, &[])?; let code = api - .account_code_at(&id, info.value) + .account_code_at(substrate_hash, info.value) .map_err(|err| internal_err(format!("runtime error: {:?}", err)))?; Ok(Bytes(code)) } else if api_version == 4 { @@ -280,7 +281,7 @@ where let access_list = access_list.unwrap_or_default(); let info = api .create( - &id, + substrate_hash, from.unwrap_or_default(), data, value.unwrap_or_default(), @@ -302,7 +303,7 @@ where error_on_execution_failure(&info.exit_reason, &[])?; let code = api - .account_code_at(&id, info.value) + .account_code_at(substrate_hash, info.value) .map_err(|err| internal_err(format!("runtime error: {:?}", err)))?; Ok(Bytes(code)) } else { @@ -321,7 +322,6 @@ where // Get best hash (TODO missing support for estimating gas historically) let substrate_hash = client.info().best_hash; - let id = BlockId::Hash(substrate_hash); // Adapt request for gas estimation. let request = EGA::adapt_request(request); @@ -335,7 +335,7 @@ where if let Some(to) = request.to { let to_code = client .runtime_api() - .account_code_at(&id, to) + .account_code_at(substrate_hash, to) .map_err(|err| internal_err(format!("runtime error: {:?}", err)))?; if to_code.is_empty() { return Ok(MIN_GAS_PER_TX); @@ -382,7 +382,7 @@ where } // If gas limit is not specified in the request we either use the multiplier if supported // or fallback to the block gas limit. - None => match api.gas_limit_multiplier_support(&id) { + None => match api.gas_limit_multiplier_support(substrate_hash) { Ok(_) => max_gas_limit, _ => block_gas_limit, }, @@ -393,7 +393,7 @@ where let gas_price = gas_price.unwrap_or_default(); if gas_price > U256::zero() { let balance = api - .account_basic(&id, from) + .account_basic(substrate_hash, from) .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? .balance; let mut available = balance; @@ -461,7 +461,7 @@ where // Legacy pre-london #[allow(deprecated)] api.call_before_version_2( - &id, + substrate_hash, from.unwrap_or_default(), to, data, @@ -477,7 +477,7 @@ where // Post-london #[allow(deprecated)] api.call_before_version_4( - &id, + substrate_hash, from.unwrap_or_default(), to, data, @@ -494,7 +494,7 @@ where // Post-london + access list support let access_list = access_list.unwrap_or_default(); api.call( - &id, + substrate_hash, from.unwrap_or_default(), to, data, @@ -522,7 +522,7 @@ where // Legacy pre-london #[allow(deprecated)] api.create_before_version_2( - &id, + substrate_hash, from.unwrap_or_default(), data, value.unwrap_or_default(), @@ -537,7 +537,7 @@ where // Post-london #[allow(deprecated)] api.create_before_version_4( - &id, + substrate_hash, from.unwrap_or_default(), data, value.unwrap_or_default(), @@ -553,7 +553,7 @@ where // Post-london + access list support let access_list = access_list.unwrap_or_default(); api.create( - &id, + substrate_hash, from.unwrap_or_default(), data, value.unwrap_or_default(), @@ -585,7 +585,7 @@ where let api_version = if let Ok(Some(api_version)) = client .runtime_api() - .api_version::>(&id) + .api_version::>(substrate_hash) { api_version } else { diff --git a/client/rpc/src/eth/fee.rs b/client/rpc/src/eth/fee.rs index 94c6b1bff1..1c7570ae06 100644 --- a/client/rpc/src/eth/fee.rs +++ b/client/rpc/src/eth/fee.rs @@ -24,10 +24,7 @@ use sc_network_common::ExHashT; use sc_transaction_pool::ChainApi; use sp_api::ProvideRuntimeApi; use sp_blockchain::HeaderBackend; -use sp_runtime::{ - generic::BlockId, - traits::{Block as BlockT, UniqueSaturatedInto}, -}; +use sp_runtime::traits::{Block as BlockT, UniqueSaturatedInto}; // Frontier use fc_rpc_core::types::*; use fp_rpc::EthereumRuntimeRPCApi; @@ -43,11 +40,11 @@ where BE: Backend + 'static, { pub fn gas_price(&self) -> Result { - let block = BlockId::Hash(self.client.info().best_hash); + let block_hash = self.client.info().best_hash; self.client .runtime_api() - .gas_price(&block) + .gas_price(block_hash) .map_err(|err| internal_err(format!("fetch runtime chain id failed: {:?}", err))) } diff --git a/client/rpc/src/eth/mod.rs b/client/rpc/src/eth/mod.rs index 864d79dab2..f89f70c398 100644 --- a/client/rpc/src/eth/mod.rs +++ b/client/rpc/src/eth/mod.rs @@ -43,10 +43,7 @@ use sp_api::{Core, HeaderT, ProvideRuntimeApi}; use sp_block_builder::BlockBuilder as BlockBuilderApi; use sp_blockchain::HeaderBackend; use sp_core::hashing::keccak_256; -use sp_runtime::{ - generic::BlockId, - traits::{Block as BlockT, UniqueSaturatedInto}, -}; +use sp_runtime::traits::{Block as BlockT, UniqueSaturatedInto}; // Frontier use fc_rpc_core::{types::*, EthApiServer}; use fc_storage::OverrideHandle; @@ -518,7 +515,6 @@ where // In case of Pending, we need an overlayed state to query over. let api = client.runtime_api(); let best_hash = client.info().best_hash; - let best = BlockId::Hash(best_hash); // Get all transactions in the ready queue. let xts: Vec<::Extrinsic> = graph .validated_pool() @@ -527,18 +523,18 @@ where .collect::::Extrinsic>>(); // Manually initialize the overlay. if let Ok(Some(header)) = client.header(best_hash) { - let parent_hash = BlockId::Hash(*header.parent_hash()); - api.initialize_block(&parent_hash, &header) + let parent_hash = *header.parent_hash(); + api.initialize_block(parent_hash, &header) .map_err(|e| internal_err(format!("Runtime api access error: {:?}", e)))?; // Apply the ready queue to the best block's state. for xt in xts { - let _ = api.apply_extrinsic(&best, xt); + let _ = api.apply_extrinsic(best_hash, xt); } Ok(api) } else { Err(internal_err(format!( "Cannot get header for block {:?}", - best + best_hash ))) } } diff --git a/client/rpc/src/eth/state.rs b/client/rpc/src/eth/state.rs index ce26afb9cc..c36c3308bf 100644 --- a/client/rpc/src/eth/state.rs +++ b/client/rpc/src/eth/state.rs @@ -27,7 +27,7 @@ use sc_transaction_pool_api::{InPoolTransaction, TransactionPool}; use sp_api::ProvideRuntimeApi; use sp_block_builder::BlockBuilder as BlockBuilderApi; use sp_blockchain::HeaderBackend; -use sp_runtime::{generic::BlockId, traits::Block as BlockT}; +use sp_runtime::traits::Block as BlockT; // Frontier use fc_rpc_core::types::*; use fp_rpc::EthereumRuntimeRPCApi; @@ -52,7 +52,7 @@ where if number == BlockNumber::Pending { let api = pending_runtime_api(self.client.as_ref(), self.graph.as_ref())?; Ok(api - .account_basic(&BlockId::Hash(self.client.info().best_hash), address) + .account_basic(self.client.info().best_hash, address) .map_err(|err| internal_err(format!("fetch runtime chain id failed: {:?}", err)))? .balance) } else if let Ok(Some(id)) = frontier_backend_client::native_block_id::( @@ -60,10 +60,14 @@ where self.backend.as_ref(), Some(number), ) { + let substrate_hash = self + .client + .expect_block_hash_from_id(&id) + .map_err(|_| internal_err(format!("Expect block number from id: {}", id)))?; Ok(self .client .runtime_api() - .account_basic(&id, address) + .account_basic(substrate_hash, address) .map_err(|err| internal_err(format!("fetch runtime chain id failed: {:?}", err)))? .balance) } else { @@ -81,7 +85,7 @@ where if number == BlockNumber::Pending { let api = pending_runtime_api(self.client.as_ref(), self.graph.as_ref())?; Ok(api - .storage_at(&BlockId::Hash(self.client.info().best_hash), address, index) + .storage_at(self.client.info().best_hash, address, index) .unwrap_or_default()) } else if let Ok(Some(id)) = frontier_backend_client::native_block_id::( self.client.as_ref(), @@ -107,12 +111,12 @@ where pub fn transaction_count(&self, address: H160, number: Option) -> Result { if let Some(BlockNumber::Pending) = number { - let block = BlockId::Hash(self.client.info().best_hash); + let substrate_hash = self.client.info().best_hash; let nonce = self .client .runtime_api() - .account_basic(&block, address) + .account_basic(substrate_hash, address) .map_err(|err| { internal_err(format!("fetch runtime account basic failed: {:?}", err)) })? @@ -141,10 +145,15 @@ where None => return Ok(U256::zero()), }; + let substrate_hash = self + .client + .expect_block_hash_from_id(&id) + .map_err(|_| internal_err(format!("Expect block number from id: {}", id)))?; + Ok(self .client .runtime_api() - .account_basic(&id, address) + .account_basic(substrate_hash, address) .map_err(|err| internal_err(format!("fetch runtime account basic failed: {:?}", err)))? .nonce) } @@ -154,7 +163,7 @@ where if number == BlockNumber::Pending { let api = pending_runtime_api(self.client.as_ref(), self.graph.as_ref())?; Ok(api - .account_code_at(&BlockId::Hash(self.client.info().best_hash), address) + .account_code_at(self.client.info().best_hash, address) .unwrap_or_default() .into()) } else if let Ok(Some(id)) = frontier_backend_client::native_block_id::( diff --git a/client/rpc/src/eth/submit.rs b/client/rpc/src/eth/submit.rs index ee4a676f4d..40ead2cd95 100644 --- a/client/rpc/src/eth/submit.rs +++ b/client/rpc/src/eth/submit.rs @@ -86,10 +86,7 @@ where let gas_limit = match request.gas { Some(gas_limit) => gas_limit, None => { - let block = self - .client - .runtime_api() - .current_block(&BlockId::Hash(hash)); + let block = self.client.runtime_api().current_block(hash); if let Ok(Some(block)) = block { block.header.gas_limit } else { @@ -148,11 +145,11 @@ where }; let transaction_hash = transaction.hash(); - let block_hash = BlockId::hash(self.client.info().best_hash); + let block_hash = self.client.info().best_hash; let api_version = match self .client .runtime_api() - .api_version::>(&block_hash) + .api_version::>(block_hash) { Ok(api_version) => api_version, _ => return Err(internal_err("cannot access runtime api")), @@ -162,7 +159,7 @@ where Some(2) => match self .client .runtime_api() - .convert_transaction(&block_hash, transaction) + .convert_transaction(block_hash, transaction) { Ok(extrinsic) => extrinsic, Err(_) => return Err(internal_err("cannot access runtime api")), @@ -174,7 +171,7 @@ where match self .client .runtime_api() - .convert_transaction_before_version_2(&block_hash, legacy_transaction) + .convert_transaction_before_version_2(block_hash, legacy_transaction) { Ok(extrinsic) => extrinsic, Err(_) => return Err(internal_err("cannot access runtime api")), @@ -200,7 +197,11 @@ where }; self.pool - .submit_one(&block_hash, TransactionSource::Local, extrinsic) + .submit_one( + &BlockId::Hash(block_hash), + TransactionSource::Local, + extrinsic, + ) .map_ok(move |_| transaction_hash) .map_err(|err| internal_err(format::Geth::pool_error(err))) .await @@ -219,11 +220,11 @@ where let transaction_hash = transaction.hash(); - let block_hash = BlockId::hash(self.client.info().best_hash); + let block_hash = self.client.info().best_hash; let api_version = match self .client .runtime_api() - .api_version::>(&block_hash) + .api_version::>(block_hash) { Ok(api_version) => api_version, _ => return Err(internal_err("cannot access runtime api")), @@ -233,7 +234,7 @@ where Some(2) => match self .client .runtime_api() - .convert_transaction(&block_hash, transaction) + .convert_transaction(block_hash, transaction) { Ok(extrinsic) => extrinsic, Err(_) => return Err(internal_err("cannot access runtime api")), @@ -245,7 +246,7 @@ where match self .client .runtime_api() - .convert_transaction_before_version_2(&block_hash, legacy_transaction) + .convert_transaction_before_version_2(block_hash, legacy_transaction) { Ok(extrinsic) => extrinsic, Err(_) => { @@ -273,7 +274,11 @@ where }; self.pool - .submit_one(&block_hash, TransactionSource::Local, extrinsic) + .submit_one( + &BlockId::Hash(block_hash), + TransactionSource::Local, + extrinsic, + ) .map_ok(move |_| transaction_hash) .map_err(|err| internal_err(format::Geth::pool_error(err))) .await diff --git a/client/rpc/src/eth/transaction.rs b/client/rpc/src/eth/transaction.rs index 9405416f29..cd524fa375 100644 --- a/client/rpc/src/eth/transaction.rs +++ b/client/rpc/src/eth/transaction.rs @@ -29,7 +29,7 @@ use sc_transaction_pool_api::InPoolTransaction; use sp_api::{ApiExt, ProvideRuntimeApi}; use sp_blockchain::HeaderBackend; use sp_core::hashing::keccak_256; -use sp_runtime::{generic::BlockId, traits::Block as BlockT}; +use sp_runtime::traits::Block as BlockT; // Frontier use fc_rpc_core::types::*; use fp_rpc::EthereumRuntimeRPCApi; @@ -65,10 +65,10 @@ where Some((hash, index)) => (hash, index as usize), None => { let api = client.runtime_api(); - let best_block: BlockId = BlockId::Hash(client.info().best_hash); + let best_block = client.info().best_hash; let api_version = if let Ok(Some(api_version)) = - api.api_version::>(&best_block) + api.api_version::>(best_block) { api_version } else { @@ -97,12 +97,12 @@ where ); let ethereum_transactions: Vec = if api_version > 1 { - api.extrinsic_filter(&best_block, xts).map_err(|err| { + api.extrinsic_filter(best_block, xts).map_err(|err| { internal_err(format!("fetch runtime extrinsic filter failed: {:?}", err)) })? } else { #[allow(deprecated)] - let legacy = api.extrinsic_filter_before_version_2(&best_block, xts) + let legacy = api.extrinsic_filter_before_version_2(best_block, xts) .map_err(|err| { internal_err(format!( "fetch runtime extrinsic filter failed: {:?}", @@ -143,7 +143,7 @@ where let base_fee = client .runtime_api() - .gas_price(&BlockId::Hash(substrate_hash)) + .gas_price(substrate_hash) .unwrap_or_default(); match (block, statuses) { @@ -188,7 +188,7 @@ where let base_fee = client .runtime_api() - .gas_price(&BlockId::Hash(substrate_hash)) + .gas_price(substrate_hash) .unwrap_or_default(); match (block, statuses) { @@ -239,7 +239,10 @@ where .current_transaction_statuses(schema, substrate_hash) .await; - let base_fee = client.runtime_api().gas_price(&id).unwrap_or_default(); + let base_fee = client + .runtime_api() + .gas_price(substrate_hash) + .unwrap_or_default(); match (block, statuses) { (Some(block), Some(statuses)) => { @@ -376,7 +379,7 @@ where EthereumTransaction::EIP2930(t) => t.gas_price, EthereumTransaction::EIP1559(t) => client .runtime_api() - .gas_price(&BlockId::Hash(substrate_hash)) + .gas_price(substrate_hash) .unwrap_or_default() .checked_add(t.max_priority_fee_per_gas) .unwrap_or_else(U256::max_value) diff --git a/client/rpc/src/eth_pubsub.rs b/client/rpc/src/eth_pubsub.rs index 8e7bd9e39c..670f653358 100644 --- a/client/rpc/src/eth_pubsub.rs +++ b/client/rpc/src/eth_pubsub.rs @@ -31,7 +31,7 @@ use sc_network::{NetworkService, NetworkStatusProvider}; use sc_network_common::ExHashT; use sc_rpc::SubscriptionTaskExecutor; use sc_transaction_pool_api::TransactionPool; -use sp_api::{ApiExt, BlockId, ProvideRuntimeApi}; +use sp_api::{ApiExt, ProvideRuntimeApi}; use sp_blockchain::HeaderBackend; use sp_consensus::SyncOracle; use sp_core::hashing::keccak_256; @@ -292,12 +292,12 @@ where .import_notification_stream() .filter_map(move |txhash| { if let Some(xt) = pool.ready_transaction(&txhash) { - let best_block: BlockId = BlockId::Hash(client.info().best_hash); + let best_block = client.info().best_hash; let api = client.runtime_api(); let api_version = if let Ok(Some(api_version)) = - api.api_version::>(&best_block) + api.api_version::>(best_block) { api_version } else { @@ -307,11 +307,11 @@ where let xts = vec![xt.data().clone()]; let txs: Option> = if api_version > 1 { - api.extrinsic_filter(&best_block, xts).ok() + api.extrinsic_filter(best_block, xts).ok() } else { #[allow(deprecated)] if let Ok(legacy) = - api.extrinsic_filter_before_version_2(&best_block, xts) + api.extrinsic_filter_before_version_2(best_block, xts) { Some(legacy.into_iter().map(|tx| tx.into()).collect()) } else { diff --git a/client/rpc/src/lib.rs b/client/rpc/src/lib.rs index 58c50b75d5..35c072cfdb 100644 --- a/client/rpc/src/lib.rs +++ b/client/rpc/src/lib.rs @@ -248,7 +248,7 @@ mod tests { use sp_blockchain::HeaderBackend; use sp_consensus::BlockOrigin; use sp_runtime::{ - generic::{Block, BlockId, Header}, + generic::{Block, Header}, traits::{BlakeTwo256, Block as BlockT}, }; use substrate_test_runtime_client::{ @@ -300,7 +300,7 @@ mod tests { // A1 -> B1 let mut builder = client - .new_block_at(&BlockId::Hash(a1_hash), Default::default(), false) + .new_block_at(a1_hash, Default::default(), false) .unwrap(); builder.push_storage_change(vec![1], None).unwrap(); let b1 = builder.build().unwrap().block; @@ -329,7 +329,7 @@ mod tests { // A1 -> B2 let mut builder = client - .new_block_at(&BlockId::Hash(a1_hash), Default::default(), false) + .new_block_at(a1_hash, Default::default(), false) .unwrap(); builder.push_storage_change(vec![2], None).unwrap(); let b2 = builder.build().unwrap().block; @@ -358,7 +358,7 @@ mod tests { // B2 -> C1. B2 branch is now canon. let mut builder = client - .new_block_at(&BlockId::Hash(b2_hash), Default::default(), false) + .new_block_at(b2_hash, Default::default(), false) .unwrap(); builder.push_storage_change(vec![1], None).unwrap(); let c1 = builder.build().unwrap().block; diff --git a/client/rpc/src/net.rs b/client/rpc/src/net.rs index 4b12efc014..b931b453be 100644 --- a/client/rpc/src/net.rs +++ b/client/rpc/src/net.rs @@ -24,7 +24,7 @@ use sc_network::NetworkService; use sc_network_common::{service::NetworkPeers, ExHashT}; use sp_api::ProvideRuntimeApi; use sp_blockchain::HeaderBackend; -use sp_runtime::{generic::BlockId, traits::Block as BlockT}; +use sp_runtime::traits::Block as BlockT; // Frontier use fc_rpc_core::{types::PeerCount, NetApiServer}; use fp_rpc::EthereumRuntimeRPCApi; @@ -64,7 +64,7 @@ where Ok(self .client .runtime_api() - .chain_id(&BlockId::Hash(hash)) + .chain_id(hash) .map_err(|_| internal_err("fetch runtime chain id failed"))? .to_string()) } diff --git a/client/rpc/src/web3.rs b/client/rpc/src/web3.rs index 4f97b78315..4d702cda1d 100644 --- a/client/rpc/src/web3.rs +++ b/client/rpc/src/web3.rs @@ -24,7 +24,7 @@ use jsonrpsee::core::RpcResult as Result; use sp_api::{Core, ProvideRuntimeApi}; use sp_blockchain::HeaderBackend; use sp_core::keccak_256; -use sp_runtime::{generic::BlockId, traits::Block as BlockT}; +use sp_runtime::traits::Block as BlockT; // Frontier use fc_rpc_core::{types::Bytes, Web3ApiServer}; use fp_rpc::EthereumRuntimeRPCApi; @@ -58,7 +58,7 @@ where let version = self .client .runtime_api() - .version(&BlockId::Hash(hash)) + .version(hash) .map_err(|err| internal_err(format!("fetch runtime version failed: {:?}", err)))?; Ok(format!( "{spec_name}/v{spec_version}.{impl_version}/{pkg_name}-{pkg_version}", diff --git a/client/storage/src/overrides/mod.rs b/client/storage/src/overrides/mod.rs index 3f2966b062..b30e3662d1 100644 --- a/client/storage/src/overrides/mod.rs +++ b/client/storage/src/overrides/mod.rs @@ -21,7 +21,7 @@ use std::{collections::BTreeMap, marker::PhantomData, sync::Arc}; use ethereum::BlockV2 as EthereumBlock; use ethereum_types::{H160, H256, U256}; // Substrate -use sp_api::{ApiExt, BlockId, ProvideRuntimeApi}; +use sp_api::{ApiExt, ProvideRuntimeApi}; use sp_io::hashing::{blake2_128, twox_128}; use sp_runtime::{traits::Block as BlockT, Permill}; // Frontier @@ -103,7 +103,7 @@ where fn account_code_at(&self, block_hash: Block::Hash, address: H160) -> Option> { self.client .runtime_api() - .account_code_at(&BlockId::Hash(block_hash), address) + .account_code_at(block_hash, address) .ok() } @@ -111,7 +111,7 @@ where fn storage_at(&self, block_hash: Block::Hash, address: H160, index: U256) -> Option { self.client .runtime_api() - .storage_at(&BlockId::Hash(block_hash), address, index) + .storage_at(block_hash, address, index) .ok() } @@ -120,7 +120,7 @@ where let api = self.client.runtime_api(); let api_version = if let Ok(Some(api_version)) = - api.api_version::>(&BlockId::Hash(block_hash)) + api.api_version::>(block_hash) { api_version } else { @@ -128,12 +128,10 @@ where }; if api_version == 1 { #[allow(deprecated)] - let old_block = api - .current_block_before_version_2(&BlockId::Hash(block_hash)) - .ok()?; + let old_block = api.current_block_before_version_2(block_hash).ok()?; old_block.map(|block| block.into()) } else { - api.current_block(&BlockId::Hash(block_hash)).ok()? + api.current_block(block_hash).ok()? } } @@ -142,7 +140,7 @@ where let api = self.client.runtime_api(); let api_version = if let Ok(Some(api_version)) = - api.api_version::>(&BlockId::Hash(block_hash)) + api.api_version::>(block_hash) { api_version } else { @@ -150,9 +148,7 @@ where }; if api_version < 4 { #[allow(deprecated)] - let old_receipts = api - .current_receipts_before_version_4(&BlockId::Hash(block_hash)) - .ok()?; + let old_receipts = api.current_receipts_before_version_4(block_hash).ok()?; old_receipts.map(|receipts| { receipts .into_iter() @@ -169,7 +165,7 @@ where } else { self.client .runtime_api() - .current_receipts(&BlockId::Hash(block_hash)) + .current_receipts(block_hash) .ok()? } } @@ -181,17 +177,14 @@ where ) -> Option> { self.client .runtime_api() - .current_transaction_statuses(&BlockId::Hash(block_hash)) + .current_transaction_statuses(block_hash) .ok()? } /// Return the elasticity multiplier at the give post-eip1559 height. fn elasticity(&self, block_hash: Block::Hash) -> Option { if self.is_eip1559(block_hash) { - self.client - .runtime_api() - .elasticity(&BlockId::Hash(block_hash)) - .ok()? + self.client.runtime_api().elasticity(block_hash).ok()? } else { None } @@ -201,7 +194,7 @@ where if let Ok(Some(api_version)) = self .client .runtime_api() - .api_version::>(&BlockId::Hash(block_hash)) + .api_version::>(block_hash) { return api_version >= 2; } diff --git a/primitives/self-contained/src/unchecked_extrinsic.rs b/primitives/self-contained/src/unchecked_extrinsic.rs index 30f4d9f4d5..97032c7add 100644 --- a/primitives/self-contained/src/unchecked_extrinsic.rs +++ b/primitives/self-contained/src/unchecked_extrinsic.rs @@ -16,11 +16,11 @@ // limitations under the License. use frame_support::{ - codec::{Decode, Encode}, dispatch::{DispatchInfo, GetDispatchInfo}, - scale_info::TypeInfo, traits::ExtrinsicCall, }; +use scale_codec::{Decode, Encode}; +use scale_info::TypeInfo; use sp_runtime::{ traits::{ self, Checkable, Extrinsic, ExtrinsicMetadata, IdentifyAccount, MaybeDisplay, Member, diff --git a/template/node/Cargo.toml b/template/node/Cargo.toml index 76097bf7ca..a429a8b08a 100644 --- a/template/node/Cargo.toml +++ b/template/node/Cargo.toml @@ -32,6 +32,7 @@ sc-consensus-manual-seal = { workspace = true } sc-executor = { workspace = true } sc-finality-grandpa = { workspace = true } sc-network = { workspace = true } +sc-network-common = { workspace = true } sc-rpc = { workspace = true } sc-rpc-api = { workspace = true } sc-service = { workspace = true } diff --git a/template/node/src/service.rs b/template/node/src/service.rs index d456e1057b..b78f3713b1 100644 --- a/template/node/src/service.rs +++ b/template/node/src/service.rs @@ -8,6 +8,7 @@ use prometheus_endpoint::Registry; use sc_client_api::{BlockBackend, StateBackendFor}; use sc_consensus::BasicQueue; use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch}; +use sc_network_common::sync::warp::WarpSyncParams; use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker}; use sp_api::{ConstructRuntimeApi, TransactionFor}; @@ -293,24 +294,23 @@ where &config.chain_spec, ); - let warp_sync: Option>> = - if sealing.is_some() { - None - } else { - config - .network - .extra_sets - .push(sc_finality_grandpa::grandpa_peers_set_config( - grandpa_protocol_name.clone(), - )); - Some(Arc::new( - sc_finality_grandpa::warp_proof::NetworkProvider::new( - backend.clone(), - grandpa_link.shared_authority_set().clone(), - Vec::default(), - ), - )) - }; + let warp_sync_params = if sealing.is_some() { + None + } else { + config + .network + .extra_sets + .push(sc_finality_grandpa::grandpa_peers_set_config( + grandpa_protocol_name.clone(), + )); + let warp_sync: Arc> = + Arc::new(sc_finality_grandpa::warp_proof::NetworkProvider::new( + backend.clone(), + grandpa_link.shared_authority_set().clone(), + Vec::default(), + )); + Some(WarpSyncParams::WithProvider(warp_sync)) + }; let (network, system_rpc_tx, tx_handler_controller, network_starter) = sc_service::build_network(sc_service::BuildNetworkParams { @@ -320,7 +320,7 @@ where spawn_handle: task_manager.spawn_handle(), import_queue, block_announce_validator_builder: None, - warp_sync, + warp_sync_params, })?; if config.offchain_worker.enabled {