From 276e5bdd38c49976e3e1598722bd11c056077317 Mon Sep 17 00:00:00 2001 From: Gavin Wood Date: Sat, 28 Aug 2021 15:51:49 +0200 Subject: [PATCH] Companion for #3629 (XCM v2) (#571) * Update .gitignore and bring into line with XCM v2's SendError * type * Some work * Weighed responses * extra fields to xcm pallet * Fixes * Bump --- .gitignore | 2 + Cargo.lock | 567 ++++++++++---------- pallets/dmp-queue/src/lib.rs | 10 +- pallets/xcmp-queue/src/lib.rs | 8 +- pallets/xcmp-queue/src/mock.rs | 3 +- polkadot-parachains/pallets/ping/src/lib.rs | 14 +- polkadot-parachains/rococo/src/lib.rs | 7 +- polkadot-parachains/shell/src/lib.rs | 3 +- polkadot-parachains/statemine/src/lib.rs | 7 +- polkadot-parachains/statemint/src/lib.rs | 7 +- polkadot-parachains/westmint/src/lib.rs | 7 +- primitives/utility/src/lib.rs | 8 +- 12 files changed, 320 insertions(+), 323 deletions(-) diff --git a/.gitignore b/.gitignore index 9f68dce381c..11807c3e718 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /.cargo/config polkadot_argument_parsing **/node_modules +**/chains/ +*.iml diff --git a/Cargo.lock b/Cargo.lock index c56c749037c..1a635d0997e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -340,9 +340,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-trait" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" +checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", @@ -476,7 +476,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#0a4141ada1d25e949e3b0f8d7e9da39826634223" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#8809d9e00f7ba5ea6f54ea56ea209076f5ff0ab0" dependencies = [ "beefy-primitives", "fnv", @@ -506,7 +506,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#0a4141ada1d25e949e3b0f8d7e9da39826634223" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#8809d9e00f7ba5ea6f54ea56ea209076f5ff0ab0" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -527,12 +527,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#0a4141ada1d25e949e3b0f8d7e9da39826634223" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#8809d9e00f7ba5ea6f54ea56ea209076f5ff0ab0" [[package]] name = "beefy-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#0a4141ada1d25e949e3b0f8d7e9da39826634223" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#8809d9e00f7ba5ea6f54ea56ea209076f5ff0ab0" dependencies = [ "parity-scale-codec", "sp-api", @@ -710,10 +710,19 @@ dependencies = [ "once_cell", ] +[[package]] +name = "bounded-vec" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afdd1dffefe5fc66262a524b91087c43b16e478b2e3dc49eb11b0e2fd6b6ec90" +dependencies = [ + "thiserror", +] + [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "finality-grandpa", "frame-support", @@ -728,7 +737,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bp-runtime", "frame-support", @@ -739,7 +748,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bitvec 0.20.1", "bp-runtime", @@ -754,7 +763,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bp-messages", "bp-runtime", @@ -771,7 +780,7 @@ dependencies = [ [[package]] name = "bp-rialto" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bp-messages", "bp-runtime", @@ -786,7 +795,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -803,7 +812,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "frame-support", "hash-db", @@ -820,7 +829,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -835,7 +844,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -850,7 +859,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -2510,7 +2519,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", ] @@ -2528,7 +2537,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -2547,7 +2556,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "Inflector", "chrono", @@ -2573,7 +2582,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -2586,7 +2595,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -2601,7 +2610,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "14.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", "serde", @@ -2612,7 +2621,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "bitflags", "frame-metadata", @@ -2638,7 +2647,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2650,7 +2659,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -2662,7 +2671,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", @@ -2672,7 +2681,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "log", @@ -2688,7 +2697,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -2702,7 +2711,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", "sp-api", @@ -2711,7 +2720,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "sp-api", @@ -3260,7 +3269,7 @@ dependencies = [ "rustls", "rustls-native-certs", "tokio 1.10.0", - "tokio-rustls 0.22.0", + "tokio-rustls", "webpki", ] @@ -3616,7 +3625,7 @@ dependencies = [ "log", "tokio 1.10.0", "tokio-stream", - "tokio-util 0.6.7", + "tokio-util", "unicase", ] @@ -3685,9 +3694,9 @@ dependencies = [ "serde_json", "soketto 0.6.0", "thiserror", - "tokio 0.2.24", - "tokio-rustls 0.15.0", - "tokio-util 0.3.1", + "tokio 1.10.0", + "tokio-rustls", + "tokio-util", "url 2.2.0", ] @@ -3710,7 +3719,7 @@ dependencies = [ [[package]] name = "kusama-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "beefy-primitives", "bitvec 0.20.1", @@ -3853,9 +3862,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.99" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" +checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" [[package]] name = "libloading" @@ -4637,7 +4646,7 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -4729,17 +4738,6 @@ dependencies = [ "slab", ] -[[package]] -name = "mio-uds" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" -dependencies = [ - "iovec", - "libc", - "mio 0.6.23", -] - [[package]] name = "miow" version = "0.2.2" @@ -5115,7 +5113,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5128,7 +5126,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -5143,7 +5141,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -5158,7 +5156,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -5172,7 +5170,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5195,7 +5193,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5209,7 +5207,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#0a4141ada1d25e949e3b0f8d7e9da39826634223" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#8809d9e00f7ba5ea6f54ea56ea209076f5ff0ab0" dependencies = [ "beefy-primitives", "frame-support", @@ -5225,7 +5223,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#0a4141ada1d25e949e3b0f8d7e9da39826634223" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#8809d9e00f7ba5ea6f54ea56ea209076f5ff0ab0" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -5250,7 +5248,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5264,7 +5262,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5280,7 +5278,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5301,7 +5299,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bitvec 0.20.1", "bp-message-dispatch", @@ -5346,7 +5344,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5362,7 +5360,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5377,7 +5375,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5400,7 +5398,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5417,7 +5415,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5431,7 +5429,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5453,7 +5451,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5468,7 +5466,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5487,7 +5485,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5503,7 +5501,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5518,7 +5516,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5535,7 +5533,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -5551,7 +5549,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5568,7 +5566,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5582,7 +5580,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -5595,7 +5593,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -5611,7 +5609,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5633,7 +5631,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5647,7 +5645,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -5660,7 +5658,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -5673,7 +5671,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5688,7 +5686,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -5708,7 +5706,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5724,7 +5722,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -5737,7 +5735,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5759,7 +5757,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", @@ -5770,7 +5768,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "log", "sp-arithmetic", @@ -5779,7 +5777,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -5792,7 +5790,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5809,7 +5807,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5824,7 +5822,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-support", "frame-system", @@ -5840,7 +5838,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5857,7 +5855,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5868,7 +5866,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5897,7 +5895,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", @@ -5912,11 +5910,12 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "sp-runtime", "sp-std", @@ -5925,7 +5924,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "frame-support", "frame-system", @@ -6365,7 +6364,7 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polkadot-approval-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "futures 0.3.16", "polkadot-node-network-protocol", @@ -6379,7 +6378,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "futures 0.3.16", "polkadot-node-network-protocol", @@ -6392,7 +6391,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -6416,7 +6415,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "futures 0.3.16", "lru", @@ -6435,7 +6434,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "frame-benchmarking-cli", "futures 0.3.16", @@ -6455,7 +6454,7 @@ dependencies = [ [[package]] name = "polkadot-client" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6561,7 +6560,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "always-assert", "derive_more 0.99.14", @@ -6582,7 +6581,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -6594,7 +6593,7 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -6619,7 +6618,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -6633,7 +6632,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "futures 0.3.16", "polkadot-node-network-protocol", @@ -6651,7 +6650,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "async-trait", "futures 0.3.16", @@ -6670,7 +6669,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "futures 0.3.16", "parity-scale-codec", @@ -6688,7 +6687,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bitvec 0.20.1", "derive_more 0.99.14", @@ -6718,7 +6717,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bitvec 0.20.1", "futures 0.3.16", @@ -6738,7 +6737,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bitvec 0.20.1", "futures 0.3.16", @@ -6756,7 +6755,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "futures 0.3.16", "polkadot-node-subsystem", @@ -6771,7 +6770,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "async-trait", "futures 0.3.16", @@ -6789,7 +6788,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "futures 0.3.16", "polkadot-node-subsystem", @@ -6804,7 +6803,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -6821,7 +6820,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bitvec 0.20.1", "derive_more 0.99.14", @@ -6840,7 +6839,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-participation" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "futures 0.3.16", "polkadot-node-primitives", @@ -6853,7 +6852,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "async-trait", "futures 0.3.16", @@ -6870,7 +6869,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bitvec 0.20.1", "futures 0.3.16", @@ -6885,7 +6884,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "always-assert", "assert_matches", @@ -6897,6 +6896,7 @@ dependencies = [ "parity-scale-codec", "pin-project 1.0.8", "polkadot-core-primitives", + "polkadot-node-subsystem-util", "polkadot-parachain", "rand 0.8.4", "sc-executor", @@ -6915,7 +6915,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "futures 0.3.16", "memory-lru", @@ -6933,7 +6933,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "async-std", "lazy_static", @@ -6951,7 +6951,7 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "async-trait", "futures 0.3.16", @@ -6968,7 +6968,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -6986,8 +6986,9 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ + "bounded-vec", "futures 0.3.16", "parity-scale-codec", "polkadot-parachain", @@ -7010,7 +7011,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7020,7 +7021,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "async-trait", "futures 0.3.16", @@ -7046,7 +7047,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "async-std", "async-trait", @@ -7076,7 +7077,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -7107,7 +7108,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "async-trait", "futures 0.3.16", @@ -7129,7 +7130,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-all-subsystems-gen" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "assert_matches", "proc-macro2 1.0.28", @@ -7140,7 +7141,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "async-trait", "futures 0.3.16", @@ -7157,7 +7158,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", @@ -7168,7 +7169,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "derive_more 0.99.14", "frame-support", @@ -7184,7 +7185,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bitvec 0.20.1", "frame-system", @@ -7214,7 +7215,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7247,7 +7248,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "beefy-primitives", "bitvec 0.20.1", @@ -7322,7 +7323,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bitvec 0.20.1", "frame-benchmarking", @@ -7365,7 +7366,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "bitflags", "bitvec 0.20.1", @@ -7404,7 +7405,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "async-trait", "beefy-gadget", @@ -7501,7 +7502,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "arrayvec 0.5.2", "derive_more 0.99.14", @@ -7522,7 +7523,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7532,7 +7533,7 @@ dependencies = [ [[package]] name = "polkadot-test-client" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -7557,7 +7558,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "beefy-primitives", "bitvec 0.20.1", @@ -7617,7 +7618,7 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "frame-benchmarking", "frame-system", @@ -8418,7 +8419,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "env_logger 0.9.0", "jsonrpsee-proc-macros", @@ -8430,6 +8431,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-version", ] [[package]] @@ -8546,7 +8548,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "beefy-primitives", "bp-messages", @@ -8743,7 +8745,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "log", "sp-core", @@ -8754,7 +8756,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -8781,7 +8783,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -8804,7 +8806,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8820,7 +8822,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8836,7 +8838,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", @@ -8847,7 +8849,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "chrono", "fdlimit", @@ -8879,13 +8881,13 @@ dependencies = [ "structopt", "thiserror", "tiny-bip39", - "tokio 0.2.24", + "tokio 1.10.0", ] [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "fnv", "futures 0.3.16", @@ -8913,7 +8915,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "hash-db", "kvdb", @@ -8938,7 +8940,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "futures 0.3.16", @@ -8991,7 +8993,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -9034,7 +9036,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -9058,7 +9060,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9071,7 +9073,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "futures 0.3.16", @@ -9097,7 +9099,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "sc-client-api", "sp-authorship", @@ -9108,7 +9110,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "lazy_static", "libsecp256k1 0.6.0", @@ -9134,7 +9136,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "derive_more 0.99.14", "parity-scale-codec", @@ -9151,7 +9153,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "log", "parity-scale-codec", @@ -9167,7 +9169,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "cfg-if 1.0.0", "libc", @@ -9186,7 +9188,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -9223,7 +9225,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "derive_more 0.99.14", "finality-grandpa", @@ -9247,7 +9249,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "ansi_term 0.12.1", "futures 0.3.16", @@ -9264,7 +9266,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -9279,7 +9281,7 @@ dependencies = [ [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "hash-db", "parity-scale-codec", @@ -9297,7 +9299,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-std", "async-trait", @@ -9348,7 +9350,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -9364,7 +9366,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "bytes 1.0.1", "fnv", @@ -9391,7 +9393,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "futures 0.3.16", "libp2p", @@ -9404,7 +9406,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9413,7 +9415,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "futures 0.3.16", "hash-db", @@ -9444,7 +9446,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -9469,7 +9471,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "futures 0.3.16", "jsonrpc-core", @@ -9485,7 +9487,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "directories", @@ -9549,7 +9551,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "log", "parity-scale-codec", @@ -9563,7 +9565,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9585,7 +9587,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "chrono", "futures 0.3.16", @@ -9603,7 +9605,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "ansi_term 0.12.1", "atty", @@ -9634,7 +9636,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", @@ -9645,7 +9647,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "futures 0.3.16", "intervalier", @@ -9672,7 +9674,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -9841,18 +9843,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.127" +version = "1.0.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" +checksum = "d1f72836d2aa753853178eda473a3b9d8e4eefdaf20523b919677e6de489f8f1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.127" +version = "1.0.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" +checksum = "e57ae87ad533d9a56427558b516d0adac283614e347abf85b0dc0cbbf0a249f3" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", @@ -10039,7 +10041,7 @@ dependencies = [ [[package]] name = "slot-range-helper" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "enumn", "parity-scale-codec", @@ -10151,7 +10153,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "hash-db", "log", @@ -10168,7 +10170,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -10180,7 +10182,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", "serde", @@ -10192,7 +10194,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "integer-sqrt", "num-traits", @@ -10206,7 +10208,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", "sp-api", @@ -10218,7 +10220,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "parity-scale-codec", @@ -10230,7 +10232,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", "sp-api", @@ -10242,7 +10244,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "futures 0.3.16", "log", @@ -10260,7 +10262,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "futures 0.3.16", @@ -10279,7 +10281,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "parity-scale-codec", @@ -10296,7 +10298,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "merlin", @@ -10318,7 +10320,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -10328,7 +10330,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -10340,7 +10342,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "base58", "blake2-rfc", @@ -10384,7 +10386,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -10393,7 +10395,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", @@ -10403,7 +10405,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "environmental", "parity-scale-codec", @@ -10414,7 +10416,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "finality-grandpa", "log", @@ -10431,7 +10433,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10445,7 +10447,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "futures 0.3.16", "hash-db", @@ -10470,7 +10472,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "lazy_static", "sp-core", @@ -10481,7 +10483,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -10498,7 +10500,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "ruzstd", "zstd", @@ -10507,7 +10509,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", "serde", @@ -10520,7 +10522,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", @@ -10531,7 +10533,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "sp-api", "sp-core", @@ -10541,7 +10543,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "backtrace", ] @@ -10549,7 +10551,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "rustc-hash", "serde", @@ -10559,7 +10561,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "either", "hash256-std-hasher", @@ -10580,7 +10582,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10597,7 +10599,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -10609,7 +10611,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "serde", "serde_json", @@ -10618,7 +10620,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", "sp-api", @@ -10631,7 +10633,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -10641,7 +10643,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "hash-db", "log", @@ -10664,12 +10666,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10682,7 +10684,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "log", "sp-core", @@ -10695,7 +10697,7 @@ dependencies = [ [[package]] name = "sp-test-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -10708,7 +10710,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -10724,7 +10726,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "erased-serde", "log", @@ -10742,7 +10744,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "sp-api", "sp-runtime", @@ -10751,7 +10753,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "log", @@ -10766,7 +10768,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "hash-db", "memory-db", @@ -10780,7 +10782,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -10791,7 +10793,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10806,7 +10808,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "parity-scale-codec", "proc-macro2 1.0.28", @@ -10817,7 +10819,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11099,7 +11101,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "platforms", ] @@ -11107,7 +11109,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.16", @@ -11129,7 +11131,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-std", "derive_more 0.99.14", @@ -11143,7 +11145,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "async-trait", "futures 0.3.16", @@ -11170,19 +11172,20 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "futures 0.3.16", "substrate-test-utils-derive", - "tokio 0.2.24", + "tokio 1.10.0", ] [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "proc-macro-crate 1.0.0", + "proc-macro2 1.0.28", "quote 1.0.9", "syn 1.0.74", ] @@ -11190,7 +11193,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "ansi_term 0.12.1", "build-helper", @@ -11414,18 +11417,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" dependencies = [ "bytes 0.5.6", - "fnv", - "iovec", - "lazy_static", - "libc", - "mio 0.6.23", - "mio-uds", - "num_cpus", "pin-project-lite 0.1.11", - "signal-hook-registry", - "slab", - "tokio-macros", - "winapi 0.3.9", + "tokio-macros 0.2.6", ] [[package]] @@ -11440,7 +11433,10 @@ dependencies = [ "memchr", "mio 0.7.13", "num_cpus", + "once_cell", "pin-project-lite 0.2.4", + "signal-hook-registry", + "tokio-macros 1.3.0", "winapi 0.3.9", ] @@ -11456,15 +11452,14 @@ dependencies = [ ] [[package]] -name = "tokio-rustls" -version = "0.15.0" +name = "tokio-macros" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d15e5669243a45f630a5167d101b942174ca94b615445b2057eace1c818736" +checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" dependencies = [ - "futures-core", - "rustls", - "tokio 0.2.24", - "webpki", + "proc-macro2 1.0.28", + "quote 1.0.9", + "syn 1.0.74", ] [[package]] @@ -11489,21 +11484,6 @@ dependencies = [ "tokio 1.10.0", ] -[[package]] -name = "tokio-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-io", - "futures-sink", - "log", - "pin-project-lite 0.1.11", - "tokio 0.2.24", -] - [[package]] name = "tokio-util" version = "0.6.7" @@ -11512,6 +11492,7 @@ checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" dependencies = [ "bytes 1.0.1", "futures-core", + "futures-io", "futures-sink", "log", "pin-project-lite 0.2.4", @@ -11707,7 +11688,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" +source = "git+https://github.com/paritytech/substrate?branch=master#42d317054ea0d1f1e6b2b22aaba67004bcf5e898" dependencies = [ "log", "parity-scale-codec", @@ -11731,7 +11712,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59" dependencies = [ "cfg-if 0.1.10", - "rand 0.6.5", + "rand 0.7.3", "static_assertions", ] @@ -12318,7 +12299,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "beefy-primitives", "bitvec 0.20.1", @@ -12560,7 +12541,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -12572,7 +12553,7 @@ dependencies = [ [[package]] name = "xcm-builder" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "frame-support", "frame-system", @@ -12591,7 +12572,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -12608,7 +12589,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +source = "git+https://github.com/paritytech/polkadot?branch=master#d8d5ce285287a185c3e62ae058bbbbf5c636ea8a" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", diff --git a/pallets/dmp-queue/src/lib.rs b/pallets/dmp-queue/src/lib.rs index a89931fb55f..81928bdb608 100644 --- a/pallets/dmp-queue/src/lib.rs +++ b/pallets/dmp-queue/src/lib.rs @@ -26,7 +26,7 @@ use cumulus_primitives_core::relay_chain::BlockNumber as RelayBlockNumber; use cumulus_primitives_core::DmpMessageHandler; use codec::{Encode, Decode}; use sp_runtime::RuntimeDebug; -use xcm::{VersionedXcm, latest::{Xcm, Outcome, Parent, ExecuteXcm, Error as XcmError}}; +use xcm::{VersionedXcm, latest::prelude::*}; use frame_support::{traits::EnsureOrigin, dispatch::Weight, weights::constants::WEIGHT_PER_MILLIS}; pub use pallet::*; @@ -422,8 +422,8 @@ mod tests { weight_limit: Weight, _credit: Weight, ) -> Outcome { - let o = match &message { - Xcm::Transact { require_weight_at_most, .. } => { + let o = match (message.0.len(), &message.0.first()) { + (1, Some(Transact { require_weight_at_most, .. })) => { if *require_weight_at_most <= weight_limit { Outcome::Complete(*require_weight_at_most) } else { @@ -466,11 +466,11 @@ mod tests { } fn msg(weight: Weight) -> Xcm { - Xcm::Transact { + Xcm(vec![Transact { origin_type: OriginKind::Native, require_weight_at_most: weight, call: vec![].into(), - } + }]) } fn msg_complete(weight: Weight) -> (Xcm, Outcome) { diff --git a/pallets/xcmp-queue/src/lib.rs b/pallets/xcmp-queue/src/lib.rs index 3cf197e6ea2..7f59e77e328 100644 --- a/pallets/xcmp-queue/src/lib.rs +++ b/pallets/xcmp-queue/src/lib.rs @@ -774,24 +774,24 @@ impl XcmpMessageSource for Pallet { /// Xcm sender for sending to a sibling parachain. impl SendXcm for Pallet { - fn send_xcm(dest: MultiLocation, msg: Xcm<()>) -> Result<(), XcmError> { + fn send_xcm(dest: MultiLocation, msg: Xcm<()>) -> Result<(), SendError> { match &dest { // An HRMP message for a sibling parachain. MultiLocation { parents: 1, interior: X1(Parachain(id)) } => { let versioned_xcm = T::VersionWrapper::wrap_version(&dest, msg) - .map_err(|()| XcmError::DestinationUnsupported)?; + .map_err(|()| SendError::DestinationUnsupported)?; let hash = T::Hashing::hash_of(&versioned_xcm); Self::send_fragment( (*id).into(), XcmpMessageFormat::ConcatenatedVersionedXcm, versioned_xcm, ) - .map_err(|e| XcmError::SendFailed(<&'static str>::from(e)))?; + .map_err(|e| SendError::Transport(<&'static str>::from(e)))?; Self::deposit_event(Event::XcmpMessageSent(Some(hash))); Ok(()) } // Anything else is unhandled. This includes a message this is meant for us. - _ => Err(XcmError::CannotReachDestination(dest, msg)), + _ => Err(SendError::CannotReachDestination(dest, msg)), } } } diff --git a/pallets/xcmp-queue/src/mock.rs b/pallets/xcmp-queue/src/mock.rs index 3e240d3aaa3..6f6be2fff29 100644 --- a/pallets/xcmp-queue/src/mock.rs +++ b/pallets/xcmp-queue/src/mock.rs @@ -107,6 +107,7 @@ parameter_types! { pub const RelayChain: MultiLocation = MultiLocation::parent(); pub Ancestry: MultiLocation = X1(Parachain(1u32.into())).into(); pub UnitWeightCost: Weight = 1_000_000; + pub const MaxInstructions: u32 = 100; } /// Means for transacting assets on this chain. @@ -138,7 +139,7 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = NativeAsset; type LocationInverter = LocationInverter; type Barrier = (); - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = (); type ResponseHandler = (); } diff --git a/polkadot-parachains/pallets/ping/src/lib.rs b/polkadot-parachains/pallets/ping/src/lib.rs index 9ebfd2d79ff..89fbed63573 100644 --- a/polkadot-parachains/pallets/ping/src/lib.rs +++ b/polkadot-parachains/pallets/ping/src/lib.rs @@ -19,11 +19,11 @@ #![cfg_attr(not(feature = "std"), no_std)] use sp_std::prelude::*; +use xcm::latest::prelude::*; use sp_runtime::traits::Saturating; use frame_system::Config as SystemConfig; use cumulus_primitives_core::ParaId; use cumulus_pallet_xcm::{Origin as CumulusOrigin, ensure_sibling_para}; -use xcm::latest::{Xcm, Error as XcmError, SendXcm, OriginKind, Junction}; pub use pallet::*; @@ -85,8 +85,8 @@ pub mod pallet { Pinged(ParaId, u32, Vec), PongSent(ParaId, u32, Vec), Ponged(ParaId, u32, Vec, T::BlockNumber), - ErrorSendingPing(XcmError, ParaId, u32, Vec), - ErrorSendingPong(XcmError, ParaId, u32, Vec), + ErrorSendingPing(SendError, ParaId, u32, Vec), + ErrorSendingPong(SendError, ParaId, u32, Vec), UnknownPong(ParaId, u32, Vec), } @@ -102,11 +102,11 @@ pub mod pallet { let seq = PingCount::::mutate(|seq| { *seq += 1; *seq }); match T::XcmSender::send_xcm( (1, Junction::Parachain(para.into())).into(), - Xcm::Transact { + Xcm(vec![Transact { origin_type: OriginKind::Native, require_weight_at_most: 1_000, call: ::Call::from(Call::::ping(seq, payload.clone())).encode().into(), - }, + }]), ) { Ok(()) => { Pings::::insert(seq, n); @@ -164,11 +164,11 @@ pub mod pallet { Self::deposit_event(Event::Pinged(para, seq, payload.clone())); match T::XcmSender::send_xcm( (1, Junction::Parachain(para.into())).into(), - Xcm::Transact { + Xcm(vec![Transact { origin_type: OriginKind::Native, require_weight_at_most: 1_000, call: ::Call::from(Call::::pong(seq, payload.clone())).encode().into(), - }, + }]), ) { Ok(()) => Self::deposit_event(Event::PongSent(para, seq, payload)), Err(e) => Self::deposit_event(Event::ErrorSendingPong(e, para, seq, payload)), diff --git a/polkadot-parachains/rococo/src/lib.rs b/polkadot-parachains/rococo/src/lib.rs index e1b0c53e155..edbe4724690 100644 --- a/polkadot-parachains/rococo/src/lib.rs +++ b/polkadot-parachains/rococo/src/lib.rs @@ -318,6 +318,7 @@ parameter_types! { pub UnitWeightCost: Weight = 1_000_000; // One ROC buys 1 second of weight. pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::parent(), ROC); + pub const MaxInstructions: u32 = 100; } match_type! { @@ -345,7 +346,7 @@ impl Config for XcmConfig { type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of ROC type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = UsingComponents, RocLocation, AccountId, Balances, ()>; type ResponseHandler = (); // Don't handle responses for now. } @@ -371,8 +372,10 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = frame_support::traits::Nothing; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; + type Origin = Origin; + type Call = Call; } impl cumulus_pallet_xcm::Config for Runtime { diff --git a/polkadot-parachains/shell/src/lib.rs b/polkadot-parachains/shell/src/lib.rs index a3bbf0ac0ba..606e03d0843 100644 --- a/polkadot-parachains/shell/src/lib.rs +++ b/polkadot-parachains/shell/src/lib.rs @@ -197,6 +197,7 @@ match_type! { parameter_types! { // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate. pub UnitWeightCost: Weight = 1_000_000; + pub const MaxInstructions: u32 = 100; } pub struct XcmConfig; @@ -209,7 +210,7 @@ impl Config for XcmConfig { type IsTeleporter = (); // balances not supported type LocationInverter = LocationInverter; type Barrier = AllowUnpaidExecutionFrom; - type Weigher = FixedWeightBounds; // balances not supported + type Weigher = FixedWeightBounds; // balances not supported type Trader = (); // balances not supported type ResponseHandler = (); // Don't handle responses for now. } diff --git a/polkadot-parachains/statemine/src/lib.rs b/polkadot-parachains/statemine/src/lib.rs index ff9c92e2be5..509e40735a8 100644 --- a/polkadot-parachains/statemine/src/lib.rs +++ b/polkadot-parachains/statemine/src/lib.rs @@ -512,6 +512,7 @@ pub type XcmOriginToTransactDispatchOrigin = ( parameter_types! { // One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate. pub UnitWeightCost: Weight = 1_000_000_000; + pub const MaxInstructions: u32 = 100; } match_type! { @@ -539,7 +540,7 @@ impl Config for XcmConfig { type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of KSM type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = UsingComponents, KsmLocation, AccountId, Balances, ()>; type ResponseHandler = (); // Don't handle responses for now. } @@ -569,8 +570,10 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; + type Origin = Origin; + type Call = Call; } impl cumulus_pallet_xcm::Config for Runtime { diff --git a/polkadot-parachains/statemint/src/lib.rs b/polkadot-parachains/statemint/src/lib.rs index 78196e8346e..4bf63318271 100644 --- a/polkadot-parachains/statemint/src/lib.rs +++ b/polkadot-parachains/statemint/src/lib.rs @@ -477,6 +477,7 @@ pub type XcmOriginToTransactDispatchOrigin = ( parameter_types! { // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate. pub UnitWeightCost: Weight = 1_000_000; + pub const MaxInstructions: u32 = 100; } match_type! { @@ -504,7 +505,7 @@ impl Config for XcmConfig { type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of DOT type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = UsingComponents, DotLocation, AccountId, Balances, ()>; type ResponseHandler = (); // Don't handle responses for now. } @@ -534,8 +535,10 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; + type Origin = Origin; + type Call = Call; } impl cumulus_pallet_xcm::Config for Runtime { diff --git a/polkadot-parachains/westmint/src/lib.rs b/polkadot-parachains/westmint/src/lib.rs index 03848e84536..ee021e30735 100644 --- a/polkadot-parachains/westmint/src/lib.rs +++ b/polkadot-parachains/westmint/src/lib.rs @@ -475,6 +475,7 @@ pub type XcmOriginToTransactDispatchOrigin = ( parameter_types! { pub UnitWeightCost: Weight = 1_000; + pub const MaxInstructions: u32 = 100; } match_type! { @@ -502,7 +503,7 @@ impl Config for XcmConfig { type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of WND type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = UsingComponents, WestendLocation, AccountId, Balances, ()>; type ResponseHandler = (); // Don't handle responses for now. } @@ -532,8 +533,10 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; + type Origin = Origin; + type Call = Call; } impl cumulus_pallet_xcm::Config for Runtime { diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index f2cf5e6824c..a7d27d95b4d 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -33,20 +33,20 @@ use xcm::{WrapVersion, latest::prelude::*}; /// for the `SendXcm` implementation. pub struct ParentAsUmp(PhantomData<(T, W)>); impl SendXcm for ParentAsUmp { - fn send_xcm(dest: MultiLocation, msg: Xcm<()>) -> Result<(), XcmError> { + fn send_xcm(dest: MultiLocation, msg: Xcm<()>) -> Result<(), SendError> { if dest.contains_parents_only(1) { // An upward message for the relay chain. let versioned_xcm = W::wrap_version(&dest, msg) - .map_err(|()| XcmError::DestinationUnsupported)?; + .map_err(|()| SendError::DestinationUnsupported)?; let data = versioned_xcm.encode(); T::send_upward_message(data) - .map_err(|e| XcmError::SendFailed(e.into()))?; + .map_err(|e| SendError::Transport(e.into()))?; Ok(()) } else { // Anything else is unhandled. This includes a message this is meant for us. - Err(XcmError::CannotReachDestination(dest, msg)) + Err(SendError::CannotReachDestination(dest, msg)) } } }