diff --git a/Cargo.lock b/Cargo.lock index c7c0b919c..8bc0797dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -158,9 +158,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ "getrandom 0.2.10", "once_cell", @@ -169,21 +169,22 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" dependencies = [ "cfg-if", "getrandom 0.2.10", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -411,12 +412,6 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "array-bytes" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" - [[package]] name = "array-bytes" version = "6.1.0" @@ -539,9 +534,9 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.24", + "rustix 0.37.26", "slab", - "socket2 0.4.9", + "socket2 0.4.10", "waker-fn", ] @@ -567,9 +562,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", @@ -674,9 +669,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -696,7 +691,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "hash-db 0.16.0", "log", @@ -740,9 +735,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bitvec" @@ -857,9 +852,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "bounded-collections" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b05133427c07c4776906f673ccf36c21b102c9829c641a5b56bd151d44fd6" +checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd" dependencies = [ "log", "parity-scale-codec", @@ -879,7 +874,7 @@ dependencies = [ [[package]] name = "bp-darwinia-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "bp-messages", "bp-runtime", @@ -896,7 +891,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "bp-runtime", "finality-grandpa", @@ -913,7 +908,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "bp-runtime", "frame-support", @@ -926,7 +921,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "bitvec", "bp-runtime", @@ -943,7 +938,7 @@ dependencies = [ [[package]] name = "bp-parachains" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "bp-polkadot-core", "bp-runtime", @@ -956,7 +951,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "bp-messages", "bp-runtime", @@ -975,7 +970,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "frame-support", "frame-system", @@ -996,7 +991,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "bp-header-chain", "ed25519-dalek 1.0.1", @@ -1011,7 +1006,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "bp-header-chain", "bp-message-dispatch", @@ -1061,9 +1056,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", "serde", @@ -1151,7 +1146,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.19", + "semver 1.0.20", "serde", "serde_json", "thiserror", @@ -1255,13 +1250,13 @@ dependencies = [ [[package]] name = "cid" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" +checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143" dependencies = [ "core2", "multibase", - "multihash 0.16.3", + "multihash", "serde", "unsigned-varint", ] @@ -1384,15 +1379,21 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "comfy-table" -version = "6.2.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" +checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" dependencies = [ - "strum 0.24.1", - "strum_macros 0.24.3", + "strum 0.25.0", + "strum_macros 0.25.3", "unicode-width", ] +[[package]] +name = "common-path" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" + [[package]] name = "concurrent-queue" version = "2.3.0" @@ -1421,6 +1422,26 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +[[package]] +name = "const-random" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11df32a13d7892ec42d51d3d175faba5211ffe13ed25d4fb348ac9e9ce835593" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.10", + "once_cell", + "tiny-keccak", +] + [[package]] name = "constant_time_eq" version = "0.3.0" @@ -1485,9 +1506,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" dependencies = [ "libc", ] @@ -1496,7 +1517,7 @@ dependencies = [ name = "crab-runtime" version = "6.4.0" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "bp-darwinia-core", "bp-message-dispatch", "bp-messages", @@ -1586,6 +1607,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", + "sp-staking", "sp-std", "sp-transaction-pool", "sp-version", @@ -1854,12 +1876,13 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "clap", "parity-scale-codec", "sc-chain-spec", "sc-cli", + "sc-client-api", "sc-service", "sp-core", "sp-runtime", @@ -1869,7 +1892,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1892,16 +1915,18 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-consensus-proposer", + "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-interface", "futures 0.3.28", + "lru 0.10.1", "parity-scale-codec", "polkadot-node-primitives", "polkadot-overseer", @@ -1909,6 +1934,7 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-consensus-aura", + "sc-consensus-babe", "sc-consensus-slots", "sc-telemetry", "sp-api", @@ -1930,7 +1956,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-client-pov-recovery", @@ -1943,11 +1969,14 @@ dependencies = [ "polkadot-primitives", "sc-client-api", "sc-consensus", + "sc-consensus-babe", "schnellru", "sp-blockchain", "sp-consensus", + "sp-consensus-slots", "sp-core", "sp-runtime", + "sp-timestamp", "sp-trie", "substrate-prometheus-endpoint", "tracing", @@ -1956,7 +1985,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-proposer" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "anyhow", "async-trait", @@ -1971,7 +2000,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -1994,7 +2023,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2018,7 +2047,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -2053,7 +2082,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "frame-support", "frame-system", @@ -2069,7 +2098,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2086,7 +2115,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -2115,7 +2144,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2126,7 +2155,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -2140,7 +2169,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2156,7 +2185,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -2174,10 +2203,24 @@ dependencies = [ "xcm-executor", ] +[[package]] +name = "cumulus-primitives-aura" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +dependencies = [ + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-primitives", + "sp-api", + "sp-consensus-aura", + "sp-runtime", + "sp-std", +] + [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -2194,7 +2237,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2217,7 +2260,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "futures 0.3.28", @@ -2230,7 +2273,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2248,7 +2291,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2256,7 +2299,6 @@ dependencies = [ "futures 0.3.28", "futures-timer", "polkadot-cli", - "polkadot-client", "polkadot-service", "sc-cli", "sc-client-api", @@ -2273,7 +2315,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2291,9 +2333,9 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-minimal-node" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", @@ -2329,7 +2371,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2359,7 +2401,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2406,7 +2448,7 @@ dependencies = [ "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms 3.1.2", + "platforms", "rustc_version", "subtle", "zeroize", @@ -2425,9 +2467,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe98ba1789d56fb3db3bee5e032774d4f421b685de7ba703643584ba24effbe" +checksum = "c390c123d671cc547244943ecad81bdaab756c6ea332d9ca9c1f48d952a24895" dependencies = [ "cc", "cxxbridge-flags", @@ -2437,9 +2479,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ce20f6b8433da4841b1dadfb9468709868022d829d5ca1f2ffbda928455ea3" +checksum = "00d3d3ac9ffb900304edf51ca719187c779f4001bb544f26c4511d621de905cf" dependencies = [ "cc", "codespan-reporting", @@ -2452,15 +2494,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20888d9e1d2298e2ff473cee30efe7d5036e437857ab68bbfea84c74dba91da2" +checksum = "94415827ecfea0f0c74c8cad7d1a86ddb3f05354d6a6ddeda0adee5e875d2939" [[package]] name = "cxxbridge-macro" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84" +checksum = "e33dbbe9f5621c9247f97ec14213b04f350bff4b6cebefe834c60055db266ecf" dependencies = [ "proc-macro2", "quote", @@ -2506,7 +2548,7 @@ dependencies = [ name = "darwinia" version = "6.4.0" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "async-trait", "clap", "crab-runtime", @@ -2538,7 +2580,6 @@ dependencies = [ "pallet-transaction-payment-rpc", "pangolin-runtime", "pangoro-runtime", - "parity-scale-codec", "polkadot-cli", "polkadot-primitives", "sc-basic-authorship", @@ -2564,6 +2605,7 @@ dependencies = [ "sp-blockchain", "sp-consensus-aura", "sp-core", + "sp-inherents", "sp-io", "sp-keystore", "sp-offchain", @@ -2584,7 +2626,7 @@ dependencies = [ name = "darwinia-account-migration" version = "6.4.0" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "darwinia-deposit", "darwinia-staking", "dc-primitives", @@ -2668,7 +2710,7 @@ dependencies = [ name = "darwinia-ecdsa-authority" version = "6.4.0" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "dc-primitives", "ethabi", "frame-benchmarking", @@ -2688,7 +2730,7 @@ dependencies = [ name = "darwinia-message-gadget" version = "6.4.0" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "frame-support", "frame-system", "pallet-balances", @@ -2706,7 +2748,7 @@ dependencies = [ name = "darwinia-message-transact" version = "6.4.0" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "bp-message-dispatch", "bp-runtime", "ethereum", @@ -2834,7 +2876,7 @@ dependencies = [ name = "darwinia-runtime" version = "6.4.0" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "bp-darwinia-core", "bp-message-dispatch", "bp-messages", @@ -2925,6 +2967,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", + "sp-staking", "sp-std", "sp-transaction-pool", "sp-version", @@ -3072,9 +3115,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "derivative" @@ -3230,6 +3276,32 @@ dependencies = [ "syn 2.0.38", ] +[[package]] +name = "docify" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1b04e6ef3d21119d3eb7b032bca17f99fe041e9c072f30f32cc0e1a2b1f3c4" +dependencies = [ + "docify_macros", +] + +[[package]] +name = "docify_macros" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b5610df7f2acf89a1bb5d1a66ae56b1c7fcdcfe3948856fb3ace3f644d70eb7" +dependencies = [ + "common-path", + "derive-syn-parse", + "lazy_static", + "proc-macro2", + "quote", + "regex", + "syn 2.0.38", + "termcolor", + "walkdir", +] + [[package]] name = "dotenvy" version = "0.15.7" @@ -3242,12 +3314,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - [[package]] name = "dtoa" version = "1.0.9" @@ -3318,9 +3384,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8 0.10.2", "signature 2.1.0", @@ -3347,7 +3413,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ "curve25519-dalek 4.1.1", - "ed25519 2.2.2", + "ed25519 2.2.3", "rand_core 0.6.4", "serde", "sha2 0.10.8", @@ -3529,25 +3595,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys 0.48.0", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "ethabi" version = "18.0.0" @@ -3674,7 +3729,7 @@ dependencies = [ [[package]] name = "evm-tracing-events" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "environmental", "ethereum", @@ -3719,19 +3774,6 @@ dependencies = [ "quote", ] -[[package]] -name = "expander" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84" -dependencies = [ - "blake2", - "fs-err", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "expander" version = "2.0.0" @@ -3800,7 +3842,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "async-trait", "fp-consensus", @@ -3816,7 +3858,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "async-trait", "ethereum", @@ -3846,7 +3888,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "fc-db", "fc-storage", @@ -3869,7 +3911,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "ethereum", "ethereum-types", @@ -3887,13 +3929,13 @@ dependencies = [ "jsonrpsee", "libsecp256k1", "log", - "lru 0.8.1", "pallet-evm", "parity-scale-codec", "prometheus", "rand 0.8.5", "rlp", "sc-client-api", + "sc-consensus-aura", "sc-network", "sc-network-common", "sc-network-sync", @@ -3902,24 +3944,29 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", + "schnellru", "serde", "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", + "sp-consensus-aura", "sp-core", + "sp-inherents", "sp-io", "sp-runtime", "sp-state-machine", "sp-storage", + "sp-timestamp", "substrate-prometheus-endpoint", + "thiserror", "tokio", ] [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "ethereum", "ethereum-types", @@ -3932,7 +3979,7 @@ dependencies = [ [[package]] name = "fc-storage" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "ethereum", "ethereum-types", @@ -4040,9 +4087,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "libz-sys", @@ -4093,7 +4140,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", ] @@ -4110,7 +4157,7 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "hex", "impl-serde", @@ -4129,7 +4176,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "ethereum", "parity-scale-codec", @@ -4141,7 +4188,7 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "ethereum", "ethereum-types", @@ -4155,7 +4202,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "evm", "frame-support", @@ -4170,7 +4217,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "ethereum", "ethereum-types", @@ -4187,7 +4234,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "frame-support", "parity-scale-codec", @@ -4199,7 +4246,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "parity-scale-codec", "serde", @@ -4214,7 +4261,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-support-procedural", @@ -4239,10 +4286,10 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "Inflector", - "array-bytes 4.2.0", + "array-bytes", "chrono", "clap", "comfy-table", @@ -4273,12 +4320,13 @@ dependencies = [ "sp-database", "sp-externalities", "sp-inherents", + "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-std", "sp-storage", "sp-trie", + "sp-wasm-interface", "thiserror", "thousands", ] @@ -4286,7 +4334,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4297,7 +4345,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -4314,7 +4362,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -4330,9 +4378,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "15.1.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" +checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692" dependencies = [ "cfg-if", "parity-scale-codec", @@ -4343,7 +4391,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-recursion", "futures 0.3.28", @@ -4364,7 +4412,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "bitflags 1.3.2", "environmental", @@ -4373,7 +4421,7 @@ dependencies = [ "impl-trait-for-tuples", "k256", "log", - "once_cell", + "macro_magic", "parity-scale-codec", "paste", "scale-info", @@ -4398,13 +4446,15 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse", + "expander 2.0.0", "frame-support-procedural-tools", "itertools 0.10.5", + "macro_magic", "proc-macro-warning", "proc-macro2", "quote", @@ -4414,7 +4464,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -4426,7 +4476,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro2", "quote", @@ -4436,7 +4486,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "cfg-if", "frame-support", @@ -4455,7 +4505,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4470,7 +4520,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "sp-api", @@ -4479,7 +4529,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "parity-scale-codec", @@ -4510,7 +4560,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.38.17", + "rustix 0.38.20", "windows-sys 0.48.0", ] @@ -4620,7 +4670,7 @@ checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", "rustls 0.20.9", - "webpki 0.22.2", + "webpki 0.22.4", ] [[package]] @@ -4773,7 +4823,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", - "bstr 1.6.2", + "bstr 1.7.0", "fnv", "log", "regex", @@ -4861,7 +4911,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] @@ -4870,16 +4920,16 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.5", ] [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.5", "allocator-api2", ] @@ -4889,7 +4939,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.1", + "hashbrown 0.14.2", ] [[package]] @@ -5078,28 +5128,13 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite 0.2.13", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", "want", ] -[[package]] -name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http", - "hyper", - "log", - "rustls 0.20.9", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.23.4", -] - [[package]] name = "hyper-rustls" version = "0.24.1" @@ -5113,7 +5148,7 @@ dependencies = [ "rustls 0.21.7", "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "webpki-roots 0.23.1", ] @@ -5132,16 +5167,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core", ] [[package]] @@ -5192,9 +5227,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "3.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f" +checksum = "bbb892e5777fe09e16f3d44de7802f4daa7267ecbe8c466f19d94e25bb0c303e" dependencies = [ "async-io", "core-foundation", @@ -5206,7 +5241,7 @@ dependencies = [ "rtnetlink", "system-configuration", "tokio", - "windows 0.34.0", + "windows", ] [[package]] @@ -5265,7 +5300,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.2", ] [[package]] @@ -5359,7 +5394,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.4", + "socket2 0.5.5", "widestring", "windows-sys 0.48.0", "winreg", @@ -5367,9 +5402,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" @@ -5378,7 +5413,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.3", - "rustix 0.38.17", + "rustix 0.38.20", "windows-sys 0.48.0", ] @@ -5408,9 +5443,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -5454,7 +5489,7 @@ dependencies = [ "soketto", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tracing", "webpki-roots 0.25.2", @@ -5496,7 +5531,7 @@ checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43" dependencies = [ "async-trait", "hyper", - "hyper-rustls 0.24.1", + "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", "rustc-hash", @@ -5592,8 +5627,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "frame-benchmarking", @@ -5645,6 +5680,7 @@ dependencies = [ "pallet-society", "pallet-staking", "pallet-staking-runtime-api", + "pallet-state-trie-migration", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", @@ -5691,8 +5727,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "frame-support", "polkadot-primitives", @@ -5736,6 +5772,17 @@ dependencies = [ "smallvec", ] +[[package]] +name = "landlock" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520baa32708c4e957d2fc3a186bc5bd8d26637c33137f399ddfc202adb240068" +dependencies = [ + "enumflags2", + "libc", + "thiserror", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -5767,12 +5814,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - [[package]] name = "libp2p" version = "0.51.3" @@ -5845,7 +5886,7 @@ dependencies = [ "libp2p-identity", "log", "multiaddr", - "multihash 0.17.0", + "multihash", "multistream-select", "once_cell", "parking_lot 0.12.1", @@ -5905,7 +5946,7 @@ dependencies = [ "ed25519-dalek 2.0.0", "log", "multiaddr", - "multihash 0.17.0", + "multihash", "quick-protobuf", "rand 0.8.5", "sha2 0.10.8", @@ -5956,7 +5997,7 @@ dependencies = [ "log", "rand 0.8.5", "smallvec", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "trust-dns-proto", "void", @@ -6098,7 +6139,7 @@ dependencies = [ "libc", "libp2p-core", "log", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", ] @@ -6113,10 +6154,10 @@ dependencies = [ "libp2p-core", "libp2p-identity", "rcgen 0.10.0", - "ring", + "ring 0.16.20", "rustls 0.20.9", "thiserror", - "webpki 0.22.2", + "webpki 0.22.4", "x509-parser 0.14.0", "yasna", ] @@ -6152,7 +6193,7 @@ dependencies = [ "libp2p-identity", "libp2p-noise", "log", - "multihash 0.17.0", + "multihash", "quick-protobuf", "quick-protobuf-codec", "rand 0.8.5", @@ -6330,15 +6371,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -6350,15 +6391,6 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -[[package]] -name = "lru" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" -dependencies = [ - "hashbrown 0.12.3", -] - [[package]] name = "lru" version = "0.9.0" @@ -6415,6 +6447,54 @@ dependencies = [ "libc", ] +[[package]] +name = "macro_magic" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9" +dependencies = [ + "macro_magic_core", + "macro_magic_macros", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "macro_magic_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00" +dependencies = [ + "const-random", + "derive-syn-parse", + "macro_magic_core_macros", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "macro_magic_core_macros" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d710e1214dffbab3b5dacb21475dde7d6ed84c69ff722b3a47a782668d44fbac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "macro_magic_macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" +dependencies = [ + "macro_magic_core", + "quote", + "syn 2.0.38", +] + [[package]] name = "maplit" version = "1.0.2" @@ -6480,7 +6560,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.17", + "rustix 0.38.20", ] [[package]] @@ -6528,12 +6608,6 @@ dependencies = [ "hash-db 0.16.0", ] -[[package]] -name = "memory_units" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" - [[package]] name = "merlin" version = "2.0.1" @@ -6590,9 +6664,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -6602,7 +6676,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures 0.3.28", "log", @@ -6621,7 +6695,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "anyhow", "jsonrpsee", @@ -6664,7 +6738,7 @@ dependencies = [ [[package]] name = "moonbeam-client-evm-tracing" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "ethereum-types", "evm-tracing-events", @@ -6679,7 +6753,7 @@ dependencies = [ [[package]] name = "moonbeam-evm-tracer" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "ethereum-types", "evm", @@ -6699,7 +6773,7 @@ dependencies = [ [[package]] name = "moonbeam-primitives-ext" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "ethereum-types", "evm-tracing-events", @@ -6712,7 +6786,7 @@ dependencies = [ [[package]] name = "moonbeam-rpc-core-debug" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "ethereum-types", "futures 0.3.28", @@ -6727,7 +6801,7 @@ dependencies = [ [[package]] name = "moonbeam-rpc-core-trace" version = "0.6.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "ethereum-types", "futures 0.3.28", @@ -6741,7 +6815,7 @@ dependencies = [ [[package]] name = "moonbeam-rpc-core-types" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "ethereum-types", "serde", @@ -6751,7 +6825,7 @@ dependencies = [ [[package]] name = "moonbeam-rpc-debug" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "ethereum", "ethereum-types", @@ -6781,7 +6855,7 @@ dependencies = [ [[package]] name = "moonbeam-rpc-primitives-debug" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "environmental", "ethereum", @@ -6799,7 +6873,7 @@ dependencies = [ [[package]] name = "moonbeam-rpc-trace" version = "0.6.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "ethereum", "ethereum-types", @@ -6843,7 +6917,7 @@ dependencies = [ "data-encoding", "log", "multibase", - "multihash 0.17.0", + "multihash", "percent-encoding", "serde", "static_assertions", @@ -6864,9 +6938,9 @@ dependencies = [ [[package]] name = "multihash" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "blake2b_simd", "blake2s_simd", @@ -6879,19 +6953,6 @@ dependencies = [ "unsigned-varint", ] -[[package]] -name = "multihash" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" -dependencies = [ - "core2", - "digest 0.10.7", - "multihash-derive", - "sha2 0.10.8", - "unsigned-varint", -] - [[package]] name = "multihash-derive" version = "0.8.0" @@ -7302,7 +7363,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -7398,7 +7459,7 @@ dependencies = [ "futures-util", "once_cell", "opentelemetry_api", - "ordered-float 3.9.1", + "ordered-float 3.9.2", "percent-encoding", "rand 0.8.5", "regex", @@ -7448,9 +7509,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.9.1" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ "num-traits", ] @@ -7458,13 +7519,14 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.43#28a2e6f0df9540d91db4018c7ecebb8bfc217a2a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.0.0#2b41f29e749fda52522cb4c7ea0e47f517f6a59d" dependencies = [ "frame-support", "impl-trait-for-tuples", "num-traits", "orml-utilities", "parity-scale-codec", + "paste", "scale-info", "serde", "sp-core", @@ -7477,12 +7539,13 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.43#28a2e6f0df9540d91db4018c7ecebb8bfc217a2a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.0.0#2b41f29e749fda52522cb4c7ea0e47f517f6a59d" dependencies = [ "frame-support", "parity-scale-codec", "scale-info", "serde", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -7491,7 +7554,7 @@ dependencies = [ [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.43#28a2e6f0df9540d91db4018c7ecebb8bfc217a2a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.0.0#2b41f29e749fda52522cb4c7ea0e47f517f6a59d" dependencies = [ "frame-support", "orml-traits", @@ -7505,7 +7568,7 @@ dependencies = [ [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.43#28a2e6f0df9540d91db4018c7ecebb8bfc217a2a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.0.0#2b41f29e749fda52522cb4c7ea0e47f517f6a59d" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -7554,7 +7617,7 @@ dependencies = [ [[package]] name = "pallet-asset-manager" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7573,7 +7636,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7588,7 +7651,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -7604,7 +7667,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -7620,7 +7683,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -7634,7 +7697,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7658,7 +7721,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7678,7 +7741,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7693,7 +7756,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -7712,9 +7775,9 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "binary-merkle-tree", "frame-support", "frame-system", @@ -7736,7 +7799,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7754,7 +7817,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -7770,7 +7833,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "bp-header-chain", "bp-runtime", @@ -7792,7 +7855,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "bitvec", "bp-message-dispatch", @@ -7813,7 +7876,7 @@ dependencies = [ [[package]] name = "pallet-bridge-parachains" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "bp-parachains", "bp-polkadot-core", @@ -7834,7 +7897,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7853,7 +7916,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7870,7 +7933,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "assert_matches", "frame-benchmarking", @@ -7887,7 +7950,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7905,7 +7968,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7928,7 +7991,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7941,7 +8004,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7953,13 +8016,14 @@ dependencies = [ "sp-io", "sp-npos-elections", "sp-runtime", + "sp-staking", "sp-std", ] [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "ethereum", "ethereum-types", @@ -7982,7 +8046,7 @@ dependencies = [ [[package]] name = "pallet-ethereum-xcm" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "ethereum", "ethereum-types", @@ -8008,7 +8072,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "environmental", "evm", @@ -8033,7 +8097,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "fp-evm", ] @@ -8041,7 +8105,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "fp-evm", "sp-core", @@ -8051,7 +8115,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-conviction-voting" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "fp-evm", "frame-support", @@ -8071,7 +8135,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "fp-evm", "frame-support", @@ -8081,7 +8145,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "fp-evm", "num", @@ -8090,7 +8154,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=darwinia-v0.9.43#b9d2fc9d8eca7a07c7410bd73e397b5b0d94dc26" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v1.0.0#301d7c0fb95e59cb927f7c121999c6929a32222a" dependencies = [ "fp-evm", "ripemd", @@ -8100,8 +8164,9 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ + "docify", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -8118,7 +8183,7 @@ dependencies = [ [[package]] name = "pallet-fee-market" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.43#cf9dbb1fbe28bea45a50c9333767ecbc54447055" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v1.0.0#660c6b744a27c2158b582838b8cc3966a4f0c347" dependencies = [ "bp-messages", "bp-runtime", @@ -8137,7 +8202,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8160,7 +8225,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "enumflags2", "frame-benchmarking", @@ -8176,7 +8241,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8196,7 +8261,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8213,7 +8278,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8230,7 +8295,7 @@ dependencies = [ [[package]] name = "pallet-message-queue" version = "7.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8249,7 +8314,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8266,7 +8331,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8282,7 +8347,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8298,7 +8363,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -8315,7 +8380,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8335,7 +8400,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -8346,7 +8411,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -8363,7 +8428,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8387,7 +8452,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8404,7 +8469,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8419,7 +8484,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8437,7 +8502,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8452,7 +8517,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "assert_matches", "frame-benchmarking", @@ -8471,7 +8536,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8488,7 +8553,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -8509,7 +8574,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8525,13 +8590,18 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", + "hex-literal 0.3.4", + "log", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", + "sp-arithmetic", + "sp-io", "sp-runtime", "sp-std", ] @@ -8539,7 +8609,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8562,7 +8632,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8573,7 +8643,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "log", "sp-arithmetic", @@ -8582,7 +8652,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "sp-api", @@ -8591,7 +8661,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8608,7 +8678,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8623,7 +8693,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8641,7 +8711,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8660,7 +8730,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -8676,7 +8746,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -8692,7 +8762,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -8704,7 +8774,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8721,7 +8791,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8737,7 +8807,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8752,7 +8822,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8766,8 +8836,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bounded-collections", "frame-benchmarking", @@ -8787,8 +8857,8 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "frame-benchmarking", "frame-support", @@ -8808,7 +8878,7 @@ dependencies = [ name = "pangolin-runtime" version = "6.4.0" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "bp-darwinia-core", "bp-message-dispatch", "bp-messages", @@ -8905,6 +8975,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", + "sp-staking", "sp-std", "sp-transaction-pool", "sp-version", @@ -8921,7 +8992,7 @@ dependencies = [ name = "pangoro-runtime" version = "6.4.0" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "bp-darwinia-core", "bp-message-dispatch", "bp-messages", @@ -9012,6 +9083,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", + "sp-staking", "sp-std", "sp-transaction-pool", "sp-version", @@ -9026,20 +9098,22 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-runtime", + "sp-std", ] [[package]] name = "parity-db" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab512a34b3c2c5e465731cc7668edf79208bbe520be03484eeb05e63ed221735" +checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f" dependencies = [ "blake2", "crc32fast", @@ -9096,9 +9170,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -9118,7 +9192,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -9137,13 +9211,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -9327,12 +9401,6 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" -[[package]] -name = "platforms" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" - [[package]] name = "platforms" version = "3.1.2" @@ -9341,15 +9409,17 @@ checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" [[package]] name = "polkadot-approval-distribution" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures 0.3.28", + "futures-timer", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", "tracing-gum", @@ -9357,10 +9427,11 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures 0.3.28", + "futures-timer", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -9371,8 +9442,8 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "derive_more", "fatality", @@ -9394,8 +9465,8 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "fatality", "futures 0.3.28", @@ -9415,15 +9486,15 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "clap", "frame-benchmarking-cli", "futures 0.3.28", "log", - "polkadot-client", - "polkadot-node-core-pvf-worker", + "polkadot-node-core-pvf-execute-worker", + "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-performance-test", "polkadot-service", @@ -9442,55 +9513,10 @@ dependencies = [ "try-runtime-cli", ] -[[package]] -name = "polkadot-client" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" -dependencies = [ - "async-trait", - "frame-benchmarking", - "frame-benchmarking-cli", - "frame-system", - "frame-system-rpc-runtime-api", - "futures 0.3.28", - "kusama-runtime", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "polkadot-core-primitives", - "polkadot-node-core-parachains-inherent", - "polkadot-primitives", - "polkadot-runtime", - "polkadot-runtime-common", - "rococo-runtime", - "sc-client-api", - "sc-consensus", - "sc-executor", - "sc-service", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-consensus-grandpa", - "sp-core", - "sp-inherents", - "sp-keyring", - "sp-mmr-primitives", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-storage", - "sp-timestamp", - "sp-transaction-pool", - "westend-runtime", -] - [[package]] name = "polkadot-collator-protocol" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "always-assert", "bitvec", @@ -9511,8 +9537,8 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "parity-scale-codec", "scale-info", @@ -9523,8 +9549,8 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "derive_more", "fatality", @@ -9548,8 +9574,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -9562,8 +9588,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures 0.3.28", "futures-timer", @@ -9582,8 +9608,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "always-assert", "async-trait", @@ -9605,8 +9631,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures 0.3.28", "parity-scale-codec", @@ -9623,8 +9649,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "derive_more", @@ -9652,8 +9678,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "futures 0.3.28", @@ -9661,6 +9687,7 @@ dependencies = [ "kvdb", "parity-scale-codec", "polkadot-erasure-coding", + "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -9673,8 +9700,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "fatality", @@ -9692,8 +9719,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures 0.3.28", "polkadot-node-subsystem", @@ -9707,8 +9734,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "async-trait", "futures 0.3.28", @@ -9727,8 +9754,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures 0.3.28", "polkadot-node-metrics", @@ -9742,8 +9769,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures 0.3.28", "futures-timer", @@ -9759,8 +9786,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "fatality", "futures 0.3.28", @@ -9778,8 +9805,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "async-trait", "futures 0.3.28", @@ -9795,8 +9822,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "fatality", @@ -9813,8 +9840,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "always-assert", "futures 0.3.28", @@ -9823,6 +9850,9 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-core-primitives", + "polkadot-node-core-pvf-common", + "polkadot-node-core-pvf-execute-worker", + "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-node-primitives", "polkadot-parachain", @@ -9834,14 +9864,15 @@ dependencies = [ "sp-tracing", "sp-wasm-interface", "substrate-build-script-utils", + "tempfile", "tokio", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures 0.3.28", "polkadot-node-primitives", @@ -9855,29 +9886,67 @@ dependencies = [ ] [[package]] -name = "polkadot-node-core-pvf-worker" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +name = "polkadot-node-core-pvf-common" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ - "assert_matches", "cpu-time", "futures 0.3.28", + "landlock", "libc", "parity-scale-codec", - "polkadot-node-core-pvf", "polkadot-parachain", "polkadot-primitives", - "rayon", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", "sp-core", "sp-externalities", "sp-io", - "sp-maybe-compressed-blob", "sp-tracing", "substrate-build-script-utils", - "tempfile", + "tokio", + "tracing-gum", +] + +[[package]] +name = "polkadot-node-core-pvf-execute-worker" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +dependencies = [ + "cpu-time", + "futures 0.3.28", + "parity-scale-codec", + "polkadot-node-core-pvf-common", + "polkadot-parachain", + "polkadot-primitives", + "rayon", + "sp-core", + "sp-maybe-compressed-blob", + "sp-tracing", + "tikv-jemalloc-ctl", + "tokio", + "tracing-gum", +] + +[[package]] +name = "polkadot-node-core-pvf-prepare-worker" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +dependencies = [ + "futures 0.3.28", + "libc", + "parity-scale-codec", + "polkadot-node-core-pvf-common", + "polkadot-parachain", + "polkadot-primitives", + "rayon", + "sc-executor", + "sc-executor-common", + "sc-executor-wasmtime", + "sp-io", + "sp-maybe-compressed-blob", + "sp-tracing", "tikv-jemalloc-ctl", "tokio", "tracing-gum", @@ -9885,8 +9954,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures 0.3.28", "lru 0.9.0", @@ -9900,8 +9969,8 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "lazy_static", "log", @@ -9918,8 +9987,8 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bs58", "futures 0.3.28", @@ -9937,8 +10006,8 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "async-channel", "async-trait", @@ -9960,8 +10029,8 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bounded-vec", "futures 0.3.28", @@ -9982,8 +10051,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -9992,8 +10061,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "async-trait", "derive_more", @@ -10005,6 +10074,7 @@ dependencies = [ "polkadot-primitives", "polkadot-statement-table", "sc-network", + "sc-transaction-pool-api", "smallvec", "sp-api", "sp-authority-discovery", @@ -10015,8 +10085,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "async-trait", "derive_more", @@ -10048,8 +10118,8 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "async-trait", "futures 0.3.28", @@ -10071,8 +10141,8 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bounded-collections", "derive_more", @@ -10088,14 +10158,14 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "env_logger 0.9.3", "kusama-runtime", "log", "polkadot-erasure-coding", - "polkadot-node-core-pvf-worker", + "polkadot-node-core-pvf-prepare-worker", "polkadot-node-primitives", "polkadot-primitives", "quote", @@ -10106,8 +10176,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "hex-literal 0.4.1", @@ -10132,8 +10202,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -10164,8 +10234,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "frame-benchmarking", @@ -10259,8 +10329,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "frame-benchmarking", @@ -10305,8 +10375,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "frame-support", "polkadot-primitives", @@ -10319,8 +10389,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bs58", "parity-scale-codec", @@ -10331,8 +10401,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitflags 1.3.2", "bitvec", @@ -10376,12 +10446,14 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "async-trait", + "frame-benchmarking", "frame-benchmarking-cli", "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "futures 0.3.28", "hex-literal 0.4.1", @@ -10395,14 +10467,16 @@ dependencies = [ "pallet-babe", "pallet-im-online", "pallet-staking", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "parity-db", + "parity-scale-codec", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", "polkadot-availability-recovery", - "polkadot-client", "polkadot-collator-protocol", + "polkadot-core-primitives", "polkadot-dispute-distribution", "polkadot-gossip-support", "polkadot-network-bridge", @@ -10429,6 +10503,7 @@ dependencies = [ "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", + "polkadot-runtime-common", "polkadot-runtime-constants", "polkadot-runtime-parachains", "polkadot-statement-distribution", @@ -10456,6 +10531,7 @@ dependencies = [ "sc-sysinfo", "sc-telemetry", "sc-transaction-pool", + "sc-transaction-pool-api", "serde", "serde_json", "sp-api", @@ -10469,6 +10545,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-keyring", "sp-keystore", "sp-mmr-primitives", "sp-offchain", @@ -10479,6 +10556,8 @@ dependencies = [ "sp-timestamp", "sp-transaction-pool", "sp-trie", + "sp-version", + "sp-weights", "substrate-prometheus-endpoint", "thiserror", "tracing-gum", @@ -10488,12 +10567,13 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "arrayvec 0.5.2", "fatality", "futures 0.3.28", + "futures-timer", "indexmap 1.9.3", "parity-scale-codec", "polkadot-node-network-protocol", @@ -10509,8 +10589,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -10570,9 +10650,15 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.4.3" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b559898e0b4931ed2d3b959ab0c2da4d99cc644c4b0b1a35b4d344027f474023" + +[[package]] +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" @@ -10583,7 +10669,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "precompile-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "affix", "derive_more", @@ -10614,7 +10700,7 @@ dependencies = [ [[package]] name = "precompile-utils-macro" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "case", "num_enum 0.5.11", @@ -10687,9 +10773,9 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" +checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", "impl-codec", @@ -10751,9 +10837,9 @@ dependencies = [ [[package]] name = "proc-macro-warning" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" +checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" dependencies = [ "proc-macro2", "quote", @@ -10762,9 +10848,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -10910,20 +10996,20 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989" +checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls 0.20.9", "slab", "thiserror", "tinyvec", "tracing", - "webpki 0.22.2", + "webpki 0.22.4", ] [[package]] @@ -11054,7 +11140,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", - "ring", + "ring 0.16.20", "time", "x509-parser 0.13.2", "yasna", @@ -11067,7 +11153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", + "ring 0.16.20", "time", "yasna", ] @@ -11090,6 +11176,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -11148,14 +11243,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.6" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.9", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -11169,13 +11264,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.9" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -11186,9 +11281,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" @@ -11196,7 +11291,7 @@ version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -11234,9 +11329,9 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff44108c7925d082f2861e683a88618b68235ad9cdc60d64d9d1188efc951cdb" +checksum = "88a3e86aa6053e59030e7ce2d2a3b258dd08fc2d337d52f73f6cb480f5858690" dependencies = [ "anyhow", "async-trait", @@ -11300,9 +11395,9 @@ dependencies = [ [[package]] name = "retry-policies" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a715dc4d0e8aea3085a9a94d76e79c79c7df7c9f6be609da841a6d2489ca3687" +checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd" dependencies = [ "anyhow", "chrono", @@ -11340,11 +11435,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "ripemd" version = "0.1.3" @@ -11388,8 +11497,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "binary-merkle-tree", "frame-benchmarking", @@ -11475,8 +11584,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "frame-support", "polkadot-primitives", @@ -11572,7 +11681,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.19", + "semver 1.0.20", ] [[package]] @@ -11586,9 +11695,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.15" +version = "0.36.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" +checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab" dependencies = [ "bitflags 1.3.2", "errno", @@ -11600,9 +11709,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.24" +version = "0.37.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d" +checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" dependencies = [ "bitflags 1.3.2", "errno", @@ -11614,14 +11723,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.17" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.8", + "linux-raw-sys 0.4.10", "windows-sys 0.48.0", ] @@ -11633,7 +11742,7 @@ checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ "base64 0.13.1", "log", - "ring", + "ring 0.16.20", "sct 0.6.1", "webpki 0.21.4", ] @@ -11645,9 +11754,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct 0.7.0", - "webpki 0.22.2", + "webpki 0.22.4", ] [[package]] @@ -11657,7 +11766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", + "ring 0.16.20", "rustls-webpki 0.101.6", "sct 0.7.0", ] @@ -11680,7 +11789,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", ] [[package]] @@ -11689,8 +11798,8 @@ version = "0.100.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -11699,8 +11808,8 @@ version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -11747,7 +11856,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "log", "sp-core", @@ -11758,7 +11867,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures 0.3.28", @@ -11766,14 +11875,13 @@ dependencies = [ "ip_network", "libp2p", "log", - "multihash 0.17.0", + "multihash", "parity-scale-codec", "prost", "prost-build", "rand 0.8.5", "sc-client-api", "sc-network", - "sc-network-common", "sp-api", "sp-authority-discovery", "sp-blockchain", @@ -11787,7 +11895,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures 0.3.28", "futures-timer", @@ -11810,7 +11918,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -11825,7 +11933,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -11844,7 +11952,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11855,9 +11963,9 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "chrono", "clap", "fdlimit", @@ -11873,7 +11981,6 @@ dependencies = [ "sc-client-db", "sc-keystore", "sc-network", - "sc-network-common", "sc-service", "sc-telemetry", "sc-tracing", @@ -11895,7 +12002,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "fnv", "futures 0.3.28", @@ -11911,7 +12018,6 @@ dependencies = [ "sp-core", "sp-database", "sp-externalities", - "sp-keystore", "sp-runtime", "sp-state-machine", "sp-statement-store", @@ -11922,7 +12028,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "hash-db 0.16.0", "kvdb", @@ -11948,7 +12054,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures 0.3.28", @@ -11973,7 +12079,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures 0.3.28", @@ -12002,7 +12108,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "fork-tree", @@ -12017,8 +12123,8 @@ dependencies = [ "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", - "sc-keystore", "sc-telemetry", + "sc-transaction-pool-api", "scale-info", "sp-api", "sp-application-crypto", @@ -12038,7 +12144,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures 0.3.28", "jsonrpsee", @@ -12060,9 +12166,9 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "async-channel", "async-trait", "fnv", @@ -12072,9 +12178,7 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-consensus", - "sc-keystore", "sc-network", - "sc-network-common", "sc-network-gossip", "sc-network-sync", "sc-utils", @@ -12096,7 +12200,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures 0.3.28", "jsonrpsee", @@ -12115,7 +12219,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "fork-tree", "parity-scale-codec", @@ -12128,10 +12232,10 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "ahash 0.8.3", - "array-bytes 4.2.0", + "ahash 0.8.5", + "array-bytes", "async-trait", "dyn-clone", "finality-grandpa", @@ -12150,6 +12254,7 @@ dependencies = [ "sc-network-common", "sc-network-gossip", "sc-telemetry", + "sc-transaction-pool-api", "sc-utils", "serde_json", "sp-api", @@ -12168,7 +12273,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "finality-grandpa", "futures 0.3.28", @@ -12188,7 +12293,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures 0.3.28", @@ -12211,13 +12316,13 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", "sc-executor-wasmtime", + "schnellru", "sp-api", "sp-core", "sp-externalities", @@ -12233,7 +12338,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -12245,14 +12350,13 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "anyhow", "cfg-if", "libc", "log", - "once_cell", - "rustix 0.36.15", + "rustix 0.36.16", "sc-allocator", "sc-executor-common", "sp-runtime-interface", @@ -12263,7 +12367,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "ansi_term", "futures 0.3.28", @@ -12279,9 +12383,9 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "parking_lot 0.12.1", "serde_json", "sp-application-crypto", @@ -12293,9 +12397,9 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "async-channel", "async-trait", "asynchronous-codec", @@ -12308,37 +12412,33 @@ dependencies = [ "libp2p", "linked_hash_set", "log", - "lru 0.8.1", "mockall", "parity-scale-codec", "parking_lot 0.12.1", + "partial_sort", "pin-project", "rand 0.8.5", - "sc-block-builder", "sc-client-api", - "sc-consensus", "sc-network-common", - "sc-peerset", "sc-utils", "serde", "serde_json", "smallvec", - "snow", "sp-arithmetic", "sp-blockchain", - "sp-consensus", "sp-core", "sp-runtime", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", + "wasm-timer", "zeroize", ] [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-channel", "cid", @@ -12349,7 +12449,6 @@ dependencies = [ "prost-build", "sc-client-api", "sc-network", - "sc-network-common", "sp-blockchain", "sp-runtime", "thiserror", @@ -12359,45 +12458,33 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", "async-trait", "bitflags 1.3.2", - "bytes", "futures 0.3.28", - "futures-timer", "libp2p-identity", "parity-scale-codec", "prost-build", "sc-consensus", - "sc-peerset", - "sc-utils", - "serde", - "smallvec", - "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", "sp-runtime", - "substrate-prometheus-endpoint", - "thiserror", - "zeroize", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.5", "futures 0.3.28", "futures-timer", "libp2p", "log", - "lru 0.8.1", "sc-network", "sc-network-common", - "sc-peerset", + "schnellru", "sp-runtime", "substrate-prometheus-endpoint", "tracing", @@ -12406,9 +12493,9 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "async-channel", "futures 0.3.28", "libp2p-identity", @@ -12418,8 +12505,6 @@ dependencies = [ "prost-build", "sc-client-api", "sc-network", - "sc-network-common", - "sc-peerset", "sp-blockchain", "sp-core", "sp-runtime", @@ -12429,9 +12514,9 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "async-channel", "async-trait", "fork-tree", @@ -12439,7 +12524,6 @@ dependencies = [ "futures-timer", "libp2p", "log", - "lru 0.8.1", "mockall", "parity-scale-codec", "prost", @@ -12448,8 +12532,8 @@ dependencies = [ "sc-consensus", "sc-network", "sc-network-common", - "sc-peerset", "sc-utils", + "schnellru", "smallvec", "sp-arithmetic", "sp-blockchain", @@ -12464,17 +12548,15 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "futures 0.3.28", "libp2p", "log", "parity-scale-codec", - "pin-project", "sc-network", "sc-network-common", - "sc-peerset", "sc-utils", "sp-consensus", "sp-runtime", @@ -12484,16 +12566,17 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "bytes", "fnv", "futures 0.3.28", "futures-timer", "hyper", - "hyper-rustls 0.23.2", + "hyper-rustls", "libp2p", + "log", "num_cpus", "once_cell", "parity-scale-codec", @@ -12502,36 +12585,22 @@ dependencies = [ "sc-client-api", "sc-network", "sc-network-common", - "sc-peerset", + "sc-transaction-pool-api", "sc-utils", "sp-api", "sp-core", + "sp-externalities", + "sp-keystore", "sp-offchain", "sp-runtime", "threadpool", "tracing", ] -[[package]] -name = "sc-peerset" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "futures 0.3.28", - "libp2p-identity", - "log", - "parking_lot 0.12.1", - "partial_sort", - "sc-utils", - "serde_json", - "sp-arithmetic", - "wasm-timer", -] - [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -12540,7 +12609,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures 0.3.28", "jsonrpsee", @@ -12571,7 +12640,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12590,7 +12659,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "http", "jsonrpsee", @@ -12605,9 +12674,9 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "futures 0.3.28", "futures-util", "hex", @@ -12631,7 +12700,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "directories", @@ -12658,11 +12727,9 @@ dependencies = [ "sc-network-light", "sc-network-sync", "sc-network-transactions", - "sc-offchain", "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", - "sc-storage-monitor", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -12697,7 +12764,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "log", "parity-scale-codec", @@ -12708,14 +12775,12 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "clap", "fs4", - "futures 0.3.28", "log", "sc-client-db", - "sc-utils", "sp-core", "thiserror", "tokio", @@ -12724,7 +12789,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12743,7 +12808,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures 0.3.28", "libc", @@ -12762,7 +12827,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "chrono", "futures 0.3.28", @@ -12781,7 +12846,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "ansi_term", "atty", @@ -12789,12 +12854,10 @@ dependencies = [ "lazy_static", "libc", "log", - "once_cell", "parking_lot 0.12.1", "regex", "rustc-hash", "sc-client-api", - "sc-rpc-server", "sc-tracing-proc-macro", "serde", "sp-api", @@ -12812,7 +12875,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -12823,14 +12886,13 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures 0.3.28", "futures-timer", "linked-hash-map", "log", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", "sc-client-api", @@ -12850,13 +12912,15 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures 0.3.28", "log", + "parity-scale-codec", "serde", "sp-blockchain", + "sp-core", "sp-runtime", "thiserror", ] @@ -12864,7 +12928,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-channel", "futures 0.3.28", @@ -12878,9 +12942,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782" +checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" dependencies = [ "bitvec", "cfg-if", @@ -12892,9 +12956,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29" +checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -12917,7 +12981,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.5", "cfg-if", "hashbrown 0.13.2", ] @@ -12958,8 +13022,8 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -12968,8 +13032,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -13073,9 +13137,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] @@ -13088,18 +13152,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", @@ -13119,9 +13183,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -13308,8 +13372,8 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "slot-range-helper" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "enumn", "parity-scale-codec", @@ -13350,7 +13414,7 @@ dependencies = [ "chacha20poly1305", "curve25519-dalek 4.1.1", "rand_core 0.6.4", - "ring", + "ring 0.16.20", "rustc_version", "sha2 0.10.8", "subtle", @@ -13358,9 +13422,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -13368,9 +13432,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -13396,7 +13460,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "hash-db 0.16.0", "log", @@ -13404,6 +13468,7 @@ dependencies = [ "scale-info", "sp-api-proc-macro", "sp-core", + "sp-externalities", "sp-metadata-ir", "sp-runtime", "sp-state-machine", @@ -13416,11 +13481,11 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "Inflector", "blake2", - "expander 1.0.0", + "expander 2.0.0", "proc-macro-crate", "proc-macro2", "quote", @@ -13429,8 +13494,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "23.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "scale-info", @@ -13442,8 +13507,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "16.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "integer-sqrt", "num-traits", @@ -13457,7 +13522,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "scale-info", @@ -13470,9 +13535,8 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -13482,13 +13546,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures 0.3.28", "log", - "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", + "schnellru", "sp-api", "sp-consensus", "sp-database", @@ -13500,7 +13564,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures 0.3.28", @@ -13515,14 +13579,13 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", "sp-api", "sp-application-crypto", - "sp-consensus", "sp-consensus-slots", "sp-inherents", "sp-runtime", @@ -13533,7 +13596,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "parity-scale-codec", @@ -13541,11 +13604,9 @@ dependencies = [ "serde", "sp-api", "sp-application-crypto", - "sp-consensus", "sp-consensus-slots", "sp-core", "sp-inherents", - "sp-keystore", "sp-runtime", "sp-std", "sp-timestamp", @@ -13554,7 +13615,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "lazy_static", "parity-scale-codec", @@ -13573,7 +13634,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "finality-grandpa", "log", @@ -13591,7 +13652,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "scale-info", @@ -13602,10 +13663,10 @@ dependencies = [ [[package]] name = "sp-core" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "21.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "bitflags 1.3.2", "blake2", "bounded-collections", @@ -13641,29 +13702,28 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", + "tracing", "zeroize", ] [[package]] name = "sp-core-hashing" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "9.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "blake2b_simd", "byteorder", "digest 0.10.7", "sha2 0.10.8", "sha3", - "sp-std", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "9.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "proc-macro2", "quote", "sp-core-hashing", "syn 2.0.38", @@ -13672,7 +13732,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -13680,8 +13740,8 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "8.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro2", "quote", @@ -13690,8 +13750,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "0.19.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "environmental", "parity-scale-codec", @@ -13702,13 +13762,12 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-core", "sp-runtime", "sp-std", "thiserror", @@ -13716,13 +13775,12 @@ dependencies = [ [[package]] name = "sp-io" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "23.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "bytes", "ed25519 1.5.3", "ed25519-dalek 1.0.1", - "futures 0.3.28", "libsecp256k1", "log", "parity-scale-codec", @@ -13742,8 +13800,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "24.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "lazy_static", "sp-core", @@ -13753,13 +13811,11 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "0.27.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "futures 0.3.28", "parity-scale-codec", "parking_lot 0.12.1", - "serde", "sp-core", "sp-externalities", "thiserror", @@ -13768,7 +13824,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "thiserror", "zstd 0.12.4", @@ -13777,7 +13833,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -13788,7 +13844,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -13806,7 +13862,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "scale-info", @@ -13820,7 +13876,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "sp-api", "sp-core", @@ -13829,8 +13885,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "8.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "backtrace", "lazy_static", @@ -13840,7 +13896,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "rustc-hash", "serde", @@ -13849,8 +13905,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "24.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "either", "hash256-std-hasher", @@ -13871,8 +13927,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "17.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -13889,8 +13945,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "11.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "Inflector", "proc-macro-crate", @@ -13902,12 +13958,13 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", "sp-core", + "sp-keystore", "sp-runtime", "sp-staking", "sp-std", @@ -13916,8 +13973,9 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ + "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", @@ -13928,8 +13986,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "0.28.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "hash-db 0.16.0", "log", @@ -13944,14 +14002,14 @@ dependencies = [ "sp-trie", "thiserror", "tracing", + "trie-db", ] [[package]] name = "sp-statement-store" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "log", "parity-scale-codec", "scale-info", "sp-api", @@ -13966,13 +14024,13 @@ dependencies = [ [[package]] name = "sp-std" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "8.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" [[package]] name = "sp-storage" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "13.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "impl-serde", "parity-scale-codec", @@ -13985,11 +14043,9 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", - "futures-timer", - "log", "parity-scale-codec", "sp-inherents", "sp-runtime", @@ -13999,8 +14055,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "10.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "sp-std", @@ -14012,7 +14068,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "sp-api", "sp-runtime", @@ -14021,10 +14077,9 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", - "log", "parity-scale-codec", "scale-info", "sp-core", @@ -14036,10 +14091,10 @@ dependencies = [ [[package]] name = "sp-trie" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "22.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.5", "hash-db 0.16.0", "hashbrown 0.13.2", "lazy_static", @@ -14059,8 +14114,8 @@ dependencies = [ [[package]] name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "22.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "impl-serde", "parity-scale-codec", @@ -14076,8 +14131,8 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "8.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -14087,22 +14142,21 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "14.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", "sp-std", - "wasmi", "wasmtime", ] [[package]] name = "sp-weights" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +version = "20.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "scale-info", @@ -14188,7 +14242,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.5", "atoi", "byteorder", "bytes", @@ -14357,7 +14411,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ - "strum_macros 0.25.2", + "strum_macros 0.25.3", ] [[package]] @@ -14375,9 +14429,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", @@ -14397,7 +14451,7 @@ dependencies = [ "lazy_static", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "subtle", "thiserror", "tokio", @@ -14434,10 +14488,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "platforms 2.0.0", -] +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" [[package]] name = "substrate-fixed" @@ -14453,7 +14504,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.28", @@ -14472,7 +14523,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "hyper", "log", @@ -14484,7 +14535,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "jsonrpsee", @@ -14497,14 +14548,12 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "jsonrpsee", - "log", "parity-scale-codec", "sc-client-api", "sc-rpc-api", - "scale-info", "serde", "sp-core", "sp-runtime", @@ -14516,7 +14565,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures 0.3.28", "substrate-test-utils-derive", @@ -14526,7 +14575,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -14537,12 +14586,13 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", "filetime", + "parity-wasm", "sp-maybe-compressed-blob", "strum 0.24.1", "tempfile", @@ -14629,9 +14679,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "task-local-extensions" @@ -14651,7 +14701,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.17", + "rustix 0.38.20", "windows-sys 0.48.0", ] @@ -14672,18 +14722,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", @@ -14751,12 +14801,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -14832,9 +14883,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -14844,7 +14895,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite 0.2.13", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] @@ -14881,17 +14932,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki 0.22.2", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -14964,9 +15004,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -15001,7 +15041,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bytes", "futures-core", "futures-util", @@ -15027,11 +15067,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite 0.2.13", "tracing-attributes", @@ -15040,9 +15079,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", @@ -15051,9 +15090,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -15071,8 +15110,8 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -15082,8 +15121,8 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "expander 2.0.0", "proc-macro-crate", @@ -15094,12 +15133,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -15251,7 +15290,7 @@ dependencies = [ "lazy_static", "rand 0.8.5", "smallvec", - "socket2 0.4.9", + "socket2 0.4.10", "thiserror", "tinyvec", "tokio", @@ -15288,7 +15327,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "clap", @@ -15299,7 +15338,6 @@ dependencies = [ "parity-scale-codec", "sc-cli", "sc-executor", - "sc-service", "serde", "serde_json", "sp-api", @@ -15340,7 +15378,7 @@ dependencies = [ "log", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "stun", "thiserror", "tokio", @@ -15484,6 +15522,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.4.1" @@ -15509,9 +15553,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom 0.2.10", ] @@ -15729,39 +15773,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmi" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" -dependencies = [ - "parity-wasm", - "wasmi-validation", - "wasmi_core", -] - -[[package]] -name = "wasmi-validation" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" -dependencies = [ - "parity-wasm", -] - -[[package]] -name = "wasmi_core" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" -dependencies = [ - "downcast-rs", - "libm", - "memory_units", - "num-rational", - "num-traits", -] - [[package]] name = "wasmparser" version = "0.102.0" @@ -15816,12 +15827,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213" dependencies = [ "anyhow", - "base64 0.21.4", + "base64 0.21.5", "bincode", "directories-next", "file-per-thread-logger", "log", - "rustix 0.36.15", + "rustix 0.36.16", "serde", "sha2 0.10.8", "toml 0.5.11", @@ -15917,7 +15928,7 @@ checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846" dependencies = [ "object 0.30.4", "once_cell", - "rustix 0.36.15", + "rustix 0.36.16", ] [[package]] @@ -15948,7 +15959,7 @@ dependencies = [ "memoffset 0.8.0", "paste", "rand 0.8.5", - "rustix 0.36.15", + "rustix 0.36.16", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", @@ -15983,18 +15994,18 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "webpki" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -16003,7 +16014,7 @@ version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki 0.22.2", + "webpki 0.22.4", ] [[package]] @@ -16037,7 +16048,7 @@ dependencies = [ "rand 0.8.5", "rcgen 0.9.3", "regex", - "ring", + "ring 0.16.20", "rtcp", "rtp", "rustls 0.19.1", @@ -16101,7 +16112,7 @@ dependencies = [ "rand 0.8.5", "rand_core 0.6.4", "rcgen 0.10.0", - "ring", + "ring 0.16.20", "rustls 0.19.1", "sec1 0.3.0", "serde", @@ -16148,7 +16159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" dependencies = [ "log", - "socket2 0.4.9", + "socket2 0.4.10", "thiserror", "tokio", "webrtc-util", @@ -16231,8 +16242,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "frame-benchmarking", @@ -16324,8 +16335,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "frame-support", "polkadot-primitives", @@ -16345,14 +16356,14 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.17", + "rustix 0.38.20", ] [[package]] name = "wide" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebecebefc38ff1860b4bc47550bbfa63af5746061cf0d29fcd7fa63171602598" +checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242" dependencies = [ "bytemuck", "safe_arch", @@ -16397,22 +16408,19 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.34.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows_aarch64_msvc 0.34.0", - "windows_i686_gnu 0.34.0", - "windows_i686_msvc 0.34.0", - "windows_x86_64_gnu 0.34.0", - "windows_x86_64_msvc 0.34.0", + "windows-core", + "windows-targets 0.48.5", ] [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets 0.48.5", ] @@ -16477,12 +16485,6 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" -[[package]] -name = "windows_aarch64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -16495,12 +16497,6 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" -[[package]] -name = "windows_i686_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -16513,12 +16509,6 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" -[[package]] -name = "windows_i686_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -16531,12 +16521,6 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" -[[package]] -name = "windows_x86_64_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -16561,12 +16545,6 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" -[[package]] -name = "windows_x86_64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -16581,9 +16559,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.16" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] @@ -16643,7 +16621,7 @@ dependencies = [ "lazy_static", "nom", "oid-registry 0.4.0", - "ring", + "ring 0.16.20", "rusticata-macros", "thiserror", "time", @@ -16669,8 +16647,8 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bounded-collections", "derivative", @@ -16685,8 +16663,8 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "frame-support", "frame-system", @@ -16707,8 +16685,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "environmental", "frame-benchmarking", @@ -16728,7 +16706,7 @@ dependencies = [ [[package]] name = "xcm-primitives" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.43#71592d863e0d6d1bade77570291529d90324c008" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.0.0#d5646748a244a369ae22ff64c9791a2f9b4c115b" dependencies = [ "cumulus-primitives-core", "ethereum", @@ -16754,8 +16732,8 @@ dependencies = [ [[package]] name = "xcm-procedural" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "Inflector", "proc-macro2", @@ -16786,6 +16764,26 @@ dependencies = [ "time", ] +[[package]] +name = "zerocopy" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "zeroize" version = "1.6.0" @@ -16846,11 +16844,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index d4e822b6b..a01d77f8d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,29 +24,29 @@ version = "6.4.0" array-bytes = { version = "6.1" } codec = { package = "parity-scale-codec", version = "3.6", default-features = false } libsecp256k1 = { version = "0.7", default-features = false } -scale-info = { version = "2.9", default-features = false } +scale-info = { version = "2.10", default-features = false } sha3 = { version = "0.10" } static_assertions = { version = "1.1" } strum = { version = "0.25", default-features = false } # cumulus -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } # darwinia crab-runtime = { path = "runtime/crab" } @@ -72,159 +72,140 @@ pangolin-runtime = { path = "runtime/pangolin" } pangoro-runtime = { path = "runtime/pangoro" } # darwinia-messages-substrate -bp-darwinia-core = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.43", default-features = false } -bp-message-dispatch = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.43", default-features = false } -bp-messages = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.43", default-features = false } -bp-polkadot-core = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.43", default-features = false } -bp-runtime = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.43", default-features = false } -bridge-runtime-common = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-bridge-dispatch = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-bridge-grandpa = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-bridge-messages = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-bridge-parachains = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-fee-market = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.43", default-features = false } +bp-darwinia-core = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v1.0.0", default-features = false } +bp-message-dispatch = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v1.0.0", default-features = false } +bp-messages = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v1.0.0", default-features = false } +bp-polkadot-core = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v1.0.0", default-features = false } +bp-runtime = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v1.0.0", default-features = false } +bridge-runtime-common = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-bridge-dispatch = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-bridge-grandpa = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-bridge-messages = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-bridge-parachains = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-fee-market = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v1.0.0", default-features = false } # frontier -fc-consensus = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43" } -fc-db = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43" } -fc-mapping-sync = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", features = ["sql"] } -fc-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", features = ["rpc-binary-search-estimate"] } -fc-rpc-core = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43" } -fc-storage = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43" } -fp-account = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", default-features = false } -fp-ethereum = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", default-features = false } -fp-evm = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", default-features = false } -fp-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", default-features = false } -fp-self-contained = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-ethereum = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", default-features = false, features = ["forbid-evm-reentrancy"] } -pallet-evm = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", default-features = false, features = ["forbid-evm-reentrancy"] } -pallet-evm-precompile-blake2 = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-bn128 = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-dispatch = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-modexp = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-simple = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.43", default-features = false } +fc-consensus = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0" } +fc-db = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0" } +fc-mapping-sync = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", features = ["sql"] } +fc-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", features = ["rpc-binary-search-estimate", "txpool"] } +fc-rpc-core = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0" } +fc-storage = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0" } +fp-account = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", default-features = false, features = ["serde"] } +fp-ethereum = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", default-features = false } +fp-evm = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", default-features = false } +fp-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", default-features = false } +fp-self-contained = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", default-features = false, features = ["serde"] } +pallet-ethereum = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", default-features = false, features = ["forbid-evm-reentrancy"] } +pallet-evm = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", default-features = false, features = ["forbid-evm-reentrancy"] } +pallet-evm-precompile-blake2 = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", default-features = false } +pallet-evm-precompile-bn128 = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", default-features = false } +pallet-evm-precompile-dispatch = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", default-features = false } +pallet-evm-precompile-modexp = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", default-features = false } +pallet-evm-precompile-simple = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.0.0", default-features = false } # moonbeam -moonbeam-evm-tracer = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.43", default-features = false } -moonbeam-primitives-ext = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.43", default-features = false } -moonbeam-rpc-debug = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.43" } -moonbeam-rpc-primitives-debug = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.43", default-features = false } -moonbeam-rpc-trace = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.43" } -pallet-asset-manager = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-conviction-voting = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.43", default-features = false } -pallet-ethereum-xcm = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.43", default-features = false } -precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.43", default-features = false } -xcm-primitives = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.43", default-features = false } +moonbeam-evm-tracer = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.0.0", default-features = false } +moonbeam-primitives-ext = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.0.0", default-features = false } +moonbeam-rpc-debug = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.0.0" } +moonbeam-rpc-primitives-debug = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.0.0", default-features = false } +moonbeam-rpc-trace = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.0.0" } +pallet-asset-manager = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.0.0", default-features = false } +pallet-ethereum-xcm = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.0.0", default-features = false } +pallet-evm-precompile-conviction-voting = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.0.0", default-features = false } +precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.0.0", default-features = false } +xcm-primitives = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.0.0", default-features = false } # open-web3-stack -orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43", default-features = false } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43", default-features = false } +orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.0.0", default-features = false } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.0.0", default-features = false } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } # substrate -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, features = ["insecure_zero_ed"] } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-conviction-voting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-referenda = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-whitelist = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } - -[patch."https://github.com/paritytech/frontier"] -fc-consensus = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -fc-db = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -fc-mapping-sync = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -fc-rpc = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -fc-rpc-core = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -fc-storage = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -fp-account = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -fp-ethereum = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -fp-evm = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -fp-rpc = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -fp-self-contained = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -pallet-ethereum = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -pallet-evm = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -pallet-evm-precompile-blake2 = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -pallet-evm-precompile-bn128 = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -pallet-evm-precompile-dispatch = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -pallet-evm-precompile-modexp = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } -pallet-evm-precompile-simple = { git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.9.43" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, features = ["insecure_zero_ed"] } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-conviction-voting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-referenda = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-whitelist = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } [profile.release] panic = "unwind" @@ -259,7 +240,6 @@ hmac = { opt-level = 3 } httparse = { opt-level = 3 } integer-sqrt = { opt-level = 3 } keccak = { opt-level = 3 } -libm = { opt-level = 3 } librocksdb-sys = { opt-level = 3 } libsecp256k1 = { opt-level = 3 } libz-sys = { opt-level = 3 } diff --git a/core/primitives/src/lib.rs b/core/primitives/src/lib.rs index 7f3b52073..18fc8d6c0 100644 --- a/core/primitives/src/lib.rs +++ b/core/primitives/src/lib.rs @@ -38,9 +38,8 @@ pub type Signature = fp_account::EthereumSignature; pub type AccountId = <::Signer as sp_runtime::traits::IdentifyAccount>::AccountId; /// Index of a transaction in the chain. -pub type Index = u32; - -/// Nonce of an account in the chain. +/// or +/// nonce of an account in the chain. pub type Nonce = u32; /// A hash of some data used by the chain. diff --git a/node/Cargo.toml b/node/Cargo.toml index 3b694b662..a09ab2748 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -13,13 +13,12 @@ substrate-build-script-utils = { workspace = true } # crates.io array-bytes = { workspace = true } async-trait = { version = "0.1" } -clap = { version = "4.1", features = ["derive"] } -codec = { workspace = true, package = "parity-scale-codec" } +clap = { version = "4.4", features = ["derive"] } futures = { version = "0.3" } jsonrpsee = { version = "0.16", features = ["server"] } log = { version = "0.4" } serde = { version = "1.0", features = ["derive"] } -tokio = { version = "1.25" } +tokio = { version = "1.33" } trauma = { version = "2.2" } # cumulus @@ -82,6 +81,7 @@ sc-transaction-pool-api = { workspace = true } sp-api = { workspace = true, features = ["std"] } sp-block-builder = { workspace = true, features = ["std"] } sp-blockchain = { workspace = true } +sp-inherents = { workspace = true, features = ["std"] } sp-consensus-aura = { workspace = true, features = ["std"] } sp-core = { workspace = true, features = ["std"] } sp-io = { workspace = true, optional = true, features = ["std"] } diff --git a/node/src/chain_spec/crab.rs b/node/src/chain_spec/crab.rs index c75affc7f..280806c5c 100644 --- a/node/src/chain_spec/crab.rs +++ b/node/src/chain_spec/crab.rs @@ -38,7 +38,7 @@ use sc_telemetry::TelemetryEndpoints; use sp_core::{crypto::UncheckedInto, H160}; /// Specialized `ChainSpec` for the normal parachain runtime. -pub type ChainSpec = sc_service::GenericChainSpec; +pub type ChainSpec = sc_service::GenericChainSpec; fn properties() -> Properties { super::properties("CRAB") @@ -170,11 +170,11 @@ pub fn genesis_config() -> ChainSpec { "crab2", ChainType::Live, move || { - GenesisConfig { + RuntimeGenesisConfig { // System stuff. - system: SystemConfig { code: WASM_BINARY.unwrap().to_vec() }, + system: SystemConfig { code: WASM_BINARY.unwrap().to_vec(), ..Default::default() }, parachain_system: Default::default(), - parachain_info: ParachainInfoConfig { parachain_id: 2105.into() }, + parachain_info: ParachainInfoConfig { parachain_id: 2105.into(), ..Default::default() }, // Monetary stuff. balances: BalancesConfig { @@ -232,7 +232,7 @@ pub fn genesis_config() -> ChainSpec { treasury: Default::default(), // XCM stuff. - polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION) }, + polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION), ..Default::default() }, // EVM stuff. ethereum: Default::default(), @@ -252,6 +252,7 @@ pub fn genesis_config() -> ChainSpec { }), ) }, + ..Default::default() }, // S2S stuff. @@ -283,12 +284,12 @@ fn testnet_genesis( collators: Vec<(AccountId, AuraId)>, endowed_accounts: Vec, id: ParaId, -) -> GenesisConfig { - GenesisConfig { +) -> RuntimeGenesisConfig { + RuntimeGenesisConfig { // System stuff. - system: SystemConfig { code: WASM_BINARY.unwrap().to_vec() }, + system: SystemConfig { code: WASM_BINARY.unwrap().to_vec(), ..Default::default() }, parachain_system: Default::default(), - parachain_info: ParachainInfoConfig { parachain_id: id }, + parachain_info: ParachainInfoConfig { parachain_id: id, ..Default::default() }, // Monetary stuff. balances: BalancesConfig { @@ -340,7 +341,10 @@ fn testnet_genesis( treasury: Default::default(), // XCM stuff. - polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION) }, + polkadot_xcm: PolkadotXcmConfig { + safe_xcm_version: Some(SAFE_XCM_VERSION), + ..Default::default() + }, // EVM stuff. ethereum: Default::default(), @@ -374,6 +378,7 @@ fn testnet_genesis( ]), ) }, + ..Default::default() }, // S2S stuff. diff --git a/node/src/chain_spec/darwinia.rs b/node/src/chain_spec/darwinia.rs index f87b55935..8ffaf69a7 100644 --- a/node/src/chain_spec/darwinia.rs +++ b/node/src/chain_spec/darwinia.rs @@ -38,7 +38,7 @@ use sc_telemetry::TelemetryEndpoints; use sp_core::{crypto::UncheckedInto, H160}; /// Specialized `ChainSpec` for the normal parachain runtime. -pub type ChainSpec = sc_service::GenericChainSpec; +pub type ChainSpec = sc_service::GenericChainSpec; fn properties() -> Properties { super::properties("RING") @@ -166,11 +166,11 @@ pub fn genesis_config() -> ChainSpec { "darwinia2", ChainType::Live, move || { - GenesisConfig { + RuntimeGenesisConfig { // System stuff. - system: SystemConfig { code: WASM_BINARY.unwrap().to_vec() }, + system: SystemConfig { code: WASM_BINARY.unwrap().to_vec(), ..Default::default() }, parachain_system: Default::default(), - parachain_info: ParachainInfoConfig { parachain_id: 2046.into() }, + parachain_info: ParachainInfoConfig { parachain_id: 2046.into(), ..Default::default() }, // Monetary stuff. balances: BalancesConfig { @@ -228,7 +228,7 @@ pub fn genesis_config() -> ChainSpec { treasury: Default::default(), // XCM stuff. - polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION) }, + polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION), ..Default::default() }, // EVM stuff. ethereum: Default::default(), @@ -248,6 +248,7 @@ pub fn genesis_config() -> ChainSpec { }), ) }, + ..Default::default() }, // S2S stuff. @@ -279,12 +280,12 @@ fn testnet_genesis( collators: Vec<(AccountId, AuraId)>, endowed_accounts: Vec, id: ParaId, -) -> GenesisConfig { - GenesisConfig { +) -> RuntimeGenesisConfig { + RuntimeGenesisConfig { // System stuff. - system: SystemConfig { code: WASM_BINARY.unwrap().to_vec() }, + system: SystemConfig { code: WASM_BINARY.unwrap().to_vec(), ..Default::default() }, parachain_system: Default::default(), - parachain_info: ParachainInfoConfig { parachain_id: id }, + parachain_info: ParachainInfoConfig { parachain_id: id, ..Default::default() }, // Monetary stuff. balances: BalancesConfig { @@ -336,7 +337,10 @@ fn testnet_genesis( treasury: Default::default(), // XCM stuff. - polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION) }, + polkadot_xcm: PolkadotXcmConfig { + safe_xcm_version: Some(SAFE_XCM_VERSION), + ..Default::default() + }, // EVM stuff. ethereum: Default::default(), @@ -370,6 +374,7 @@ fn testnet_genesis( ]), ) }, + ..Default::default() }, // S2S stuff. diff --git a/node/src/chain_spec/pangolin.rs b/node/src/chain_spec/pangolin.rs index 9fae26fbf..83aa8d822 100644 --- a/node/src/chain_spec/pangolin.rs +++ b/node/src/chain_spec/pangolin.rs @@ -38,7 +38,7 @@ use sc_telemetry::TelemetryEndpoints; use sp_core::{crypto::UncheckedInto, H160}; /// Specialized `ChainSpec` for the normal parachain runtime. -pub type ChainSpec = sc_service::GenericChainSpec; +pub type ChainSpec = sc_service::GenericChainSpec; fn properties() -> Properties { super::properties("PRING") @@ -144,11 +144,11 @@ pub fn genesis_config() -> ChainSpec { "pangolin2", ChainType::Live, move || { - GenesisConfig { + RuntimeGenesisConfig { // System stuff. - system: SystemConfig { code: WASM_BINARY.unwrap().to_vec() }, + system: SystemConfig { code: WASM_BINARY.unwrap().to_vec(), ..Default::default() }, parachain_system: Default::default(), - parachain_info: ParachainInfoConfig { parachain_id: 2105.into() }, + parachain_info: ParachainInfoConfig { parachain_id: 2105.into(), ..Default::default() }, // Monetary stuff. balances: BalancesConfig { @@ -157,6 +157,7 @@ pub fn genesis_config() -> ChainSpec { (array_bytes::hex_n_into_unchecked(C2), 10_000 * UNIT), (array_bytes::hex_n_into_unchecked(C3), 10_000 * UNIT), ], + ..Default::default() }, transaction_payment: Default::default(), assets: AssetsConfig { @@ -221,7 +222,7 @@ pub fn genesis_config() -> ChainSpec { sudo: SudoConfig { key: Some(array_bytes::hex_n_into_unchecked(SUDO)) }, // XCM stuff. - polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION) }, + polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION), ..Default::default() }, // EVM stuff. ethereum: Default::default(), @@ -241,6 +242,7 @@ pub fn genesis_config() -> ChainSpec { }), ) }, + ..Default::default() }, // S2S stuff. @@ -272,12 +274,12 @@ fn testnet_genesis( collators: Vec<(AccountId, AuraId)>, endowed_accounts: Vec, id: ParaId, -) -> GenesisConfig { - GenesisConfig { +) -> RuntimeGenesisConfig { + RuntimeGenesisConfig { // System stuff. - system: SystemConfig { code: WASM_BINARY.unwrap().to_vec() }, + system: SystemConfig { code: WASM_BINARY.unwrap().to_vec(), ..Default::default() }, parachain_system: Default::default(), - parachain_info: ParachainInfoConfig { parachain_id: id }, + parachain_info: ParachainInfoConfig { parachain_id: id, ..Default::default() }, // Monetary stuff. balances: BalancesConfig { @@ -341,7 +343,10 @@ fn testnet_genesis( sudo: SudoConfig { key: Some(array_bytes::hex_n_into_unchecked(ALITH)) }, // XCM stuff. - polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION) }, + polkadot_xcm: PolkadotXcmConfig { + safe_xcm_version: Some(SAFE_XCM_VERSION), + ..Default::default() + }, // EVM stuff. ethereum: Default::default(), @@ -375,6 +380,7 @@ fn testnet_genesis( ]), ) }, + ..Default::default() }, // S2S stuff. diff --git a/node/src/cli.rs b/node/src/cli.rs index a5f6825fc..aced9003d 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -16,9 +16,6 @@ // You should have received a copy of the GNU General Public License // along with Darwinia. If not, see . -// std -use std::{path::PathBuf, str::FromStr}; - /// Sub-commands supported by the collator. #[derive(Debug, clap::Subcommand)] pub enum Subcommand { @@ -108,7 +105,7 @@ pub struct RelayChainCli { pub chain_id: Option, /// The base path that should be used by the relay chain. - pub base_path: Option, + pub base_path: Option, } impl RelayChainCli { /// Parse the relay chain CLI parameters using the para chain `Configuration`. @@ -129,7 +126,7 @@ impl RelayChainCli { } /// Available frontier backend types. -#[derive(Debug, Copy, Clone, Default, clap::ValueEnum)] +#[derive(Copy, Clone, Debug, Default, clap::ValueEnum)] pub enum FrontierBackendType { /// Either RocksDb or ParityDb as per inherited from the global backend settings. #[default] @@ -227,7 +224,7 @@ pub enum TracingApi { Debug, Trace, } -impl FromStr for TracingApi { +impl std::str::FromStr for TracingApi { type Err = String; fn from_str(s: &str) -> Result { @@ -239,7 +236,7 @@ impl FromStr for TracingApi { } } -#[derive(Clone, Debug)] +#[derive(Clone, Debug, Default)] pub struct EthRpcConfig { pub tracing_api: Vec, pub tracing_max_permits: u32, diff --git a/node/src/command.rs b/node/src/command.rs index 27988a436..6b1841839 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -18,8 +18,6 @@ // std use std::{env, net::SocketAddr, path::PathBuf}; -// crates.io -use codec::Encode; // cumulus use cumulus_primitives_core::ParaId; // darwinia @@ -28,21 +26,17 @@ use crate::{ cli::{Cli, FrontierBackendType, RelayChainCli, Subcommand}, service::{self, *}, }; -use dc_primitives::Block; // substrate use sc_cli::{ CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, - Result, RuntimeVersion, SharedParams, SubstrateCli, + Result, SharedParams, SubstrateCli, }; use sc_service::{ config::{BasePath, PrometheusConfig}, ChainSpec, DatabaseSource, }; -use sp_core::{ - crypto::{self, Ss58AddressFormatRegistry}, - hexdisplay::HexDisplay, -}; -use sp_runtime::traits::{AccountIdConversion, Block as BlockT}; +use sp_core::crypto::{self, Ss58AddressFormatRegistry}; +use sp_runtime::traits::AccountIdConversion; impl SubstrateCli for Cli { fn impl_name() -> String { @@ -78,32 +72,6 @@ impl SubstrateCli for Cli { fn load_spec(&self, id: &str) -> std::result::Result, String> { load_spec(id) } - - fn native_runtime_version(spec: &Box) -> &'static RuntimeVersion { - #[cfg(feature = "crab-native")] - if spec.is_crab() { - return &crab_runtime::VERSION; - } - - #[cfg(feature = "darwinia-native")] - if spec.is_darwinia() { - return &darwinia_runtime::VERSION; - } - - #[cfg(feature = "pangolin-native")] - if spec.is_pangolin() { - return &pangolin_runtime::VERSION; - } - - #[cfg(feature = "pangoro-native")] - if spec.is_pangoro() { - return &pangoro_runtime::VERSION; - } - - panic!( - "No feature(crab-native, darwinia-native, pangolin-native, pangoro-native) is enabled!" - ); - } } impl SubstrateCli for RelayChainCli { @@ -140,10 +108,6 @@ impl SubstrateCli for RelayChainCli { fn load_spec(&self, id: &str) -> std::result::Result, String> { polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id) } - - fn native_runtime_version(chain_spec: &Box) -> &'static RuntimeVersion { - polkadot_cli::Cli::native_runtime_version(chain_spec) - } } impl DefaultConfigurationValues for RelayChainCli { fn p2p_listen_port() -> u16 { @@ -274,7 +238,7 @@ pub fn run() -> Result<()> { ($config:expr, $cli:ident, |$partials:ident| $code:expr) => {{ #[cfg(feature = "crab-native")] if $config.chain_spec.is_crab() { - let $partials = new_partial::( + let $partials = service::new_partial::( &$config, &$cli.eth_args.build_eth_rpc_config(), )?; @@ -284,7 +248,7 @@ pub fn run() -> Result<()> { #[cfg(feature = "darwinia-native")] if $config.chain_spec.is_darwinia() { - let $partials = new_partial::( + let $partials = service::new_partial::( &$config, &$cli.eth_args.build_eth_rpc_config(), )?; @@ -294,7 +258,7 @@ pub fn run() -> Result<()> { #[cfg(feature = "pangolin-native")] if $config.chain_spec.is_pangolin() { - let $partials = new_partial::( + let $partials = service::new_partial::( &$config, &$cli.eth_args.build_eth_rpc_config(), )?; @@ -304,7 +268,7 @@ pub fn run() -> Result<()> { #[cfg(feature = "pangoro-native")] if $config.chain_spec.is_pangoro() { - let $partials = new_partial::( + let $partials = service::new_partial::( &$config, &$cli.eth_args.build_eth_rpc_config(), )?; @@ -476,17 +440,10 @@ pub fn run() -> Result<()> { cmd.run(config, polkadot_config) }) }, - Some(Subcommand::ExportGenesisState(cmd)) => { - let runner = cli.create_runner(cmd)?; - let chain_spec = &runner.config().chain_spec; - - set_default_ss58_version(chain_spec); - runner.sync_run(|_config| { - let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?; - let state_version = Cli::native_runtime_version(&spec).state_version(); - cmd.run::(&*spec, state_version) - }) - }, + Some(Subcommand::ExportGenesisState(cmd)) => + construct_async_run!(|components, cli, cmd, config| { + Ok(async move { cmd.run(&*config.chain_spec, &*components.client) }) + }), Some(Subcommand::ExportGenesisWasm(cmd)) => { let runner = cli.create_runner(cmd)?; let chain_spec = &runner.config().chain_spec; @@ -506,36 +463,9 @@ pub fn run() -> Result<()> { set_default_ss58_version(&runner.config().chain_spec); - match &**cmd { + match cmd { BenchmarkCmd::Pallet(cmd) => - runner.sync_run(|config| { - let chain_spec = &config.chain_spec; - - ensure_dev(chain_spec)?; - - #[cfg(feature = "crab-native")] - if chain_spec.is_crab() { - return cmd.run::(config); - } - - #[cfg(feature = "darwinia-native")] - if chain_spec.is_darwinia() { - return cmd.run::(config); - } - - #[cfg(feature = "pangolin-native")] - if chain_spec.is_pangolin() { - return cmd.run::(config); - } - - #[cfg(feature = "pangoro-native")] - if chain_spec.is_pangoro() { - return cmd.run::(config); - } - - panic!("No feature(crab-native, darwinia-native, pangolin-native, pangoro-native) is enabled!"); - }), - + runner.sync_run(|config| cmd.run::(config)), BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| { construct_benchmark_partials!(config, cli, |partials| { let db = partials.backend.expose_db(); @@ -559,14 +489,15 @@ pub fn run() -> Result<()> { ), #[cfg(feature = "try-runtime")] Some(Subcommand::TryRuntime(cmd)) => { + // substrate + use frame_benchmarking::benchmarking::HostFunctions; use sc_service::TaskManager; - use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch}; use sp_io::SubstrateHostFunctions; use try_runtime_cli::block_building_info; - type HostFunctionsOf = ExtendedHostFunctions< + type HostFunctions = ExtendedHostFunctions< SubstrateHostFunctions, - ::ExtendHostFunctions, + HostFunctions, >; let runner = cli.create_runner(cmd)?; @@ -581,35 +512,7 @@ pub fn run() -> Result<()> { .map_err(|e| format!("Error: {:?}", e))?; let info_provider = block_building_info::timestamp_with_aura_info(6000); - #[cfg(feature = "crab-native")] - if chain_spec.is_crab() { - return runner.async_run(|_| { - Ok((cmd.run::, _>(Some(info_provider)), task_manager)) - }); - } - - #[cfg(feature = "darwinia-native")] - if chain_spec.is_darwinia() { - return runner.async_run(|_| { - Ok((cmd.run::, _>(Some(info_provider)), task_manager)) - }); - } - - #[cfg(feature = "pangolin-native")] - if chain_spec.is_pangolin() { - return runner.async_run(|_| { - Ok((cmd.run::, _>(Some(info_provider)), task_manager)) - }); - } - - #[cfg(feature = "pangoro-native")] - if chain_spec.is_pangoro() { - return runner.async_run(|_| { - Ok((cmd.run::, _>(Some(info_provider)), task_manager)) - }); - } - - panic!("No feature(crab-native, darwinia-native, pangolin-native, pangoro-native) is enabled!"); + Ok((cmd.run::(Some(info_provider)), task_manager)) }, #[cfg(not(feature = "try-runtime"))] Some(Subcommand::TryRuntime) => Err( @@ -639,24 +542,22 @@ pub fn run() -> Result<()> { let id = ParaId::from(para_id); let parachain_account = AccountIdConversion::::into_account_truncating(&id); - let state_version = Cli::native_runtime_version(&config.chain_spec).state_version(); - let block: Block = - cumulus_client_cli::generate_genesis_block(&*config.chain_spec, state_version) - .map_err(|e| format!("{:?}", e))?; - let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode())); let tokio_handle = config.tokio_handle.clone(); let eth_rpc_config = cli.eth_args.build_eth_rpc_config(); log::info!("Parachain id: {:?}", id); log::info!("Parachain Account: {}", parachain_account); - log::info!("Parachain genesis state: {}", genesis_state); log::info!( "Is collating: {}", if config.role.is_authority() { "yes" } else { "no" } ); if !collator_options.relay_chain_rpc_urls.is_empty() && !cli.relay_chain_args.is_empty() { - log::warn!("Detected relay chain node arguments together with --relay-chain-rpc-url. This command starts a minimal Polkadot node that only uses a network-related subset of all relay chain CLI options."); + log::warn!( + "Detected relay chain node arguments together with --relay-chain-rpc-url. \ + This command starts a minimal Polkadot node that only uses a \ + network-related subset of all relay chain CLI options." + ); } if chain_spec.is_dev() { diff --git a/node/src/rpc.rs b/node/src/rpc.rs index 2dc1ee15a..db444c00c 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -35,7 +35,7 @@ use moonbeam_rpc_trace::{Trace, TraceServer}; pub type RpcExtension = jsonrpsee::RpcModule<()>; /// Full client dependencies -pub struct FullDeps { +pub struct FullDeps { /// The client instance to use. pub client: Arc, /// Transaction pool instance. @@ -66,6 +66,8 @@ pub struct FullDeps { pub block_data_cache: Arc>, /// Mandated parent hashes for a given block hash. pub forced_parent_hashes: Option>, + /// Something that can create the inherent data providers for pending state + pub pending_create_inherent_data_providers: CIDP, } /// EVM tracing rpc server config @@ -87,8 +89,8 @@ where } /// Instantiate all RPC extensions. -pub fn create_full( - deps: FullDeps, +pub fn create_full( + deps: FullDeps, subscription_task_executor: sc_rpc::SubscriptionTaskExecutor, pubsub_notification_sinks: Arc< fc_mapping_sync::EthereumBlockNotificationSinks< @@ -109,12 +111,16 @@ where + sp_api::CallApiAt + sp_api::ProvideRuntimeApi + sp_blockchain::HeaderBackend + + sc_client_api::backend::AuxStore + + sc_client_api::UsageProvider + sp_blockchain::HeaderMetadata, C::Api: fp_rpc::ConvertTransactionRuntimeApi + fp_rpc::EthereumRuntimeRPCApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + sp_block_builder::BlockBuilder + + sp_consensus_aura::AuraApi + substrate_frame_rpc_system::AccountNonceApi, + CIDP: sp_inherents::CreateInherentDataProviders + Send + 'static, P: 'static + Sync + Send + sc_transaction_pool_api::TransactionPool, A: 'static + sc_transaction_pool::ChainApi, EC: fc_rpc::EthConfig, @@ -146,6 +152,7 @@ where overrides, block_data_cache, forced_parent_hashes, + pending_create_inherent_data_providers, } = deps; module.merge(System::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?; @@ -166,18 +173,20 @@ where fee_history_cache_limit, 10, forced_parent_hashes, + pending_create_inherent_data_providers, + Some(Box::new(fc_rpc::pending::AuraConsensusDataProvider::new(client.clone()))), ) .replace_config::() .into_rpc(), )?; - let tx_pool = TxPool::new(client.clone(), graph); + let tx_pool = TxPool::new(client.clone(), graph.clone()); if let Some(filter_pool) = filter_pool { module.merge( EthFilter::new( client.clone(), frontier_backend, - tx_pool.clone(), + graph, filter_pool, 500_usize, // max stored filters max_past_logs, diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs index 34b24af4b..c1780a543 100644 --- a/node/src/service/mod.rs +++ b/node/src/service/mod.rs @@ -40,9 +40,12 @@ use std::{ sync::{Arc, Mutex}, time::Duration, }; +// crates.io +use futures::FutureExt; // darwinia use dc_primitives::*; // substrate +use sc_client_api::Backend; use sc_consensus::ImportQueue; use sc_network::NetworkBlock; @@ -336,11 +339,25 @@ where .await?; if parachain_config.offchain_worker.enabled { - sc_service::build_offchain_workers( - ¶chain_config, - task_manager.spawn_handle(), - client.clone(), - network.clone(), + task_manager.spawn_handle().spawn( + "offchain-workers-runner", + "offchain-work", + sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { + runtime_api_provider: client.clone(), + keystore: Some(keystore_container.keystore()), + offchain_db: backend.offchain_storage(), + transaction_pool: Some( + sc_transaction_pool_api::OffchainTransactionPoolFactory::new( + transaction_pool.clone(), + ), + ), + network_provider: network.clone(), + is_validator: parachain_config.role.is_authority(), + enable_http_requests: false, + custom_extensions: move |_| Vec::new(), + }) + .run(client.clone(), task_manager.spawn_handle()) + .boxed(), ); } @@ -385,6 +402,18 @@ where let eth_rpc_config = eth_rpc_config.clone(); let sync_service = sync_service.clone(); + let slot_duration = sc_consensus_aura::slot_duration(&*client)?; + let pending_create_inherent_data_providers = move |_, ()| async move { + let current = sp_timestamp::InherentDataProvider::from_system_time(); + let next_slot = current.timestamp().as_millis() + slot_duration.as_millis(); + let timestamp = sp_timestamp::InherentDataProvider::new(next_slot.into()); + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( + *timestamp, + slot_duration, + ); + Ok((slot, timestamp)) + }; + Box::new(move |deny_unsafe, subscription_task_executor| { let deps = crate::rpc::FullDeps { client: client.clone(), @@ -405,12 +434,13 @@ where overrides: overrides.clone(), block_data_cache: block_data_cache.clone(), forced_parent_hashes: None, + pending_create_inherent_data_providers, }; if eth_rpc_config.tracing_api.contains(&crate::cli::TracingApi::Debug) || eth_rpc_config.tracing_api.contains(&crate::cli::TracingApi::Trace) { - crate::rpc::create_full::<_, _, _, _, crate::rpc::DefaultEthConfig<_, _>>( + crate::rpc::create_full::<_, _, _, _, crate::rpc::DefaultEthConfig<_, _>, _>( deps, subscription_task_executor, pubsub_notification_sinks.clone(), @@ -421,7 +451,7 @@ where ) .map_err(Into::into) } else { - crate::rpc::create_full::<_, _, _, _, crate::rpc::DefaultEthConfig<_, _>>( + crate::rpc::create_full::<_, _, _, _, crate::rpc::DefaultEthConfig<_, _>, _>( deps, subscription_task_executor, pubsub_notification_sinks.clone(), @@ -743,22 +773,25 @@ where })?; if config.offchain_worker.enabled { - let offchain_workers = Arc::new(sc_offchain::OffchainWorkers::new_with_options( - client.clone(), - sc_offchain::OffchainWorkerOptions { enable_http_requests: false }, - )); - - // Start the offchain workers to have task_manager.spawn_handle().spawn( - "offchain-notifications", - None, - sc_offchain::notification_future( - config.role.is_authority(), - client.clone(), - offchain_workers, - task_manager.spawn_handle(), - network.clone(), - ), + "offchain-workers-runner", + "offchain-work", + sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { + runtime_api_provider: client.clone(), + keystore: None, + offchain_db: backend.offchain_storage(), + transaction_pool: Some( + sc_transaction_pool_api::OffchainTransactionPoolFactory::new( + transaction_pool.clone(), + ), + ), + network_provider: network.clone(), + is_validator: config.role.is_authority(), + enable_http_requests: false, + custom_extensions: move |_| vec![], + }) + .run(client.clone(), task_manager.spawn_handle()) + .boxed(), ); } @@ -821,8 +854,8 @@ where Default::default(), Default::default(), ), - raw_downward_messages: vec![], - raw_horizontal_messages: vec![], + raw_downward_messages: Vec::new(), + raw_horizontal_messages: Vec::new(), }; Ok((slot, timestamp, mocked_parachain)) @@ -894,6 +927,18 @@ where let eth_rpc_config = eth_rpc_config.clone(); let sync_service = sync_service.clone(); + let slot_duration = sc_consensus_aura::slot_duration(&*client)?; + let pending_create_inherent_data_providers = move |_, ()| async move { + let current = sp_timestamp::InherentDataProvider::from_system_time(); + let next_slot = current.timestamp().as_millis() + slot_duration.as_millis(); + let timestamp = sp_timestamp::InherentDataProvider::new(next_slot.into()); + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( + *timestamp, + slot_duration, + ); + Ok((slot, timestamp)) + }; + Box::new(move |deny_unsafe, subscription_task_executor| { let deps = crate::rpc::FullDeps { client: client.clone(), @@ -914,12 +959,13 @@ where overrides: overrides.clone(), block_data_cache: block_data_cache.clone(), forced_parent_hashes: None, + pending_create_inherent_data_providers, }; if eth_rpc_config.tracing_api.contains(&crate::cli::TracingApi::Debug) || eth_rpc_config.tracing_api.contains(&crate::cli::TracingApi::Trace) { - crate::rpc::create_full::<_, _, _, _, crate::rpc::DefaultEthConfig<_, _>>( + crate::rpc::create_full::<_, _, _, _, crate::rpc::DefaultEthConfig<_, _>, _>( deps, subscription_task_executor, pubsub_notification_sinks.clone(), @@ -930,7 +976,7 @@ where ) .map_err(Into::into) } else { - crate::rpc::create_full::<_, _, _, _, crate::rpc::DefaultEthConfig<_, _>>( + crate::rpc::create_full::<_, _, _, _, crate::rpc::DefaultEthConfig<_, _>, _>( deps, subscription_task_executor, pubsub_notification_sinks.clone(), diff --git a/pallet/account-migration/src/lib.rs b/pallet/account-migration/src/lib.rs index e6bde2562..32986bfb5 100644 --- a/pallet/account-migration/src/lib.rs +++ b/pallet/account-migration/src/lib.rs @@ -58,7 +58,7 @@ pub use weights::WeightInfo; // darwinia use darwinia_deposit::Deposit; use darwinia_staking::Ledger; -use dc_primitives::{AccountId as AccountId20, AssetId, Balance, BlockNumber, Index}; +use dc_primitives::{AccountId as AccountId20, AssetId, Balance, Nonce}; // substrate use frame_support::{ migration, @@ -103,8 +103,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config< - Index = Index, - BlockNumber = BlockNumber, + Nonce = Nonce, AccountId = AccountId20, AccountData = AccountData, Lookup = IdentityLookup, @@ -149,7 +148,7 @@ pub mod pallet { #[pallet::storage] #[pallet::getter(fn account_of)] pub type Accounts = - StorageMap<_, Blake2_128Concat, AccountId32, AccountInfo>>; + StorageMap<_, Blake2_128Concat, AccountId32, AccountInfo>>; /// [`pallet_asset::AssetAccount`] data. /// diff --git a/pallet/account-migration/src/mock.rs b/pallet/account-migration/src/mock.rs index b30caa9f3..c961038ec 100644 --- a/pallet/account-migration/src/mock.rs +++ b/pallet/account-migration/src/mock.rs @@ -20,7 +20,7 @@ pub use crate as darwinia_account_migration; pub use dc_primitives::*; // substrate -use frame_support::traits::GenesisBuild; +use frame_support::traits::BuildGenesisConfig; use sp_io::TestExternalities; pub struct Dummy; @@ -73,15 +73,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = frame_support::traits::Everything; type BlockHashCount = (); type BlockLength = (); - type BlockNumber = BlockNumber; type BlockWeights = (); type DbWeight = (); type Hash = sp_core::H256; type Hashing = sp_runtime::traits::BlakeTwo256; - type Header = sp_runtime::generic::Header; - type Index = Index; type Lookup = sp_runtime::traits::IdentityLookup; type MaxConsumers = frame_support::traits::ConstU32<16>; + type Nonce = Nonce; type OnKilledAccount = (); type OnNewAccount = (); type OnSetCode = (); @@ -107,13 +105,13 @@ impl pallet_balances::Config for Runtime { type DustRemoval = (); type ExistentialDeposit = (); type FreezeIdentifier = (); - type HoldIdentifier = (); type MaxFreezes = (); type MaxHolds = (); type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type RuntimeHoldReason = (); type WeightInfo = (); } @@ -203,11 +201,7 @@ impl darwinia_account_migration::Config for Runtime { } frame_support::construct_runtime! { - pub enum Runtime where - Block = frame_system::mocking::MockBlock, - NodeBlock = frame_system::mocking::MockBlock, - UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic, - { + pub enum Runtime { System: frame_system, Timestamp: pallet_timestamp, Balances: pallet_balances, diff --git a/pallet/deposit/src/mock.rs b/pallet/deposit/src/mock.rs index f2e1b7c09..a6a391008 100644 --- a/pallet/deposit/src/mock.rs +++ b/pallet/deposit/src/mock.rs @@ -20,7 +20,7 @@ pub use crate as darwinia_deposit; pub use dc_types::{AssetId, Balance, Moment, UNIT}; // substrate -use frame_support::traits::GenesisBuild; +use frame_support::traits::BuildGenesisConfig; use sp_io::TestExternalities; impl frame_system::Config for Runtime { @@ -35,9 +35,9 @@ impl frame_system::Config for Runtime { type Hash = sp_core::H256; type Hashing = sp_runtime::traits::BlakeTwo256; type Header = sp_runtime::testing::Header; - type Index = u64; type Lookup = sp_runtime::traits::IdentityLookup; type MaxConsumers = frame_support::traits::ConstU32<16>; + type Nonce = u64; type OnKilledAccount = (); type OnNewAccount = (); type OnSetCode = (); @@ -63,13 +63,13 @@ impl pallet_balances::Config for Runtime { type DustRemoval = (); type ExistentialDeposit = frame_support::traits::ConstU128<0>; type FreezeIdentifier = (); - type HoldIdentifier = (); type MaxFreezes = (); type MaxHolds = (); type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type RuntimeHoldReason = (); type WeightInfo = (); } @@ -132,11 +132,7 @@ impl darwinia_deposit::Config for Runtime { } frame_support::construct_runtime! { - pub enum Runtime where - Block = frame_system::mocking::MockBlock, - NodeBlock = frame_system::mocking::MockBlock, - UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic, - { + pub enum Runtime { System: frame_system, Timestamp: pallet_timestamp, Balances: pallet_balances, diff --git a/pallet/ecdsa-authority/src/lib.rs b/pallet/ecdsa-authority/src/lib.rs index e730fdebe..be56377cf 100644 --- a/pallet/ecdsa-authority/src/lib.rs +++ b/pallet/ecdsa-authority/src/lib.rs @@ -46,9 +46,12 @@ use ethabi::Token; // darwinia use dc_primitives::{AccountId, BlockNumber}; // substrate -use frame_support::pallet_prelude::*; +use frame_support::{pallet_prelude::*, DefaultNoBound}; use frame_system::pallet_prelude::*; -use sp_runtime::{traits::Zero, Perbill}; +use sp_runtime::{ + traits::{SaturatedConversion, Zero}, + Perbill, +}; use sp_std::prelude::*; #[frame_support::pallet] @@ -57,9 +60,7 @@ pub mod pallet { use crate::*; #[pallet::config] - pub trait Config: - frame_system::Config - { + pub trait Config: frame_system::Config { /// Override the [`frame_system::Config::RuntimeEvent`]. type RuntimeEvent: From> + IsType<::RuntimeEvent>; @@ -82,14 +83,14 @@ pub mod pallet { /// The interval of checking the message root. /// This must be shorter than [`Config::MaxPendingPeriod`]. #[pallet::constant] - type SyncInterval: Get; + type SyncInterval: Get>; /// How long should we wait for the message root to be signed. /// /// If the collecting new message root signatures process takes more than /// `MaxPendingPeriod`, we will drop the root. And update the root with a new one. #[pallet::constant] - type MaxPendingPeriod: Get; + type MaxPendingPeriod: Get; /// The Darwinia message root. /// @@ -171,7 +172,7 @@ pub mod pallet { pub type MessageRootToSign = StorageValue<_, MessageRootSigned, OptionQuery>; - #[derive(frame_support::DefaultNoBound)] + #[derive(DefaultNoBound)] #[pallet::genesis_config] pub struct GenesisConfig where @@ -182,7 +183,7 @@ pub mod pallet { } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { >::put(BoundedVec::try_from(self.authorities.clone()).unwrap()); >::put(BoundedVec::try_from(self.authorities.clone()).unwrap()); @@ -193,9 +194,11 @@ pub mod pallet { #[pallet::without_storage_info] pub struct Pallet(PhantomData); #[pallet::hooks] - impl Hooks for Pallet { - fn on_initialize(now: T::BlockNumber) -> Weight { + impl Hooks> for Pallet { + fn on_initialize(now: BlockNumberFor) -> Weight { if (now % T::SyncInterval::get()).is_zero() { + let now = now.saturated_into(); + if let Some(message_root) = Self::try_update_message_root(now, false) { Self::on_new_message_root(now, message_root); } @@ -338,7 +341,7 @@ pub mod pallet { signatures: authorities_change_signed.signatures.to_vec(), }); - let now = >::block_number(); + let now = >::block_number().saturated_into(); if let Some(message_root) = Self::try_update_message_root(now, true) { Self::on_new_message_root(now, message_root); @@ -492,7 +495,7 @@ pub mod pallet { >::mutate(|nonce| *nonce += 1); } - fn try_update_message_root(at: T::BlockNumber, force: bool) -> Option { + fn try_update_message_root(at: BlockNumber, force: bool) -> Option { // Not allow to relay the messages if the new authorities set is not verified. if Self::ensure_not_on_authorities_change().is_err() { return None; @@ -533,9 +536,12 @@ pub mod pallet { } } - fn on_new_message_root(at: T::BlockNumber, message_root: Hash) { - let commitment = - Commitment { block_number: at, message_root, nonce: >::get() }; + fn on_new_message_root(at: BlockNumber, message_root: Hash) { + let commitment = Commitment { + block_number: at.saturated_into::(), + message_root, + nonce: >::get(), + }; let message = Sign::signable_message( T::ChainId::get(), T::Version::get().spec_name.as_ref(), diff --git a/pallet/ecdsa-authority/src/mock.rs b/pallet/ecdsa-authority/src/mock.rs index c27a29091..e623d3c3d 100644 --- a/pallet/ecdsa-authority/src/mock.rs +++ b/pallet/ecdsa-authority/src/mock.rs @@ -21,7 +21,7 @@ pub use crate::{self as darwinia_ecdsa_authority}; // darwinia use darwinia_ecdsa_authority::{primitives::*, *}; // substrate -use frame_support::traits::{GenesisBuild, OnInitialize}; +use frame_support::traits::{BuildGenesisConfig, OnInitialize}; use sp_io::TestExternalities; frame_support::parameter_types! { @@ -36,15 +36,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = frame_support::traits::Everything; type BlockHashCount = (); type BlockLength = (); - type BlockNumber = BlockNumber; type BlockWeights = (); type DbWeight = (); type Hash = sp_core::H256; type Hashing = sp_runtime::traits::BlakeTwo256; - type Header = sp_runtime::generic::Header; - type Index = u64; type Lookup = sp_runtime::traits::IdentityLookup; type MaxConsumers = frame_support::traits::ConstU32<16>; + type Nonce = u64; type OnKilledAccount = (); type OnNewAccount = (); type OnSetCode = (); @@ -73,12 +71,7 @@ impl Config for Runtime { } frame_support::construct_runtime! { - pub enum Runtime - where - Block = frame_system::mocking::MockBlock, - NodeBlock = frame_system::mocking::MockBlock, - UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic, - { + pub enum Runtime { System: frame_system, EcdsaAuthority: darwinia_ecdsa_authority, } diff --git a/pallet/ecdsa-authority/src/primitives.rs b/pallet/ecdsa-authority/src/primitives.rs index 92ae203af..566bc4fb8 100644 --- a/pallet/ecdsa-authority/src/primitives.rs +++ b/pallet/ecdsa-authority/src/primitives.rs @@ -24,7 +24,7 @@ pub use sp_core::{ecdsa::Signature, H160 as Address, H256 as Hash}; use codec::{Decode, Encode}; use scale_info::TypeInfo; // darwinia -use dc_primitives::AccountId; +use dc_primitives::{AccountId, BlockNumber}; // substrate use frame_support::{BoundedVec, EqNoBound, PartialEqNoBound, RuntimeDebug, RuntimeDebugNoBound}; use sp_core::Get; @@ -131,7 +131,7 @@ impl Operation { /// The darwinia-ecdsa-authority commitment. #[derive(Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, TypeInfo)] pub struct Commitment { - pub(crate) block_number: u32, + pub(crate) block_number: BlockNumber, pub(crate) message_root: Hash, pub(crate) nonce: u32, } diff --git a/pallet/message-gadget/Cargo.toml b/pallet/message-gadget/Cargo.toml index 48392f133..27c8e8e9c 100644 --- a/pallet/message-gadget/Cargo.toml +++ b/pallet/message-gadget/Cargo.toml @@ -19,6 +19,7 @@ frame-support = { workspace = true } frame-system = { workspace = true } sp-core = { workspace = true } sp-io = { workspace = true } +sp-runtime = { workspace = true, optional = true } sp-std = { workspace = true } [dev-dependencies] @@ -28,7 +29,6 @@ array-bytes = { workspace = true } # substrate pallet-balances = { workspace = true, features = ["std"] } pallet-timestamp = { workspace = true, features = ["std"] } -sp-runtime = { workspace = true, features = ["std"] } [features] default = ["std"] @@ -46,6 +46,7 @@ std = [ "frame-system/std", "sp-core/std", "sp-io/std", + "sp-runtime/std", "sp-std/std", ] diff --git a/pallet/message-gadget/src/lib.rs b/pallet/message-gadget/src/lib.rs index 0aaa9e11f..9287503ce 100644 --- a/pallet/message-gadget/src/lib.rs +++ b/pallet/message-gadget/src/lib.rs @@ -24,7 +24,7 @@ use core::marker::PhantomData; // frontier use pallet_evm::Runner; // substrate -use frame_support::{log, pallet_prelude::*}; +use frame_support::{log, pallet_prelude::*, DefaultNoBound}; use frame_system::pallet_prelude::*; use sp_core::{Get, H160, H256}; use sp_io::hashing; @@ -45,13 +45,14 @@ pub mod pallet { #[pallet::getter(fn commitment_contract)] pub type CommitmentContract = StorageValue<_, H160, ValueQuery>; - #[derive(Default)] + #[derive(DefaultNoBound)] #[pallet::genesis_config] - pub struct GenesisConfig { + pub struct GenesisConfig { pub commitment_contract: H160, + _marker: PhantomData, } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { >::put(H160::default()); } diff --git a/pallet/message-gadget/src/tests.rs b/pallet/message-gadget/src/tests.rs index da8a2e80e..acba923a3 100644 --- a/pallet/message-gadget/src/tests.rs +++ b/pallet/message-gadget/src/tests.rs @@ -39,10 +39,9 @@ impl frame_system::Config for Runtime { type DbWeight = (); type Hash = sp_core::H256; type Hashing = sp_runtime::traits::BlakeTwo256; - type Header = sp_runtime::testing::Header; - type Index = u64; type Lookup = sp_runtime::traits::IdentityLookup; type MaxConsumers = frame_support::traits::ConstU32<16>; + type Nonce = u64; type OnKilledAccount = (); type OnNewAccount = (); type OnSetCode = (); @@ -68,13 +67,13 @@ impl pallet_balances::Config for Runtime { type DustRemoval = (); type ExistentialDeposit = frame_support::traits::ConstU128<0>; type FreezeIdentifier = (); - type HoldIdentifier = (); type MaxFreezes = (); type MaxHolds = (); type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type RuntimeHoldReason = (); type WeightInfo = (); } @@ -104,11 +103,7 @@ impl pallet_evm::Config for Runtime { impl darwinia_message_gadget::Config for Runtime {} frame_support::construct_runtime! { - pub enum Runtime where - Block = frame_system::mocking::MockBlock, - NodeBlock = frame_system::mocking::MockBlock, - UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic, - { + pub enum Runtime { System: frame_system, Timestamp: pallet_timestamp, Balances: pallet_balances, diff --git a/pallet/message-transact/src/mock.rs b/pallet/message-transact/src/mock.rs index bc9457bb9..0990e0b75 100644 --- a/pallet/message-transact/src/mock.rs +++ b/pallet/message-transact/src/mock.rs @@ -58,10 +58,9 @@ impl frame_system::Config for TestRuntime { type DbWeight = (); type Hash = sp_core::H256; type Hashing = BlakeTwo256; - type Header = Header; - type Index = u64; type Lookup = IdentityLookup; type MaxConsumers = ConstU32<16>; + type Nonce = u64; type OnKilledAccount = (); type OnNewAccount = (); type OnSetCode = (); @@ -84,13 +83,13 @@ impl pallet_balances::Config for TestRuntime { type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type FreezeIdentifier = (); - type HoldIdentifier = (); type MaxFreezes = (); type MaxHolds = (); type MaxLocks = MaxLocks; type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type RuntimeHoldReason = (); type WeightInfo = (); } @@ -262,11 +261,7 @@ impl crate::Config for TestRuntime { } frame_support::construct_runtime! { - pub enum TestRuntime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub enum TestRuntime { System: frame_system::{Pallet, Call, Config, Storage, Event}, Timestamp: pallet_timestamp::{Pallet, Call, Storage}, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, diff --git a/pallet/staking/src/lib.rs b/pallet/staking/src/lib.rs index ae283987d..2b0afe878 100644 --- a/pallet/staking/src/lib.rs +++ b/pallet/staking/src/lib.rs @@ -57,11 +57,9 @@ use frame_support::{ log, pallet_prelude::*, traits::{Currency, OnUnbalanced, UnixTime}, - EqNoBound, PalletId, PartialEqNoBound, + DefaultNoBound, EqNoBound, PalletId, PartialEqNoBound, }; -use frame_system::pallet_prelude::*; -#[cfg(feature = "std")] -use frame_system::RawOrigin; +use frame_system::{pallet_prelude::*, RawOrigin}; use sp_runtime::{ traits::{AccountIdConversion, Convert}, Perbill, Perquintill, @@ -112,7 +110,7 @@ pub mod pallet { /// Minimum time to stake at least. #[pallet::constant] - type MinStakingDuration: Get; + type MinStakingDuration: Get>; /// The percentage of the total payout that is distributed to stakers. /// @@ -242,7 +240,7 @@ pub mod pallet { #[pallet::getter(fn elapsed_time)] pub type ElapsedTime = StorageValue<_, Moment, ValueQuery>; - #[derive(frame_support::DefaultNoBound)] + #[derive(DefaultNoBound)] #[pallet::genesis_config] pub struct GenesisConfig { /// Current timestamp. @@ -256,7 +254,7 @@ pub mod pallet { } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { if self.collator_count == 0 { panic!("[pallet::staking] collator count mustn't be 0"); @@ -581,7 +579,7 @@ pub mod pallet { fn unstake_token

( staked: &mut Balance, - unstaking: &mut BoundedVec<(Balance, T::BlockNumber), T::MaxUnstakings>, + unstaking: &mut BoundedVec<(Balance, BlockNumberFor), T::MaxUnstakings>, amount: Balance, ) -> DispatchResult where @@ -629,7 +627,7 @@ pub mod pallet { fn restake_token

( staked: &mut Balance, - unstaking: &mut BoundedVec<(Balance, T::BlockNumber), T::MaxUnstakings>, + unstaking: &mut BoundedVec<(Balance, BlockNumberFor), T::MaxUnstakings>, mut amount: Balance, ) -> DispatchResult where @@ -961,11 +959,11 @@ where /// Staked deposits. pub staked_deposits: BoundedVec, ::MaxDeposits>, /// The RING in unstaking process. - pub unstaking_ring: BoundedVec<(Balance, T::BlockNumber), T::MaxUnstakings>, + pub unstaking_ring: BoundedVec<(Balance, BlockNumberFor), T::MaxUnstakings>, /// The KTON in unstaking process. - pub unstaking_kton: BoundedVec<(Balance, T::BlockNumber), T::MaxUnstakings>, + pub unstaking_kton: BoundedVec<(Balance, BlockNumberFor), T::MaxUnstakings>, /// The deposit in unstaking process. - pub unstaking_deposits: BoundedVec<(DepositId, T::BlockNumber), T::MaxUnstakings>, + pub unstaking_deposits: BoundedVec<(DepositId, BlockNumberFor), T::MaxUnstakings>, } impl Ledger where @@ -1029,7 +1027,7 @@ pub struct IndividualExposure { // - 20 points to the block producer for producing a (non-uncle) block in the parachain chain, // - 2 points to the block producer for each reference to a previously unreferenced uncle, and // - 1 point to the producer of each referenced uncle block. -impl pallet_authorship::EventHandler for Pallet +impl pallet_authorship::EventHandler> for Pallet where T: Config + pallet_authorship::Config + pallet_session::Config, { diff --git a/pallet/staking/src/mock.rs b/pallet/staking/src/mock.rs index 11acfb7f2..5e20fc588 100644 --- a/pallet/staking/src/mock.rs +++ b/pallet/staking/src/mock.rs @@ -21,7 +21,7 @@ pub use crate as darwinia_staking; // darwinia use dc_types::{AssetId, Balance, Moment, UNIT}; // substrate -use frame_support::traits::{GenesisBuild, OnInitialize}; +use frame_support::traits::{BuildGenesisConfig, OnInitialize}; use sp_io::TestExternalities; use sp_runtime::RuntimeAppPublic; @@ -33,15 +33,14 @@ impl frame_system::Config for Runtime { type BaseCallFilter = frame_support::traits::Everything; type BlockHashCount = (); type BlockLength = (); - type BlockNumber = BlockNumber; type BlockWeights = (); type DbWeight = (); type Hash = sp_core::H256; type Hashing = sp_runtime::traits::BlakeTwo256; type Header = sp_runtime::testing::Header; - type Index = u64; type Lookup = sp_runtime::traits::IdentityLookup; type MaxConsumers = frame_support::traits::ConstU32<16>; + type Nonce = u64; type OnKilledAccount = (); type OnNewAccount = (); type OnSetCode = (); @@ -67,13 +66,13 @@ impl pallet_balances::Config for Runtime { type DustRemoval = (); type ExistentialDeposit = frame_support::traits::ConstU128<0>; type FreezeIdentifier = (); - type HoldIdentifier = (); type MaxFreezes = (); type MaxHolds = (); type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type RuntimeHoldReason = (); type WeightInfo = (); } @@ -265,11 +264,7 @@ impl darwinia_staking::Config for Runtime { impl darwinia_staking::DepositConfig for Runtime {} frame_support::construct_runtime! { - pub enum Runtime where - Block = frame_system::mocking::MockBlock, - NodeBlock = frame_system::mocking::MockBlock, - UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic, - { + pub enum Runtime { System: frame_system, Timestamp: pallet_timestamp, Balances: pallet_balances, diff --git a/precompile/assets/src/mock.rs b/precompile/assets/src/mock.rs index c94a00a31..ec6276d96 100644 --- a/precompile/assets/src/mock.rs +++ b/precompile/assets/src/mock.rs @@ -70,10 +70,9 @@ impl frame_system::Config for TestRuntime { type DbWeight = (); type Hash = H256; type Hashing = sp_runtime::traits::BlakeTwo256; - type Header = sp_runtime::testing::Header; - type Index = u64; type Lookup = sp_runtime::traits::IdentityLookup; type MaxConsumers = frame_support::traits::ConstU32<16>; + type Nonce = u64; type OnKilledAccount = (); type OnNewAccount = (); type OnSetCode = (); @@ -92,13 +91,13 @@ impl pallet_balances::Config for TestRuntime { type DustRemoval = (); type ExistentialDeposit = frame_support::traits::ConstU128<0>; type FreezeIdentifier = (); - type HoldIdentifier = (); type MaxFreezes = (); type MaxHolds = (); type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type RuntimeHoldReason = (); type WeightInfo = (); } @@ -216,11 +215,7 @@ impl pallet_assets::Config for TestRuntime { } frame_support::construct_runtime! { - pub enum TestRuntime where - Block = frame_system::mocking::MockBlock, - NodeBlock = frame_system::mocking::MockBlock, - UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic, - { + pub enum TestRuntime { System: frame_system, Timestamp: pallet_timestamp, Balances: pallet_balances, diff --git a/precompile/deposit/src/mock.rs b/precompile/deposit/src/mock.rs index 0054a81a7..d487fe235 100644 --- a/precompile/deposit/src/mock.rs +++ b/precompile/deposit/src/mock.rs @@ -58,9 +58,9 @@ impl frame_system::Config for TestRuntime { type Hash = H256; type Hashing = sp_runtime::traits::BlakeTwo256; type Header = sp_runtime::testing::Header; - type Index = u64; type Lookup = sp_runtime::traits::IdentityLookup; type MaxConsumers = ConstU32<16>; + type Nonce = u64; type OnKilledAccount = (); type OnNewAccount = (); type OnSetCode = (); @@ -79,13 +79,13 @@ impl pallet_balances::Config for TestRuntime { type DustRemoval = (); type ExistentialDeposit = frame_support::traits::ConstU128<0>; type FreezeIdentifier = (); - type HoldIdentifier = (); type MaxFreezes = (); type MaxHolds = (); type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type RuntimeHoldReason = (); type WeightInfo = (); } @@ -185,11 +185,7 @@ impl pallet_evm::Config for TestRuntime { } frame_support::construct_runtime! { - pub enum TestRuntime where - Block = frame_system::mocking::MockBlock, - NodeBlock = frame_system::mocking::MockBlock, - UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic, - { + pub enum TestRuntime { System: frame_system, Balances: pallet_balances, Timestamp: pallet_timestamp, diff --git a/precompile/staking/src/mock.rs b/precompile/staking/src/mock.rs index 61f5862db..04d2ff1b2 100644 --- a/precompile/staking/src/mock.rs +++ b/precompile/staking/src/mock.rs @@ -59,10 +59,9 @@ impl frame_system::Config for TestRuntime { type DbWeight = (); type Hash = H256; type Hashing = sp_runtime::traits::BlakeTwo256; - type Header = sp_runtime::testing::Header; - type Index = u64; type Lookup = sp_runtime::traits::IdentityLookup; type MaxConsumers = ConstU32<16>; + type Nonce = u64; type OnKilledAccount = (); type OnNewAccount = (); type OnSetCode = (); @@ -81,13 +80,13 @@ impl pallet_balances::Config for TestRuntime { type DustRemoval = (); type ExistentialDeposit = frame_support::traits::ConstU128<0>; type FreezeIdentifier = (); - type HoldIdentifier = (); type MaxFreezes = (); type MaxHolds = (); type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type RuntimeHoldReason = (); type WeightInfo = (); } @@ -248,11 +247,7 @@ impl darwinia_staking::Config for TestRuntime { impl darwinia_staking::DepositConfig for TestRuntime {} frame_support::construct_runtime! { - pub enum TestRuntime where - Block = frame_system::mocking::MockBlock, - NodeBlock = frame_system::mocking::MockBlock, - UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic, - { + pub enum TestRuntime { System: frame_system, Balances: pallet_balances, Timestamp: pallet_timestamp, diff --git a/precompile/state-storage/src/mock.rs b/precompile/state-storage/src/mock.rs index 17ca0b608..48d7cf662 100644 --- a/precompile/state-storage/src/mock.rs +++ b/precompile/state-storage/src/mock.rs @@ -58,9 +58,9 @@ impl frame_system::Config for TestRuntime { type Hash = H256; type Hashing = sp_runtime::traits::BlakeTwo256; type Header = sp_runtime::testing::Header; - type Index = u64; type Lookup = sp_runtime::traits::IdentityLookup; type MaxConsumers = frame_support::traits::ConstU32<16>; + type Nonce = u64; type OnKilledAccount = (); type OnNewAccount = (); type OnSetCode = (); @@ -79,13 +79,13 @@ impl pallet_balances::Config for TestRuntime { type DustRemoval = (); type ExistentialDeposit = frame_support::traits::ConstU64<0>; type FreezeIdentifier = (); - type HoldIdentifier = (); type MaxFreezes = (); type MaxHolds = (); type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type RuntimeHoldReason = (); type WeightInfo = (); } @@ -170,11 +170,7 @@ impl pallet_evm::Config for TestRuntime { } frame_support::construct_runtime! { - pub enum TestRuntime where - Block = frame_system::mocking::MockBlock, - NodeBlock = frame_system::mocking::MockBlock, - UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic, - { + pub enum TestRuntime { System: frame_system, Timestamp: pallet_timestamp, Balances: pallet_balances, diff --git a/runtime/common/src/xcm_configs.rs b/runtime/common/src/xcm_configs.rs index ee4a4a08f..745ca902d 100644 --- a/runtime/common/src/xcm_configs.rs +++ b/runtime/common/src/xcm_configs.rs @@ -26,17 +26,14 @@ use dc_primitives::GWEI; use xcm::latest::{prelude::*, Weight as XcmWeight}; use xcm_builder::TakeRevenue; use xcm_executor::{ - traits::{Convert, ShouldExecute, WeightTrader}, + traits::{ConvertLocation, WeightTrader}, Assets, }; // substrate use frame_support::{ log, pallet_prelude::*, - traits::{ - tokens::currency::Currency as CurrencyT, ConstU128, OnUnbalanced as OnUnbalancedT, - ProcessMessageError, - }, + traits::{tokens::currency::Currency as CurrencyT, ConstU128, OnUnbalanced as OnUnbalancedT}, weights::{Weight, WeightToFee as WeightToFeeT}, }; use sp_core::Get; @@ -58,85 +55,19 @@ frame_support::match_types! { }; } -//TODO: move DenyThenTry to polkadot's xcm module. -/// Deny executing the xcm message if it matches any of the Deny filter regardless of anything else. -/// If it passes the Deny, and matches one of the Allow cases then it is let through. -pub struct DenyThenTry(PhantomData, PhantomData) -where - Deny: ShouldExecute, - Allow: ShouldExecute; - -impl ShouldExecute for DenyThenTry -where - Deny: ShouldExecute, - Allow: ShouldExecute, -{ - fn should_execute( - origin: &MultiLocation, - message: &mut [Instruction], - max_weight: Weight, - weight_credit: &mut Weight, - ) -> Result<(), ProcessMessageError> { - Deny::should_execute(origin, message, max_weight, weight_credit)?; - Allow::should_execute(origin, message, max_weight, weight_credit) - } -} - -// See issue -pub struct DenyReserveTransferToRelayChain; -impl ShouldExecute for DenyReserveTransferToRelayChain { - fn should_execute( - origin: &MultiLocation, - message: &mut [Instruction], - _max_weight: Weight, - _weight_credit: &mut Weight, - ) -> Result<(), ProcessMessageError> { - if message.iter().any(|inst| { - matches!( - inst, - InitiateReserveWithdraw { - reserve: MultiLocation { parents: 1, interior: Here }, - .. - } | DepositReserveAsset { dest: MultiLocation { parents: 1, interior: Here }, .. } - | TransferReserveAsset { - dest: MultiLocation { parents: 1, interior: Here }, - .. - } - ) - }) { - return Err(ProcessMessageError::Unsupported); // Deny - } - - // An unexpected reserve transfer has arrived from the Relay Chain. Generally, `IsReserve` - // should not allow this, but we just log it here. - if matches!(origin, MultiLocation { parents: 1, interior: Here }) - && message.iter().any(|inst| matches!(inst, ReserveAssetDeposited { .. })) - { - log::warn!( - target: "xcm::barriers", - "Unexpected ReserveAssetDeposited from the Relay Chain", - ); - } - // Permit everything else - Ok(()) - } -} - /// Struct that converts a given MultiLocation into a 20 bytes account id by hashing /// with blake2_256 and taking the first 20 bytes pub struct Account20Hash(PhantomData); -impl + Into<[u8; 20]> + Clone> Convert +impl + Into<[u8; 20]> + Clone> ConvertLocation for Account20Hash { - fn convert_ref(location: impl Borrow) -> Result { + fn convert_location(location: &MultiLocation) -> Option { let hash: [u8; 32] = ("multiloc", location.borrow()).using_encoded(blake2_256); let mut account_id = [0u8; 20]; + account_id.copy_from_slice(&hash[0..20]); - Ok(account_id.into()) - } - fn reverse_ref(_: impl Borrow) -> Result { - Err(()) + Some(account_id.into()) } } diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml index ace8121ec..7d922e94f 100644 --- a/runtime/crab/Cargo.toml +++ b/runtime/crab/Cargo.toml @@ -116,6 +116,7 @@ sp-inherents = { workspace = true } sp-offchain = { workspace = true } sp-runtime = { workspace = true } sp-session = { workspace = true } +sp-staking = { workspace = true } sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } @@ -240,6 +241,7 @@ std = [ "sp-offchain/std", "sp-runtime/std", "sp-session/std", + "sp-staking/std", "sp-std/std", "sp-transaction-pool/std", "sp-version/std", @@ -327,6 +329,7 @@ runtime-benchmarks = [ # substrate optional "frame-benchmarking/runtime-benchmarks", "frame-system-benchmarking/runtime-benchmarks", + "sp-staking/runtime-benchmarks", ] try-runtime = [ @@ -387,4 +390,5 @@ try-runtime = [ "sp-runtime/try-runtime", # substrate optional "frame-try-runtime/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs index e8e5308df..0bb824439 100644 --- a/runtime/crab/src/lib.rs +++ b/runtime/crab/src/lib.rs @@ -113,11 +113,7 @@ pub fn native_version() -> sp_version::NativeVersion { // Create the runtime by composing the FRAME pallets that were previously configured. frame_support::construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = dc_primitives::Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub enum Runtime { // System stuff. System: frame_system = 0, ParachainSystem: cumulus_pallet_parachain_system = 1, @@ -777,7 +773,16 @@ sp_api::impl_runtime_apis! { use frame_support::traits::Currency; use frame_system_benchmarking::Pallet as SystemBench; - impl frame_system_benchmarking::Config for Runtime {} + impl frame_system_benchmarking::Config for Runtime { + fn setup_set_code_requirements(code: &sp_std::vec::Vec) -> Result<(), BenchmarkError> { + ParachainSystem::initialize_for_set_code_benchmark(code.len() as u32); + Ok(()) + } + + fn verify_set_code() { + System::assert_last_event(cumulus_pallet_parachain_system::Event::::ValidationFunctionStored.into()); + } + } use cumulus_pallet_session_benchmarking::Pallet as SessionBench; impl cumulus_pallet_session_benchmarking::Config for Runtime {} diff --git a/runtime/crab/src/pallets/aura.rs b/runtime/crab/src/pallets/aura.rs index 1da134500..d07588224 100644 --- a/runtime/crab/src/pallets/aura.rs +++ b/runtime/crab/src/pallets/aura.rs @@ -20,6 +20,7 @@ use crate::*; impl pallet_aura::Config for Runtime { + type AllowMultipleBlocksPerSlot = ConstBool; type AuthorityId = sp_consensus_aura::sr25519::AuthorityId; type DisabledValidators = (); type MaxAuthorities = ConstU32<100_000>; diff --git a/runtime/crab/src/pallets/balances.rs b/runtime/crab/src/pallets/balances.rs index c9a61fcd0..df1ba0a13 100644 --- a/runtime/crab/src/pallets/balances.rs +++ b/runtime/crab/src/pallets/balances.rs @@ -29,12 +29,12 @@ impl pallet_balances::Config for Runtime { type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type FreezeIdentifier = (); - type HoldIdentifier = (); type MaxFreezes = (); type MaxHolds = (); type MaxLocks = ConstU32<50>; type MaxReserves = ConstU32<50>; type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type RuntimeHoldReason = (); type WeightInfo = weights::pallet_balances::WeightInfo; } diff --git a/runtime/crab/src/pallets/elections_phragmen.rs b/runtime/crab/src/pallets/elections_phragmen.rs index 5087e770a..63c61b3cd 100644 --- a/runtime/crab/src/pallets/elections_phragmen.rs +++ b/runtime/crab/src/pallets/elections_phragmen.rs @@ -29,7 +29,7 @@ impl pallet_elections_phragmen::Config for Runtime { type CandidacyBond = ConstU128<{ 100 * MILLIUNIT }>; type ChangeMembers = Council; type Currency = Balances; - type CurrencyToVote = frame_support::traits::U128CurrencyToVote; + type CurrencyToVote = sp_staking::currency_to_vote::U128CurrencyToVote; type DesiredMembers = ConstU32; type DesiredRunnersUp = ConstU32<7>; type InitializeMembers = Council; diff --git a/runtime/crab/src/pallets/fee_market.rs b/runtime/crab/src/pallets/fee_market.rs index c69815555..ffafb658c 100644 --- a/runtime/crab/src/pallets/fee_market.rs +++ b/runtime/crab/src/pallets/fee_market.rs @@ -28,7 +28,7 @@ impl, I: 'static> pallet_fee_market::Slasher, - timeout: T::BlockNumber, + timeout: frame_system::pallet_prelude::BlockNumberFor, ) -> pallet_fee_market::BalanceOf { // substrate use sp_runtime::traits::UniqueSaturatedInto; diff --git a/runtime/crab/src/pallets/polkadot_xcm.rs b/runtime/crab/src/pallets/polkadot_xcm.rs index 798e8f27c..be86d7b00 100644 --- a/runtime/crab/src/pallets/polkadot_xcm.rs +++ b/runtime/crab/src/pallets/polkadot_xcm.rs @@ -75,31 +75,33 @@ pub type XcmOriginToTransactDispatchOrigin = ( pallet_xcm::XcmPassthrough, ); -pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< - darwinia_common_runtime::xcm_configs::DenyReserveTransferToRelayChain, - ( - xcm_builder::TakeWeightCredit, - xcm_builder::WithComputedOrigin< - ( - // If the message is one that immediately attemps to pay for execution, then allow - // it. - xcm_builder::AllowTopLevelPaidExecutionFrom, - // Parent, its pluralities (i.e. governance bodies), and the Fellows plurality get - // free execution. - xcm_builder::AllowUnpaidExecutionFrom< - darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, - >, - // Subscriptions for version tracking are OK. - xcm_builder::AllowSubscriptionsFrom< - darwinia_common_runtime::xcm_configs::ParentOrSiblings, - >, - ), - UniversalLocation, - ConstU32<8>, - >, - // Expected responses are OK. - xcm_builder::AllowKnownQueryResponses, - ), +pub type Barrier = xcm_builder::TrailingSetTopicAsId< + xcm_builder::DenyThenTry< + xcm_builder::DenyReserveTransferToRelayChain, + ( + xcm_builder::TakeWeightCredit, + xcm_builder::WithComputedOrigin< + ( + // If the message is one that immediately attemps to pay for execution, then + // allow it. + xcm_builder::AllowTopLevelPaidExecutionFrom, + // Parent, its pluralities (i.e. governance bodies), and the Fellows plurality + // get free execution. + xcm_builder::AllowUnpaidExecutionFrom< + darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, + >, + // Subscriptions for version tracking are OK. + xcm_builder::AllowSubscriptionsFrom< + darwinia_common_runtime::xcm_configs::ParentOrSiblings, + >, + ), + UniversalLocation, + ConstU32<8>, + >, + // Expected responses are OK. + xcm_builder::AllowKnownQueryResponses, + ), + >, >; frame_support::parameter_types! { @@ -134,6 +136,7 @@ impl xcm_builder::TakeRevenue for ToTreasury { pub struct XcmExecutorConfig; impl xcm_executor::Config for XcmExecutorConfig { + type Aliasers = frame_support::traits::Nothing; type AssetClaims = PolkadotXcm; type AssetExchanger = (); type AssetLocker = (); @@ -176,12 +179,12 @@ pub type LocalOriginToLocation = xcm_primitives::SignedToAccountId20; /// The means for routing XCM messages which are not for local execution into the right message /// queues. -pub type XcmRouter = ( +pub type XcmRouter = xcm_builder::WithUniqueTopic<( // Two routers - use UMP to communicate with the relay chain: cumulus_primitives_utility::ParentAsUmp, // ..and XCMP to communicate with the sibling chains. XcmpQueue, -); +)>; #[cfg(feature = "runtime-benchmarks")] frame_support::parameter_types! { diff --git a/runtime/crab/src/pallets/system.rs b/runtime/crab/src/pallets/system.rs index dc829cc01..6ddc141fc 100644 --- a/runtime/crab/src/pallets/system.rs +++ b/runtime/crab/src/pallets/system.rs @@ -66,12 +66,11 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; /// The basic call filter to use in dispatchable. type BaseCallFilter = frame_support::traits::Everything; + type Block = Block; /// Maximum number of block number to block hash mappings to keep (oldest pruned first). type BlockHashCount = ConstU32<256>; /// The maximum length of a block (in bytes). type BlockLength = RuntimeBlockLength; - /// The index type for blocks. - type BlockNumber = BlockNumber; /// Block & extrinsics weights: base values and limits. type BlockWeights = RuntimeBlockWeights; /// The weight of database operations that the runtime can invoke. @@ -80,13 +79,11 @@ impl frame_system::Config for Runtime { type Hash = Hash; /// The hashing algorithm used. type Hashing = Hashing; - /// The header type. - type Header = sp_runtime::generic::Header; - /// The index type for storing how many extrinsics an account has signed. - type Index = Index; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = sp_runtime::traits::IdentityLookup; type MaxConsumers = ConstU32<16>; + /// The index type for storing how many extrinsics an account has signed. + type Nonce = Nonce; /// What to do if an account is fully reaped from the system. type OnKilledAccount = (); /// What to do if a new account is created. diff --git a/runtime/crab/tests/mock.rs b/runtime/crab/tests/mock.rs index f07f4a636..010b306e8 100644 --- a/runtime/crab/tests/mock.rs +++ b/runtime/crab/tests/mock.rs @@ -19,7 +19,7 @@ pub use crab_runtime::*; // substrate -use frame_support::traits::GenesisBuild; +use frame_support::traits::BuildGenesisConfig; use sp_io::TestExternalities; pub const KTON_ID: u64 = AssetIds::CKton as _; diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml index 5428945d7..953f7554b 100644 --- a/runtime/darwinia/Cargo.toml +++ b/runtime/darwinia/Cargo.toml @@ -117,6 +117,7 @@ sp-inherents = { workspace = true } sp-offchain = { workspace = true } sp-runtime = { workspace = true } sp-session = { workspace = true } +sp-staking = { workspace = true } sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } @@ -242,6 +243,7 @@ std = [ "sp-offchain/std", "sp-runtime/std", "sp-session/std", + "sp-staking/std", "sp-std/std", "sp-transaction-pool/std", "sp-version/std", @@ -330,6 +332,7 @@ runtime-benchmarks = [ # substrate optional "frame-benchmarking/runtime-benchmarks", "frame-system-benchmarking/runtime-benchmarks", + "sp-staking/runtime-benchmarks", ] try-runtime = [ @@ -393,4 +396,5 @@ try-runtime = [ "sp-runtime/try-runtime", # substrate optional "frame-try-runtime/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs index 9ac149560..ad1cd939d 100644 --- a/runtime/darwinia/src/lib.rs +++ b/runtime/darwinia/src/lib.rs @@ -113,11 +113,7 @@ pub fn native_version() -> sp_version::NativeVersion { // Create the runtime by composing the FRAME pallets that were previously configured. frame_support::construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = dc_primitives::Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub enum Runtime { // System stuff. System: frame_system = 0, ParachainSystem: cumulus_pallet_parachain_system = 1, @@ -779,7 +775,16 @@ sp_api::impl_runtime_apis! { use frame_support::traits::Currency; use frame_system_benchmarking::Pallet as SystemBench; - impl frame_system_benchmarking::Config for Runtime {} + impl frame_system_benchmarking::Config for Runtime { + fn setup_set_code_requirements(code: &sp_std::vec::Vec) -> Result<(), BenchmarkError> { + ParachainSystem::initialize_for_set_code_benchmark(code.len() as u32); + Ok(()) + } + + fn verify_set_code() { + System::assert_last_event(cumulus_pallet_parachain_system::Event::::ValidationFunctionStored.into()); + } + } use cumulus_pallet_session_benchmarking::Pallet as SessionBench; impl cumulus_pallet_session_benchmarking::Config for Runtime {} diff --git a/runtime/darwinia/src/pallets/aura.rs b/runtime/darwinia/src/pallets/aura.rs index 1da134500..d07588224 100644 --- a/runtime/darwinia/src/pallets/aura.rs +++ b/runtime/darwinia/src/pallets/aura.rs @@ -20,6 +20,7 @@ use crate::*; impl pallet_aura::Config for Runtime { + type AllowMultipleBlocksPerSlot = ConstBool; type AuthorityId = sp_consensus_aura::sr25519::AuthorityId; type DisabledValidators = (); type MaxAuthorities = ConstU32<100_000>; diff --git a/runtime/darwinia/src/pallets/balances.rs b/runtime/darwinia/src/pallets/balances.rs index c9a61fcd0..df1ba0a13 100644 --- a/runtime/darwinia/src/pallets/balances.rs +++ b/runtime/darwinia/src/pallets/balances.rs @@ -29,12 +29,12 @@ impl pallet_balances::Config for Runtime { type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type FreezeIdentifier = (); - type HoldIdentifier = (); type MaxFreezes = (); type MaxHolds = (); type MaxLocks = ConstU32<50>; type MaxReserves = ConstU32<50>; type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type RuntimeHoldReason = (); type WeightInfo = weights::pallet_balances::WeightInfo; } diff --git a/runtime/darwinia/src/pallets/elections_phragmen.rs b/runtime/darwinia/src/pallets/elections_phragmen.rs index 5087e770a..63c61b3cd 100644 --- a/runtime/darwinia/src/pallets/elections_phragmen.rs +++ b/runtime/darwinia/src/pallets/elections_phragmen.rs @@ -29,7 +29,7 @@ impl pallet_elections_phragmen::Config for Runtime { type CandidacyBond = ConstU128<{ 100 * MILLIUNIT }>; type ChangeMembers = Council; type Currency = Balances; - type CurrencyToVote = frame_support::traits::U128CurrencyToVote; + type CurrencyToVote = sp_staking::currency_to_vote::U128CurrencyToVote; type DesiredMembers = ConstU32; type DesiredRunnersUp = ConstU32<7>; type InitializeMembers = Council; diff --git a/runtime/darwinia/src/pallets/fee_market.rs b/runtime/darwinia/src/pallets/fee_market.rs index eb716d87d..f7f0a0c88 100644 --- a/runtime/darwinia/src/pallets/fee_market.rs +++ b/runtime/darwinia/src/pallets/fee_market.rs @@ -27,7 +27,7 @@ impl, I: 'static> pallet_fee_market::Slasher, - timeout: T::BlockNumber, + timeout: frame_system::pallet_prelude::BlockNumberFor, ) -> pallet_fee_market::BalanceOf { // substrate use sp_runtime::traits::UniqueSaturatedInto; diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs index 8473bb345..e3bfb7ff9 100644 --- a/runtime/darwinia/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia/src/pallets/polkadot_xcm.rs @@ -75,31 +75,33 @@ pub type XcmOriginToTransactDispatchOrigin = ( pallet_xcm::XcmPassthrough, ); -pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< - darwinia_common_runtime::xcm_configs::DenyReserveTransferToRelayChain, - ( - xcm_builder::TakeWeightCredit, - xcm_builder::WithComputedOrigin< - ( - // If the message is one that immediately attemps to pay for execution, then allow - // it. - xcm_builder::AllowTopLevelPaidExecutionFrom, - // Parent, its pluralities (i.e. governance bodies), and the Fellows plurality get - // free execution. - xcm_builder::AllowUnpaidExecutionFrom< - darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, - >, - // Subscriptions for version tracking are OK. - xcm_builder::AllowSubscriptionsFrom< - darwinia_common_runtime::xcm_configs::ParentOrSiblings, - >, - ), - UniversalLocation, - ConstU32<8>, - >, - // Expected responses are OK. - xcm_builder::AllowKnownQueryResponses, - ), +pub type Barrier = xcm_builder::TrailingSetTopicAsId< + xcm_builder::DenyThenTry< + xcm_builder::DenyReserveTransferToRelayChain, + ( + xcm_builder::TakeWeightCredit, + xcm_builder::WithComputedOrigin< + ( + // If the message is one that immediately attemps to pay for execution, then + // allow it. + xcm_builder::AllowTopLevelPaidExecutionFrom, + // Parent, its pluralities (i.e. governance bodies), and the Fellows plurality + // get free execution. + xcm_builder::AllowUnpaidExecutionFrom< + darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, + >, + // Subscriptions for version tracking are OK. + xcm_builder::AllowSubscriptionsFrom< + darwinia_common_runtime::xcm_configs::ParentOrSiblings, + >, + ), + UniversalLocation, + ConstU32<8>, + >, + // Expected responses are OK. + xcm_builder::AllowKnownQueryResponses, + ), + >, >; frame_support::parameter_types! { @@ -162,6 +164,7 @@ impl xcm_executor::traits::CallDispatcher for XcmCallDispatcher { pub struct XcmExecutorConfig; impl xcm_executor::Config for XcmExecutorConfig { + type Aliasers = frame_support::traits::Nothing; type AssetClaims = PolkadotXcm; type AssetExchanger = (); type AssetLocker = (); @@ -204,12 +207,12 @@ pub type LocalOriginToLocation = xcm_primitives::SignedToAccountId20; /// The means for routing XCM messages which are not for local execution into the right message /// queues. -pub type XcmRouter = ( +pub type XcmRouter = xcm_builder::WithUniqueTopic<( // Two routers - use UMP to communicate with the relay chain: cumulus_primitives_utility::ParentAsUmp, // ..and XCMP to communicate with the sibling chains. XcmpQueue, -); +)>; #[cfg(feature = "runtime-benchmarks")] frame_support::parameter_types! { diff --git a/runtime/darwinia/src/pallets/system.rs b/runtime/darwinia/src/pallets/system.rs index 5f5f4478b..5532835da 100644 --- a/runtime/darwinia/src/pallets/system.rs +++ b/runtime/darwinia/src/pallets/system.rs @@ -66,12 +66,11 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; /// The basic call filter to use in dispatchable. type BaseCallFilter = frame_support::traits::Everything; + type Block = Block; /// Maximum number of block number to block hash mappings to keep (oldest pruned first). type BlockHashCount = ConstU32<256>; /// The maximum length of a block (in bytes). type BlockLength = RuntimeBlockLength; - /// The index type for blocks. - type BlockNumber = BlockNumber; /// Block & extrinsics weights: base values and limits. type BlockWeights = RuntimeBlockWeights; /// The weight of database operations that the runtime can invoke. @@ -80,13 +79,11 @@ impl frame_system::Config for Runtime { type Hash = Hash; /// The hashing algorithm used. type Hashing = Hashing; - /// The header type. - type Header = sp_runtime::generic::Header; - /// The index type for storing how many extrinsics an account has signed. - type Index = Index; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = sp_runtime::traits::IdentityLookup; type MaxConsumers = ConstU32<16>; + /// The index type for storing how many extrinsics an account has signed. + type Nonce = Nonce; /// What to do if an account is fully reaped from the system. type OnKilledAccount = (); /// What to do if a new account is created. diff --git a/runtime/darwinia/tests/mock.rs b/runtime/darwinia/tests/mock.rs index 4ab2ed7ff..8046212f4 100644 --- a/runtime/darwinia/tests/mock.rs +++ b/runtime/darwinia/tests/mock.rs @@ -19,7 +19,7 @@ pub use darwinia_runtime::*; // substrate -use frame_support::traits::GenesisBuild; +use frame_support::traits::BuildGenesisConfig; use sp_io::TestExternalities; pub const KTON_ID: u64 = AssetIds::Kton as _; diff --git a/runtime/pangolin/Cargo.toml b/runtime/pangolin/Cargo.toml index ab6c1d458..3b65c4d83 100644 --- a/runtime/pangolin/Cargo.toml +++ b/runtime/pangolin/Cargo.toml @@ -76,8 +76,8 @@ pallet-evm-precompile-simple = { workspace = true } moonbeam-evm-tracer = { workspace = true, optional = true } moonbeam-rpc-primitives-debug = { workspace = true } pallet-asset-manager = { workspace = true } -pallet-evm-precompile-conviction-voting = { workspace = true } pallet-ethereum-xcm = { workspace = true } +pallet-evm-precompile-conviction-voting = { workspace = true } precompile-utils = { workspace = true } xcm-primitives = { workspace = true } @@ -126,6 +126,7 @@ sp-inherents = { workspace = true } sp-offchain = { workspace = true } sp-runtime = { workspace = true } sp-session = { workspace = true } +sp-staking = { workspace = true } sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } @@ -259,6 +260,7 @@ std = [ "sp-offchain/std", "sp-runtime/std", "sp-session/std", + "sp-staking/std", "sp-std/std", "sp-transaction-pool/std", "sp-version/std", @@ -352,6 +354,7 @@ runtime-benchmarks = [ # substrate optional "frame-benchmarking/runtime-benchmarks", "frame-system-benchmarking/runtime-benchmarks", + "sp-staking/runtime-benchmarks", ] try-runtime = [ @@ -421,4 +424,5 @@ try-runtime = [ "sp-runtime/try-runtime", # substrate optional "frame-try-runtime/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/runtime/pangolin/src/lib.rs b/runtime/pangolin/src/lib.rs index 47eb69d87..0b6cd10e2 100644 --- a/runtime/pangolin/src/lib.rs +++ b/runtime/pangolin/src/lib.rs @@ -114,11 +114,7 @@ pub fn native_version() -> sp_version::NativeVersion { // Create the runtime by composing the FRAME pallets that were previously configured. frame_support::construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = dc_primitives::Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub enum Runtime { // System stuff. System: frame_system = 0, ParachainSystem: cumulus_pallet_parachain_system = 1, @@ -785,7 +781,17 @@ sp_api::impl_runtime_apis! { use frame_support::pallet_prelude::Weight; use frame_support::traits::Currency; - impl frame_system_benchmarking::Config for Runtime {} + use frame_system_benchmarking::Pallet as SystemBench; + impl frame_system_benchmarking::Config for Runtime { + fn setup_set_code_requirements(code: &sp_std::vec::Vec) -> Result<(), BenchmarkError> { + ParachainSystem::initialize_for_set_code_benchmark(code.len() as u32); + Ok(()) + } + + fn verify_set_code() { + System::assert_last_event(cumulus_pallet_parachain_system::Event::::ValidationFunctionStored.into()); + } + } use cumulus_pallet_session_benchmarking::Pallet as SessionBench; impl cumulus_pallet_session_benchmarking::Config for Runtime {} diff --git a/runtime/pangolin/src/migration.rs b/runtime/pangolin/src/migration.rs index e8be58ca1..675d47fca 100644 --- a/runtime/pangolin/src/migration.rs +++ b/runtime/pangolin/src/migration.rs @@ -41,28 +41,7 @@ impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { } fn migrate() -> frame_support::weights::Weight { - // substrate - use sp_core::H160; - use sp_std::str::FromStr; - - migration::clear_storage_prefix(b"PhragmenElection", b"Members", &[], None, None); - migration::clear_storage_prefix(b"PhragmenElection", b"RunnersUp", &[], None, None); - migration::clear_storage_prefix(b"PhragmenElection", b"Candidates", &[], None, None); - migration::clear_storage_prefix(b"PhragmenElection", b"ElectionRounds", &[], None, None); - migration::clear_storage_prefix(b"PhragmenElection", b"Voting", &[], None, None); - migration::clear_storage_prefix(b"TechnicalMembership", b"Members", &[], None, None); - migration::clear_storage_prefix(b"TechnicalMembership", b"Prime", &[], None, None); - - const REVERT_BYTECODE: [u8; 5] = [0x60, 0x00, 0x60, 0x00, 0xFD]; - // CONVICTION_VOTING_ADDRESS equals to the addr(1538) in the pallet-evm runtime. - const CONVICTION_VOTING_ADDRESS: &str = "0x0000000000000000000000000000000000000602"; - EVM::create_account( - H160::from_str(CONVICTION_VOTING_ADDRESS) - .expect("CONVICTION_VOTING_ADDRESS is not a valid address"), - REVERT_BYTECODE.to_vec(), - ); - - // frame_support::weights::Weight::zero() - RuntimeBlockWeights::get().max_block + frame_support::weights::Weight::zero() + // RuntimeBlockWeights::get().max_block // ::DbWeight::get().reads_writes(5, 5) } diff --git a/runtime/pangolin/src/pallets/aura.rs b/runtime/pangolin/src/pallets/aura.rs index 1da134500..d07588224 100644 --- a/runtime/pangolin/src/pallets/aura.rs +++ b/runtime/pangolin/src/pallets/aura.rs @@ -20,6 +20,7 @@ use crate::*; impl pallet_aura::Config for Runtime { + type AllowMultipleBlocksPerSlot = ConstBool; type AuthorityId = sp_consensus_aura::sr25519::AuthorityId; type DisabledValidators = (); type MaxAuthorities = ConstU32<100_000>; diff --git a/runtime/pangolin/src/pallets/balances.rs b/runtime/pangolin/src/pallets/balances.rs index c9a61fcd0..df1ba0a13 100644 --- a/runtime/pangolin/src/pallets/balances.rs +++ b/runtime/pangolin/src/pallets/balances.rs @@ -29,12 +29,12 @@ impl pallet_balances::Config for Runtime { type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type FreezeIdentifier = (); - type HoldIdentifier = (); type MaxFreezes = (); type MaxHolds = (); type MaxLocks = ConstU32<50>; type MaxReserves = ConstU32<50>; type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type RuntimeHoldReason = (); type WeightInfo = weights::pallet_balances::WeightInfo; } diff --git a/runtime/pangolin/src/pallets/fee_market.rs b/runtime/pangolin/src/pallets/fee_market.rs index c14ee5151..e4477bc33 100644 --- a/runtime/pangolin/src/pallets/fee_market.rs +++ b/runtime/pangolin/src/pallets/fee_market.rs @@ -28,7 +28,7 @@ impl, I: 'static> pallet_fee_market::Slasher, - timeout: T::BlockNumber, + timeout: frame_system::pallet_prelude::BlockNumberFor, ) -> pallet_fee_market::BalanceOf { // substrate use sp_runtime::traits::UniqueSaturatedInto; diff --git a/runtime/pangolin/src/pallets/orml_xtokens.rs b/runtime/pangolin/src/pallets/orml_xtokens.rs index e9c9dc1d3..eeb6b8b29 100644 --- a/runtime/pangolin/src/pallets/orml_xtokens.rs +++ b/runtime/pangolin/src/pallets/orml_xtokens.rs @@ -38,7 +38,7 @@ pub struct CurrencyIdtoMultiLocation(sp_std::marker::PhantomDat impl sp_runtime::traits::Convert> for CurrencyIdtoMultiLocation where - AssetXConverter: xcm_executor::traits::Convert, + AssetXConverter: sp_runtime::traits::MaybeEquivalence, { fn convert(currency: CurrencyId) -> Option { match currency { @@ -46,7 +46,7 @@ where let multi: MultiLocation = pallets::polkadot_xcm::AnchoringSelfReserve::get(); Some(multi) }, - CurrencyId::ForeignAsset(asset) => AssetXConverter::reverse_ref(asset).ok(), + CurrencyId::ForeignAsset(asset) => AssetXConverter::convert_back(&asset), } } } diff --git a/runtime/pangolin/src/pallets/polkadot_xcm.rs b/runtime/pangolin/src/pallets/polkadot_xcm.rs index 6c64ab43a..48d239c5a 100644 --- a/runtime/pangolin/src/pallets/polkadot_xcm.rs +++ b/runtime/pangolin/src/pallets/polkadot_xcm.rs @@ -109,31 +109,33 @@ pub type XcmOriginToTransactDispatchOrigin = ( pallet_xcm::XcmPassthrough, ); -pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< - darwinia_common_runtime::xcm_configs::DenyReserveTransferToRelayChain, - ( - xcm_builder::TakeWeightCredit, - xcm_builder::WithComputedOrigin< - ( - // If the message is one that immediately attemps to pay for execution, then allow - // it. - xcm_builder::AllowTopLevelPaidExecutionFrom, - // Parent, its pluralities (i.e. governance bodies), and the Fellows plurality get - // free execution. - xcm_builder::AllowUnpaidExecutionFrom< - darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, - >, - // Subscriptions for version tracking are OK. - xcm_builder::AllowSubscriptionsFrom< - darwinia_common_runtime::xcm_configs::ParentOrSiblings, - >, - ), - UniversalLocation, - ConstU32<8>, - >, - // Expected responses are OK. - xcm_builder::AllowKnownQueryResponses, - ), +pub type Barrier = xcm_builder::TrailingSetTopicAsId< + xcm_builder::DenyThenTry< + xcm_builder::DenyReserveTransferToRelayChain, + ( + xcm_builder::TakeWeightCredit, + xcm_builder::WithComputedOrigin< + ( + // If the message is one that immediately attemps to pay for execution, then + // allow it. + xcm_builder::AllowTopLevelPaidExecutionFrom, + // Parent, its pluralities (i.e. governance bodies), and the Fellows plurality + // get free execution. + xcm_builder::AllowExplicitUnpaidExecutionFrom< + darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, + >, + // Subscriptions for version tracking are OK. + xcm_builder::AllowSubscriptionsFrom< + darwinia_common_runtime::xcm_configs::ParentOrSiblings, + >, + ), + UniversalLocation, + ConstU32<8>, + >, + // Expected responses are OK. + xcm_builder::AllowKnownQueryResponses, + ), + >, >; frame_support::parameter_types! { @@ -221,6 +223,7 @@ pub type XcmWeigher = xcm_builder::FixedWeightBounds; /// The means for routing XCM messages which are not for local execution into the right message /// queues. -pub type XcmRouter = ( +pub type XcmRouter = xcm_builder::WithUniqueTopic<( // Two routers - use UMP to communicate with the relay chain: cumulus_primitives_utility::ParentAsUmp, // ..and XCMP to communicate with the sibling chains. XcmpQueue, -); +)>; #[cfg(feature = "runtime-benchmarks")] frame_support::parameter_types! { diff --git a/runtime/pangolin/src/pallets/system.rs b/runtime/pangolin/src/pallets/system.rs index dc829cc01..6ddc141fc 100644 --- a/runtime/pangolin/src/pallets/system.rs +++ b/runtime/pangolin/src/pallets/system.rs @@ -66,12 +66,11 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; /// The basic call filter to use in dispatchable. type BaseCallFilter = frame_support::traits::Everything; + type Block = Block; /// Maximum number of block number to block hash mappings to keep (oldest pruned first). type BlockHashCount = ConstU32<256>; /// The maximum length of a block (in bytes). type BlockLength = RuntimeBlockLength; - /// The index type for blocks. - type BlockNumber = BlockNumber; /// Block & extrinsics weights: base values and limits. type BlockWeights = RuntimeBlockWeights; /// The weight of database operations that the runtime can invoke. @@ -80,13 +79,11 @@ impl frame_system::Config for Runtime { type Hash = Hash; /// The hashing algorithm used. type Hashing = Hashing; - /// The header type. - type Header = sp_runtime::generic::Header; - /// The index type for storing how many extrinsics an account has signed. - type Index = Index; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = sp_runtime::traits::IdentityLookup; type MaxConsumers = ConstU32<16>; + /// The index type for storing how many extrinsics an account has signed. + type Nonce = Nonce; /// What to do if an account is fully reaped from the system. type OnKilledAccount = (); /// What to do if a new account is created. diff --git a/runtime/pangolin/tests/mock.rs b/runtime/pangolin/tests/mock.rs index 7c44756bd..4a02c115d 100644 --- a/runtime/pangolin/tests/mock.rs +++ b/runtime/pangolin/tests/mock.rs @@ -19,7 +19,7 @@ pub use pangolin_runtime::*; // substrate -use frame_support::traits::GenesisBuild; +use frame_support::traits::BuildGenesisConfig; use sp_io::TestExternalities; pub const KTON_ID: u64 = AssetIds::PKton as _; diff --git a/runtime/pangoro/Cargo.toml b/runtime/pangoro/Cargo.toml index 30707d4d8..d79ef21b6 100644 --- a/runtime/pangoro/Cargo.toml +++ b/runtime/pangoro/Cargo.toml @@ -117,6 +117,7 @@ sp-inherents = { workspace = true } sp-offchain = { workspace = true } sp-runtime = { workspace = true } sp-session = { workspace = true } +sp-staking = { workspace = true } sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } @@ -242,6 +243,7 @@ std = [ "sp-offchain/std", "sp-runtime/std", "sp-session/std", + "sp-staking/std", "sp-std/std", "sp-transaction-pool/std", "sp-version/std", @@ -328,6 +330,7 @@ runtime-benchmarks = [ # substrate optional "frame-benchmarking/runtime-benchmarks", "frame-system-benchmarking/runtime-benchmarks", + "sp-staking/runtime-benchmarks", ] try-runtime = [ @@ -391,4 +394,5 @@ try-runtime = [ "sp-runtime/try-runtime", # substrate optional "frame-try-runtime/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/runtime/pangoro/src/lib.rs b/runtime/pangoro/src/lib.rs index 09e424204..7bc801f40 100644 --- a/runtime/pangoro/src/lib.rs +++ b/runtime/pangoro/src/lib.rs @@ -113,11 +113,7 @@ pub fn native_version() -> sp_version::NativeVersion { // Create the runtime by composing the FRAME pallets that were previously configured. frame_support::construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = dc_primitives::Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub enum Runtime { // System stuff. System: frame_system = 0, ParachainSystem: cumulus_pallet_parachain_system = 1, @@ -778,7 +774,16 @@ sp_api::impl_runtime_apis! { use frame_support::traits::Currency; use frame_system_benchmarking::Pallet as SystemBench; - impl frame_system_benchmarking::Config for Runtime {} + impl frame_system_benchmarking::Config for Runtime { + fn setup_set_code_requirements(code: &sp_std::vec::Vec) -> Result<(), BenchmarkError> { + ParachainSystem::initialize_for_set_code_benchmark(code.len() as u32); + Ok(()) + } + + fn verify_set_code() { + System::assert_last_event(cumulus_pallet_parachain_system::Event::::ValidationFunctionStored.into()); + } + } use cumulus_pallet_session_benchmarking::Pallet as SessionBench; impl cumulus_pallet_session_benchmarking::Config for Runtime {} diff --git a/runtime/pangoro/src/pallets/aura.rs b/runtime/pangoro/src/pallets/aura.rs index 1da134500..d07588224 100644 --- a/runtime/pangoro/src/pallets/aura.rs +++ b/runtime/pangoro/src/pallets/aura.rs @@ -20,6 +20,7 @@ use crate::*; impl pallet_aura::Config for Runtime { + type AllowMultipleBlocksPerSlot = ConstBool; type AuthorityId = sp_consensus_aura::sr25519::AuthorityId; type DisabledValidators = (); type MaxAuthorities = ConstU32<100_000>; diff --git a/runtime/pangoro/src/pallets/balances.rs b/runtime/pangoro/src/pallets/balances.rs index c9a61fcd0..df1ba0a13 100644 --- a/runtime/pangoro/src/pallets/balances.rs +++ b/runtime/pangoro/src/pallets/balances.rs @@ -29,12 +29,12 @@ impl pallet_balances::Config for Runtime { type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type FreezeIdentifier = (); - type HoldIdentifier = (); type MaxFreezes = (); type MaxHolds = (); type MaxLocks = ConstU32<50>; type MaxReserves = ConstU32<50>; type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type RuntimeHoldReason = (); type WeightInfo = weights::pallet_balances::WeightInfo; } diff --git a/runtime/pangoro/src/pallets/elections_phragmen.rs b/runtime/pangoro/src/pallets/elections_phragmen.rs index b51c53ae8..37bd64c48 100644 --- a/runtime/pangoro/src/pallets/elections_phragmen.rs +++ b/runtime/pangoro/src/pallets/elections_phragmen.rs @@ -29,7 +29,7 @@ impl pallet_elections_phragmen::Config for Runtime { type CandidacyBond = ConstU128<{ 100 * MILLIUNIT }>; type ChangeMembers = Council; type Currency = Balances; - type CurrencyToVote = frame_support::traits::U128CurrencyToVote; + type CurrencyToVote = sp_staking::currency_to_vote::U128CurrencyToVote; type DesiredMembers = ConstU32; type DesiredRunnersUp = ConstU32<7>; type InitializeMembers = Council; diff --git a/runtime/pangoro/src/pallets/fee_market.rs b/runtime/pangoro/src/pallets/fee_market.rs index ffadaff69..c31af4216 100644 --- a/runtime/pangoro/src/pallets/fee_market.rs +++ b/runtime/pangoro/src/pallets/fee_market.rs @@ -27,7 +27,7 @@ impl, I: 'static> pallet_fee_market::Slasher, - timeout: T::BlockNumber, + timeout: frame_system::pallet_prelude::BlockNumberFor, ) -> pallet_fee_market::BalanceOf { // substrate use sp_runtime::traits::UniqueSaturatedInto; diff --git a/runtime/pangoro/src/pallets/polkadot_xcm.rs b/runtime/pangoro/src/pallets/polkadot_xcm.rs index c52fee3fe..d6ccc3f9f 100644 --- a/runtime/pangoro/src/pallets/polkadot_xcm.rs +++ b/runtime/pangoro/src/pallets/polkadot_xcm.rs @@ -75,31 +75,33 @@ pub type XcmOriginToTransactDispatchOrigin = ( pallet_xcm::XcmPassthrough, ); -pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< - darwinia_common_runtime::xcm_configs::DenyReserveTransferToRelayChain, - ( - xcm_builder::TakeWeightCredit, - xcm_builder::WithComputedOrigin< - ( - // If the message is one that immediately attemps to pay for execution, then allow - // it. - xcm_builder::AllowTopLevelPaidExecutionFrom, - // Parent, its pluralities (i.e. governance bodies), and the Fellows plurality get - // free execution. - xcm_builder::AllowUnpaidExecutionFrom< - darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, - >, - // Subscriptions for version tracking are OK. - xcm_builder::AllowSubscriptionsFrom< - darwinia_common_runtime::xcm_configs::ParentOrSiblings, - >, - ), - UniversalLocation, - ConstU32<8>, - >, - // Expected responses are OK. - xcm_builder::AllowKnownQueryResponses, - ), +pub type Barrier = xcm_builder::TrailingSetTopicAsId< + xcm_builder::DenyThenTry< + xcm_builder::DenyReserveTransferToRelayChain, + ( + xcm_builder::TakeWeightCredit, + xcm_builder::WithComputedOrigin< + ( + // If the message is one that immediately attemps to pay for execution, then + // allow it. + xcm_builder::AllowTopLevelPaidExecutionFrom, + // Parent, its pluralities (i.e. governance bodies), and the Fellows plurality + // get free execution. + xcm_builder::AllowUnpaidExecutionFrom< + darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, + >, + // Subscriptions for version tracking are OK. + xcm_builder::AllowSubscriptionsFrom< + darwinia_common_runtime::xcm_configs::ParentOrSiblings, + >, + ), + UniversalLocation, + ConstU32<8>, + >, + // Expected responses are OK. + xcm_builder::AllowKnownQueryResponses, + ), + >, >; frame_support::parameter_types! { @@ -162,6 +164,7 @@ impl xcm_executor::traits::CallDispatcher for XcmCallDispatcher { pub struct XcmExecutorConfig; impl xcm_executor::Config for XcmExecutorConfig { + type Aliasers = frame_support::traits::Nothing; type AssetClaims = PolkadotXcm; type AssetExchanger = (); type AssetLocker = (); @@ -204,12 +207,12 @@ pub type LocalOriginToLocation = xcm_primitives::SignedToAccountId20; /// The means for routing XCM messages which are not for local execution into the right message /// queues. -pub type XcmRouter = ( +pub type XcmRouter = xcm_builder::WithUniqueTopic<( // Two routers - use UMP to communicate with the relay chain: cumulus_primitives_utility::ParentAsUmp, // ..and XCMP to communicate with the sibling chains. XcmpQueue, -); +)>; #[cfg(feature = "runtime-benchmarks")] frame_support::parameter_types! { diff --git a/runtime/pangoro/src/pallets/system.rs b/runtime/pangoro/src/pallets/system.rs index 5f5f4478b..5532835da 100644 --- a/runtime/pangoro/src/pallets/system.rs +++ b/runtime/pangoro/src/pallets/system.rs @@ -66,12 +66,11 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; /// The basic call filter to use in dispatchable. type BaseCallFilter = frame_support::traits::Everything; + type Block = Block; /// Maximum number of block number to block hash mappings to keep (oldest pruned first). type BlockHashCount = ConstU32<256>; /// The maximum length of a block (in bytes). type BlockLength = RuntimeBlockLength; - /// The index type for blocks. - type BlockNumber = BlockNumber; /// Block & extrinsics weights: base values and limits. type BlockWeights = RuntimeBlockWeights; /// The weight of database operations that the runtime can invoke. @@ -80,13 +79,11 @@ impl frame_system::Config for Runtime { type Hash = Hash; /// The hashing algorithm used. type Hashing = Hashing; - /// The header type. - type Header = sp_runtime::generic::Header; - /// The index type for storing how many extrinsics an account has signed. - type Index = Index; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = sp_runtime::traits::IdentityLookup; type MaxConsumers = ConstU32<16>; + /// The index type for storing how many extrinsics an account has signed. + type Nonce = Nonce; /// What to do if an account is fully reaped from the system. type OnKilledAccount = (); /// What to do if a new account is created. diff --git a/runtime/pangoro/tests/mock.rs b/runtime/pangoro/tests/mock.rs index 00f54778a..735907201 100644 --- a/runtime/pangoro/tests/mock.rs +++ b/runtime/pangoro/tests/mock.rs @@ -19,7 +19,7 @@ pub use pangoro_runtime::*; // substrate -use frame_support::traits::GenesisBuild; +use frame_support::traits::BuildGenesisConfig; use sp_io::TestExternalities; pub const KTON_ID: u64 = AssetIds::OKton as _;