diff --git a/.taplo.toml b/.taplo.toml index 3da852f44..a4f937764 100644 --- a/.taplo.toml +++ b/.taplo.toml @@ -5,3 +5,9 @@ align_entries = true allowed_blank_lines = 1 reorder_arrays = true reorder_keys = true + +[[rule]] +keys = ["build-dependencies", "dependencies", "dev-dependencies"] + +[rule.formatting] +column_width = 120 diff --git a/Cargo.lock b/Cargo.lock index 6b10dbd87..f5643a8c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -180,6 +180,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + [[package]] name = "always-assert" version = "0.1.3" @@ -201,12 +207,6 @@ dependencies = [ "libc", ] -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - [[package]] name = "ansi_term" version = "0.12.1" @@ -279,6 +279,20 @@ dependencies = [ "num-traits", ] +[[package]] +name = "aquamarine" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" +dependencies = [ + "include_dir", + "itertools 0.10.5", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "arc-swap" version = "1.6.0" @@ -297,6 +311,15 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +[[package]] +name = "arrayvec" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" +dependencies = [ + "nodrop", +] + [[package]] name = "arrayvec" version = "0.5.2" @@ -384,8 +407,8 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "asset-hub-kusama-runtime" -version = "0.9.420" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.10.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "assets-common", "cumulus-pallet-aura-ext", @@ -395,7 +418,6 @@ dependencies = [ "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", - "cumulus-primitives-timestamp", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -403,10 +425,12 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", + "frame-try-runtime", "hex-literal 0.4.1", "kusama-runtime-constants", "log", - "pallet-asset-tx-payment", + "pallet-asset-conversion", + "pallet-asset-conversion-tx-payment", "pallet-assets", "pallet-aura", "pallet-authorship", @@ -426,12 +450,12 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-common", + "primitive-types", "scale-info", "smallvec", "sp-api", @@ -443,19 +467,21 @@ dependencies = [ "sp-runtime", "sp-session", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", "sp-weights", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "asset-hub-polkadot-runtime" -version = "0.9.420" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.10.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "assets-common", "cumulus-pallet-aura-ext", @@ -465,7 +491,6 @@ dependencies = [ "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", - "cumulus-primitives-timestamp", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -473,6 +498,7 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", + "frame-try-runtime", "hex-literal 0.4.1", "log", "pallet-asset-tx-payment", @@ -493,11 +519,10 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-common", "polkadot-runtime-constants", "scale-info", @@ -511,19 +536,21 @@ dependencies = [ "sp-runtime", "sp-session", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", "sp-weights", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "asset-hub-westend-runtime" -version = "0.9.420" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.10.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "assets-common", "cumulus-pallet-aura-ext", @@ -533,7 +560,6 @@ dependencies = [ "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", - "cumulus-primitives-timestamp", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -541,6 +567,7 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", + "frame-try-runtime", "hex-literal 0.4.1", "log", "pallet-asset-conversion", @@ -563,11 +590,10 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-common", "primitive-types", "scale-info", @@ -581,22 +607,25 @@ dependencies = [ "sp-runtime", "sp-session", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", "westend-runtime-constants", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "assets-common" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-primitives-core", "frame-support", + "impl-trait-for-tuples", "log", "pallet-asset-conversion", "pallet-asset-tx-payment", @@ -607,10 +636,10 @@ dependencies = [ "sp-api", "sp-runtime", "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -624,6 +653,64 @@ dependencies = [ "futures-core", ] +[[package]] +name = "async-channel" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +dependencies = [ + "concurrent-queue", + "event-listener 5.2.0", + "event-listener-strategy 0.5.1", + "futures-core", + "pin-project-lite 0.2.13", +] + +[[package]] +name = "async-executor" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite 2.0.1", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + [[package]] name = "async-io" version = "2.2.0" @@ -634,9 +721,9 @@ dependencies = [ "cfg-if", "concurrent-queue", "futures-io", - "futures-lite", + "futures-lite 2.0.1", "parking", - "polling", + "polling 3.3.0", "rustix 0.38.25", "slab", "tracing", @@ -660,10 +747,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "655b9c7fe787d3b25cc0f804a1a8401790f0c5bc395beb5a64dc77d8de079105" dependencies = [ "event-listener 3.1.0", - "event-listener-strategy", + "event-listener-strategy 0.3.0", "pin-project-lite 0.2.13", ] +[[package]] +name = "async-net" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" +dependencies = [ + "async-io 1.13.0", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.25", + "windows-sys 0.48.0", +] + [[package]] name = "async-recursion" version = "1.0.5" @@ -675,6 +790,30 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.2.0", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.25", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + [[package]] name = "async-trait" version = "0.1.74" @@ -699,6 +838,12 @@ dependencies = [ "pin-project-lite 0.2.13", ] +[[package]] +name = "atomic-take" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8ab6b55fe97976e46f91ddbed8d147d966475dc29b2032757ba47e02376fbc3" + [[package]] name = "atomic-waker" version = "1.1.2" @@ -724,6 +869,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-std", + "sp-weights", ] [[package]] @@ -811,8 +957,8 @@ dependencies = [ [[package]] name = "binary-merkle-tree" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "hash-db", "log", @@ -848,6 +994,21 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "bip39" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" +dependencies = [ + "bitcoin_hashes", +] + +[[package]] +name = "bitcoin_hashes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" + [[package]] name = "bitflags" version = "1.3.2" @@ -881,6 +1042,16 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "blake2-rfc" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" +dependencies = [ + "arrayvec 0.4.12", + "constant_time_eq 0.1.5", +] + [[package]] name = "blake2b_simd" version = "1.0.2" @@ -889,7 +1060,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq", + "constant_time_eq 0.3.0", ] [[package]] @@ -900,7 +1071,7 @@ checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq", + "constant_time_eq 0.3.0", ] [[package]] @@ -913,7 +1084,7 @@ dependencies = [ "arrayvec 0.7.4", "cc", "cfg-if", - "constant_time_eq", + "constant_time_eq 0.3.0", ] [[package]] @@ -971,6 +1142,22 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel 2.2.1", + "async-lock 3.1.1", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.0.1", + "piper", + "tracing", +] + [[package]] name = "bounded-collections" version = "0.1.9" @@ -994,8 +1181,8 @@ dependencies = [ [[package]] name = "bp-bridge-hub-cumulus" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -1009,34 +1196,36 @@ dependencies = [ [[package]] name = "bp-bridge-hub-rococo" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-bridge-hub-cumulus", "bp-messages", "bp-runtime", "frame-support", "sp-api", + "sp-runtime", "sp-std", ] [[package]] name = "bp-bridge-hub-wococo" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-bridge-hub-cumulus", "bp-messages", "bp-runtime", "frame-support", "sp-api", + "sp-runtime", "sp-std", ] [[package]] name = "bp-header-chain" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-runtime", "finality-grandpa", @@ -1052,8 +1241,8 @@ dependencies = [ [[package]] name = "bp-messages" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-header-chain", "bp-runtime", @@ -1067,8 +1256,8 @@ dependencies = [ [[package]] name = "bp-parachains" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-header-chain", "bp-polkadot-core", @@ -1084,8 +1273,8 @@ dependencies = [ [[package]] name = "bp-polkadot-core" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-messages", "bp-runtime", @@ -1102,8 +1291,8 @@ dependencies = [ [[package]] name = "bp-relayers" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-messages", "bp-runtime", @@ -1117,24 +1306,26 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-header-chain", "bp-polkadot-core", "bp-runtime", "frame-support", "sp-api", + "sp-std", ] [[package]] name = "bp-runtime" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "frame-system", "hash-db", "impl-trait-for-tuples", + "log", "num-traits", "parity-scale-codec", "scale-info", @@ -1150,8 +1341,8 @@ dependencies = [ [[package]] name = "bp-test-utils" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-header-chain", "bp-parachains", @@ -1171,7 +1362,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-header-chain", "bp-polkadot-core", @@ -1179,12 +1370,24 @@ dependencies = [ "bp-runtime", "frame-support", "sp-api", + "sp-std", ] [[package]] -name = "bridge-hub-kusama-runtime" +name = "bp-xcm-bridge-hub-router" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", +] + +[[package]] +name = "bridge-hub-kusama-runtime" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -1193,7 +1396,6 @@ dependencies = [ "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", - "cumulus-primitives-timestamp", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -1201,6 +1403,7 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", + "frame-try-runtime", "hex-literal 0.4.1", "kusama-runtime-constants", "log", @@ -1216,11 +1419,10 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-common", "scale-info", "serde", @@ -1235,18 +1437,20 @@ dependencies = [ "sp-runtime", "sp-session", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "bridge-hub-polkadot-runtime" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -1255,7 +1459,6 @@ dependencies = [ "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", - "cumulus-primitives-timestamp", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -1263,6 +1466,7 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", + "frame-try-runtime", "hex-literal 0.4.1", "log", "pallet-aura", @@ -1277,11 +1481,10 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-common", "polkadot-runtime-constants", "scale-info", @@ -1297,21 +1500,24 @@ dependencies = [ "sp-runtime", "sp-session", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "bridge-hub-rococo-runtime" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-bridge-hub-rococo", "bp-bridge-hub-wococo", + "bp-header-chain", "bp-messages", "bp-parachains", "bp-polkadot-core", @@ -1327,7 +1533,6 @@ dependencies = [ "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", - "cumulus-primitives-timestamp", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -1335,6 +1540,7 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", + "frame-try-runtime", "hex-literal 0.4.1", "log", "pallet-aura", @@ -1353,11 +1559,10 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-common", "rococo-runtime-constants", "scale-info", @@ -1373,18 +1578,20 @@ dependencies = [ "sp-runtime", "sp-session", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "bridge-runtime-common" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-header-chain", "bp-messages", @@ -1392,6 +1599,7 @@ dependencies = [ "bp-polkadot-core", "bp-relayers", "bp-runtime", + "bp-xcm-bridge-hub-router", "frame-support", "frame-system", "hash-db", @@ -1410,8 +1618,8 @@ dependencies = [ "sp-runtime", "sp-std", "sp-trie", - "xcm", - "xcm-builder", + "staging-xcm", + "staging-xcm-builder", ] [[package]] @@ -1420,6 +1628,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + [[package]] name = "bstr" version = "1.8.0" @@ -1518,21 +1735,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "casey" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614586263949597dcc18675da12ef9b429135e13628d92eb8b8c6fa50ca5656b" -dependencies = [ - "syn 1.0.109", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - [[package]] name = "cc" version = "1.0.83" @@ -1622,33 +1824,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "ciborium" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" - -[[package]] -name = "ciborium-ll" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" -dependencies = [ - "ciborium-io", - "half", -] - [[package]] name = "cid" version = "0.9.0" @@ -1761,6 +1936,7 @@ dependencies = [ "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", + "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-timestamp", "cumulus-primitives-utility", @@ -1783,7 +1959,6 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-xcm", - "parachain-info", "parity-scale-codec", "runtime-common", "scale-info", @@ -1800,10 +1975,11 @@ dependencies = [ "sp-transaction-pool", "sp-version", "sp-weights", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -1830,8 +2006,8 @@ dependencies = [ [[package]] name = "collectives-polkadot-runtime" -version = "1.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -1840,7 +2016,6 @@ dependencies = [ "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", - "cumulus-primitives-timestamp", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -1848,6 +2023,7 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", + "frame-try-runtime", "hex-literal 0.4.1", "log", "pallet-alliance", @@ -1870,11 +2046,10 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-xcm", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-common", "polkadot-runtime-constants", "scale-info", @@ -1889,12 +2064,14 @@ dependencies = [ "sp-runtime", "sp-session", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -1968,6 +2145,12 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + [[package]] name = "constant_time_eq" version = "0.3.0" @@ -2156,48 +2339,10 @@ dependencies = [ ] [[package]] -name = "criterion" -version = "0.5.1" +name = "crossbeam-deque" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast", - "ciborium", - "clap", - "criterion-plot", - "futures", - "is-terminal", - "itertools 0.10.5", - "num-traits", - "once_cell", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "tokio", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -2336,8 +2481,8 @@ dependencies = [ [[package]] name = "cumulus-client-cli" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "clap", "parity-scale-codec", @@ -2352,8 +2497,8 @@ dependencies = [ [[package]] name = "cumulus-client-collator" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -2375,8 +2520,8 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "cumulus-client-collator", @@ -2387,9 +2532,9 @@ dependencies = [ "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-interface", "futures", - "lru 0.10.1", "parity-scale-codec", "polkadot-node-primitives", + "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", "sc-client-api", @@ -2398,6 +2543,7 @@ dependencies = [ "sc-consensus-babe", "sc-consensus-slots", "sc-telemetry", + "schnellru", "sp-api", "sp-application-crypto", "sp-block-builder", @@ -2416,8 +2562,8 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "cumulus-client-pov-recovery", @@ -2445,8 +2591,8 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-proposer" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "anyhow", "async-trait", @@ -2458,33 +2604,10 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cumulus-client-consensus-relay-chain" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" -dependencies = [ - "async-trait", - "cumulus-client-consensus-common", - "cumulus-primitives-core", - "cumulus-relay-chain-interface", - "futures", - "parking_lot 0.12.1", - "sc-consensus", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", - "substrate-prometheus-endpoint", - "tracing", -] - [[package]] name = "cumulus-client-network" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -2493,7 +2616,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "sc-client-api", "sp-blockchain", @@ -2506,8 +2629,8 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2530,8 +2653,8 @@ dependencies = [ [[package]] name = "cumulus-client-service" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -2565,12 +2688,14 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ + "cumulus-pallet-parachain-system", "frame-support", "frame-system", "pallet-aura", + "pallet-timestamp", "parity-scale-codec", "scale-info", "sp-application-crypto", @@ -2581,8 +2706,8 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2593,13 +2718,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] name = "cumulus-pallet-parachain-system" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -2611,7 +2736,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "scale-info", "sp-core", "sp-externalities", @@ -2622,13 +2747,14 @@ dependencies = [ "sp-std", "sp-trie", "sp-version", - "xcm", + "staging-xcm", + "trie-db", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2638,8 +2764,8 @@ dependencies = [ [[package]] name = "cumulus-pallet-session-benchmarking" -version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "4.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -2652,8 +2778,8 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2663,13 +2789,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] name = "cumulus-pallet-xcmp-queue" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -2683,14 +2809,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-executor", ] [[package]] name = "cumulus-primitives-aura" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -2703,25 +2829,25 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "scale-info", "sp-api", "sp-runtime", "sp-std", "sp-trie", - "xcm", + "staging-xcm", ] [[package]] name = "cumulus-primitives-parachain-inherent" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2743,8 +2869,8 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-primitives-core", "futures", @@ -2756,8 +2882,8 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2767,15 +2893,15 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] name = "cumulus-relay-chain-inprocess-interface" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2798,8 +2924,8 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2816,8 +2942,8 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-minimal-node" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "array-bytes", "async-trait", @@ -2825,7 +2951,6 @@ dependencies = [ "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "futures", - "lru 0.9.0", "polkadot-availability-recovery", "polkadot-collator-protocol", "polkadot-core-primitives", @@ -2837,55 +2962,61 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sc-authority-discovery", - "sc-client-api", "sc-network", "sc-network-common", "sc-service", "sc-tracing", "sc-utils", + "schnellru", "sp-api", - "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-runtime", - "tokio", "tracing", ] [[package]] name = "cumulus-relay-chain-rpc-interface" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", + "either", "futures", "futures-timer", "jsonrpsee", - "lru 0.9.0", "parity-scale-codec", + "pin-project", "polkadot-overseer", + "rand 0.8.5", "sc-client-api", "sc-rpc-api", "sc-service", + "schnellru", "serde", "serde_json", + "smoldot", + "smoldot-light", "sp-api", "sp-authority-discovery", "sp-consensus-babe", "sp-core", + "sp-runtime", "sp-state-machine", "sp-storage", + "thiserror", "tokio", + "tokio-util", "tracing", "url", ] [[package]] name = "cumulus-test-relay-sproof-builder" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2893,119 +3024,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-std", -] - -[[package]] -name = "cumulus-test-relay-validation-worker-provider" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" -dependencies = [ - "polkadot-node-core-pvf", - "toml 0.7.8", -] - -[[package]] -name = "cumulus-test-runtime" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" -dependencies = [ - "cumulus-pallet-parachain-system", - "cumulus-primitives-core", - "cumulus-primitives-timestamp", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", - "pallet-balances", - "pallet-glutton", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-block-builder", - "sp-core", - "sp-inherents", - "sp-io", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std", - "sp-transaction-pool", - "sp-version", - "substrate-wasm-builder", -] - -[[package]] -name = "cumulus-test-service" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" -dependencies = [ - "async-trait", - "clap", - "criterion", - "cumulus-client-cli", - "cumulus-client-consensus-common", - "cumulus-client-consensus-relay-chain", - "cumulus-client-pov-recovery", - "cumulus-client-service", - "cumulus-pallet-parachain-system", - "cumulus-primitives-core", - "cumulus-primitives-parachain-inherent", - "cumulus-relay-chain-inprocess-interface", - "cumulus-relay-chain-interface", - "cumulus-relay-chain-minimal-node", - "cumulus-test-relay-sproof-builder", - "cumulus-test-relay-validation-worker-provider", - "cumulus-test-runtime", - "frame-system", - "frame-system-rpc-runtime-api", - "jsonrpsee", - "pallet-timestamp", - "pallet-transaction-payment", - "parachains-common", - "parity-scale-codec", - "polkadot-cli", - "polkadot-node-subsystem", - "polkadot-overseer", - "polkadot-primitives", - "polkadot-service", - "polkadot-test-service", - "rand 0.8.5", - "sc-basic-authorship", - "sc-block-builder", - "sc-chain-spec", - "sc-cli", - "sc-client-api", - "sc-consensus", - "sc-executor", - "sc-executor-common", - "sc-executor-wasmtime", - "sc-network", - "sc-service", - "sc-telemetry", - "sc-tracing", - "sc-transaction-pool", - "sc-transaction-pool-api", - "serde", - "sp-api", - "sp-arithmetic", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-io", - "sp-keyring", - "sp-runtime", - "sp-state-machine", - "sp-timestamp", - "sp-tracing", "sp-trie", - "substrate-test-client", - "tempfile", - "tokio", - "tracing", - "url", ] [[package]] @@ -3062,6 +3081,19 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "curve25519-dalek-ng" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.6.4", + "subtle-ng", + "zeroize", +] + [[package]] name = "cxx" version = "1.0.110" @@ -3188,6 +3220,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-std", + "sp-weights", ] [[package]] @@ -3270,6 +3303,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive-syn-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "derive_builder" version = "0.11.2" @@ -3335,6 +3379,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-std", + "sp-weights", ] [[package]] @@ -3379,8 +3424,10 @@ version = "1.14.0-dev" dependencies = [ "clap", "cumulus-client-cli", + "cumulus-client-collator", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", "cumulus-client-service", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", @@ -3430,6 +3477,7 @@ version = "1.14.0-dev" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", + "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-timestamp", "did", @@ -3456,7 +3504,6 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "parachain-info", "parity-scale-codec", "rococo-runtime", "scale-info", @@ -3473,6 +3520,7 @@ dependencies = [ "sp-transaction-pool", "sp-version", "sp-weights", + "staging-parachain-info", "substrate-wasm-builder", ] @@ -3482,8 +3530,10 @@ version = "1.14.0-dev" dependencies = [ "clap", "cumulus-client-cli", + "cumulus-client-collator", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", "cumulus-client-service", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", @@ -3533,6 +3583,7 @@ version = "1.14.0-dev" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", + "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-timestamp", "did", @@ -3559,7 +3610,6 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-web3-names", - "parachain-info", "parity-scale-codec", "runtime-common", "scale-info", @@ -3575,6 +3625,7 @@ dependencies = [ "sp-transaction-pool", "sp-version", "sp-weights", + "staging-parachain-info", "substrate-wasm-builder", ] @@ -3632,27 +3683,28 @@ dependencies = [ [[package]] name = "docify" -version = "0.1.16" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1b04e6ef3d21119d3eb7b032bca17f99fe041e9c072f30f32cc0e1a2b1f3c4" +checksum = "43a2f138ad521dc4a2ced1a4576148a6a610b4c5923933b062a263130a6802ce" dependencies = [ "docify_macros", ] [[package]] name = "docify_macros" -version = "0.1.16" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5610df7f2acf89a1bb5d1a66ae56b1c7fcdcfe3948856fb3ace3f644d70eb7" +checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad" dependencies = [ "common-path", - "derive-syn-parse", - "lazy_static", + "derive-syn-parse 0.2.0", + "once_cell", "proc-macro2", "quote", "regex", "syn 2.0.39", "termcolor", + "toml 0.8.8", "walkdir", ] @@ -3662,6 +3714,12 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + [[package]] name = "dtoa" version = "1.0.9" @@ -3784,16 +3842,31 @@ dependencies = [ ] [[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "elliptic-curve" -version = "0.12.3" +name = "ed25519-zebra" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" +dependencies = [ + "curve25519-dalek 4.1.1", + "ed25519 2.2.3", + "hashbrown 0.14.2", + "hex", + "rand_core 0.6.4", + "sha2 0.10.8", + "zeroize", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "elliptic-curve" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct 0.1.1", "crypto-bigint 0.4.9", @@ -3991,6 +4064,17 @@ dependencies = [ "pin-project-lite 0.2.13", ] +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite 0.2.13", +] + [[package]] name = "event-listener-strategy" version = "0.3.0" @@ -4001,6 +4085,16 @@ dependencies = [ "pin-project-lite 0.2.13", ] +[[package]] +name = "event-listener-strategy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +dependencies = [ + "event-listener 5.2.0", + "pin-project-lite 0.2.13", +] + [[package]] name = "exit-future" version = "0.2.0" @@ -4059,6 +4153,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + [[package]] name = "fastrand" version = "2.0.1" @@ -4218,8 +4321,8 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "9.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", ] @@ -4241,8 +4344,8 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "frame-support-procedural", @@ -4266,8 +4369,8 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "Inflector", "array-bytes", @@ -4314,8 +4417,8 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4325,8 +4428,8 @@ dependencies = [ [[package]] name = "frame-election-provider-support" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -4342,12 +4445,13 @@ dependencies = [ [[package]] name = "frame-executive" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "frame-system", "frame-try-runtime", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -4371,8 +4475,8 @@ dependencies = [ [[package]] name = "frame-remote-externalities" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.30.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-recursion", "futures", @@ -4384,6 +4488,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-state-machine", "spinners", "substrate-rpc-client", "tokio", @@ -4392,10 +4497,12 @@ dependencies = [ [[package]] name = "frame-support" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ + "aquamarine", "bitflags 1.3.2", + "docify", "environmental", "frame-metadata", "frame-support-procedural", @@ -4407,31 +4514,35 @@ dependencies = [ "paste", "scale-info", "serde", + "serde_json", "smallvec", "sp-api", "sp-arithmetic", "sp-core", "sp-core-hashing-proc-macro", "sp-debug-derive", + "sp-genesis-builder", "sp-inherents", "sp-io", + "sp-metadata-ir", "sp-runtime", "sp-staking", "sp-state-machine", "sp-std", "sp-tracing", "sp-weights", + "static_assertions", "tt-call", ] [[package]] name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "18.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "Inflector", "cfg-expr", - "derive-syn-parse", + "derive-syn-parse 0.1.5", "expander 2.0.0", "frame-support-procedural-tools", "itertools 0.10.5", @@ -4444,8 +4555,8 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -4456,8 +4567,8 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "proc-macro2", "quote", @@ -4466,8 +4577,8 @@ dependencies = [ [[package]] name = "frame-system" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cfg-if", "frame-support", @@ -4485,8 +4596,8 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -4500,8 +4611,8 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "sp-api", @@ -4509,8 +4620,8 @@ dependencies = [ [[package]] name = "frame-try-runtime" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "parity-scale-codec", @@ -4603,13 +4714,32 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite 0.2.13", + "waker-fn", +] + [[package]] name = "futures-lite" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" dependencies = [ + "fastrand 2.0.1", "futures-core", + "futures-io", + "memchr", + "parking", "pin-project-lite 0.2.13", ] @@ -4829,16 +4959,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "half" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" -dependencies = [ - "cfg-if", - "crunchy", -] - [[package]] name = "handlebars" version = "4.5.0" @@ -4891,6 +5011,11 @@ name = "hashbrown" version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash 0.8.6", + "allocator-api2", + "serde", +] [[package]] name = "heck" @@ -5153,7 +5278,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e" dependencies = [ - "async-io", + "async-io 2.2.0", "core-foundation", "fnv", "futures", @@ -5215,6 +5340,25 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -5236,6 +5380,12 @@ dependencies = [ "hashbrown 0.14.2", ] +[[package]] +name = "indexmap-nostd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" + [[package]] name = "indicatif" version = "0.17.7" @@ -5284,36 +5434,36 @@ dependencies = [ [[package]] name = "integration-tests-common" -version = "1.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "asset-hub-kusama-runtime", "asset-hub-polkadot-runtime", "asset-hub-westend-runtime", "bp-messages", - "bp-runtime", "bridge-hub-kusama-runtime", "bridge-hub-polkadot-runtime", "bridge-hub-rococo-runtime", "bridge-runtime-common", "collectives-polkadot-runtime", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", "frame-support", - "frame-system", - "kusama-runtime", "kusama-runtime-constants", "pallet-assets", - "pallet-balances", "pallet-bridge-messages", "pallet-im-online", + "pallet-message-queue", "pallet-staking", "pallet-xcm", - "parachain-info", "parachains-common", "parity-scale-codec", + "paste", "penpal-runtime", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime", "polkadot-runtime-constants", @@ -5327,12 +5477,11 @@ dependencies = [ "sp-consensus-beefy", "sp-core", "sp-runtime", - "sp-weights", + "staging-kusama-runtime", + "staging-xcm", "westend-runtime", "westend-runtime-constants", - "xcm", "xcm-emulator", - "xcm-executor", ] [[package]] @@ -5400,6 +5549,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "is_executable" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8" +dependencies = [ + "winapi", +] + [[package]] name = "itertools" version = "0.10.5" @@ -5715,9 +5873,12 @@ dependencies = [ "clap", "clone-runtime", "cumulus-client-cli", + "cumulus-client-collator", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", "cumulus-client-service", + "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-inprocess-interface", @@ -5765,11 +5926,11 @@ dependencies = [ "sp-timestamp", "sp-transaction-pool", "spiritnet-runtime", + "staging-xcm", "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", "try-runtime-cli", - "xcm", ] [[package]] @@ -5827,112 +5988,13 @@ dependencies = [ "sp-core", "sp-runtime", "sp-std", -] - -[[package]] -name = "kusama-runtime" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" -dependencies = [ - "bitvec", - "frame-benchmarking", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal 0.4.1", - "kusama-runtime-constants", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-bounties", - "pallet-child-bounties", - "pallet-collective", - "pallet-conviction-voting", - "pallet-democracy", - "pallet-election-provider-multi-phase", - "pallet-election-provider-support-benchmarking", - "pallet-elections-phragmen", - "pallet-fast-unstake", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-message-queue", - "pallet-multisig", - "pallet-nis", - "pallet-nomination-pools", - "pallet-nomination-pools-benchmarking", - "pallet-nomination-pools-runtime-api", - "pallet-offences", - "pallet-offences-benchmarking", - "pallet-preimage", - "pallet-proxy", - "pallet-ranked-collective", - "pallet-recovery", - "pallet-referenda", - "pallet-scheduler", - "pallet-session", - "pallet-session-benchmarking", - "pallet-society", - "pallet-staking", - "pallet-staking-runtime-api", - "pallet-state-trie-migration", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vesting", - "pallet-whitelist", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "rustc-hex", - "scale-info", - "serde", - "serde_derive", - "smallvec", - "sp-api", - "sp-arithmetic", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", - "sp-npos-elections", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-version", - "static_assertions", - "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "sp-weights", ] [[package]] name = "kusama-runtime-constants" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "polkadot-primitives", @@ -6015,6 +6077,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + [[package]] name = "libp2p" version = "0.51.3" @@ -6143,7 +6211,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ - "bs58", + "bs58 0.4.0", "ed25519-dalek 2.1.0", "log", "multiaddr", @@ -6564,6 +6632,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + [[package]] name = "linux-raw-sys" version = "0.4.11" @@ -6597,21 +6671,18 @@ dependencies = [ [[package]] name = "lru" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" dependencies = [ "hashbrown 0.13.2", ] [[package]] name = "lru" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" -dependencies = [ - "hashbrown 0.13.2", -] +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" [[package]] name = "lru-cache" @@ -6670,7 +6741,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00" dependencies = [ "const-random", - "derive-syn-parse", + "derive-syn-parse 0.1.5", "macro_magic_core_macros", "proc-macro2", "quote", @@ -6818,6 +6889,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "merlin" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" +dependencies = [ + "byteorder", + "keccak", + "rand_core 0.6.4", + "zeroize", +] + [[package]] name = "mick-jaeger" version = "0.1.8" @@ -6857,8 +6940,8 @@ dependencies = [ [[package]] name = "mmr-gadget" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "log", @@ -6876,8 +6959,8 @@ dependencies = [ [[package]] name = "mmr-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "anyhow", "jsonrpsee", @@ -7118,6 +7201,18 @@ dependencies = [ "memoffset 0.6.5", ] +[[package]] +name = "no-std-net" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + [[package]] name = "nohash-hasher" version = "0.2.0" @@ -7262,12 +7357,6 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - [[package]] name = "opaque-debug" version = "0.2.3" @@ -7351,8 +7440,8 @@ dependencies = [ [[package]] name = "pallet-alliance" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "array-bytes", "frame-benchmarking", @@ -7372,8 +7461,8 @@ dependencies = [ [[package]] name = "pallet-asset-conversion" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "5.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -7390,11 +7479,12 @@ dependencies = [ [[package]] name = "pallet-asset-conversion-tx-payment" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "5.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "frame-system", + "pallet-asset-conversion", "pallet-transaction-payment", "parity-scale-codec", "scale-info", @@ -7404,8 +7494,8 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -7422,12 +7512,13 @@ dependencies = [ [[package]] name = "pallet-assets" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -7437,11 +7528,12 @@ dependencies = [ [[package]] name = "pallet-aura" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "frame-system", + "log", "pallet-timestamp", "parity-scale-codec", "scale-info", @@ -7453,8 +7545,8 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "frame-system", @@ -7469,8 +7561,8 @@ dependencies = [ [[package]] name = "pallet-authorship" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "frame-system", @@ -7483,8 +7575,8 @@ dependencies = [ [[package]] name = "pallet-babe" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -7507,9 +7599,11 @@ dependencies = [ [[package]] name = "pallet-bags-list" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ + "aquamarine", + "docify", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7527,8 +7621,8 @@ dependencies = [ [[package]] name = "pallet-balances" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -7542,11 +7636,12 @@ dependencies = [ [[package]] name = "pallet-beefy" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "frame-system", + "log", "pallet-authorship", "pallet-session", "parity-scale-codec", @@ -7561,8 +7656,8 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "array-bytes", "binary-merkle-tree", @@ -7580,13 +7675,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-state-machine", "sp-std", ] [[package]] name = "pallet-bounties" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -7603,8 +7699,8 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-header-chain", "bp-runtime", @@ -7624,8 +7720,8 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-messages", "bp-runtime", @@ -7643,8 +7739,8 @@ dependencies = [ [[package]] name = "pallet-bridge-parachains" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-header-chain", "bp-parachains", @@ -7664,8 +7760,8 @@ dependencies = [ [[package]] name = "pallet-bridge-relayers" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bp-messages", "bp-relayers", @@ -7684,8 +7780,8 @@ dependencies = [ [[package]] name = "pallet-child-bounties" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -7703,8 +7799,8 @@ dependencies = [ [[package]] name = "pallet-collator-selection" -version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "4.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -7722,8 +7818,8 @@ dependencies = [ [[package]] name = "pallet-collective" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -7758,8 +7854,8 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "assert_matches", "frame-benchmarking", @@ -7775,8 +7871,8 @@ dependencies = [ [[package]] name = "pallet-core-fellowship" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -7793,8 +7889,8 @@ dependencies = [ [[package]] name = "pallet-democracy" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -7895,8 +7991,8 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7918,8 +8014,8 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7927,12 +8023,13 @@ dependencies = [ "parity-scale-codec", "sp-npos-elections", "sp-runtime", + "sp-std", ] [[package]] name = "pallet-elections-phragmen" -version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -7950,8 +8047,8 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "docify", "frame-benchmarking", @@ -7967,28 +8064,10 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-glutton" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" -dependencies = [ - "blake2", - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-grandpa" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8010,8 +8089,8 @@ dependencies = [ [[package]] name = "pallet-identity" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "enumflags2", "frame-benchmarking", @@ -8026,8 +8105,8 @@ dependencies = [ [[package]] name = "pallet-im-online" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8046,8 +8125,8 @@ dependencies = [ [[package]] name = "pallet-indices" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8079,8 +8158,8 @@ dependencies = [ [[package]] name = "pallet-membership" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8096,8 +8175,8 @@ dependencies = [ [[package]] name = "pallet-message-queue" -version = "7.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8147,12 +8226,13 @@ dependencies = [ [[package]] name = "pallet-mmr" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -8164,8 +8244,8 @@ dependencies = [ [[package]] name = "pallet-multisig" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8180,8 +8260,8 @@ dependencies = [ [[package]] name = "pallet-nft-fractionalization" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "5.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8197,8 +8277,8 @@ dependencies = [ [[package]] name = "pallet-nfts" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "enumflags2", "frame-benchmarking", @@ -8215,10 +8295,9 @@ dependencies = [ [[package]] name = "pallet-nfts-runtime-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "9.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ - "frame-support", "pallet-nfts", "parity-scale-codec", "sp-api", @@ -8226,8 +8305,8 @@ dependencies = [ [[package]] name = "pallet-nis" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8242,12 +8321,13 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "20.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-core", @@ -8255,12 +8335,13 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-std", + "sp-tracing", ] [[package]] name = "pallet-nomination-pools-benchmarking" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8279,8 +8360,8 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" -version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "18.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -8290,8 +8371,8 @@ dependencies = [ [[package]] name = "pallet-offences" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "frame-system", @@ -8307,8 +8388,8 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8343,8 +8424,8 @@ dependencies = [ [[package]] name = "pallet-preimage" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8360,8 +8441,8 @@ dependencies = [ [[package]] name = "pallet-proxy" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8375,8 +8456,8 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8393,8 +8474,8 @@ dependencies = [ [[package]] name = "pallet-recovery" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8408,8 +8489,8 @@ dependencies = [ [[package]] name = "pallet-referenda" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "assert_matches", "frame-benchmarking", @@ -8447,8 +8528,8 @@ dependencies = [ [[package]] name = "pallet-salary" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8465,9 +8546,10 @@ dependencies = [ [[package]] name = "pallet-scheduler" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -8482,8 +8564,8 @@ dependencies = [ [[package]] name = "pallet-session" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "frame-system", @@ -8497,20 +8579,22 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", + "sp-state-machine", "sp-std", "sp-trie", ] [[package]] name = "pallet-session-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "pallet-session", "pallet-staking", + "parity-scale-codec", "rand 0.8.5", "sp-runtime", "sp-session", @@ -8519,13 +8603,12 @@ dependencies = [ [[package]] name = "pallet-society" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "hex-literal 0.3.4", "log", "parity-scale-codec", "rand_chacha 0.2.2", @@ -8538,8 +8621,8 @@ dependencies = [ [[package]] name = "pallet-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8561,8 +8644,8 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8572,8 +8655,8 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "log", "sp-arithmetic", @@ -8581,8 +8664,8 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "9.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "sp-api", @@ -8590,8 +8673,8 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8607,8 +8690,8 @@ dependencies = [ [[package]] name = "pallet-sudo" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8622,8 +8705,8 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8635,13 +8718,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-storage", "sp-timestamp", ] [[package]] name = "pallet-tips" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8659,8 +8743,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "frame-system", @@ -8675,8 +8759,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "25.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -8691,8 +8775,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -8703,8 +8787,8 @@ dependencies = [ [[package]] name = "pallet-treasury" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8720,8 +8804,8 @@ dependencies = [ [[package]] name = "pallet-uniques" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8735,8 +8819,8 @@ dependencies = [ [[package]] name = "pallet-utility" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8751,8 +8835,8 @@ dependencies = [ [[package]] name = "pallet-vesting" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8785,8 +8869,8 @@ dependencies = [ [[package]] name = "pallet-whitelist" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8800,8 +8884,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bounded-collections", "frame-benchmarking", @@ -8815,14 +8899,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-executor", ] [[package]] name = "pallet-xcm-benchmarks" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8833,23 +8917,9 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", -] - -[[package]] -name = "parachain-info" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" -dependencies = [ - "cumulus-primitives-core", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-runtime", - "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -8880,13 +8950,15 @@ dependencies = [ [[package]] name = "parachains-common" -version = "1.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-primitives-core", "cumulus-primitives-utility", "frame-support", "frame-system", + "kusama-runtime-constants", + "log", "num-traits", "pallet-asset-tx-payment", "pallet-assets", @@ -8894,17 +8966,22 @@ dependencies = [ "pallet-balances", "pallet-collator-selection", "parity-scale-codec", + "polkadot-core-primitives", "polkadot-primitives", + "polkadot-runtime-constants", + "rococo-runtime-constants", "scale-info", + "smallvec", "sp-consensus-aura", "sp-core", "sp-io", "sp-runtime", "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "westend-runtime-constants", ] [[package]] @@ -9079,6 +9156,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "peeking_take_while" version = "0.1.2" @@ -9105,8 +9191,8 @@ dependencies = [ [[package]] name = "penpal-runtime" -version = "0.9.27" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.8.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -9115,7 +9201,6 @@ dependencies = [ "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", - "cumulus-primitives-timestamp", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -9123,6 +9208,7 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", + "frame-try-runtime", "hex-literal 0.4.1", "log", "pallet-asset-tx-payment", @@ -9137,10 +9223,9 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-xcm", - "parachain-info", "parachains-common", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "scale-info", @@ -9154,12 +9239,14 @@ dependencies = [ "sp-runtime", "sp-session", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -9180,6 +9267,7 @@ dependencies = [ "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", + "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-timestamp", "cumulus-primitives-utility", @@ -9227,7 +9315,6 @@ dependencies = [ "pallet-vesting", "pallet-web3-names", "pallet-xcm", - "parachain-info", "parachain-staking", "parity-scale-codec", "public-credentials", @@ -9246,10 +9333,11 @@ dependencies = [ "sp-transaction-pool", "sp-version", "sp-weights", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -9345,6 +9433,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + [[package]] name = "pkcs8" version = "0.9.0" @@ -9377,38 +9476,10 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" -[[package]] -name = "plotters" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - [[package]] name = "polkadot-approval-distribution" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "futures-timer", @@ -9425,9 +9496,10 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ + "always-assert", "futures", "futures-timer", "polkadot-node-network-protocol", @@ -9440,13 +9512,12 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "derive_more", "fatality", "futures", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -9455,6 +9526,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", + "schnellru", "sp-core", "sp-keystore", "thiserror", @@ -9463,12 +9535,11 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "fatality", "futures", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -9478,21 +9549,20 @@ dependencies = [ "polkadot-primitives", "rand 0.8.5", "sc-network", + "schnellru", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-cli" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "clap", "frame-benchmarking-cli", "futures", "log", - "polkadot-node-core-pvf-execute-worker", - "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-performance-test", "polkadot-service", @@ -9513,10 +9583,9 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ - "always-assert", "bitvec", "fatality", "futures", @@ -9530,13 +9599,14 @@ dependencies = [ "sp-keystore", "sp-runtime", "thiserror", + "tokio-util", "tracing-gum", ] [[package]] name = "polkadot-core-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "scale-info", @@ -9547,15 +9617,14 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "derive_more", "fatality", "futures", "futures-timer", "indexmap 1.9.3", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -9564,6 +9633,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "sc-network", + "schnellru", "sp-application-crypto", "sp-keystore", "thiserror", @@ -9572,8 +9642,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -9586,8 +9656,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "futures-timer", @@ -9598,6 +9668,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", + "sc-network-common", "sp-application-crypto", "sp-core", "sp-keystore", @@ -9606,8 +9677,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "always-assert", "async-trait", @@ -9629,8 +9700,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "parity-scale-codec", @@ -9647,16 +9718,15 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bitvec", "derive_more", "futures", "futures-timer", "kvdb", - "lru 0.9.0", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", @@ -9665,7 +9735,8 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sc-keystore", - "schnorrkel", + "schnellru", + "schnorrkel 0.9.1", "sp-application-crypto", "sp-consensus", "sp-consensus-slots", @@ -9676,8 +9747,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bitvec", "futures", @@ -9698,8 +9769,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bitvec", "fatality", @@ -9717,8 +9788,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "polkadot-node-subsystem", @@ -9732,8 +9803,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "futures", @@ -9744,7 +9815,8 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-parachain", + "polkadot-overseer", + "polkadot-parachain-primitives", "polkadot-primitives", "sp-maybe-compressed-blob", "tracing-gum", @@ -9752,8 +9824,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "polkadot-node-metrics", @@ -9767,8 +9839,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "futures-timer", @@ -9784,27 +9856,27 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "fatality", "futures", "kvdb", - "lru 0.9.0", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "sc-keystore", + "schnellru", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-parachains-inherent" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "futures", @@ -9819,9 +9891,26 @@ dependencies = [ ] [[package]] -name = "polkadot-node-core-provisioner" +name = "polkadot-node-core-prospective-parachains" version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" +dependencies = [ + "bitvec", + "fatality", + "futures", + "parity-scale-codec", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", + "thiserror", + "tracing-gum", +] + +[[package]] +name = "polkadot-node-core-provisioner" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bitvec", "fatality", @@ -9831,15 +9920,14 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.5", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "always-assert", "futures", @@ -9849,17 +9937,14 @@ dependencies = [ "pin-project", "polkadot-core-primitives", "polkadot-node-core-pvf-common", - "polkadot-node-core-pvf-execute-worker", - "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-node-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "rand 0.8.5", "slotmap", "sp-core", "sp-maybe-compressed-blob", - "sp-tracing", "sp-wasm-interface", "substrate-build-script-utils", "tempfile", @@ -9869,8 +9954,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "polkadot-node-primitives", @@ -9885,15 +9970,15 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-common" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "cpu-time", "futures", "landlock", "libc", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "sc-executor", "sc-executor-common", @@ -9902,41 +9987,20 @@ dependencies = [ "sp-externalities", "sp-io", "sp-tracing", - "substrate-build-script-utils", - "tokio", - "tracing-gum", -] - -[[package]] -name = "polkadot-node-core-pvf-execute-worker" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" -dependencies = [ - "cpu-time", - "futures", - "parity-scale-codec", - "polkadot-node-core-pvf-common", - "polkadot-parachain", - "polkadot-primitives", - "rayon", - "sp-core", - "sp-maybe-compressed-blob", - "sp-tracing", - "tikv-jemalloc-ctl", "tokio", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-prepare-worker" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "libc", "parity-scale-codec", "polkadot-node-core-pvf-common", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "rayon", "sc-executor", @@ -9952,23 +10016,23 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", - "lru 0.9.0", "polkadot-node-metrics", "polkadot-node-subsystem", "polkadot-node-subsystem-types", "polkadot-primitives", + "schnellru", "sp-consensus-babe", "tracing-gum", ] [[package]] name = "polkadot-node-jaeger" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "lazy_static", "log", @@ -9985,10 +10049,10 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ - "bs58", + "bs58 0.5.1", "futures", "futures-timer", "log", @@ -10004,11 +10068,12 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-trait", + "bitvec", "derive_more", "fatality", "futures", @@ -10027,15 +10092,15 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bounded-vec", "futures", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", - "schnorrkel", + "schnorrkel 0.9.1", "serde", "sp-application-crypto", "sp-consensus-babe", @@ -10044,13 +10109,13 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-runtime", "thiserror", - "zstd 0.11.2+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] name = "polkadot-node-subsystem" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -10059,8 +10124,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "derive_more", @@ -10083,8 +10148,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "derive_more", @@ -10093,7 +10158,6 @@ dependencies = [ "futures-channel", "itertools 0.10.5", "kvdb", - "lru 0.9.0", "parity-db", "parity-scale-codec", "parking_lot 0.11.2", @@ -10107,6 +10171,7 @@ dependencies = [ "polkadot-primitives", "prioritized-metered-channel", "rand 0.8.5", + "schnellru", "sp-application-crypto", "sp-core", "sp-keystore", @@ -10116,13 +10181,12 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "futures", "futures-timer", - "lru 0.9.0", "orchestra", "parking_lot 0.12.1", "polkadot-node-metrics", @@ -10131,6 +10195,7 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-primitives", "sc-client-api", + "schnellru", "sp-api", "sp-core", "tikv-jemalloc-ctl", @@ -10138,9 +10203,9 @@ dependencies = [ ] [[package]] -name = "polkadot-parachain" +name = "polkadot-parachain-primitives" version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bounded-collections", "derive_more", @@ -10156,11 +10221,10 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "env_logger 0.9.3", - "kusama-runtime", "log", "polkadot-erasure-coding", "polkadot-node-core-pvf-prepare-worker", @@ -10169,19 +10233,20 @@ dependencies = [ "quote", "sc-executor-common", "sp-maybe-compressed-blob", + "staging-kusama-runtime", "thiserror", ] [[package]] name = "polkadot-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bitvec", "hex-literal 0.4.1", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "scale-info", "serde", "sp-api", @@ -10200,8 +10265,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -10232,8 +10297,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bitvec", "frame-benchmarking", @@ -10290,6 +10355,7 @@ dependencies = [ "pallet-vesting", "pallet-whitelist", "pallet-xcm", + "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", @@ -10316,19 +10382,20 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "polkadot-runtime-common" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bitvec", "frame-benchmarking", @@ -10367,14 +10434,14 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "staging-xcm", "static_assertions", - "xcm", ] [[package]] name = "polkadot-runtime-constants" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "polkadot-primitives", @@ -10387,10 +10454,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ - "bs58", + "bs58 0.5.1", + "frame-benchmarking", "parity-scale-codec", "polkadot-primitives", "sp-std", @@ -10399,8 +10467,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bitflags 1.3.2", "bitvec", @@ -10408,6 +10476,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "impl-trait-for-tuples", "log", "pallet-authority-discovery", "pallet-authorship", @@ -10419,7 +10488,7 @@ dependencies = [ "pallet-timestamp", "pallet-vesting", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-metrics", "rand 0.8.5", @@ -10437,15 +10506,15 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "staging-xcm", + "staging-xcm-executor", "static_assertions", - "xcm", - "xcm-executor", ] [[package]] name = "polkadot-service" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "frame-benchmarking", @@ -10455,11 +10524,10 @@ dependencies = [ "frame-system-rpc-runtime-api", "futures", "hex-literal 0.4.1", - "kusama-runtime", + "is_executable", "kvdb", "kvdb-rocksdb", "log", - "lru 0.9.0", "mmr-gadget", "pallet-babe", "pallet-im-online", @@ -10487,7 +10555,9 @@ dependencies = [ "polkadot-node-core-chain-selection", "polkadot-node-core-dispute-coordinator", "polkadot-node-core-parachains-inherent", + "polkadot-node-core-prospective-parachains", "polkadot-node-core-provisioner", + "polkadot-node-core-pvf", "polkadot-node-core-pvf-checker", "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", @@ -10496,7 +10566,7 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", @@ -10527,6 +10597,7 @@ dependencies = [ "sc-telemetry", "sc-transaction-pool", "sc-transaction-pool-api", + "schnellru", "serde", "serde_json", "sp-api", @@ -10550,9 +10621,9 @@ dependencies = [ "sp-storage", "sp-timestamp", "sp-transaction-pool", - "sp-trie", "sp-version", "sp-weights", + "staging-kusama-runtime", "substrate-prometheus-endpoint", "thiserror", "tracing-gum", @@ -10561,10 +10632,11 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.7.4", + "bitvec", "fatality", "futures", "futures-timer", @@ -10573,6 +10645,7 @@ dependencies = [ "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", "sp-keystore", @@ -10583,8 +10656,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -10593,8 +10666,8 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "0.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bitvec", "frame-election-provider-support", @@ -10620,7 +10693,7 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -10645,62 +10718,27 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", "test-runtime-constants", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] -name = "polkadot-test-service" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ - "frame-system", - "futures", - "hex", - "pallet-balances", - "pallet-staking", - "pallet-transaction-payment", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-overseer", - "polkadot-parachain", - "polkadot-primitives", - "polkadot-rpc", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "polkadot-service", - "polkadot-test-runtime", - "rand 0.8.5", - "sc-authority-discovery", - "sc-chain-spec", - "sc-cli", - "sc-client-api", - "sc-consensus", - "sc-consensus-babe", - "sc-consensus-grandpa", - "sc-network", - "sc-service", - "sc-tracing", - "sc-transaction-pool", - "sp-arithmetic", - "sp-authority-discovery", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-grandpa", - "sp-core", - "sp-inherents", - "sp-keyring", - "sp-runtime", - "sp-state-machine", - "substrate-test-client", - "tempfile", - "test-runtime-constants", - "tokio", - "tracing-gum", + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite 0.2.13", + "windows-sys 0.48.0", ] [[package]] @@ -10858,7 +10896,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -11023,6 +11061,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-std", + "sp-weights", ] [[package]] @@ -11437,8 +11476,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "binary-merkle-tree", "frame-benchmarking", @@ -11490,7 +11529,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -11513,19 +11552,20 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "rococo-runtime-constants" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "polkadot-primitives", @@ -11627,7 +11667,7 @@ dependencies = [ "pallet-web3-names", "parachain-staking", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "public-credentials", "scale-info", "smallvec", @@ -11637,9 +11677,10 @@ dependencies = [ "sp-runtime", "sp-std", "sp-trie", - "xcm", - "xcm-builder", - "xcm-executor", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -11692,6 +11733,20 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + [[package]] name = "rustix" version = "0.38.25" @@ -11779,6 +11834,17 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +[[package]] +name = "ruzstd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" +dependencies = [ + "byteorder", + "thiserror-core", + "twox-hash", +] + [[package]] name = "rw-stream-sink" version = "0.3.0" @@ -11816,8 +11882,8 @@ dependencies = [ [[package]] name = "sc-allocator" -version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "18.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "log", "sp-core", @@ -11827,8 +11893,8 @@ dependencies = [ [[package]] name = "sc-authority-discovery" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "futures", @@ -11855,8 +11921,8 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "futures-timer", @@ -11878,8 +11944,8 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.28.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -11893,8 +11959,8 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -11912,8 +11978,8 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11923,8 +11989,8 @@ dependencies = [ [[package]] name = "sc-cli" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.31.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "array-bytes", "chrono", @@ -11962,8 +12028,8 @@ dependencies = [ [[package]] name = "sc-client-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "fnv", "futures", @@ -11988,8 +12054,8 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.30.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "hash-db", "kvdb", @@ -12014,8 +12080,8 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.28.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "futures", @@ -12039,8 +12105,8 @@ dependencies = [ [[package]] name = "sc-consensus-aura" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "futures", @@ -12068,8 +12134,8 @@ dependencies = [ [[package]] name = "sc-consensus-babe" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "fork-tree", @@ -12104,8 +12170,8 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "jsonrpsee", @@ -12126,11 +12192,11 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "array-bytes", - "async-channel", + "async-channel 1.9.0", "async-trait", "fnv", "futures", @@ -12160,8 +12226,8 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "jsonrpsee", @@ -12179,8 +12245,8 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.28.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "fork-tree", "parity-scale-codec", @@ -12192,8 +12258,8 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.14.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "ahash 0.8.6", "array-bytes", @@ -12233,8 +12299,8 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.14.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "finality-grandpa", "futures", @@ -12253,8 +12319,8 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.28.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "futures", @@ -12276,8 +12342,8 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.27.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -12298,8 +12364,8 @@ dependencies = [ [[package]] name = "sc-executor-common" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.24.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -12310,8 +12376,8 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.24.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "anyhow", "cfg-if", @@ -12327,8 +12393,8 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.28.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "ansi_term", "futures", @@ -12343,8 +12409,8 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "20.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "array-bytes", "parking_lot 0.12.1", @@ -12357,11 +12423,11 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "array-bytes", - "async-channel", + "async-channel 1.9.0", "async-trait", "asynchronous-codec", "bytes", @@ -12398,10 +12464,10 @@ dependencies = [ [[package]] name = "sc-network-bitswap" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.28.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ - "async-channel", + "async-channel 1.9.0", "cid", "futures", "libp2p-identity", @@ -12418,8 +12484,8 @@ dependencies = [ [[package]] name = "sc-network-common" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.28.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -12435,8 +12501,8 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "ahash 0.8.6", "futures", @@ -12453,11 +12519,11 @@ dependencies = [ [[package]] name = "sc-network-light" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.28.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "array-bytes", - "async-channel", + "async-channel 1.9.0", "futures", "libp2p-identity", "log", @@ -12474,11 +12540,11 @@ dependencies = [ [[package]] name = "sc-network-sync" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.28.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "array-bytes", - "async-channel", + "async-channel 1.9.0", "async-trait", "fork-tree", "futures", @@ -12508,8 +12574,8 @@ dependencies = [ [[package]] name = "sc-network-transactions" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.28.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "array-bytes", "futures", @@ -12526,8 +12592,8 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "array-bytes", "bytes", @@ -12560,8 +12626,8 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.14.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -12569,8 +12635,8 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "jsonrpsee", @@ -12600,8 +12666,8 @@ dependencies = [ [[package]] name = "sc-rpc-api" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.28.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12619,8 +12685,8 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "http", "jsonrpsee", @@ -12634,8 +12700,8 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "array-bytes", "futures", @@ -12648,6 +12714,7 @@ dependencies = [ "sc-chain-spec", "sc-client-api", "sc-transaction-pool-api", + "sc-utils", "serde", "sp-api", "sp-blockchain", @@ -12655,13 +12722,14 @@ dependencies = [ "sp-runtime", "sp-version", "thiserror", + "tokio", "tokio-stream", ] [[package]] name = "sc-service" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.30.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "directories", @@ -12724,8 +12792,8 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.25.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "log", "parity-scale-codec", @@ -12735,8 +12803,8 @@ dependencies = [ [[package]] name = "sc-storage-monitor" -version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.11.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "clap", "fs4", @@ -12749,8 +12817,8 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12768,8 +12836,8 @@ dependencies = [ [[package]] name = "sc-sysinfo" -version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "libc", @@ -12787,8 +12855,8 @@ dependencies = [ [[package]] name = "sc-telemetry" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "chrono", "futures", @@ -12806,8 +12874,8 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "ansi_term", "atty", @@ -12835,8 +12903,8 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -12846,8 +12914,8 @@ dependencies = [ [[package]] name = "sc-transaction-pool" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "futures", @@ -12872,8 +12940,8 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "futures", @@ -12888,10 +12956,10 @@ dependencies = [ [[package]] name = "sc-utils" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "9.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ - "async-channel", + "async-channel 1.9.0", "futures", "futures-timer", "lazy_static", @@ -12957,7 +13025,7 @@ dependencies = [ "arrayvec 0.5.2", "curve25519-dalek 2.1.3", "getrandom 0.1.16", - "merlin", + "merlin 2.0.1", "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", @@ -12965,6 +13033,22 @@ dependencies = [ "zeroize", ] +[[package]] +name = "schnorrkel" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "curve25519-dalek-ng", + "merlin 3.0.0", + "rand_core 0.6.4", + "sha2 0.9.9", + "subtle-ng", + "zeroize", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -13301,8 +13385,8 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "slot-range-helper" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "enumn", "parity-scale-codec", @@ -13326,6 +13410,113 @@ version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +[[package]] +name = "smol" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" +dependencies = [ + "async-channel 1.9.0", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-net", + "async-process", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "smoldot" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0bb30cf57b7b5f6109ce17c3164445e2d6f270af2cb48f6e4d31c2967c9a9f5" +dependencies = [ + "arrayvec 0.7.4", + "async-lock 2.8.0", + "atomic-take", + "base64 0.21.5", + "bip39", + "blake2-rfc", + "bs58 0.5.1", + "chacha20", + "crossbeam-queue", + "derive_more", + "ed25519-zebra 4.0.3", + "either", + "event-listener 2.5.3", + "fnv", + "futures-lite 1.13.0", + "futures-util", + "hashbrown 0.14.2", + "hex", + "hmac 0.12.1", + "itertools 0.11.0", + "libsecp256k1", + "merlin 3.0.0", + "no-std-net", + "nom", + "num-bigint", + "num-rational", + "num-traits", + "pbkdf2 0.12.2", + "pin-project", + "poly1305", + "rand 0.8.5", + "rand_chacha 0.3.1", + "ruzstd", + "schnorrkel 0.10.2", + "serde", + "serde_json", + "sha2 0.10.8", + "sha3", + "siphasher", + "slab", + "smallvec", + "soketto", + "twox-hash", + "wasmi", + "x25519-dalek 2.0.0", + "zeroize", +] + +[[package]] +name = "smoldot-light" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "256b5bad1d6b49045e95fe87492ce73d5af81545d8b4d8318a872d2007024c33" +dependencies = [ + "async-channel 1.9.0", + "async-lock 2.8.0", + "base64 0.21.5", + "blake2-rfc", + "derive_more", + "either", + "event-listener 2.5.3", + "fnv", + "futures-channel", + "futures-lite 1.13.0", + "futures-util", + "hashbrown 0.14.2", + "hex", + "itertools 0.11.0", + "log", + "lru 0.11.1", + "no-std-net", + "parking_lot 0.12.1", + "pin-project", + "rand 0.8.5", + "rand_chacha 0.3.1", + "serde", + "serde_json", + "siphasher", + "slab", + "smol", + "smoldot", + "zeroize", +] + [[package]] name = "snap" version = "1.1.0" @@ -13388,8 +13579,8 @@ dependencies = [ [[package]] name = "sp-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "hash-db", "log", @@ -13409,8 +13600,8 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "Inflector", "blake2", @@ -13423,8 +13614,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "23.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "25.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "scale-info", @@ -13436,8 +13627,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "16.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "18.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "integer-sqrt", "num-traits", @@ -13450,8 +13641,8 @@ dependencies = [ [[package]] name = "sp-authority-discovery" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "scale-info", @@ -13463,8 +13654,8 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "sp-api", "sp-inherents", @@ -13474,8 +13665,8 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "futures", "log", @@ -13492,8 +13683,8 @@ dependencies = [ [[package]] name = "sp-consensus" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.27.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "futures", @@ -13507,8 +13698,8 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.27.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "parity-scale-codec", @@ -13524,8 +13715,8 @@ dependencies = [ [[package]] name = "sp-consensus-babe" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.27.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "parity-scale-codec", @@ -13543,8 +13734,8 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "lazy_static", "parity-scale-codec", @@ -13562,8 +13753,8 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "finality-grandpa", "log", @@ -13580,8 +13771,8 @@ dependencies = [ [[package]] name = "sp-consensus-slots" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.27.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "scale-info", @@ -13592,16 +13783,17 @@ dependencies = [ [[package]] name = "sp-core" -version = "21.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "array-bytes", + "arrayvec 0.7.4", "bitflags 1.3.2", "blake2", "bounded-collections", - "bs58", + "bs58 0.5.1", "dyn-clonable", - "ed25519-zebra", + "ed25519-zebra 3.1.0", "futures", "hash-db", "hash256-std-hasher", @@ -13609,7 +13801,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", "paste", @@ -13617,7 +13809,7 @@ dependencies = [ "rand 0.8.5", "regex", "scale-info", - "schnorrkel", + "schnorrkel 0.9.1", "secp256k1", "secrecy", "serde", @@ -13637,8 +13829,8 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "9.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "blake2b_simd", "byteorder", @@ -13650,8 +13842,8 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" -version = "9.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "quote", "sp-core-hashing", @@ -13660,8 +13852,8 @@ dependencies = [ [[package]] name = "sp-database" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -13669,8 +13861,8 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "proc-macro2", "quote", @@ -13679,8 +13871,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.19.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.21.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "environmental", "parity-scale-codec", @@ -13688,10 +13880,21 @@ dependencies = [ "sp-storage", ] +[[package]] +name = "sp-genesis-builder" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" +dependencies = [ + "serde_json", + "sp-api", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -13704,12 +13907,11 @@ dependencies = [ [[package]] name = "sp-io" -version = "23.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "25.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bytes", - "ed25519 1.5.3", - "ed25519-dalek 1.0.1", + "ed25519-dalek 2.1.0", "libsecp256k1", "log", "parity-scale-codec", @@ -13729,8 +13931,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "24.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "lazy_static", "sp-core", @@ -13740,8 +13942,8 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.27.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -13752,8 +13954,8 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" -version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "thiserror", "zstd 0.12.4", @@ -13761,8 +13963,8 @@ dependencies = [ [[package]] name = "sp-metadata-ir" -version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -13772,8 +13974,8 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -13790,8 +13992,8 @@ dependencies = [ [[package]] name = "sp-npos-elections" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "scale-info", @@ -13804,8 +14006,8 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "sp-api", "sp-core", @@ -13814,8 +14016,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "backtrace", "lazy_static", @@ -13824,8 +14026,8 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "rustc-hash", "serde", @@ -13834,8 +14036,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "24.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "either", "hash256-std-hasher", @@ -13856,8 +14058,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "17.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "19.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -13874,8 +14076,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "11.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "Inflector", "proc-macro-crate", @@ -13886,8 +14088,8 @@ dependencies = [ [[package]] name = "sp-session" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "scale-info", @@ -13901,8 +14103,8 @@ dependencies = [ [[package]] name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -13915,8 +14117,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.28.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.30.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "hash-db", "log", @@ -13936,11 +14138,17 @@ dependencies = [ [[package]] name = "sp-statement-store" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "5.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ + "aes-gcm 0.10.3", + "curve25519-dalek 4.1.1", + "ed25519-dalek 2.1.0", + "hkdf", "parity-scale-codec", + "rand 0.8.5", "scale-info", + "sha2 0.10.8", "sp-api", "sp-application-crypto", "sp-core", @@ -13949,17 +14157,18 @@ dependencies = [ "sp-runtime-interface", "sp-std", "thiserror", + "x25519-dalek 2.0.0", ] [[package]] name = "sp-std" -version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" [[package]] name = "sp-storage" -version = "13.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "impl-serde", "parity-scale-codec", @@ -13971,8 +14180,8 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "parity-scale-codec", @@ -13984,8 +14193,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "10.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "12.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "sp-std", @@ -13996,8 +14205,8 @@ dependencies = [ [[package]] name = "sp-transaction-pool" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "sp-api", "sp-runtime", @@ -14005,8 +14214,8 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "parity-scale-codec", @@ -14020,8 +14229,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "22.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "ahash 0.8.6", "hash-db", @@ -14043,8 +14252,8 @@ dependencies = [ [[package]] name = "sp-version" -version = "22.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "impl-serde", "parity-scale-codec", @@ -14060,8 +14269,8 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" -version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -14071,8 +14280,8 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "14.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -14084,8 +14293,8 @@ dependencies = [ [[package]] name = "sp-weights" -version = "20.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "parity-scale-codec", "scale-info", @@ -14132,6 +14341,7 @@ dependencies = [ "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", + "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-timestamp", "cumulus-primitives-utility", @@ -14177,7 +14387,6 @@ dependencies = [ "pallet-vesting", "pallet-web3-names", "pallet-xcm", - "parachain-info", "parachain-staking", "parity-scale-codec", "public-credentials", @@ -14185,63 +14394,243 @@ dependencies = [ "scale-info", "sp-api", "sp-block-builder", - "sp-consensus-aura", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "sp-weights", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der 0.6.1", +] + +[[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der 0.7.8", +] + +[[package]] +name = "ss58-registry" +version = "1.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35935738370302d5e33963665b77541e4b990a3e919ec904c837a56cfc891de1" +dependencies = [ + "Inflector", + "num-format", + "proc-macro2", + "quote", + "serde", + "serde_json", + "unicode-xid", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "staging-kusama-runtime" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" +dependencies = [ + "binary-merkle-tree", + "bitvec", + "frame-benchmarking", + "frame-election-provider-support", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "kusama-runtime-constants", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", + "pallet-bounties", + "pallet-child-bounties", + "pallet-collective", + "pallet-conviction-voting", + "pallet-democracy", + "pallet-election-provider-multi-phase", + "pallet-election-provider-support-benchmarking", + "pallet-elections-phragmen", + "pallet-fast-unstake", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-membership", + "pallet-message-queue", + "pallet-mmr", + "pallet-multisig", + "pallet-nis", + "pallet-nomination-pools", + "pallet-nomination-pools-benchmarking", + "pallet-nomination-pools-runtime-api", + "pallet-offences", + "pallet-offences-benchmarking", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-recovery", + "pallet-referenda", + "pallet-scheduler", + "pallet-session", + "pallet-session-benchmarking", + "pallet-society", + "pallet-staking", + "pallet-staking-runtime-api", + "pallet-state-trie-migration", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", + "pallet-utility", + "pallet-vesting", + "pallet-whitelist", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parity-scale-codec", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "rustc-hex", + "scale-info", + "serde", + "serde_derive", + "smallvec", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-consensus-beefy", "sp-core", "sp-inherents", "sp-io", + "sp-mmr-primitives", + "sp-npos-elections", "sp-offchain", "sp-runtime", "sp-session", + "sp-staking", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", - "sp-weights", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "static_assertions", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] -name = "spki" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +name = "staging-parachain-info" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ - "base64ct", - "der 0.6.1", + "cumulus-primitives-core", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std", ] [[package]] -name = "spki" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +name = "staging-xcm" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ - "base64ct", - "der 0.7.8", + "bounded-collections", + "derivative", + "environmental", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-weights", + "xcm-procedural", ] [[package]] -name = "ss58-registry" -version = "1.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35935738370302d5e33963665b77541e4b990a3e919ec904c837a56cfc891de1" +name = "staging-xcm-builder" +version = "2.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ - "Inflector", - "num-format", - "proc-macro2", - "quote", - "serde", - "serde_json", - "unicode-xid", + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-transaction-payment", + "parity-scale-codec", + "polkadot-parachain-primitives", + "scale-info", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", + "staging-xcm", + "staging-xcm-executor", ] [[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +name = "staging-xcm-executor" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" +dependencies = [ + "environmental", + "frame-benchmarking", + "frame-support", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", + "staging-xcm", +] [[package]] name = "standalone-node" @@ -14397,20 +14786,20 @@ checksum = "e620c7098893ba667438b47169c00aacdd9e7c10e042250ce2b60b087ec97328" dependencies = [ "hmac 0.11.0", "pbkdf2 0.8.0", - "schnorrkel", + "schnorrkel 0.9.1", "sha2 0.9.9", "zeroize", ] [[package]] name = "substrate-build-script-utils" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" [[package]] name = "substrate-frame-rpc-system" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -14428,8 +14817,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.14.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "hyper", "log", @@ -14440,8 +14829,8 @@ dependencies = [ [[package]] name = "substrate-rpc-client" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.28.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "jsonrpsee", @@ -14453,8 +14842,8 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -14468,36 +14857,10 @@ dependencies = [ "trie-db", ] -[[package]] -name = "substrate-test-client" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" -dependencies = [ - "array-bytes", - "async-trait", - "futures", - "parity-scale-codec", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-executor", - "sc-offchain", - "sc-service", - "serde", - "serde_json", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-keyring", - "sp-keystore", - "sp-runtime", - "sp-state-machine", -] - [[package]] name = "substrate-wasm-builder" -version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "12.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "ansi_term", "build-helper", @@ -14527,6 +14890,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +[[package]] +name = "subtle-ng" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" + [[package]] name = "syn" version = "1.0.109" @@ -14601,7 +14970,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand", + "fastrand 2.0.1", "redox_syscall 0.4.1", "rustix 0.38.25", "windows-sys 0.48.0", @@ -14635,8 +15004,8 @@ dependencies = [ [[package]] name = "test-runtime-constants" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "0.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "polkadot-primitives", @@ -14656,6 +15025,26 @@ dependencies = [ "thiserror-impl", ] +[[package]] +name = "thiserror-core" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999" +dependencies = [ + "thiserror-core-impl", +] + +[[package]] +name = "thiserror-core-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "thiserror-impl" version = "1.0.50" @@ -14904,7 +15293,19 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", ] [[package]] @@ -14929,6 +15330,19 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.13" @@ -15015,9 +15429,10 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ + "coarsetime", "polkadot-node-jaeger", "polkadot-primitives", "tracing", @@ -15026,8 +15441,8 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "expander 2.0.0", "proc-macro-crate", @@ -15156,8 +15571,8 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "async-trait", "clap", @@ -15501,9 +15916,9 @@ dependencies = [ [[package]] name = "wasm-opt" -version = "0.112.0" +version = "0.114.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c" +checksum = "effbef3bd1dde18acb401f73e740a6f3d4a1bc651e9773bddc512fe4d8d68f67" dependencies = [ "anyhow", "libc", @@ -15517,9 +15932,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.112.0" +version = "0.114.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445" +checksum = "c09e24eb283919ace2ed5733bda4842a59ce4c8de110ef5c6d98859513d17047" dependencies = [ "anyhow", "cxx", @@ -15529,9 +15944,9 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.112.0" +version = "0.114.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14" +checksum = "36f2f817bed2e8d65eb779fa37317e74de15585751f903c9118342d1970703a4" dependencies = [ "anyhow", "cc", @@ -15554,6 +15969,37 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wasmi" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" +dependencies = [ + "smallvec", + "spin 0.9.8", + "wasmi_arena", + "wasmi_core", + "wasmparser-nostd", +] + +[[package]] +name = "wasmi_arena" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" + +[[package]] +name = "wasmi_core" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +dependencies = [ + "downcast-rs", + "libm", + "num-traits", + "paste", +] + [[package]] name = "wasmparser" version = "0.102.0" @@ -15564,6 +16010,15 @@ dependencies = [ "url", ] +[[package]] +name = "wasmparser-nostd" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +dependencies = [ + "indexmap-nostd", +] + [[package]] name = "wasmtime" version = "8.0.1" @@ -16014,9 +16469,10 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ + "binary-merkle-tree", "bitvec", "frame-benchmarking", "frame-election-provider-support", @@ -16033,6 +16489,8 @@ dependencies = [ "pallet-babe", "pallet-bags-list", "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", @@ -16045,6 +16503,7 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-message-queue", + "pallet-mmr", "pallet-multisig", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", @@ -16072,7 +16531,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -16082,6 +16541,7 @@ dependencies = [ "serde_derive", "smallvec", "sp-api", + "sp-application-crypto", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", @@ -16096,19 +16556,20 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", "westend-runtime-constants", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "westend-runtime-constants" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "frame-support", "polkadot-primitives", @@ -16417,95 +16878,36 @@ dependencies = [ "time", ] -[[package]] -name = "xcm" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" -dependencies = [ - "bounded-collections", - "derivative", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-weights", - "xcm-procedural", -] - -[[package]] -name = "xcm-builder" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" -dependencies = [ - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "log", - "pallet-transaction-payment", - "parity-scale-codec", - "polkadot-parachain", - "scale-info", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std", - "sp-weights", - "xcm", - "xcm-executor", -] - [[package]] name = "xcm-emulator" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +version = "0.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ - "casey", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", - "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-test-relay-sproof-builder", - "cumulus-test-service", "frame-support", "frame-system", + "impl-trait-for-tuples", + "lazy_static", "log", "pallet-balances", "pallet-message-queue", - "parachain-info", "parachains-common", "parity-scale-codec", "paste", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-parachains", - "quote", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-std", - "sp-trie", - "xcm", -] - -[[package]] -name = "xcm-executor" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" -dependencies = [ - "environmental", - "frame-benchmarking", - "frame-support", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", "sp-std", - "sp-weights", - "xcm", + "sp-tracing", + "staging-xcm", + "staging-xcm-executor", ] [[package]] @@ -16529,6 +16931,7 @@ dependencies = [ "frame-system", "integration-tests-common", "kilt-asset-dids", + "pallet-bags-list", "pallet-did-lookup", "pallet-message-queue", "pallet-web3-names", @@ -16536,7 +16939,7 @@ dependencies = [ "parity-scale-codec", "penpal-runtime", "peregrine-runtime", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime", "polkadot-runtime-constants", @@ -16555,15 +16958,15 @@ dependencies = [ "sp-runtime", "sp-tracing", "spiritnet-runtime", - "xcm", + "staging-xcm", + "staging-xcm-executor", "xcm-emulator", - "xcm-executor", ] [[package]] name = "xcm-procedural" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "2.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-crates-io-v1.1.0#72dd732e5aebfa97dbb774cd3345d9ed6ee8aaf0" dependencies = [ "Inflector", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 880b98e64..ee81daa25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ version = "1.14.0-dev" [workspace.dependencies] # Build deps -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } # External (without extra features and with default disabled if necessary) base58 = { version = "0.2.0", default-features = false } @@ -92,145 +92,149 @@ peregrine-runtime = { path = "runtimes/peregrine", default-features = false } spiritnet-runtime = { path = "runtimes/spiritnet", default-features = false } # Benchmarking (with default disabled) -cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } # Cumulus (with default disabled) -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +cumulus-primitives-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +parachain-info = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } # XCM Emulator tests -asset-hub-kusama-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -asset-hub-polkadot-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -asset-hub-rococo-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -asset-hub-westend-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -bridge-hub-kusama-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -bridge-hub-polkadot-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -bridge-hub-rococo-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -collectives-polkadot-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -integration-tests-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -penpal-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -xcm-emulator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +asset-hub-kusama-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +asset-hub-polkadot-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +asset-hub-rococo-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +asset-hub-westend-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +bridge-hub-kusama-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +bridge-hub-polkadot-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +bridge-hub-rococo-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +collectives-polkadot-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +integration-tests-common = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +penpal-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +xcm-emulator = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } # Substrate (with default disabled) -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-message-queue = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-weights = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-bags-list = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-indices = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-tips = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +pallet-vesting = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-authority-discovery = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-session = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-version = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +try-runtime-cli = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } # Polkadot (with default disabled) -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -rococo-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -rococo-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +polkadot-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +rococo-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +rococo-runtime-constants = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.1.0" } # Client-only (with default enabled) -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-offchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-consensus-beefy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sp-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-crates-io-v1.1.0" } [profile] diff --git a/crates/kilt-dip-primitives/Cargo.toml b/crates/kilt-dip-primitives/Cargo.toml index 37e4ea466..578c1aeea 100644 --- a/crates/kilt-dip-primitives/Cargo.toml +++ b/crates/kilt-dip-primitives/Cargo.toml @@ -11,7 +11,8 @@ repository = { workspace = true } version = { workspace = true } [dev-dependencies] -cumulus-pallet-parachain-system = { workspace = true, features = ["std"] } +cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook", "std"] } +cumulus-primitives-core = { workspace = true } enum-iterator = { workspace = true } hex-literal = { workspace = true } peregrine-runtime = { workspace = true, features = ["std"] } diff --git a/crates/kilt-dip-primitives/src/verifier/parachain/v0/mock.rs b/crates/kilt-dip-primitives/src/verifier/parachain/v0/mock.rs index 2c852981a..ce7ef8049 100644 --- a/crates/kilt-dip-primitives/src/verifier/parachain/v0/mock.rs +++ b/crates/kilt-dip-primitives/src/verifier/parachain/v0/mock.rs @@ -95,6 +95,7 @@ impl cumulus_pallet_parachain_system::Config for TestRuntime { type RuntimeEvent = RuntimeEvent; type SelfParaId = ParachainId; type XcmpMessageHandler = (); + type ConsensusHook = cumulus_pallet_parachain_system::consensus_hook::RequireParentIncluded; } impl pallet_relay_store::Config for TestRuntime { diff --git a/dip-template/nodes/dip-consumer/Cargo.toml b/dip-template/nodes/dip-consumer/Cargo.toml index c8a252b5a..8c733ced4 100644 --- a/dip-template/nodes/dip-consumer/Cargo.toml +++ b/dip-template/nodes/dip-consumer/Cargo.toml @@ -61,8 +61,10 @@ polkadot-primitives = { workspace = true, features = ["std"] } # Cumulus cumulus-client-cli = { workspace = true } +cumulus-client-collator = { workspace = true } cumulus-client-consensus-aura = { workspace = true } cumulus-client-consensus-common = { workspace = true } +cumulus-client-consensus-proposer = { workspace = true } cumulus-client-service = { workspace = true } cumulus-primitives-core = { workspace = true, features = ["std"] } cumulus-primitives-parachain-inherent = { workspace = true, features = ["std"] } diff --git a/dip-template/nodes/dip-consumer/src/command.rs b/dip-template/nodes/dip-consumer/src/command.rs index 048933f6a..a8cbba1b5 100644 --- a/dip-template/nodes/dip-consumer/src/command.rs +++ b/dip-template/nodes/dip-consumer/src/command.rs @@ -21,7 +21,7 @@ use std::{fs::create_dir_all, net::SocketAddr}; use cumulus_primitives_core::ParaId; use dip_consumer_runtime_template::Block; use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; -use log::{info, warn}; +use log::info; use sc_cli::{ ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, LoggerBuilder, NetworkParams, Result, SharedParams, SubstrateCli, @@ -210,14 +210,11 @@ pub fn run() -> Result<()> { cmd.run(partials.client) }), #[cfg(not(feature = "runtime-benchmarks"))] - BenchmarkCmd::Storage(_) => { - return Err(sc_cli::Error::Input( - "Compile with --features=runtime-benchmarks \ + BenchmarkCmd::Storage(_) => Err(sc_cli::Error::Input( + "Compile with --features=runtime-benchmarks \ to enable storage benchmarks." - .into(), - ) - .into()) - } + .into(), + )), #[cfg(feature = "runtime-benchmarks")] BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| { let partials = new_partial(&config)?; @@ -270,14 +267,6 @@ pub fn run() -> Result<()> { if config.role.is_authority() { "yes" } else { "no" } ); - if !collator_options.relay_chain_rpc_urls.is_empty() && cli.relay_chain_args.is_empty() { - warn!( - "Detected relay chain node arguments together with --relay-chain-rpc-url. \ - This command starts a minimal Polkadot node that only uses a \ - network-related subset of all relay chain CLI options." - ); - } - start_parachain_node(config, polkadot_config, collator_options, id, hwbench) .await .map(|r| r.0) diff --git a/dip-template/nodes/dip-consumer/src/service.rs b/dip-template/nodes/dip-consumer/src/service.rs index 858cf5ff4..02b8fa93c 100644 --- a/dip-template/nodes/dip-consumer/src/service.rs +++ b/dip-template/nodes/dip-consumer/src/service.rs @@ -16,24 +16,25 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use std::{error::Error, sync::Arc, time::Duration}; +use std::{sync::Arc, time::Duration}; use cumulus_client_cli::CollatorOptions; -use cumulus_client_consensus_aura::{ - import_queue, slot_duration, AuraConsensus, BuildAuraConsensusParams, ImportQueueParams, SlotProportion, -}; -use cumulus_client_consensus_common::{ParachainBlockImport as TParachainBlockImport, ParachainConsensus}; +use cumulus_client_collator::service::CollatorService; +use cumulus_client_consensus_aura::{import_queue, slot_duration, ImportQueueParams}; +use cumulus_client_consensus_common::ParachainBlockImport as TParachainBlockImport; +use cumulus_client_consensus_proposer::Proposer; use cumulus_client_service::{ - build_network, build_relay_chain_interface, prepare_node_config, start_collator, start_full_node, - BuildNetworkParams, StartCollatorParams, StartFullNodeParams, + build_network, build_relay_chain_interface, prepare_node_config, start_relay_chain_tasks, BuildNetworkParams, + CollatorSybilResistance, DARecoveryProfile, StartRelayChainTasksParams, +}; +use cumulus_primitives_core::{ + relay_chain::{CollatorPair, ValidationCode}, + ParaId, }; -use cumulus_primitives_core::ParaId; -use cumulus_primitives_parachain_inherent::ParachainInherentData; -use cumulus_relay_chain_interface::RelayChainInterface; -use dip_consumer_runtime_template::{api, native_version, NodeBlock as Block, RuntimeApi}; +use cumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface}; +use dip_consumer_runtime_template::{api, native_version, Hash, NodeBlock as Block, RuntimeApi}; use frame_benchmarking::benchmarking::HostFunctions; use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE; -use sc_basic_authorship::ProposerFactory; use sc_client_api::Backend; use sc_consensus::{DefaultImportQueue, ImportQueue}; use sc_executor::NativeElseWasmExecutor; @@ -79,7 +80,7 @@ pub fn new_partial( ParachainClient, ParachainBackend, (), - DefaultImportQueue, + DefaultImportQueue, FullPool, (ParachainBlockImport, Option, Option), >, @@ -170,7 +171,6 @@ async fn start_node_impl( .await .map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?; - let force_authoring = parachain_config.force_authoring; let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); @@ -187,6 +187,7 @@ async fn start_node_impl( spawn_handle: task_manager.spawn_handle(), relay_chain_interface: relay_chain_interface.clone(), import_queue: params.import_queue, + sybil_resistance_level: CollatorSybilResistance::Resistant, // because of Aura }) .await?; @@ -234,8 +235,8 @@ async fn start_node_impl( task_manager: &mut task_manager, config: parachain_config, keystore: params.keystore_container.keystore(), - backend, - network: network.clone(), + backend: backend.clone(), + network, system_rpc_tx, tx_handler_controller, telemetry: telemetry.as_mut(), @@ -267,53 +268,41 @@ async fn start_node_impl( .overseer_handle() .map_err(|e| sc_service::Error::Application(Box::new(e)))?; + start_relay_chain_tasks(StartRelayChainTasksParams { + client: client.clone(), + announce_block: announce_block.clone(), + para_id, + relay_chain_interface: relay_chain_interface.clone(), + task_manager: &mut task_manager, + da_recovery_profile: if validator { + DARecoveryProfile::Collator + } else { + DARecoveryProfile::FullNode + }, + import_queue: import_queue_service, + relay_chain_slot_duration, + recovery_handle: Box::new(overseer_handle.clone()), + sync_service: sync_service.clone(), + })?; + if validator { - let parachain_consensus = build_consensus( + start_consensus( client.clone(), + backend.clone(), block_import, prometheus_registry.as_ref(), telemetry.as_ref().map(|t| t.handle()), &task_manager, relay_chain_interface.clone(), transaction_pool, - sync_service.clone(), + sync_service, params.keystore_container.keystore(), - force_authoring, - para_id, - )?; - - let spawner = task_manager.spawn_handle(); - let params = StartCollatorParams { - para_id, - block_status: client.clone(), - announce_block, - client: client.clone(), - task_manager: &mut task_manager, - relay_chain_interface, - sync_service: sync_service.clone(), - spawner, - parachain_consensus, - import_queue: import_queue_service, - collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, - recovery_handle: Box::new(overseer_handle), - }; - - start_collator(params).await?; - } else { - let params = StartFullNodeParams { - client: client.clone(), - announce_block, - task_manager: &mut task_manager, para_id, - relay_chain_interface, - sync_service, - relay_chain_slot_duration, - import_queue: import_queue_service, - recovery_handle: Box::new(overseer_handle), - }; - - start_full_node(params)?; + collator_key.expect("Collator key not provided"), + overseer_handle, + announce_block, + )?; } start_network.start_network(); @@ -327,7 +316,7 @@ fn build_import_queue( config: &Configuration, telemetry: Option, task_manager: &TaskManager, -) -> Result, sc_service::Error> { +) -> Result, sc_service::Error> { let slot_duration = slot_duration(&*client)?; import_queue::(ImportQueueParams { @@ -351,70 +340,67 @@ fn build_import_queue( } #[allow(clippy::too_many_arguments)] -fn build_consensus( +fn start_consensus( client: Arc, + backend: Arc, block_import: ParachainBlockImport, prometheus_registry: Option<&Registry>, telemetry: Option, task_manager: &TaskManager, relay_chain_interface: Arc, - transaction_pool: Arc>, + transaction_pool: Arc>, sync_oracle: Arc>, keystore: KeystorePtr, - force_authoring: bool, + relay_chain_slot_duration: Duration, para_id: ParaId, -) -> Result>, sc_service::Error> { - let slot_duration = slot_duration(&*client)?; + collator_key: CollatorPair, + overseer_handle: OverseerHandle, + announce_block: Arc>) + Send + Sync>, +) -> Result<(), sc_service::Error> { + use cumulus_client_consensus_aura::collators::lookahead::{self as aura, Params as AuraParams}; - let proposer_factory = ProposerFactory::with_proof_recording( + let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; + + let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( task_manager.spawn_handle(), client.clone(), transaction_pool, prometheus_registry, - telemetry.clone(), + telemetry, ); - let params = BuildAuraConsensusParams { - proposer_factory, - create_inherent_data_providers: move |_, (relay_parent, validation_data)| { - let relay_chain_interface = relay_chain_interface.clone(); - async move { - let parachain_inherent = - ParachainInherentData::create_at(relay_parent, &relay_chain_interface, &validation_data, para_id) - .await; - let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( - *timestamp, - slot_duration, - ); - - let parachain_inherent = parachain_inherent - .ok_or_else(|| Box::::from("Failed to create parachain inherent"))?; - Ok((slot, timestamp, parachain_inherent)) - } - }, + let proposer = Proposer::new(proposer_factory); + + let collator_service = CollatorService::new( + client.clone(), + Arc::new(task_manager.spawn_handle()), + announce_block, + client.clone(), + ); + + let params = AuraParams { + create_inherent_data_providers: move |_, ()| async move { Ok(()) }, block_import, - para_client: client, - backoff_authoring_blocks: Option::<()>::None, + para_client: client.clone(), + para_backend: backend, + relay_client: relay_chain_interface, + code_hash_provider: move |block_hash| client.code_at(block_hash).ok().map(|c| ValidationCode::from(c).hash()), sync_oracle, keystore, - force_authoring, + collator_key, + para_id, + overseer_handle, slot_duration, - block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32), - max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)), - telemetry, + relay_chain_slot_duration, + proposer, + collator_service, + authoring_duration: Duration::from_millis(500), }; - Ok(AuraConsensus::build::< - sp_consensus_aura::sr25519::AuthorityPair, - _, - _, - _, - _, - _, - _, - >(params)) + let fut = aura::run::(params); + task_manager.spawn_essential_handle().spawn("aura", None, fut); + + Ok(()) } pub async fn start_parachain_node( diff --git a/dip-template/nodes/dip-provider/Cargo.toml b/dip-template/nodes/dip-provider/Cargo.toml index 304a7d30a..abb003ba6 100644 --- a/dip-template/nodes/dip-provider/Cargo.toml +++ b/dip-template/nodes/dip-provider/Cargo.toml @@ -61,8 +61,10 @@ polkadot-primitives = { workspace = true, features = ["std"] } # Cumulus cumulus-client-cli = { workspace = true } +cumulus-client-collator = { workspace = true } cumulus-client-consensus-aura = { workspace = true } cumulus-client-consensus-common = { workspace = true } +cumulus-client-consensus-proposer = { workspace = true } cumulus-client-service = { workspace = true } cumulus-primitives-core = { workspace = true, features = ["std"] } cumulus-primitives-parachain-inherent = { workspace = true, features = ["std"] } diff --git a/dip-template/nodes/dip-provider/src/command.rs b/dip-template/nodes/dip-provider/src/command.rs index 7913cafd0..4d47dd55e 100644 --- a/dip-template/nodes/dip-provider/src/command.rs +++ b/dip-template/nodes/dip-provider/src/command.rs @@ -21,7 +21,7 @@ use std::{fs::create_dir_all, net::SocketAddr}; use cumulus_primitives_core::ParaId; use dip_provider_runtime_template::Block; use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; -use log::{info, warn}; +use log::info; use sc_cli::{ ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, LoggerBuilder, NetworkParams, Result, SharedParams, SubstrateCli, @@ -210,14 +210,11 @@ pub fn run() -> Result<()> { cmd.run(partials.client) }), #[cfg(not(feature = "runtime-benchmarks"))] - BenchmarkCmd::Storage(_) => { - return Err(sc_cli::Error::Input( - "Compile with --features=runtime-benchmarks \ + BenchmarkCmd::Storage(_) => Err(sc_cli::Error::Input( + "Compile with --features=runtime-benchmarks \ to enable storage benchmarks." - .into(), - ) - .into()) - } + .into(), + )), #[cfg(feature = "runtime-benchmarks")] BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| { let partials = new_partial(&config)?; @@ -270,14 +267,6 @@ pub fn run() -> Result<()> { if config.role.is_authority() { "yes" } else { "no" } ); - if !collator_options.relay_chain_rpc_urls.is_empty() && cli.relay_chain_args.is_empty() { - warn!( - "Detected relay chain node arguments together with --relay-chain-rpc-url. \ - This command starts a minimal Polkadot node that only uses a \ - network-related subset of all relay chain CLI options." - ); - } - start_parachain_node(config, polkadot_config, collator_options, id, hwbench) .await .map(|r| r.0) diff --git a/dip-template/nodes/dip-provider/src/service.rs b/dip-template/nodes/dip-provider/src/service.rs index 2ba0ab563..aa152a816 100644 --- a/dip-template/nodes/dip-provider/src/service.rs +++ b/dip-template/nodes/dip-provider/src/service.rs @@ -16,24 +16,25 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use std::{error::Error, sync::Arc, time::Duration}; +use std::{sync::Arc, time::Duration}; use cumulus_client_cli::CollatorOptions; -use cumulus_client_consensus_aura::{ - import_queue, slot_duration, AuraConsensus, BuildAuraConsensusParams, ImportQueueParams, SlotProportion, -}; -use cumulus_client_consensus_common::{ParachainBlockImport as TParachainBlockImport, ParachainConsensus}; +use cumulus_client_collator::service::CollatorService; +use cumulus_client_consensus_aura::{import_queue, slot_duration, ImportQueueParams}; +use cumulus_client_consensus_common::ParachainBlockImport as TParachainBlockImport; +use cumulus_client_consensus_proposer::Proposer; use cumulus_client_service::{ - build_network, build_relay_chain_interface, prepare_node_config, start_collator, start_full_node, - BuildNetworkParams, StartCollatorParams, StartFullNodeParams, + build_network, build_relay_chain_interface, prepare_node_config, start_relay_chain_tasks, BuildNetworkParams, + CollatorSybilResistance, DARecoveryProfile, StartRelayChainTasksParams, +}; +use cumulus_primitives_core::{ + relay_chain::{CollatorPair, ValidationCode}, + ParaId, }; -use cumulus_primitives_core::ParaId; -use cumulus_primitives_parachain_inherent::ParachainInherentData; -use cumulus_relay_chain_interface::RelayChainInterface; -use dip_provider_runtime_template::{api, native_version, NodeBlock as Block, RuntimeApi}; +use cumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface}; +use dip_provider_runtime_template::{api, native_version, Hash, NodeBlock as Block, RuntimeApi}; use frame_benchmarking::benchmarking::HostFunctions; use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE; -use sc_basic_authorship::ProposerFactory; use sc_client_api::Backend; use sc_consensus::{DefaultImportQueue, ImportQueue}; use sc_executor::NativeElseWasmExecutor; @@ -79,7 +80,7 @@ pub fn new_partial( ParachainClient, ParachainBackend, (), - DefaultImportQueue, + DefaultImportQueue, FullPool, (ParachainBlockImport, Option, Option), >, @@ -170,7 +171,6 @@ async fn start_node_impl( .await .map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?; - let force_authoring = parachain_config.force_authoring; let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); @@ -187,6 +187,7 @@ async fn start_node_impl( spawn_handle: task_manager.spawn_handle(), relay_chain_interface: relay_chain_interface.clone(), import_queue: params.import_queue, + sybil_resistance_level: CollatorSybilResistance::Resistant, // because of Aura }) .await?; @@ -234,8 +235,8 @@ async fn start_node_impl( task_manager: &mut task_manager, config: parachain_config, keystore: params.keystore_container.keystore(), - backend, - network: network.clone(), + backend: backend.clone(), + network, system_rpc_tx, tx_handler_controller, telemetry: telemetry.as_mut(), @@ -267,53 +268,41 @@ async fn start_node_impl( .overseer_handle() .map_err(|e| sc_service::Error::Application(Box::new(e)))?; + start_relay_chain_tasks(StartRelayChainTasksParams { + client: client.clone(), + announce_block: announce_block.clone(), + para_id, + relay_chain_interface: relay_chain_interface.clone(), + task_manager: &mut task_manager, + da_recovery_profile: if validator { + DARecoveryProfile::Collator + } else { + DARecoveryProfile::FullNode + }, + import_queue: import_queue_service, + relay_chain_slot_duration, + recovery_handle: Box::new(overseer_handle.clone()), + sync_service: sync_service.clone(), + })?; + if validator { - let parachain_consensus = build_consensus( + start_consensus( client.clone(), + backend.clone(), block_import, prometheus_registry.as_ref(), telemetry.as_ref().map(|t| t.handle()), &task_manager, relay_chain_interface.clone(), transaction_pool, - sync_service.clone(), + sync_service, params.keystore_container.keystore(), - force_authoring, - para_id, - )?; - - let spawner = task_manager.spawn_handle(); - let params = StartCollatorParams { - para_id, - block_status: client.clone(), - announce_block, - client: client.clone(), - task_manager: &mut task_manager, - relay_chain_interface, - sync_service: sync_service.clone(), - spawner, - parachain_consensus, - import_queue: import_queue_service, - collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, - recovery_handle: Box::new(overseer_handle), - }; - - start_collator(params).await?; - } else { - let params = StartFullNodeParams { - client: client.clone(), - announce_block, - task_manager: &mut task_manager, para_id, - relay_chain_interface, - sync_service, - relay_chain_slot_duration, - import_queue: import_queue_service, - recovery_handle: Box::new(overseer_handle), - }; - - start_full_node(params)?; + collator_key.expect("Collator key not provided"), + overseer_handle, + announce_block, + )?; } start_network.start_network(); @@ -327,7 +316,7 @@ fn build_import_queue( config: &Configuration, telemetry: Option, task_manager: &TaskManager, -) -> Result, sc_service::Error> { +) -> Result, sc_service::Error> { let slot_duration = slot_duration(&*client)?; import_queue::(ImportQueueParams { @@ -351,70 +340,67 @@ fn build_import_queue( } #[allow(clippy::too_many_arguments)] -fn build_consensus( +fn start_consensus( client: Arc, + backend: Arc, block_import: ParachainBlockImport, prometheus_registry: Option<&Registry>, telemetry: Option, task_manager: &TaskManager, relay_chain_interface: Arc, - transaction_pool: Arc>, + transaction_pool: Arc>, sync_oracle: Arc>, keystore: KeystorePtr, - force_authoring: bool, + relay_chain_slot_duration: Duration, para_id: ParaId, -) -> Result>, sc_service::Error> { - let slot_duration = slot_duration(&*client)?; + collator_key: CollatorPair, + overseer_handle: OverseerHandle, + announce_block: Arc>) + Send + Sync>, +) -> Result<(), sc_service::Error> { + use cumulus_client_consensus_aura::collators::lookahead::{self as aura, Params as AuraParams}; - let proposer_factory = ProposerFactory::with_proof_recording( + let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; + + let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( task_manager.spawn_handle(), client.clone(), transaction_pool, prometheus_registry, - telemetry.clone(), + telemetry, ); - let params = BuildAuraConsensusParams { - proposer_factory, - create_inherent_data_providers: move |_, (relay_parent, validation_data)| { - let relay_chain_interface = relay_chain_interface.clone(); - async move { - let parachain_inherent = - ParachainInherentData::create_at(relay_parent, &relay_chain_interface, &validation_data, para_id) - .await; - let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( - *timestamp, - slot_duration, - ); - - let parachain_inherent = parachain_inherent - .ok_or_else(|| Box::::from("Failed to create parachain inherent"))?; - Ok((slot, timestamp, parachain_inherent)) - } - }, + let proposer = Proposer::new(proposer_factory); + + let collator_service = CollatorService::new( + client.clone(), + Arc::new(task_manager.spawn_handle()), + announce_block, + client.clone(), + ); + + let params = AuraParams { + create_inherent_data_providers: move |_, ()| async move { Ok(()) }, block_import, - para_client: client, - backoff_authoring_blocks: Option::<()>::None, + para_client: client.clone(), + para_backend: backend, + relay_client: relay_chain_interface, + code_hash_provider: move |block_hash| client.code_at(block_hash).ok().map(|c| ValidationCode::from(c).hash()), sync_oracle, keystore, - force_authoring, + collator_key, + para_id, + overseer_handle, slot_duration, - block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32), - max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)), - telemetry, + relay_chain_slot_duration, + proposer, + collator_service, + authoring_duration: Duration::from_millis(500), }; - Ok(AuraConsensus::build::< - sp_consensus_aura::sr25519::AuthorityPair, - _, - _, - _, - _, - _, - _, - >(params)) + let fut = aura::run::(params); + task_manager.spawn_essential_handle().spawn("aura", None, fut); + + Ok(()) } pub async fn start_parachain_node( diff --git a/dip-template/runtimes/dip-consumer/Cargo.toml b/dip-template/runtimes/dip-consumer/Cargo.toml index c53757a4f..9ab8ab50d 100644 --- a/dip-template/runtimes/dip-consumer/Cargo.toml +++ b/dip-template/runtimes/dip-consumer/Cargo.toml @@ -57,7 +57,8 @@ sp-weights = { workspace = true } # Cumulus cumulus-pallet-aura-ext = { workspace = true } -cumulus-pallet-parachain-system = { workspace = true } +cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook"] } +cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-timestamp = { workspace = true } pallet-collator-selection = { workspace = true } diff --git a/dip-template/runtimes/dip-consumer/src/lib.rs b/dip-template/runtimes/dip-consumer/src/lib.rs index e55df02b8..31552ce4e 100644 --- a/dip-template/runtimes/dip-consumer/src/lib.rs +++ b/dip-template/runtimes/dip-consumer/src/lib.rs @@ -37,11 +37,8 @@ use dip_provider_runtime_template::Web3Name; pub use sp_consensus_aura::sr25519::AuthorityId as AuraId; pub use sp_runtime::{MultiAddress, Perbill, Permill}; -use cumulus_pallet_parachain_system::{ - register_validate_block, ParachainSetCode, RelayChainStateProof, RelayNumberStrictlyIncreases, -}; +use cumulus_pallet_parachain_system::{ParachainSetCode, RelayNumberMonotonicallyIncreases}; use cumulus_primitives_core::CollationInfo; -use cumulus_primitives_timestamp::InherentDataProvider; use frame_support::{ construct_runtime, dispatch::DispatchClass, @@ -71,7 +68,7 @@ use sp_runtime::{ transaction_validity::{TransactionSource, TransactionValidity}, AccountId32, ApplyExtrinsicResult, MultiSignature, OpaqueExtrinsic, }; -use sp_std::{prelude::*, time::Duration}; +use sp_std::prelude::*; use sp_version::RuntimeVersion; mod dip; @@ -170,27 +167,9 @@ pub fn native_version() -> NativeVersion { } } -struct CheckInherents; - -impl cumulus_pallet_parachain_system::CheckInherents for CheckInherents { - fn check_inherents(block: &Block, relay_state_proof: &RelayChainStateProof) -> CheckInherentsResult { - let relay_chain_slot = relay_state_proof - .read_slot() - .expect("Could not read the relay chain slot from the proof"); - - let inherent_data = - InherentDataProvider::from_relay_chain_slot_and_duration(relay_chain_slot, Duration::from_secs(6)) - .create_inherent_data() - .expect("Could not create the timestamp inherent data"); - - inherent_data.check_extrinsics(block) - } -} - -register_validate_block! { +cumulus_pallet_parachain_system::register_validate_block! { Runtime = Runtime, BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::, - CheckInherents = CheckInherents, } const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(5); @@ -250,8 +229,30 @@ impl frame_system::Config for Runtime { type Version = Version; } +/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included into the +/// relay chain. +const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1; +/// How many parachain blocks are processed by the relay chain per parent. Limits the number of +/// blocks authored per slot. +const BLOCK_PROCESSING_VELOCITY: u32 = 1; +/// Relay chain slot duration, in milliseconds. +const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000; + +/// `SLOT_DURATION` is picked up by `pallet_timestamp` which is in turn picked +/// up by `pallet_aura` to implement `fn slot_duration()`. +/// +/// Change this to adjust the block time. +const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK; + +type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook< + Runtime, + RELAY_CHAIN_SLOT_DURATION_MILLIS, + BLOCK_PROCESSING_VELOCITY, + UNINCLUDED_SEGMENT_CAPACITY, +>; + impl cumulus_pallet_parachain_system::Config for Runtime { - type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; + type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases; type DmpMessageHandler = (); type OnSystemEvent = (); type OutboundXcmpMessageSource = (); @@ -260,6 +261,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type RuntimeEvent = RuntimeEvent; type SelfParaId = ParachainInfo; type XcmpMessageHandler = (); + type ConsensusHook = ConsensusHook; } impl pallet_timestamp::Config for Runtime { @@ -380,9 +382,19 @@ mod benches { } impl_runtime_apis! { + + impl cumulus_primitives_aura::AuraUnincludedSegmentApi for Runtime { + fn can_build_upon( + included_hash: ::Hash, + slot: cumulus_primitives_aura::Slot, + ) -> bool { + ConsensusHook::can_build_upon(included_hash, slot) + } + } + impl sp_consensus_aura::AuraApi for Runtime { fn slot_duration() -> SlotDuration { - SlotDuration::from_millis(Aura::slot_duration()) + SlotDuration::from_millis(SLOT_DURATION) } fn authorities() -> Vec { diff --git a/dip-template/runtimes/dip-provider/Cargo.toml b/dip-template/runtimes/dip-provider/Cargo.toml index 4ec768988..ad1f689a1 100644 --- a/dip-template/runtimes/dip-provider/Cargo.toml +++ b/dip-template/runtimes/dip-provider/Cargo.toml @@ -57,7 +57,8 @@ sp-weights = { workspace = true } # Cumulus cumulus-pallet-aura-ext = { workspace = true } -cumulus-pallet-parachain-system = { workspace = true } +cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook"] } +cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-timestamp = { workspace = true } pallet-collator-selection = { workspace = true } diff --git a/dip-template/runtimes/dip-provider/src/lib.rs b/dip-template/runtimes/dip-provider/src/lib.rs index b2c92dd1b..aef6075cc 100644 --- a/dip-template/runtimes/dip-provider/src/lib.rs +++ b/dip-template/runtimes/dip-provider/src/lib.rs @@ -35,11 +35,8 @@ use scale_info::TypeInfo; pub use sp_consensus_aura::sr25519::AuthorityId as AuraId; pub use sp_runtime::{MultiAddress, Perbill, Permill}; -use cumulus_pallet_parachain_system::{ - register_validate_block, ParachainSetCode, RelayChainStateProof, RelayNumberStrictlyIncreases, -}; +use cumulus_pallet_parachain_system::{ParachainSetCode, RelayNumberMonotonicallyIncreases}; use cumulus_primitives_core::CollationInfo; -use cumulus_primitives_timestamp::InherentDataProvider; use did::{DidRawOrigin, EnsureDidOrigin}; use frame_support::{ construct_runtime, @@ -72,7 +69,7 @@ use sp_runtime::{ transaction_validity::{TransactionSource, TransactionValidity}, AccountId32, ApplyExtrinsicResult, MultiSignature, OpaqueExtrinsic, }; -use sp_std::{prelude::*, time::Duration}; +use sp_std::prelude::*; use sp_version::RuntimeVersion; #[cfg(any(feature = "std", test))] @@ -171,27 +168,9 @@ pub fn native_version() -> NativeVersion { } } -struct CheckInherents; - -impl cumulus_pallet_parachain_system::CheckInherents for CheckInherents { - fn check_inherents(block: &Block, relay_state_proof: &RelayChainStateProof) -> CheckInherentsResult { - let relay_chain_slot = relay_state_proof - .read_slot() - .expect("Could not read the relay chain slot from the proof"); - - let inherent_data = - InherentDataProvider::from_relay_chain_slot_and_duration(relay_chain_slot, Duration::from_secs(6)) - .create_inherent_data() - .expect("Could not create the timestamp inherent data"); - - inherent_data.check_extrinsics(block) - } -} - -register_validate_block! { +cumulus_pallet_parachain_system::register_validate_block! { Runtime = Runtime, BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::, - CheckInherents = CheckInherents, } // Same as official KILT prefix. @@ -251,8 +230,30 @@ impl frame_system::Config for Runtime { type Version = Version; } +/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included into the +/// relay chain. +const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1; +/// How many parachain blocks are processed by the relay chain per parent. Limits the number of +/// blocks authored per slot. +const BLOCK_PROCESSING_VELOCITY: u32 = 1; +/// Relay chain slot duration, in milliseconds. +const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000; + +/// `SLOT_DURATION` is picked up by `pallet_timestamp` which is in turn picked +/// up by `pallet_aura` to implement `fn slot_duration()`. +/// +/// Change this to adjust the block time. +const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK; + +type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook< + Runtime, + RELAY_CHAIN_SLOT_DURATION_MILLIS, + BLOCK_PROCESSING_VELOCITY, + UNINCLUDED_SEGMENT_CAPACITY, +>; + impl cumulus_pallet_parachain_system::Config for Runtime { - type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; + type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases; type DmpMessageHandler = (); type OnSystemEvent = (); type OutboundXcmpMessageSource = (); @@ -261,6 +262,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type RuntimeEvent = RuntimeEvent; type SelfParaId = ParachainInfo; type XcmpMessageHandler = (); + type ConsensusHook = ConsensusHook; } impl pallet_timestamp::Config for Runtime { @@ -456,9 +458,19 @@ mod benches { } impl_runtime_apis! { + + impl cumulus_primitives_aura::AuraUnincludedSegmentApi for Runtime { + fn can_build_upon( + included_hash: ::Hash, + slot: cumulus_primitives_aura::Slot, + ) -> bool { + ConsensusHook::can_build_upon(included_hash, slot) + } + } + impl sp_consensus_aura::AuraApi for Runtime { fn slot_duration() -> SlotDuration { - SlotDuration::from_millis(Aura::slot_duration()) + SlotDuration::from_millis(SLOT_DURATION) } fn authorities() -> Vec { diff --git a/integration-tests/emulated/Cargo.toml b/integration-tests/emulated/Cargo.toml index 677123d9c..d382cad32 100644 --- a/integration-tests/emulated/Cargo.toml +++ b/integration-tests/emulated/Cargo.toml @@ -10,53 +10,54 @@ readme = { workspace = true } repository = { workspace = true } version = { workspace = true } -[dev-dependencies] -asset-hub-kusama-runtime = { workspace = true } -asset-hub-polkadot-runtime = { workspace = true } -asset-hub-westend-runtime = { workspace = true } -attestation = { workspace = true } -bridge-hub-kusama-runtime = { workspace = true } -bridge-hub-polkadot-runtime = { workspace = true } -bridge-hub-rococo-runtime = { workspace = true } -collectives-polkadot-runtime = { workspace = true } -ctype = { workspace = true } -cumulus-pallet-dmp-queue = { workspace = true } -cumulus-pallet-xcmp-queue = { workspace = true } -cumulus-primitives-core = { workspace = true } -did = { workspace = true } -frame-support = { workspace = true } -frame-system = { workspace = true } -integration-tests-common = { workspace = true } -kilt-asset-dids = { workspace = true } -pallet-did-lookup = { workspace = true } -pallet-message-queue = { workspace = true } -pallet-web3-names = { workspace = true } -pallet-xcm = { workspace = true } -parity-scale-codec = { workspace = true, features = ["derive"] } -penpal-runtime = { workspace = true } +[dependencies] +asset-hub-kusama-runtime = { workspace = true, default-features = true } +asset-hub-polkadot-runtime = { workspace = true, default-features = true } +asset-hub-westend-runtime = { workspace = true, default-features = true } +attestation = { workspace = true, default-features = true } +bridge-hub-kusama-runtime = { workspace = true, default-features = true } +bridge-hub-polkadot-runtime = { workspace = true, default-features = true } +bridge-hub-rococo-runtime = { workspace = true, default-features = true } +collectives-polkadot-runtime = { workspace = true, default-features = true } +ctype = { workspace = true, default-features = true } +cumulus-pallet-dmp-queue = { workspace = true, default-features = true } +cumulus-pallet-xcmp-queue = { workspace = true, default-features = true } +cumulus-primitives-core = { workspace = true, default-features = true } +did = { workspace = true, default-features = true } +frame-support = { workspace = true, default-features = true } +frame-system = { workspace = true, default-features = true } +integration-tests-common = { workspace = true, default-features = true } +kilt-asset-dids = { workspace = true, default-features = true } +pallet-bags-list = { workspace = true, default-features = true } +pallet-did-lookup = { workspace = true, default-features = true } +pallet-message-queue = { workspace = true, default-features = true } +pallet-web3-names = { workspace = true, default-features = true } +pallet-xcm = { workspace = true, default-features = true } +parity-scale-codec = { workspace = true, features = ["derive"], default-features = true } +penpal-runtime = { workspace = true, default-features = true } peregrine-runtime = { workspace = true, default-features = true } -polkadot-parachain = { workspace = true } -polkadot-primitives = { workspace = true } -polkadot-runtime = { workspace = true } -polkadot-runtime-constants = { workspace = true } -polkadot-runtime-parachains = { workspace = true } -polkadot-service = { workspace = true } -polkadot-test-runtime = { workspace = true } -public-credentials = { workspace = true, features = ["mock"] } -rococo-runtime = { workspace = true } -runtime-common = { workspace = true } -sc-consensus-grandpa = { workspace = true } -sp-authority-discovery = { workspace = true } -sp-consensus-babe = { workspace = true } -sp-consensus-beefy = { workspace = true } -sp-core = { workspace = true } -sp-io = { workspace = true } -sp-runtime = { workspace = true } -sp-tracing = { workspace = true } +polkadot-parachain = { workspace = true, default-features = true } +polkadot-primitives = { workspace = true, default-features = true } +polkadot-runtime = { workspace = true, default-features = true } +polkadot-runtime-constants = { workspace = true, default-features = true } +polkadot-runtime-parachains = { workspace = true, default-features = true } +polkadot-service = { workspace = true, default-features = true } +polkadot-test-runtime = { workspace = true, default-features = true } +public-credentials = { workspace = true, features = ["mock"], default-features = true } +rococo-runtime = { workspace = true, default-features = true } +runtime-common = { workspace = true, default-features = true } +sc-consensus-grandpa = { workspace = true, default-features = true } +sp-authority-discovery = { workspace = true, default-features = true } +sp-consensus-babe = { workspace = true, default-features = true } +sp-consensus-beefy = { workspace = true, default-features = true } +sp-core = { workspace = true, default-features = true } +sp-io = { workspace = true, default-features = true } +sp-runtime = { workspace = true, default-features = true } +sp-tracing = { workspace = true, default-features = true } spiritnet-runtime = { workspace = true, default-features = true } -xcm = { workspace = true } -xcm-emulator = { workspace = true } -xcm-executor = { workspace = true } +xcm = { workspace = true, default-features = true } +xcm-emulator = { workspace = true, default-features = true } +xcm-executor = { workspace = true, default-features = true } [features] runtime-benchmarks = [ @@ -78,3 +79,11 @@ runtime-benchmarks = [ "runtime-common/runtime-benchmarks", "spiritnet-runtime/runtime-benchmarks", ] + +try-runtime = [ + "ctype/try-runtime", + "did/try-runtime", + "pallet-bags-list/try-runtime", + "peregrine-runtime/try-runtime", + "spiritnet-runtime/try-runtime", +] diff --git a/integration-tests/emulated/src/lib.rs b/integration-tests/emulated/src/lib.rs index 99afcb8e1..57b246ccf 100644 --- a/integration-tests/emulated/src/lib.rs +++ b/integration-tests/emulated/src/lib.rs @@ -16,9 +16,8 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -#[cfg(test)] mod mock; +mod utils; + #[cfg(test)] mod tests; -#[cfg(test)] -mod utils; diff --git a/integration-tests/emulated/src/mock/para_chains.rs b/integration-tests/emulated/src/mock/para_chains.rs index b782ecd2e..f1a2930e8 100644 --- a/integration-tests/emulated/src/mock/para_chains.rs +++ b/integration-tests/emulated/src/mock/para_chains.rs @@ -19,7 +19,7 @@ use integration_tests_common::constants::{accounts, asset_hub_polkadot, polkadot use runtime_common::AuthorityId; use sp_core::sr25519; use sp_runtime::{BuildStorage, Storage}; -use xcm_emulator::{decl_test_parachains, BridgeMessageHandler, Parachain, TestExt}; +use xcm_emulator::decl_test_parachains; use crate::utils::{get_account_id_from_seed, get_from_seed}; @@ -78,19 +78,12 @@ pub mod peregrine { use peregrine_runtime::{ BalancesConfig, ParachainInfoConfig, PolkadotXcmConfig, RuntimeGenesisConfig, SessionConfig, SessionKeys, - SystemConfig, WASM_BINARY, }; pub const PARA_ID: u32 = 2_000; pub fn genesis() -> Storage { RuntimeGenesisConfig { - system: SystemConfig { - code: WASM_BINARY - .expect("WASM binary was not build, please build it!") - .to_vec(), - ..Default::default() - }, parachain_info: ParachainInfoConfig { parachain_id: PARA_ID.into(), ..Default::default() @@ -133,12 +126,11 @@ decl_test_parachains! { XcmpMessageHandler: spiritnet_runtime::XcmpQueue, DmpMessageHandler: spiritnet_runtime::DmpQueue, LocationToAccountId: spiritnet_runtime::xcm_config::LocationToAccountIdConverter, - System: spiritnet_runtime::System, - Balances: spiritnet_runtime::Balances, - ParachainSystem: spiritnet_runtime::ParachainSystem, ParachainInfo: spiritnet_runtime::ParachainInfo, }, - pallets_extra = { + pallets = { + Balances: spiritnet_runtime::Balances, + PolkadotXcm: spiritnet_runtime::PolkadotXcm, Did: spiritnet_runtime::Did, Ctype: spiritnet_runtime::Ctype, Attestation: spiritnet_runtime::Attestation, @@ -175,17 +167,15 @@ decl_test_parachains! { on_init = { asset_hub_polkadot_runtime::AuraExt::on_initialize(1); }, - runtime= asset_hub_polkadot_runtime, + runtime = asset_hub_polkadot_runtime, core = { XcmpMessageHandler: asset_hub_polkadot_runtime::XcmpQueue, DmpMessageHandler: asset_hub_polkadot_runtime::DmpQueue, LocationToAccountId: asset_hub_polkadot_runtime::xcm_config::LocationToAccountId, - System: asset_hub_polkadot_runtime::System, - Balances: asset_hub_polkadot_runtime::Balances, - ParachainSystem: asset_hub_polkadot_runtime::ParachainSystem, ParachainInfo: asset_hub_polkadot_runtime::ParachainInfo, }, - pallets_extra = { + pallets = { + Balances: asset_hub_polkadot_runtime::Balances, PolkadotXcm: asset_hub_polkadot_runtime::PolkadotXcm, Assets: asset_hub_polkadot_runtime::Assets, } @@ -195,44 +185,15 @@ decl_test_parachains! { on_init = { asset_hub_polkadot_runtime::AuraExt::on_initialize(1); }, - runtime= asset_hub_polkadot_runtime, - core = { - XcmpMessageHandler: asset_hub_polkadot_runtime::XcmpQueue, + runtime = asset_hub_polkadot_runtime, DmpMessageHandler: asset_hub_polkadot_runtime::DmpQueue, - LocationToAccountId: asset_hub_polkadot_runtime::xcm_config::LocationToAccountId, - System: asset_hub_polkadot_runtime::System, - Balances: asset_hub_polkadot_runtime::Balances, - ParachainSystem: asset_hub_polkadot_runtime::ParachainSystem, ParachainInfo: asset_hub_polkadot_runtime::ParachainInfo, }, - pallets_extra = { + pallets = { + Balances: asset_hub_polkadot_runtime::Balances, PolkadotXcm: asset_hub_polkadot_runtime::PolkadotXcm, Assets: asset_hub_polkadot_runtime::Assets, } }, - pub struct Peregrine { - genesis = peregrine::genesis(), - on_init = (), - runtime = { - Runtime: peregrine_runtime::Runtime, - RuntimeOrigin: peregrine_runtime::RuntimeOrigin, - RuntimeCall: peregrine_runtime::RuntimeCall, - RuntimeEvent: peregrine_runtime::RuntimeEvent, - XcmpMessageHandler: peregrine_runtime::XcmpQueue, - DmpMessageHandler: peregrine_runtime::DmpQueue, - LocationToAccountId: peregrine_runtime::xcm_config::LocationToAccountIdConverter, - System: peregrine_runtime::System, - Balances: peregrine_runtime::Balances, - ParachainSystem: peregrine_runtime::ParachainSystem, - ParachainInfo: peregrine_runtime::ParachainInfo, - }, - pallets_extra = { - Did: peregrine_runtime::Did, - Ctype: peregrine_runtime::Ctype, - Attestation: peregrine_runtime::Attestation, - Web3Names: peregrine_runtime::Web3Names, - DidLookup: peregrine_runtime::DidLookup, - PublicCredentials: peregrine_runtime::PublicCredentials, - } - } + } diff --git a/integration-tests/emulated/src/mock/relay_chains.rs b/integration-tests/emulated/src/mock/relay_chains.rs index 19e477c4a..98b709c1a 100644 --- a/integration-tests/emulated/src/mock/relay_chains.rs +++ b/integration-tests/emulated/src/mock/relay_chains.rs @@ -14,46 +14,38 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -use integration_tests_common::{polkadot, rococo}; -use xcm_emulator::{decl_test_relay_chains, RelayChain, TestExt, XcmHash}; +use integration_tests_common::constants::{polkadot, rococo}; +use xcm_emulator::{decl_test_relay_chains, DefaultMessageProcessor}; decl_test_relay_chains! { #[api_version(5)] pub struct Polkadot { genesis = polkadot::genesis(), on_init = (), - runtime = { - Runtime: polkadot_runtime::Runtime, - RuntimeOrigin: polkadot_runtime::RuntimeOrigin, - RuntimeCall: polkadot_runtime::RuntimeCall, - RuntimeEvent: polkadot_runtime::RuntimeEvent, - MessageQueue: polkadot_runtime::MessageQueue, - XcmConfig: polkadot_runtime::xcm_config::XcmConfig, + runtime = polkadot_runtime, + core = { + MessageProcessor: DefaultMessageProcessor, SovereignAccountOf: polkadot_runtime::xcm_config::SovereignAccountOf, - System: polkadot_runtime::System, - Balances: polkadot_runtime::Balances, }, - pallets_extra = { + pallets = { XcmPallet: polkadot_runtime::XcmPallet, + Balances: polkadot_runtime::Balances, + Hrmp: polkadot_runtime::Hrmp, } }, #[api_version(5)] pub struct Rococo { genesis = rococo::genesis(), on_init = (), - runtime = { - Runtime: rococo_runtime::Runtime, - RuntimeOrigin: rococo_runtime::RuntimeOrigin, - RuntimeCall: rococo_runtime::RuntimeCall, - RuntimeEvent: rococo_runtime::RuntimeEvent, - MessageQueue: rococo_runtime::MessageQueue, - XcmConfig: rococo_runtime::xcm_config::XcmConfig, + runtime = rococo_runtime, + core = { + MessageProcessor: DefaultMessageProcessor, SovereignAccountOf: rococo_runtime::xcm_config::LocationConverter, - System: rococo_runtime::System, - Balances: rococo_runtime::Balances, }, - pallets_extra = { + pallets = { XcmPallet: rococo_runtime::XcmPallet, + Sudo: rococo_runtime::Sudo, + Balances: rococo_runtime::Balances, } - } + }, } diff --git a/integration-tests/emulated/src/tests/peregrine/did_pallets/association.rs b/integration-tests/emulated/src/tests/peregrine/did_pallets/association.rs index 9e74ed937..fc64e3e3c 100644 --- a/integration-tests/emulated/src/tests/peregrine/did_pallets/association.rs +++ b/integration-tests/emulated/src/tests/peregrine/did_pallets/association.rs @@ -19,8 +19,8 @@ use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; -use xcm::{DoubleEncoded, VersionedXcm}; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, DoubleEncoded, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ @@ -37,9 +37,9 @@ use crate::{ fn get_xcm_message_add_association(origin_kind: OriginKind, withdraw_balance: Balance) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::DidLookup( + call: Box::new(::RuntimeCall::DidLookup( pallet_did_lookup::Call::associate_sender {}, )), }) @@ -53,7 +53,7 @@ fn get_xcm_message_add_association(origin_kind: OriginKind, withdraw_balance: Ba fn test_create_association_from_asset_hub_successful() { MockNetworkRococo::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); let init_balance = KILT * 10; @@ -73,7 +73,7 @@ fn test_create_association_from_asset_hub_successful() { Box::new(xcm_add_association_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -84,7 +84,7 @@ fn test_create_association_from_asset_hub_successful() { #[cfg(not(feature = "runtime-benchmarks"))] Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Peregrine, @@ -111,7 +111,7 @@ fn test_create_association_from_asset_hub_successful() { fn test_create_association_from_asset_hub_unsuccessful() { let origin_kind_list = vec![OriginKind::Native, OriginKind::Superuser, OriginKind::Xcm]; - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 100; let destination = get_sibling_destination_peregrine(); @@ -134,7 +134,7 @@ fn test_create_association_from_asset_hub_unsuccessful() { Box::new(xcm_add_association_msg.clone()) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -144,7 +144,7 @@ fn test_create_association_from_asset_hub_unsuccessful() { }); Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; let is_event_present = Peregrine::events().iter().any(|event| { matches!( diff --git a/integration-tests/emulated/src/tests/peregrine/did_pallets/attestation.rs b/integration-tests/emulated/src/tests/peregrine/did_pallets/attestation.rs index d0ba815a6..6da14bc62 100644 --- a/integration-tests/emulated/src/tests/peregrine/did_pallets/attestation.rs +++ b/integration-tests/emulated/src/tests/peregrine/did_pallets/attestation.rs @@ -20,8 +20,8 @@ use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; use sp_core::H256; -use xcm::VersionedXcm; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ @@ -43,15 +43,13 @@ fn get_xcm_message_attestation_creation( ) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call = ::RuntimeCall::Did(did::Call::dispatch_as { + let call = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::Attestation( - attestation::Call::add { - claim_hash, - ctype_hash, - authorization: None, - }, - )), + call: Box::new(::RuntimeCall::Attestation(attestation::Call::add { + claim_hash, + ctype_hash, + authorization: None, + })), }) .encode() .into(); @@ -63,7 +61,7 @@ fn get_xcm_message_attestation_creation( fn test_attestation_creation_from_asset_hub_successful() { MockNetworkRococo::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let ctype_hash_value = H256([0; 32]); let claim_hash_value = H256([1; 32]); @@ -95,7 +93,7 @@ fn test_attestation_creation_from_asset_hub_successful() { Box::new(xcm_issue_attestation_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -106,7 +104,7 @@ fn test_attestation_creation_from_asset_hub_successful() { #[cfg(not(feature = "runtime-benchmarks"))] Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Peregrine, @@ -129,7 +127,7 @@ fn test_attestation_creation_from_asset_hub_successful() { #[test] fn test_attestation_creation_from_asset_hub_unsuccessful() { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let destination = get_sibling_destination_peregrine(); let ctype_hash_value = H256([0; 32]); @@ -159,7 +157,7 @@ fn test_attestation_creation_from_asset_hub_unsuccessful() { Box::new(xcm_issue_attestation_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -169,7 +167,7 @@ fn test_attestation_creation_from_asset_hub_unsuccessful() { }); Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; let is_event_present = Peregrine::events().iter().any(|event| { matches!( diff --git a/integration-tests/emulated/src/tests/peregrine/did_pallets/ctype.rs b/integration-tests/emulated/src/tests/peregrine/did_pallets/ctype.rs index c9316406b..be1fc1157 100644 --- a/integration-tests/emulated/src/tests/peregrine/did_pallets/ctype.rs +++ b/integration-tests/emulated/src/tests/peregrine/did_pallets/ctype.rs @@ -19,8 +19,8 @@ use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; -use xcm::{DoubleEncoded, VersionedXcm}; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, DoubleEncoded, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ @@ -37,9 +37,9 @@ use crate::{ fn get_xcm_message_ctype_creation(origin_kind: OriginKind, withdraw_balance: Balance) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::Ctype(ctype::Call::add { + call: Box::new(::RuntimeCall::Ctype(ctype::Call::add { ctype: b"{\"foo\": \"bar\"}".to_vec(), })), }) @@ -53,7 +53,7 @@ fn get_xcm_message_ctype_creation(origin_kind: OriginKind, withdraw_balance: Bal fn test_ctype_creation_from_asset_hub_successful() { MockNetworkRococo::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 10; @@ -74,7 +74,7 @@ fn test_ctype_creation_from_asset_hub_successful() { Box::new(xcm_add_ctype_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -85,7 +85,7 @@ fn test_ctype_creation_from_asset_hub_successful() { #[cfg(not(feature = "runtime-benchmarks"))] Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Peregrine, @@ -109,7 +109,7 @@ fn test_ctype_creation_from_asset_hub_successful() { #[test] fn test_ctype_creation_from_asset_hub_unsuccessful() { - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 10; @@ -136,7 +136,7 @@ fn test_ctype_creation_from_asset_hub_unsuccessful() { Box::new(xcm_add_ctype_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -146,7 +146,7 @@ fn test_ctype_creation_from_asset_hub_unsuccessful() { }); Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; let is_event_present = Peregrine::events().iter().any(|event| { matches!( diff --git a/integration-tests/emulated/src/tests/peregrine/did_pallets/did.rs b/integration-tests/emulated/src/tests/peregrine/did_pallets/did.rs index c9c00f0c7..9ede7b30c 100644 --- a/integration-tests/emulated/src/tests/peregrine/did_pallets/did.rs +++ b/integration-tests/emulated/src/tests/peregrine/did_pallets/did.rs @@ -21,13 +21,13 @@ use frame_support::traits::fungible::hold::Inspect; use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; -use xcm::{DoubleEncoded, VersionedXcm}; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, DoubleEncoded, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ network::MockNetworkRococo, - para_chains::{AssetHubRococo, AssetHubRococoPallet, Peregrine}, + para_chains::{AssetHubRococo, AssetHubRococoPallet, Peregrine, PeregrinePallet}, relay_chains::Rococo, }, tests::peregrine::did_pallets::utils::{ @@ -38,7 +38,7 @@ use crate::{ fn get_xcm_message_create_did(origin_kind: OriginKind, withdraw_balance: Balance) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::create_from_account { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::create_from_account { authentication_key: DidVerificationKey::Account(asset_hub_sovereign_account), }) .encode() @@ -51,7 +51,7 @@ fn get_xcm_message_create_did(origin_kind: OriginKind, withdraw_balance: Balance fn test_did_creation_from_asset_hub_successful() { MockNetworkRococo::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 10; let withdraw_balance = init_balance / 2; @@ -72,7 +72,7 @@ fn test_did_creation_from_asset_hub_successful() { Box::new(xcm_create_did_msg.clone()) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -82,7 +82,7 @@ fn test_did_creation_from_asset_hub_successful() { }); Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Peregrine, vec![ @@ -94,7 +94,7 @@ fn test_did_creation_from_asset_hub_successful() { ] ); - let balance_on_hold = <::Balances as Inspect>::balance_on_hold( + let balance_on_hold = <::Balances as Inspect>::balance_on_hold( &peregrine_runtime::RuntimeHoldReason::from(did::HoldReason::Deposit), &asset_hub_sovereign_account, ); @@ -112,7 +112,7 @@ fn test_did_creation_from_asset_hub_successful() { #[test] fn test_did_creation_from_asset_hub_unsuccessful() { - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 100; let withdraw_balance = init_balance / 2; @@ -138,7 +138,7 @@ fn test_did_creation_from_asset_hub_unsuccessful() { Box::new(xcm_create_did_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -148,7 +148,7 @@ fn test_did_creation_from_asset_hub_unsuccessful() { }); Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; let is_create_event_present = Peregrine::events().iter().any(|event| { matches!( diff --git a/integration-tests/emulated/src/tests/peregrine/did_pallets/public_credentials.rs b/integration-tests/emulated/src/tests/peregrine/did_pallets/public_credentials.rs index 207978f92..e0fba6b64 100644 --- a/integration-tests/emulated/src/tests/peregrine/did_pallets/public_credentials.rs +++ b/integration-tests/emulated/src/tests/peregrine/did_pallets/public_credentials.rs @@ -20,8 +20,8 @@ use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; use sp_core::H256; -use xcm::{DoubleEncoded, VersionedXcm}; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, DoubleEncoded, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ @@ -50,9 +50,9 @@ fn get_xcm_message_add_public_credential( Default::default(), ); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::PublicCredentials( + call: Box::new(::RuntimeCall::PublicCredentials( public_credentials::Call::add { credential: Box::new(credential), }, @@ -68,7 +68,7 @@ fn get_xcm_message_add_public_credential( fn test_create_public_credential_from_asset_hub_successful() { MockNetworkRococo::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); let ctype_hash_value = H256([0; 32]); @@ -92,7 +92,7 @@ fn test_create_public_credential_from_asset_hub_successful() { Box::new(xcm_issue_public_credential_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -103,7 +103,7 @@ fn test_create_public_credential_from_asset_hub_successful() { #[cfg(not(feature = "runtime-benchmarks"))] Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Peregrine, @@ -129,7 +129,7 @@ fn test_create_public_credential_from_asset_hub_successful() { fn test_create_public_credential_from_asset_hub_unsuccessful() { let origin_kind_list = vec![OriginKind::Native, OriginKind::Superuser, OriginKind::Xcm]; - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 100; let ctype_hash_value = H256([0; 32]); @@ -155,7 +155,7 @@ fn test_create_public_credential_from_asset_hub_unsuccessful() { Box::new(xcm_issue_public_credential_msg.clone()) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -165,7 +165,7 @@ fn test_create_public_credential_from_asset_hub_unsuccessful() { }); Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; let is_event_present = Peregrine::events().iter().any(|event| { matches!( diff --git a/integration-tests/emulated/src/tests/peregrine/did_pallets/unallowed_did_call.rs b/integration-tests/emulated/src/tests/peregrine/did_pallets/unallowed_did_call.rs index 01947510f..89ba8ca87 100644 --- a/integration-tests/emulated/src/tests/peregrine/did_pallets/unallowed_did_call.rs +++ b/integration-tests/emulated/src/tests/peregrine/did_pallets/unallowed_did_call.rs @@ -19,8 +19,8 @@ use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; -use xcm::{DoubleEncoded, VersionedXcm}; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, DoubleEncoded, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ @@ -37,11 +37,11 @@ use crate::{ fn get_xcm_message_system_remark(origin_kind: OriginKind, withdraw_balance: Balance) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::System( - frame_system::Call::remark { remark: vec![] }, - )), + call: Box::new(::RuntimeCall::System(frame_system::Call::remark { + remark: vec![], + })), }) .encode() .into(); @@ -52,13 +52,13 @@ fn get_xcm_message_system_remark(origin_kind: OriginKind, withdraw_balance: Bala fn get_xcm_message_recursion(origin_kind: OriginKind, withdraw_balance: Balance) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account.clone(), - call: Box::new(::RuntimeCall::Did(did::Call::dispatch_as { + call: Box::new(::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::System( - frame_system::Call::remark { remark: vec![] }, - )), + call: Box::new(::RuntimeCall::System(frame_system::Call::remark { + remark: vec![], + })), })), }) .encode() @@ -76,7 +76,7 @@ fn test_not_allowed_did_call() { OriginKind::SovereignAccount, ]; - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 100; let destination = get_sibling_destination_peregrine(); @@ -99,7 +99,7 @@ fn test_not_allowed_did_call() { Box::new(xcm_invalid_did_msg.clone()) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -109,7 +109,7 @@ fn test_not_allowed_did_call() { }); Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; // All calls should have [NoPermission] error assert_expected_events!( @@ -138,7 +138,7 @@ fn test_recursion_did_call() { OriginKind::SovereignAccount, ]; - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 100; let destination = get_sibling_destination_peregrine(); @@ -161,7 +161,7 @@ fn test_recursion_did_call() { Box::new(xcm_invalid_did_msg.clone()) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -171,7 +171,7 @@ fn test_recursion_did_call() { }); Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; // All calls should have [NoPermission] error assert_expected_events!( diff --git a/integration-tests/emulated/src/tests/peregrine/did_pallets/utils.rs b/integration-tests/emulated/src/tests/peregrine/did_pallets/utils.rs index ef7fc7a3f..7d6fa0410 100644 --- a/integration-tests/emulated/src/tests/peregrine/did_pallets/utils.rs +++ b/integration-tests/emulated/src/tests/peregrine/did_pallets/utils.rs @@ -22,13 +22,16 @@ use did::{did_details::DidVerificationKey, pallet::Did}; use runtime_common::Balance; use sp_core::H256; use sp_runtime::AccountId32; -use xcm::{DoubleEncoded, VersionedMultiLocation, VersionedXcm}; -use xcm_emulator::{ - Instruction::{BuyExecution, Transact, WithdrawAsset}, - Junction, - Junctions::{self, Here}, - OriginKind, ParentThen, Weight, WeightLimit, Xcm, +use xcm::{ + v3::prelude::{ + Instruction::{BuyExecution, Transact, WithdrawAsset}, + Junction, + Junctions::{self, Here}, + OriginKind, ParentThen, Weight, WeightLimit, Xcm, + }, + DoubleEncoded, VersionedMultiLocation, VersionedXcm, }; +use xcm_emulator::Parachain; use crate::mock::para_chains::{peregrine, AssetHubRococo, Peregrine}; diff --git a/integration-tests/emulated/src/tests/peregrine/did_pallets/w3n.rs b/integration-tests/emulated/src/tests/peregrine/did_pallets/w3n.rs index c46912a2b..bd0849f5d 100644 --- a/integration-tests/emulated/src/tests/peregrine/did_pallets/w3n.rs +++ b/integration-tests/emulated/src/tests/peregrine/did_pallets/w3n.rs @@ -20,8 +20,8 @@ use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; use sp_runtime::BoundedVec; -use xcm::{DoubleEncoded, VersionedXcm}; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, DoubleEncoded, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ @@ -38,9 +38,9 @@ use crate::{ fn get_xcm_message_claim_w3n(origin_kind: OriginKind, withdraw_balance: Balance) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::Web3Names( + call: Box::new(::RuntimeCall::Web3Names( pallet_web3_names::Call::claim { name: BoundedVec::try_from(b"adelo".to_vec()).unwrap(), }, @@ -56,7 +56,7 @@ fn get_xcm_message_claim_w3n(origin_kind: OriginKind, withdraw_balance: Balance) fn test_claim_w3n_from_asset_hub_successful() { MockNetworkRococo::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); let init_balance = KILT * 10; @@ -76,7 +76,7 @@ fn test_claim_w3n_from_asset_hub_successful() { Box::new(xcm_claim_w3n_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -87,7 +87,7 @@ fn test_claim_w3n_from_asset_hub_successful() { #[cfg(not(feature = "runtime-benchmarks"))] Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Peregrine, @@ -113,7 +113,7 @@ fn test_claim_w3n_from_asset_hub_successful() { fn test_claim_w3n_from_asset_hub_unsuccessful() { let origin_kind_list = vec![OriginKind::Native, OriginKind::Superuser, OriginKind::Xcm]; - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 100; let destination = get_sibling_destination_peregrine(); @@ -136,7 +136,7 @@ fn test_claim_w3n_from_asset_hub_unsuccessful() { Box::new(xcm_claim_w3n_msg.clone()) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, vec![ @@ -146,7 +146,7 @@ fn test_claim_w3n_from_asset_hub_unsuccessful() { }); Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; let is_event_present = Peregrine::events().iter().any(|event| { matches!( diff --git a/integration-tests/emulated/src/tests/peregrine/reserve_transfers.rs b/integration-tests/emulated/src/tests/peregrine/reserve_transfers.rs index 176f5182a..cd9e620d4 100644 --- a/integration-tests/emulated/src/tests/peregrine/reserve_transfers.rs +++ b/integration-tests/emulated/src/tests/peregrine/reserve_transfers.rs @@ -16,22 +16,23 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org +use cumulus_pallet_xcmp_queue::Event as XcmpQueueEvent; use frame_support::{assert_ok, dispatch::RawOrigin, traits::fungible::Inspect}; -use integration_tests_common::{asset_hub_polkadot, polkadot::ED, ALICE}; +use integration_tests_common::constants::{ + accounts::ALICE, + asset_hub_polkadot::{self, ED}, +}; use peregrine_runtime::PolkadotXcm as PeregrineXcm; use runtime_common::AccountId; use sp_core::sr25519; use sp_runtime::traits::Zero; -use xcm::v3::WeightLimit; -use xcm_emulator::{ - assert_expected_events, cumulus_pallet_xcmp_queue::Event as XcmpQueueEvent, Here, Junction, Junctions, Parachain, - Parent, ParentThen, TestExt, X1, -}; +use xcm::v3::prelude::{Here, Junction, Junctions, Parent, ParentThen, WeightLimit, X1}; +use xcm_emulator::{assert_expected_events, Chain, Network, Parachain, TestExt}; use crate::{ mock::{ network::MockNetworkRococo, - para_chains::{AssetHubRococo, Peregrine}, + para_chains::{AssetHubRococo, Peregrine, PeregrinePallet}, relay_chains::Rococo, }, utils::get_account_id_from_seed, @@ -61,7 +62,7 @@ fn test_reserve_asset_transfer_from_regular_peregrine_account_to_relay() { WeightLimit::Unlimited, )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( Peregrine, @@ -84,12 +85,12 @@ fn test_reserve_asset_transfer_from_regular_peregrine_account_to_asset_hub() { let asset_hub_sovereign_account = Peregrine::sovereign_account_id_of(Peregrine::sibling_location_of(AssetHubRococo::para_id())); - let balance_to_transfer = 1000 * ED; + let balance_to_transfer = 10000 * ED; Peregrine::execute_with(|| { // the sovereign_account of AssetHub should have no coins. let balance_before_transfer: u128 = - <::Balances as Inspect>::balance(&asset_hub_sovereign_account); + >::balance(&asset_hub_sovereign_account); assert!(balance_before_transfer.is_zero()); @@ -109,7 +110,7 @@ fn test_reserve_asset_transfer_from_regular_peregrine_account_to_asset_hub() { WeightLimit::Unlimited, )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; // we expect to have the [Complete] event. assert_expected_events!( @@ -122,7 +123,7 @@ fn test_reserve_asset_transfer_from_regular_peregrine_account_to_asset_hub() { // we also expect that the sovereignAccount of AssetHub has some coins now let balance_after_transfer: u128 = - <::Balances as Inspect>::balance(&asset_hub_sovereign_account); + <::Balances as Inspect>::balance(&asset_hub_sovereign_account); assert_eq!(balance_after_transfer, balance_to_transfer); }); @@ -132,7 +133,7 @@ fn test_reserve_asset_transfer_from_regular_peregrine_account_to_asset_hub() { }); // Fails on AssetHub since peregrine is not a trusted registrar AssetHubRococo::execute_with(|| { - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, diff --git a/integration-tests/emulated/src/tests/peregrine/sudo.rs b/integration-tests/emulated/src/tests/peregrine/sudo.rs index 3f7762af5..e94c51b34 100644 --- a/integration-tests/emulated/src/tests/peregrine/sudo.rs +++ b/integration-tests/emulated/src/tests/peregrine/sudo.rs @@ -19,12 +19,15 @@ use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; -use xcm::{v3::WeightLimit, DoubleEncoded, VersionedMultiLocation, VersionedXcm}; -use xcm_emulator::{ - assert_expected_events, Here, - Instruction::{BuyExecution, Transact, UnpaidExecution, WithdrawAsset}, - Junction, Junctions, OriginKind, Parachain, ParentThen, RelayChain, TestExt, Weight, Xcm, +use xcm::{ + v3::prelude::{ + Here, + Instruction::{BuyExecution, Transact, UnpaidExecution, WithdrawAsset}, + Junction, Junctions, OriginKind, ParentThen, WeightLimit, Xcm, + }, + DoubleEncoded, VersionedMultiLocation, VersionedXcm, }; +use xcm_emulator::{assert_expected_events, Chain, Network, Parachain, RelayChain, TestExt, Weight}; use crate::mock::{ network::MockNetworkRococo, @@ -46,7 +49,7 @@ fn get_parachain_destination_from_relay_chain() -> VersionedMultiLocation { fn get_unpaid_xcm_message(origin_kind: OriginKind) -> VersionedXcm<()> { let code = vec![]; - let call: DoubleEncoded<()> = ::RuntimeCall::System(frame_system::Call::set_code { code }) + let call: DoubleEncoded<()> = ::RuntimeCall::System(frame_system::Call::set_code { code }) .encode() .into(); let weight_limit = WeightLimit::Unlimited; @@ -68,7 +71,7 @@ fn get_unpaid_xcm_message(origin_kind: OriginKind) -> VersionedXcm<()> { fn get_paid_xcm_message(init_balance: Balance, origin_kind: OriginKind) -> VersionedXcm<()> { let code = vec![]; - let call: DoubleEncoded<()> = ::RuntimeCall::System(frame_system::Call::set_code { code }) + let call: DoubleEncoded<()> = ::RuntimeCall::System(frame_system::Call::set_code { code }) .encode() .into(); let weight_limit = WeightLimit::Unlimited; @@ -91,7 +94,7 @@ fn get_paid_xcm_message(init_balance: Balance, origin_kind: OriginKind) -> Versi #[test] fn test_sudo_call_from_relay_chain_to_peregrine() { - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let parachain_destination = get_parachain_destination_from_relay_chain(); let origin_kind_list = vec![ @@ -114,7 +117,7 @@ fn test_sudo_call_from_relay_chain_to_peregrine() { Box::new(xcm) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( Rococo, @@ -125,7 +128,7 @@ fn test_sudo_call_from_relay_chain_to_peregrine() { }); Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Peregrine, @@ -149,7 +152,7 @@ fn test_sudo_call_from_relay_chain_to_peregrine() { fn test_sudo_call_from_asset_hub_to_peregrine() { let asset_hub_sovereign_account = get_sovereign_account_id_of_asset_hub(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let parachain_destination = get_parachain_destination_from_parachain(); let init_balance = KILT * 10; @@ -179,7 +182,7 @@ fn test_sudo_call_from_asset_hub_to_peregrine() { Box::new(xcm) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, @@ -191,7 +194,7 @@ fn test_sudo_call_from_asset_hub_to_peregrine() { // We expect to get the [NoPermission] error Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Peregrine, diff --git a/integration-tests/emulated/src/tests/peregrine/teleportation.rs b/integration-tests/emulated/src/tests/peregrine/teleportation.rs index f92b3a1ef..ad64cfbce 100644 --- a/integration-tests/emulated/src/tests/peregrine/teleportation.rs +++ b/integration-tests/emulated/src/tests/peregrine/teleportation.rs @@ -16,13 +16,16 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use frame_support::assert_noop; -use frame_support::dispatch::RawOrigin; -use integration_tests_common::{asset_hub_polkadot, polkadot::ED, ALICE, BOB}; +use frame_support::{assert_noop, dispatch::RawOrigin}; +use integration_tests_common::constants::{ + accounts::{ALICE, BOB}, + asset_hub_polkadot, + polkadot::ED, +}; use peregrine_runtime::PolkadotXcm as PeregrineXcm; use sp_core::sr25519; -use xcm::v3::WeightLimit; -use xcm_emulator::{Here, Junction, Junctions, ParentThen, TestExt, X1}; +use xcm::v3::prelude::{Here, Junction, Junctions, ParentThen, WeightLimit, X1}; +use xcm_emulator::{Chain, Network, TestExt}; use crate::{ mock::{ diff --git a/integration-tests/emulated/src/tests/peregrine/unpaid_execution.rs b/integration-tests/emulated/src/tests/peregrine/unpaid_execution.rs index d5f590d78..59b69b55a 100644 --- a/integration-tests/emulated/src/tests/peregrine/unpaid_execution.rs +++ b/integration-tests/emulated/src/tests/peregrine/unpaid_execution.rs @@ -23,16 +23,18 @@ use frame_support::{ }; use parity_scale_codec::Encode; use runtime_common::{constants::EXISTENTIAL_DEPOSIT, AccountId}; -use xcm::{v3::WeightLimit, DoubleEncoded, VersionedMultiLocation, VersionedXcm}; -use xcm_emulator::{ - assert_expected_events, - Instruction::{Transact, UnpaidExecution}, - Junction, Junctions, Outcome, Parachain, ParentThen, RelayChain, TestExt, Weight, Xcm, +use xcm::{ + v3::prelude::{ + Instruction::{Transact, UnpaidExecution}, + Junction, Junctions, OriginKind, Outcome, ParentThen, WeightLimit, Xcm, + }, + DoubleEncoded, VersionedMultiLocation, VersionedXcm, }; +use xcm_emulator::{assert_expected_events, Chain, Network, Parachain, TestExt, Weight}; use crate::mock::{ network::MockNetworkRococo, - para_chains::{peregrine, AssetHubRococo, AssetHubRococoPallet, Peregrine}, + para_chains::{peregrine, AssetHubRococo, AssetHubRococoPallet, Peregrine, PeregrinePallet}, relay_chains::{Rococo, RococoPallet}, }; @@ -40,7 +42,7 @@ use crate::mock::{ fn test_unpaid_execution_from_asset_hub_to_peregrine() { MockNetworkRococo::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let parachain_destination: VersionedMultiLocation = ParentThen(Junctions::X1(Junction::Parachain(peregrine::PARA_ID))).into(); @@ -60,7 +62,7 @@ fn test_unpaid_execution_from_asset_hub_to_peregrine() { Box::new(xcm) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubRococo, @@ -71,7 +73,7 @@ fn test_unpaid_execution_from_asset_hub_to_peregrine() { }); Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Peregrine, vec![ @@ -93,7 +95,7 @@ fn test_unpaid_execution_from_asset_hub_to_peregrine() { fn test_unpaid_execution_from_rococo_to_peregrine() { MockNetworkRococo::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let parachain_destination: VersionedMultiLocation = Junctions::X1(Junction::Parachain(peregrine::PARA_ID)).into(); let init_balance = ::BaseDeposit::get() + ::Fee::get() @@ -104,7 +106,7 @@ fn test_unpaid_execution_from_rococo_to_peregrine() { let polkadot_sovereign_account = Peregrine::sovereign_account_id_of(Peregrine::parent_location()); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::create_from_account { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::create_from_account { authentication_key: DidVerificationKey::Account(polkadot_sovereign_account.clone()), }) .encode() @@ -116,7 +118,7 @@ fn test_unpaid_execution_from_rococo_to_peregrine() { check_origin, }, Transact { - origin_kind: xcm_emulator::OriginKind::SovereignAccount, + origin_kind: OriginKind::SovereignAccount, require_weight_at_most: Weight::from_parts(10_000_600_000_000, 200_000_000_000), call, }, @@ -135,7 +137,7 @@ fn test_unpaid_execution_from_rococo_to_peregrine() { Box::new(xcm) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( Rococo, @@ -146,7 +148,7 @@ fn test_unpaid_execution_from_rococo_to_peregrine() { }); Peregrine::execute_with(|| { - type PeregrineRuntimeEvent = ::RuntimeEvent; + type PeregrineRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Peregrine, vec![ @@ -163,7 +165,7 @@ fn test_unpaid_execution_from_rococo_to_peregrine() { // Since the user have not paid any tx fees, we expect that the free balance is the ED let balance_after_transfer: u128 = - <::Balances as Inspect>::balance(&polkadot_sovereign_account); + <::Balances as Inspect>::balance(&polkadot_sovereign_account); assert_eq!(balance_after_transfer, EXISTENTIAL_DEPOSIT); }); diff --git a/integration-tests/emulated/src/tests/spiritnet/did_pallets/association.rs b/integration-tests/emulated/src/tests/spiritnet/did_pallets/association.rs index 706355a5f..491ef61d4 100644 --- a/integration-tests/emulated/src/tests/spiritnet/did_pallets/association.rs +++ b/integration-tests/emulated/src/tests/spiritnet/did_pallets/association.rs @@ -19,8 +19,8 @@ use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; -use xcm::{DoubleEncoded, VersionedXcm}; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, DoubleEncoded, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ @@ -37,9 +37,9 @@ use crate::{ fn get_xcm_message_add_association(origin_kind: OriginKind, withdraw_balance: Balance) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::DidLookup( + call: Box::new(::RuntimeCall::DidLookup( pallet_did_lookup::Call::associate_sender {}, )), }) @@ -53,7 +53,7 @@ fn get_xcm_message_add_association(origin_kind: OriginKind, withdraw_balance: Ba fn test_create_association_from_asset_hub_successful() { MockNetworkPolkadot::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); let init_balance = KILT * 10; @@ -73,7 +73,7 @@ fn test_create_association_from_asset_hub_successful() { Box::new(xcm_add_association_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -84,7 +84,7 @@ fn test_create_association_from_asset_hub_successful() { #[cfg(not(feature = "runtime-benchmarks"))] Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Spiritnet, @@ -111,7 +111,7 @@ fn test_create_association_from_asset_hub_successful() { fn test_create_association_from_asset_hub_unsuccessful() { let origin_kind_list = vec![OriginKind::Native, OriginKind::Superuser, OriginKind::Xcm]; - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 100; let destination = get_sibling_destination_spiritnet(); @@ -134,7 +134,7 @@ fn test_create_association_from_asset_hub_unsuccessful() { Box::new(xcm_add_association_msg.clone()) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -144,7 +144,7 @@ fn test_create_association_from_asset_hub_unsuccessful() { }); Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; let is_event_present = Spiritnet::events().iter().any(|event| { matches!( diff --git a/integration-tests/emulated/src/tests/spiritnet/did_pallets/attestation.rs b/integration-tests/emulated/src/tests/spiritnet/did_pallets/attestation.rs index 30c27c194..33183aaa4 100644 --- a/integration-tests/emulated/src/tests/spiritnet/did_pallets/attestation.rs +++ b/integration-tests/emulated/src/tests/spiritnet/did_pallets/attestation.rs @@ -20,8 +20,8 @@ use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; use sp_core::H256; -use xcm::VersionedXcm; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ @@ -43,15 +43,13 @@ fn get_xcm_message_attestation_creation( ) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call = ::RuntimeCall::Did(did::Call::dispatch_as { + let call = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::Attestation( - attestation::Call::add { - claim_hash, - ctype_hash, - authorization: None, - }, - )), + call: Box::new(::RuntimeCall::Attestation(attestation::Call::add { + claim_hash, + ctype_hash, + authorization: None, + })), }) .encode() .into(); @@ -63,7 +61,7 @@ fn get_xcm_message_attestation_creation( fn test_attestation_creation_from_asset_hub_successful() { MockNetworkPolkadot::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let ctype_hash_value = H256([0; 32]); let claim_hash_value = H256([1; 32]); @@ -95,7 +93,7 @@ fn test_attestation_creation_from_asset_hub_successful() { Box::new(xcm_issue_attestation_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -106,7 +104,7 @@ fn test_attestation_creation_from_asset_hub_successful() { #[cfg(not(feature = "runtime-benchmarks"))] Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Spiritnet, @@ -129,7 +127,7 @@ fn test_attestation_creation_from_asset_hub_successful() { #[test] fn test_attestation_creation_from_asset_hub_unsuccessful() { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let destination = get_sibling_destination_spiritnet(); let ctype_hash_value = H256([0; 32]); @@ -159,7 +157,7 @@ fn test_attestation_creation_from_asset_hub_unsuccessful() { Box::new(xcm_issue_attestation_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -169,7 +167,7 @@ fn test_attestation_creation_from_asset_hub_unsuccessful() { }); Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; let is_event_present = Spiritnet::events().iter().any(|event| { matches!( diff --git a/integration-tests/emulated/src/tests/spiritnet/did_pallets/ctype.rs b/integration-tests/emulated/src/tests/spiritnet/did_pallets/ctype.rs index 5b1f33437..f0680cdfa 100644 --- a/integration-tests/emulated/src/tests/spiritnet/did_pallets/ctype.rs +++ b/integration-tests/emulated/src/tests/spiritnet/did_pallets/ctype.rs @@ -19,8 +19,8 @@ use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; -use xcm::{DoubleEncoded, VersionedXcm}; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, DoubleEncoded, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ @@ -37,9 +37,9 @@ use crate::{ fn get_xcm_message_ctype_creation(origin_kind: OriginKind, withdraw_balance: Balance) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::Ctype(ctype::Call::add { + call: Box::new(::RuntimeCall::Ctype(ctype::Call::add { ctype: b"{\"foo\": \"bar\"}".to_vec(), })), }) @@ -53,7 +53,7 @@ fn get_xcm_message_ctype_creation(origin_kind: OriginKind, withdraw_balance: Bal fn test_ctype_creation_from_asset_hub_successful() { MockNetworkPolkadot::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 10; @@ -74,7 +74,7 @@ fn test_ctype_creation_from_asset_hub_successful() { Box::new(xcm_create_ctype_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -85,7 +85,7 @@ fn test_ctype_creation_from_asset_hub_successful() { #[cfg(not(feature = "runtime-benchmarks"))] Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Spiritnet, @@ -109,7 +109,7 @@ fn test_ctype_creation_from_asset_hub_successful() { #[test] fn test_ctype_creation_from_asset_hub_unsuccessful() { - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 10; @@ -136,7 +136,7 @@ fn test_ctype_creation_from_asset_hub_unsuccessful() { Box::new(xcm_create_ctype_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -146,7 +146,7 @@ fn test_ctype_creation_from_asset_hub_unsuccessful() { }); Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; let is_event_present = Spiritnet::events().iter().any(|event| { matches!( diff --git a/integration-tests/emulated/src/tests/spiritnet/did_pallets/did.rs b/integration-tests/emulated/src/tests/spiritnet/did_pallets/did.rs index a38c6eeb7..cd0026d9e 100644 --- a/integration-tests/emulated/src/tests/spiritnet/did_pallets/did.rs +++ b/integration-tests/emulated/src/tests/spiritnet/did_pallets/did.rs @@ -21,13 +21,13 @@ use frame_support::traits::fungible::hold::Inspect; use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; -use xcm::{DoubleEncoded, VersionedXcm}; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, DoubleEncoded, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ network::MockNetworkPolkadot, - para_chains::{AssetHubPolkadot, AssetHubPolkadotPallet, Spiritnet}, + para_chains::{AssetHubPolkadot, AssetHubPolkadotPallet, Spiritnet, SpiritnetPallet}, relay_chains::Polkadot, }, tests::spiritnet::did_pallets::utils::{ @@ -38,7 +38,7 @@ use crate::{ fn get_xcm_message_create_did(origin_kind: OriginKind, withdraw_balance: Balance) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::create_from_account { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::create_from_account { authentication_key: DidVerificationKey::Account(asset_hub_sovereign_account), }) .encode() @@ -51,7 +51,7 @@ fn get_xcm_message_create_did(origin_kind: OriginKind, withdraw_balance: Balance fn test_did_creation_from_asset_hub_successful() { MockNetworkPolkadot::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 10; let withdraw_balance = init_balance / 2; @@ -72,7 +72,7 @@ fn test_did_creation_from_asset_hub_successful() { Box::new(xcm_create_did_msg.clone()) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -82,7 +82,7 @@ fn test_did_creation_from_asset_hub_successful() { }); Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Spiritnet, vec![ @@ -94,7 +94,7 @@ fn test_did_creation_from_asset_hub_successful() { ] ); - let balance_on_hold = <::Balances as Inspect>::balance_on_hold( + let balance_on_hold = <::Balances as Inspect>::balance_on_hold( &spiritnet_runtime::RuntimeHoldReason::from(did::HoldReason::Deposit), &asset_hub_sovereign_account, ); @@ -112,7 +112,7 @@ fn test_did_creation_from_asset_hub_successful() { #[test] fn test_did_creation_from_asset_hub_unsuccessful() { - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 100; let withdraw_balance = init_balance / 2; @@ -138,7 +138,7 @@ fn test_did_creation_from_asset_hub_unsuccessful() { Box::new(xcm_create_did_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -148,7 +148,7 @@ fn test_did_creation_from_asset_hub_unsuccessful() { }); Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; let is_create_event_present = Spiritnet::events().iter().any(|event| { matches!( diff --git a/integration-tests/emulated/src/tests/spiritnet/did_pallets/public_credentials.rs b/integration-tests/emulated/src/tests/spiritnet/did_pallets/public_credentials.rs index d0e4aadcf..bff46f30e 100644 --- a/integration-tests/emulated/src/tests/spiritnet/did_pallets/public_credentials.rs +++ b/integration-tests/emulated/src/tests/spiritnet/did_pallets/public_credentials.rs @@ -20,8 +20,8 @@ use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; use sp_core::H256; -use xcm::{DoubleEncoded, VersionedXcm}; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, DoubleEncoded, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ @@ -50,9 +50,9 @@ fn get_xcm_message_add_public_credential( Default::default(), ); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::PublicCredentials( + call: Box::new(::RuntimeCall::PublicCredentials( public_credentials::Call::add { credential: Box::new(credential), }, @@ -68,7 +68,7 @@ fn get_xcm_message_add_public_credential( fn test_create_public_credential_from_asset_hub_successful() { MockNetworkPolkadot::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); let ctype_hash_value = H256([0; 32]); @@ -92,7 +92,7 @@ fn test_create_public_credential_from_asset_hub_successful() { Box::new(xcm_issue_public_credential_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -103,7 +103,7 @@ fn test_create_public_credential_from_asset_hub_successful() { #[cfg(not(feature = "runtime-benchmarks"))] Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Spiritnet, @@ -129,7 +129,7 @@ fn test_create_public_credential_from_asset_hub_successful() { fn test_create_public_credential_from_asset_hub_unsuccessful() { let origin_kind_list = vec![OriginKind::Native, OriginKind::Superuser, OriginKind::Xcm]; - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 100; let ctype_hash_value = H256([0; 32]); @@ -155,7 +155,7 @@ fn test_create_public_credential_from_asset_hub_unsuccessful() { Box::new(xcm_issue_public_credential_msg.clone()) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -165,7 +165,7 @@ fn test_create_public_credential_from_asset_hub_unsuccessful() { }); Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; let is_event_present = Spiritnet::events().iter().any(|event| { matches!( diff --git a/integration-tests/emulated/src/tests/spiritnet/did_pallets/unallowed_did_call.rs b/integration-tests/emulated/src/tests/spiritnet/did_pallets/unallowed_did_call.rs index 18df0efa6..98da08b9a 100644 --- a/integration-tests/emulated/src/tests/spiritnet/did_pallets/unallowed_did_call.rs +++ b/integration-tests/emulated/src/tests/spiritnet/did_pallets/unallowed_did_call.rs @@ -19,8 +19,8 @@ use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; -use xcm::{DoubleEncoded, VersionedXcm}; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, DoubleEncoded, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ @@ -37,11 +37,11 @@ use crate::{ fn get_xcm_message_system_remark(origin_kind: OriginKind, withdraw_balance: Balance) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::System( - frame_system::Call::remark { remark: vec![] }, - )), + call: Box::new(::RuntimeCall::System(frame_system::Call::remark { + remark: vec![], + })), }) .encode() .into(); @@ -52,13 +52,13 @@ fn get_xcm_message_system_remark(origin_kind: OriginKind, withdraw_balance: Bala fn get_xcm_message_recursion(origin_kind: OriginKind, withdraw_balance: Balance) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account.clone(), - call: Box::new(::RuntimeCall::Did(did::Call::dispatch_as { + call: Box::new(::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::System( - frame_system::Call::remark { remark: vec![] }, - )), + call: Box::new(::RuntimeCall::System(frame_system::Call::remark { + remark: vec![], + })), })), }) .encode() @@ -76,7 +76,7 @@ fn test_not_allowed_did_call() { OriginKind::SovereignAccount, ]; - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 100; let destination = get_sibling_destination_spiritnet(); @@ -99,7 +99,7 @@ fn test_not_allowed_did_call() { Box::new(xcm_invalid_did_msg.clone()) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -109,7 +109,7 @@ fn test_not_allowed_did_call() { }); Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; // All calls should have [NoPermission] error assert_expected_events!( @@ -138,7 +138,7 @@ fn test_recursion_did_call() { OriginKind::SovereignAccount, ]; - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 100; let destination = get_sibling_destination_spiritnet(); @@ -161,7 +161,7 @@ fn test_recursion_did_call() { Box::new(xcm_invalid_did_msg.clone()) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -171,7 +171,7 @@ fn test_recursion_did_call() { }); Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; // All calls should have [NoPermission] error assert_expected_events!( diff --git a/integration-tests/emulated/src/tests/spiritnet/did_pallets/utils.rs b/integration-tests/emulated/src/tests/spiritnet/did_pallets/utils.rs index a99be9d17..733d45891 100644 --- a/integration-tests/emulated/src/tests/spiritnet/did_pallets/utils.rs +++ b/integration-tests/emulated/src/tests/spiritnet/did_pallets/utils.rs @@ -22,13 +22,16 @@ use did::{did_details::DidVerificationKey, pallet::Did}; use runtime_common::{AccountId, Balance}; use sp_core::H256; use sp_runtime::AccountId32; -use xcm::{DoubleEncoded, VersionedMultiLocation, VersionedXcm}; -use xcm_emulator::{ - Instruction::{BuyExecution, Transact, WithdrawAsset}, - Junction, - Junctions::{self, Here}, - OriginKind, ParentThen, Weight, WeightLimit, Xcm, +use xcm::{ + v3::prelude::{ + Instruction::{BuyExecution, Transact, WithdrawAsset}, + Junction, + Junctions::{self, Here}, + OriginKind, ParentThen, Weight, WeightLimit, Xcm, + }, + DoubleEncoded, VersionedMultiLocation, VersionedXcm, }; +use xcm_emulator::Parachain; use crate::mock::para_chains::{spiritnet, AssetHubPolkadot, Spiritnet}; diff --git a/integration-tests/emulated/src/tests/spiritnet/did_pallets/w3n.rs b/integration-tests/emulated/src/tests/spiritnet/did_pallets/w3n.rs index 3deca2575..2d5c78850 100644 --- a/integration-tests/emulated/src/tests/spiritnet/did_pallets/w3n.rs +++ b/integration-tests/emulated/src/tests/spiritnet/did_pallets/w3n.rs @@ -20,8 +20,8 @@ use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; use sp_runtime::BoundedVec; -use xcm::{DoubleEncoded, VersionedXcm}; -use xcm_emulator::{assert_expected_events, OriginKind, Parachain, TestExt}; +use xcm::{v3::prelude::OriginKind, DoubleEncoded, VersionedXcm}; +use xcm_emulator::{assert_expected_events, Chain, Network, TestExt}; use crate::{ mock::{ @@ -38,9 +38,9 @@ use crate::{ fn get_xcm_message_claim_w3n(origin_kind: OriginKind, withdraw_balance: Balance) -> VersionedXcm<()> { let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::dispatch_as { did_identifier: asset_hub_sovereign_account, - call: Box::new(::RuntimeCall::Web3Names( + call: Box::new(::RuntimeCall::Web3Names( pallet_web3_names::Call::claim { name: BoundedVec::try_from(b"adelo".to_vec()).unwrap(), }, @@ -56,7 +56,7 @@ fn get_xcm_message_claim_w3n(origin_kind: OriginKind, withdraw_balance: Balance) fn test_claim_w3n_from_asset_hub_successful() { MockNetworkPolkadot::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let asset_hub_sovereign_account = get_asset_hub_sovereign_account(); let init_balance = KILT * 10; @@ -76,7 +76,7 @@ fn test_claim_w3n_from_asset_hub_successful() { Box::new(xcm_claim_w3n_msg) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -87,7 +87,7 @@ fn test_claim_w3n_from_asset_hub_successful() { #[cfg(not(feature = "runtime-benchmarks"))] Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Spiritnet, @@ -113,7 +113,7 @@ fn test_claim_w3n_from_asset_hub_successful() { fn test_claim_w3n_from_asset_hub_unsuccessful() { let origin_kind_list = vec![OriginKind::Native, OriginKind::Superuser, OriginKind::Xcm]; - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let init_balance = KILT * 100; let destination = get_sibling_destination_spiritnet(); @@ -136,7 +136,7 @@ fn test_claim_w3n_from_asset_hub_unsuccessful() { Box::new(xcm_claim_w3n_msg.clone()) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, vec![ @@ -146,7 +146,7 @@ fn test_claim_w3n_from_asset_hub_unsuccessful() { }); Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; let is_event_present = Spiritnet::events().iter().any(|event| { matches!( diff --git a/integration-tests/emulated/src/tests/spiritnet/reserve_transfers.rs b/integration-tests/emulated/src/tests/spiritnet/reserve_transfers.rs index 80cc35855..7bc33bde2 100644 --- a/integration-tests/emulated/src/tests/spiritnet/reserve_transfers.rs +++ b/integration-tests/emulated/src/tests/spiritnet/reserve_transfers.rs @@ -16,22 +16,24 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org +use cumulus_pallet_xcmp_queue::Event as XcmpQueueEvent; use frame_support::{assert_ok, dispatch::RawOrigin, traits::fungible::Inspect}; -use integration_tests_common::{asset_hub_polkadot, polkadot::ED, ALICE}; +use integration_tests_common::constants::{accounts::ALICE, asset_hub_polkadot, polkadot::ED}; use runtime_common::AccountId; use sp_core::sr25519; use sp_runtime::traits::Zero; use spiritnet_runtime::PolkadotXcm as SpiritnetXcm; -use xcm::v3::WeightLimit; -use xcm_emulator::{ - assert_expected_events, cumulus_pallet_xcmp_queue::Event as XcmpQueueEvent, Here, Junction, Junctions, Parachain, - Parent, ParentThen, TestExt, X1, +use xcm::v3::{ + prelude::{Here, Junction, Junctions, Parent, ParentThen, X1}, + WeightLimit, }; +use xcm_emulator::{assert_expected_events, Chain, Network, Parachain, TestExt}; + use crate::{ mock::{ network::MockNetworkPolkadot, - para_chains::{AssetHubPolkadot, Spiritnet}, + para_chains::{AssetHubPolkadot, Spiritnet, SpiritnetPallet}, relay_chains::Polkadot, }, utils::get_account_id_from_seed, @@ -62,7 +64,7 @@ fn test_reserve_asset_transfer_from_regular_spiritnet_account_to_relay() { WeightLimit::Unlimited, )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; // The msg should be blocked by the barrier assert_expected_events!( @@ -93,8 +95,8 @@ fn test_reserve_asset_transfer_from_regular_spiritnet_account_to_asset_hub() { Spiritnet::execute_with(|| { // the sovereign_account of AssetHub should have no coins. - let balance_before_transfer: u128 = - <::Balances as Inspect>::balance(&asset_hub_sovereign_account); + let balance_before_transfer = + <::Balances as Inspect>::balance(&asset_hub_sovereign_account); assert!(balance_before_transfer.is_zero()); @@ -114,7 +116,7 @@ fn test_reserve_asset_transfer_from_regular_spiritnet_account_to_asset_hub() { WeightLimit::Unlimited, )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; // we expect to have the [Complete] event. assert_expected_events!( @@ -126,8 +128,8 @@ fn test_reserve_asset_transfer_from_regular_spiritnet_account_to_asset_hub() { ); // we also expect that the sovereignAccount of AssetHub has some coins now - let balance_after_transfer: u128 = - <::Balances as Inspect>::balance(&asset_hub_sovereign_account); + let balance_after_transfer = + <::Balances as Inspect>::balance(&asset_hub_sovereign_account); assert_eq!(balance_after_transfer, balance_to_transfer); }); @@ -139,7 +141,7 @@ fn test_reserve_asset_transfer_from_regular_spiritnet_account_to_asset_hub() { // Fails on AssetHub since spiritnet is not a trusted registrar AssetHubPolkadot::execute_with(|| { - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, diff --git a/integration-tests/emulated/src/tests/spiritnet/sudo.rs b/integration-tests/emulated/src/tests/spiritnet/sudo.rs index 6fef6a9ec..bac362944 100644 --- a/integration-tests/emulated/src/tests/spiritnet/sudo.rs +++ b/integration-tests/emulated/src/tests/spiritnet/sudo.rs @@ -20,12 +20,18 @@ use asset_hub_polkadot_runtime::System as AssetHubSystem; use frame_support::{assert_ok, traits::fungible::Mutate}; use parity_scale_codec::Encode; use runtime_common::{constants::KILT, AccountId, Balance}; -use xcm::{v3::WeightLimit, DoubleEncoded, VersionedMultiLocation, VersionedXcm}; -use xcm_emulator::{ - assert_expected_events, Here, - Instruction::{BuyExecution, Transact, UnpaidExecution, WithdrawAsset}, - Junction, Junctions, OriginKind, Parachain, ParentThen, RelayChain, TestExt, Weight, Xcm, +use xcm::{ + v3::{ + prelude::{ + Here, + Instruction::{BuyExecution, Transact, UnpaidExecution, WithdrawAsset}, + Junction, Junctions, OriginKind, ParentThen, Xcm, + }, + WeightLimit, + }, + DoubleEncoded, VersionedMultiLocation, VersionedXcm, }; +use xcm_emulator::{assert_expected_events, Chain, Network, Parachain, RelayChain, TestExt, Weight}; use crate::mock::{ network::MockNetworkPolkadot, @@ -47,7 +53,7 @@ fn get_parachain_destination_from_relay_chain() -> VersionedMultiLocation { fn get_unpaid_xcm_message(origin_kind: OriginKind) -> VersionedXcm<()> { let code = vec![]; - let call: DoubleEncoded<()> = ::RuntimeCall::System(frame_system::Call::set_code { code }) + let call: DoubleEncoded<()> = ::RuntimeCall::System(frame_system::Call::set_code { code }) .encode() .into(); let weight_limit = WeightLimit::Unlimited; @@ -69,7 +75,7 @@ fn get_unpaid_xcm_message(origin_kind: OriginKind) -> VersionedXcm<()> { fn get_paid_xcm_message(init_balance: Balance, origin_kind: OriginKind) -> VersionedXcm<()> { let code = vec![]; - let call: DoubleEncoded<()> = ::RuntimeCall::System(frame_system::Call::set_code { code }) + let call: DoubleEncoded<()> = ::RuntimeCall::System(frame_system::Call::set_code { code }) .encode() .into(); let weight_limit = WeightLimit::Unlimited; @@ -93,7 +99,7 @@ fn get_paid_xcm_message(init_balance: Balance, origin_kind: OriginKind) -> Versi /// Sudo calls from other chains should not be whitelisted and therefore fail. #[test] fn test_sudo_call_from_relay_chain_to_spiritnet() { - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let parachain_destination = get_parachain_destination_from_relay_chain(); let origin_kind_list = vec![ @@ -115,7 +121,7 @@ fn test_sudo_call_from_relay_chain_to_spiritnet() { Box::new(xcm.clone()), )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( Polkadot, @@ -126,7 +132,7 @@ fn test_sudo_call_from_relay_chain_to_spiritnet() { }); Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Spiritnet, @@ -151,7 +157,7 @@ fn test_sudo_call_from_relay_chain_to_spiritnet() { fn test_sudo_call_from_asset_hub_to_spiritnet() { let asset_hub_sovereign_account = get_sovereign_account_id_of_asset_hub(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let parachain_destination = get_parachain_destination_from_parachain(); let init_balance = KILT * 10; @@ -179,7 +185,7 @@ fn test_sudo_call_from_asset_hub_to_spiritnet() { Box::new(xcm.clone()) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, @@ -190,7 +196,7 @@ fn test_sudo_call_from_asset_hub_to_spiritnet() { }); Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Spiritnet, diff --git a/integration-tests/emulated/src/tests/spiritnet/teleportation.rs b/integration-tests/emulated/src/tests/spiritnet/teleportation.rs index f1776c1ed..6bd38161e 100644 --- a/integration-tests/emulated/src/tests/spiritnet/teleportation.rs +++ b/integration-tests/emulated/src/tests/spiritnet/teleportation.rs @@ -16,13 +16,17 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use frame_support::assert_noop; -use frame_support::dispatch::RawOrigin; -use integration_tests_common::{asset_hub_polkadot, polkadot::ED, ALICE, BOB}; +use frame_support::{assert_noop, dispatch::RawOrigin}; +use integration_tests_common::constants::{ + accounts::{ALICE, BOB}, + asset_hub_polkadot, + polkadot::ED, +}; use sp_core::sr25519; use spiritnet_runtime::PolkadotXcm as SpiritnetXcm; +use xcm::v3::prelude::{Here, Junction, Junctions, ParentThen, X1}; use xcm::v3::WeightLimit; -use xcm_emulator::{Here, Junction, Junctions, ParentThen, TestExt, X1}; +use xcm_emulator::{Chain, Network, TestExt}; use crate::{ mock::{ diff --git a/integration-tests/emulated/src/tests/spiritnet/unpaid_execution.rs b/integration-tests/emulated/src/tests/spiritnet/unpaid_execution.rs index cefa82b8e..6dab86ebd 100644 --- a/integration-tests/emulated/src/tests/spiritnet/unpaid_execution.rs +++ b/integration-tests/emulated/src/tests/spiritnet/unpaid_execution.rs @@ -20,19 +20,22 @@ use did::did_details::DidVerificationKey; use frame_support::{ assert_ok, traits::fungible::{Inspect, Mutate}, + weights::Weight, }; use parity_scale_codec::Encode; use runtime_common::{constants::EXISTENTIAL_DEPOSIT, AccountId}; -use xcm::{v3::WeightLimit, DoubleEncoded, VersionedMultiLocation, VersionedXcm}; -use xcm_emulator::{ - assert_expected_events, - Instruction::{Transact, UnpaidExecution}, - Junction, Junctions, Outcome, Parachain, ParentThen, RelayChain, TestExt, Weight, Xcm, +use xcm::{ + v3::{ + prelude::{OriginKind, Transact, UnpaidExecution}, + Junction, Junctions, Outcome, ParentThen, WeightLimit, Xcm, + }, + DoubleEncoded, VersionedMultiLocation, VersionedXcm, }; +use xcm_emulator::{assert_expected_events, Chain, Network, Parachain, TestExt}; use crate::mock::{ network::MockNetworkPolkadot, - para_chains::{spiritnet, AssetHubPolkadot, AssetHubPolkadotPallet, Spiritnet}, + para_chains::{spiritnet, AssetHubPolkadot, AssetHubPolkadotPallet, Spiritnet, SpiritnetPallet}, relay_chains::{Polkadot, PolkadotPallet}, }; @@ -40,7 +43,7 @@ use crate::mock::{ fn test_unpaid_execution_to_spiritnet() { MockNetworkPolkadot::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let parachain_destination: VersionedMultiLocation = ParentThen(Junctions::X1(Junction::Parachain(spiritnet::PARA_ID))).into(); @@ -60,7 +63,7 @@ fn test_unpaid_execution_to_spiritnet() { Box::new(xcm) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( AssetHubPolkadot, @@ -72,7 +75,7 @@ fn test_unpaid_execution_to_spiritnet() { // Execution should be blocked by barrier Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Spiritnet, vec![ @@ -94,7 +97,7 @@ fn test_unpaid_execution_to_spiritnet() { fn test_unpaid_execution_from_polkadot_to_spiritnet() { MockNetworkPolkadot::reset(); - let sudo_origin = ::RuntimeOrigin::root(); + let sudo_origin = ::RuntimeOrigin::root(); let parachain_destination: VersionedMultiLocation = Junctions::X1(Junction::Parachain(spiritnet::PARA_ID)).into(); let init_balance = ::BaseDeposit::get() + ::Fee::get() @@ -105,7 +108,7 @@ fn test_unpaid_execution_from_polkadot_to_spiritnet() { let polkadot_sovereign_account = Spiritnet::sovereign_account_id_of(Spiritnet::parent_location()); - let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::create_from_account { + let call: DoubleEncoded<()> = ::RuntimeCall::Did(did::Call::create_from_account { authentication_key: DidVerificationKey::Account(polkadot_sovereign_account.clone()), }) .encode() @@ -117,15 +120,19 @@ fn test_unpaid_execution_from_polkadot_to_spiritnet() { check_origin, }, Transact { - origin_kind: xcm_emulator::OriginKind::SovereignAccount, + origin_kind: OriginKind::SovereignAccount, require_weight_at_most: Weight::from_parts(10_000_600_000_000, 200_000_000_000), call, }, ])); Spiritnet::execute_with(|| { - // DID creation takes a deposit of 2 KILT coins + Fees. We have to give them to the sovereign account. Otherwise, the extrinsic will fail. - >::set_balance(&polkadot_sovereign_account, init_balance); + // DID creation takes a deposit of 2 KILT coins + Fees. We have to give them to + // the sovereign account. Otherwise, the extrinsic will fail. + <::Balances as Mutate>::set_balance( + &polkadot_sovereign_account, + init_balance, + ); }); // Submit XCM msg from relaychain @@ -136,7 +143,7 @@ fn test_unpaid_execution_from_polkadot_to_spiritnet() { Box::new(xcm) )); - type RuntimeEvent = ::RuntimeEvent; + type RuntimeEvent = ::RuntimeEvent; assert_expected_events!( Polkadot, @@ -147,7 +154,7 @@ fn test_unpaid_execution_from_polkadot_to_spiritnet() { }); Spiritnet::execute_with(|| { - type SpiritnetRuntimeEvent = ::RuntimeEvent; + type SpiritnetRuntimeEvent = ::RuntimeEvent; assert_expected_events!( Spiritnet, vec![ @@ -162,9 +169,10 @@ fn test_unpaid_execution_from_polkadot_to_spiritnet() { ] ); - // Since the user have not paid any tx fees, we expect that the free balance is the ED - let balance_after_transfer: u128 = - <::Balances as Inspect>::balance(&polkadot_sovereign_account); + // Since the user have not paid any tx fees, we expect that the free balance is + // the ED + let balance_after_transfer = + <::Balances as Inspect>::balance(&polkadot_sovereign_account); assert_eq!(balance_after_transfer, EXISTENTIAL_DEPOSIT); }); diff --git a/nodes/parachain/Cargo.toml b/nodes/parachain/Cargo.toml index d34c06a20..59c906e76 100644 --- a/nodes/parachain/Cargo.toml +++ b/nodes/parachain/Cargo.toml @@ -70,15 +70,17 @@ substrate-frame-rpc-system = { workspace = true } # Cumulus dependencies cumulus-client-cli = { workspace = true } +cumulus-client-collator = { workspace = true } cumulus-client-consensus-aura = { workspace = true } cumulus-client-consensus-common = { workspace = true } +cumulus-client-consensus-proposer = { workspace = true } cumulus-client-service = { workspace = true } +cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true, features = ["std"] } cumulus-primitives-parachain-inherent = { workspace = true, features = ["std"] } cumulus-relay-chain-inprocess-interface = { workspace = true } cumulus-relay-chain-interface = { workspace = true } cumulus-relay-chain-minimal-node = { workspace = true } - # Polkadot dependencies polkadot-cli = { workspace = true } polkadot-primitives = { workspace = true, features = ["std"] } diff --git a/nodes/parachain/src/cli.rs b/nodes/parachain/src/cli.rs index 64b06c2e7..b65fdf69d 100644 --- a/nodes/parachain/src/cli.rs +++ b/nodes/parachain/src/cli.rs @@ -58,12 +58,6 @@ pub(crate) enum Subcommand { Benchmark(frame_benchmarking_cli::BenchmarkCmd), /// Try some command against runtime state. - #[cfg(feature = "try-runtime")] - TryRuntime(try_runtime_cli::TryRuntimeCmd), - - /// Try some command against runtime state. Note: `try-runtime` feature must - /// be enabled. - #[cfg(not(feature = "try-runtime"))] TryRuntime, } diff --git a/nodes/parachain/src/command.rs b/nodes/parachain/src/command.rs index ca8f34f44..62ad32484 100644 --- a/nodes/parachain/src/command.rs +++ b/nodes/parachain/src/command.rs @@ -24,10 +24,8 @@ use crate::{ use cumulus_client_cli::generate_genesis_block; use cumulus_primitives_core::ParaId; use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; -use log::{info, warn}; +use log::info; use parity_scale_codec::Encode; -#[cfg(feature = "try-runtime")] -use polkadot_service::TaskManager; use runtime_common::Block; use sc_cli::{ ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, Result, @@ -36,7 +34,7 @@ use sc_cli::{ use sc_executor::NativeExecutionDispatch; use sc_service::config::{BasePath, PrometheusConfig}; use sp_core::hexdisplay::HexDisplay; -use sp_runtime::traits::{AccountIdConversion, Block as BlockT, Zero}; +use sp_runtime::traits::{AccountIdConversion, Block as BlockT}; use std::net::SocketAddr; trait IdentifyChain { @@ -378,67 +376,18 @@ pub fn run() -> Result<()> { (_, _) => Err("Unknown parachain runtime".into()), } } - #[cfg(feature = "try-runtime")] - Some(Subcommand::TryRuntime(cmd)) => { - use runtime_common::constants::MILLISECS_PER_BLOCK; - use sc_executor::sp_wasm_interface::ExtendedHostFunctions; - use try_runtime_cli::block_building_info::timestamp_with_aura_info; - - let runner = cli.create_runner(cmd)?; - let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry); - let task_manager = TaskManager::new(runner.config().tokio_handle.clone(), *registry) - .map_err(|e| format!("Error: {:?}", e))?; - let info_provider = timestamp_with_aura_info(MILLISECS_PER_BLOCK); - - if runner.config().chain_spec.is_peregrine() { - runner.async_run(|_| { - Ok(( - cmd.run::::ExtendHostFunctions, - >, _>(Some(info_provider)), - task_manager, - )) - }) - } else if runner.config().chain_spec.is_spiritnet() { - runner.async_run(|_| { - Ok(( - cmd.run::::ExtendHostFunctions, - >, _>(Some(info_provider)), - task_manager, - )) - }) - } else if runner.config().chain_spec.is_clone() { - runner.async_run(|_| { - Ok(( - cmd.run::::ExtendHostFunctions, - >, _>(Some(info_provider)), - task_manager, - )) - }) - } else { - Err("Chain doesn't support try-runtime".into()) - } - } - #[cfg(not(feature = "try-runtime"))] - Some(Subcommand::TryRuntime) => Err("TryRuntime wasn't enabled when building the node. \ - You can enable it with `--features try-runtime`." - .into()), + Some(Subcommand::TryRuntime) => Err("The `try-runtime` subcommand has been migrated to a standalone CLI (https://github.com/paritytech/try-runtime-cli). It is no longer being maintained here.".into()), None => { let runner = cli.create_runner(&cli.run.normalize())?; let collator_options = cli.run.collator_options(); runner.run_node_until_exit(|config| async move { - let hwbench = (!cli.no_hardware_benchmarks).then_some( - config.database.path().map(|database_path| { + let hwbench = (!cli.no_hardware_benchmarks) + .then_some(config.database.path().map(|database_path| { let _ = std::fs::create_dir_all(database_path); sc_sysinfo::gather_hwbench(Some(database_path)) - })).flatten(); - + })) + .flatten(); let para_id = chain_spec::Extensions::try_get(&*config.chain_spec) .map(|e| e.para_id) @@ -473,10 +422,6 @@ pub fn run() -> Result<()> { if config.role.is_authority() { "yes" } else { "no" } ); - if !collator_options.relay_chain_rpc_urls.len().is_zero() && !cli.relay_chain_args.len().is_zero() { - warn!("Detected relay chain node arguments together with --relay-chain-rpc-urls. This command starts a minimal Polkadot node that only uses a network-related subset of all relay chain CLI options."); - } - if config.chain_spec.is_peregrine() { crate::service::start_node::( config, diff --git a/nodes/parachain/src/service.rs b/nodes/parachain/src/service.rs index 502145536..8ad8a941e 100644 --- a/nodes/parachain/src/service.rs +++ b/nodes/parachain/src/service.rs @@ -20,16 +20,19 @@ use jsonrpsee::RpcModule; use cumulus_client_cli::CollatorOptions; -use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; -use cumulus_client_consensus_common::{ParachainBlockImport as TParachainBlockImport, ParachainConsensus}; +use cumulus_client_collator::service::CollatorService; +use cumulus_client_consensus_common::ParachainBlockImport as TParachainBlockImport; +use cumulus_client_consensus_proposer::Proposer; use cumulus_client_service::{ - prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, + build_relay_chain_interface, prepare_node_config, start_relay_chain_tasks, CollatorSybilResistance, + DARecoveryProfile, StartRelayChainTasksParams, }; -use cumulus_primitives_core::ParaId; -use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; -use cumulus_relay_chain_interface::{RelayChainInterface, RelayChainResult}; -use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node; -use polkadot_service::{CollatorPair, NativeExecutionDispatch}; +use cumulus_primitives_core::{ + relay_chain::{CollatorPair, ValidationCode}, + ParaId, +}; +use cumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface}; +use polkadot_service::NativeExecutionDispatch; use sc_consensus::ImportQueue; use sc_executor::NativeElseWasmExecutor; use sc_network::NetworkBlock; @@ -42,7 +45,10 @@ use sp_runtime::traits::BlakeTwo256; use std::{sync::Arc, time::Duration}; use substrate_prometheus_endpoint::Registry; -use runtime_common::{AccountId, AuthorityId, Balance, BlockNumber, Nonce}; +use runtime_common::{AccountId, AuthorityId, Balance, BlockNumber, Hash, Nonce}; + +pub const AUTHORING_DURATION: u64 = 500; +pub const TASK_MANAGER_IDENTIFIER: &str = "aura"; type Header = sp_runtime::generic::Header; @@ -64,7 +70,7 @@ type PartialComponents>, TFullBackend, (), - sc_consensus::DefaultImportQueue>>, + sc_consensus::DefaultImportQueue, TransactionPool>, ( ParachainBlockImport, @@ -134,7 +140,7 @@ where RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::Metadata + sp_session::SessionKeys - + sp_api::ApiExt, Block>> + + sp_api::ApiExt + sp_offchain::OffchainWorkerApi + sp_block_builder::BlockBuilder, sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, @@ -145,10 +151,7 @@ where &Configuration, Option, &TaskManager, - ) -> Result< - sc_consensus::DefaultImportQueue>>, - sc_service::Error, - >, + ) -> Result, sc_service::Error>, { let telemetry = config .telemetry_endpoints @@ -207,27 +210,6 @@ where }) } -async fn build_relay_chain_interface( - polkadot_config: Configuration, - parachain_config: &Configuration, - telemetry_worker_handle: Option, - task_manager: &mut TaskManager, - collator_options: CollatorOptions, - hwbench: Option, -) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option)> { - if !collator_options.relay_chain_rpc_urls.is_empty() { - build_minimal_relay_chain_node(polkadot_config, task_manager, collator_options.relay_chain_rpc_urls).await - } else { - build_inprocess_relay_chain( - polkadot_config, - parachain_config, - telemetry_worker_handle, - task_manager, - hwbench, - ) - } -} - /// Start a node with the given parachain `Configuration` and relay chain /// `Configuration`. /// @@ -235,14 +217,13 @@ async fn build_relay_chain_interface( /// runtime api. #[allow(clippy::too_many_arguments)] #[sc_tracing::logging::prefix_logs_with("Parachain")] -async fn start_node_impl( +async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, collator_options: CollatorOptions, id: ParaId, _rpc_ext_builder: RB, build_import_queue: BIQ, - build_consensus: BIC, hwbench: Option, ) -> sc_service::error::Result<( TaskManager, @@ -256,12 +237,14 @@ where RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::Metadata + sp_session::SessionKeys - + sp_api::ApiExt, Block>> + + sp_api::ApiExt + sp_offchain::OffchainWorkerApi + sp_block_builder::BlockBuilder + cumulus_primitives_core::CollectCollationInfo + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi - + substrate_frame_rpc_system::AccountNonceApi, + + substrate_frame_rpc_system::AccountNonceApi + + sp_consensus_aura::AuraApi + + cumulus_primitives_aura::AuraUnincludedSegmentApi, sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, Executor: sc_executor::NativeExecutionDispatch + 'static, RB: FnOnce( @@ -275,23 +258,7 @@ where &Configuration, Option, &TaskManager, - ) -> Result< - sc_consensus::DefaultImportQueue>>, - sc_service::Error, - >, - BIC: FnOnce( - Arc>, - ParachainBlockImport, - Option<&Registry>, - Option, - &TaskManager, - Arc, - Arc>>, - Arc>, - KeystorePtr, - bool, - ParaId, - ) -> Result>, sc_service::Error>, + ) -> Result, sc_service::Error>, { let parachain_config = prepare_node_config(parachain_config); @@ -313,7 +280,6 @@ where .await .map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?; - let force_authoring = parachain_config.force_authoring; let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); @@ -329,6 +295,7 @@ where spawn_handle: task_manager.spawn_handle(), relay_chain_interface: relay_chain_interface.clone(), import_queue: params.import_queue, + sybil_resistance_level: CollatorSybilResistance::Resistant, // because of Aura }) .await?; @@ -356,7 +323,7 @@ where config: parachain_config, keystore: params.keystore_container.keystore(), backend: backend.clone(), - network: network.clone(), + network, system_rpc_tx, tx_handler_controller, telemetry: telemetry.as_mut(), @@ -386,53 +353,41 @@ where .overseer_handle() .map_err(|e| sc_service::Error::Application(Box::new(e)))?; + start_relay_chain_tasks(StartRelayChainTasksParams { + client: client.clone(), + announce_block: announce_block.clone(), + para_id: id, + relay_chain_interface: relay_chain_interface.clone(), + task_manager: &mut task_manager, + da_recovery_profile: if validator { + DARecoveryProfile::Collator + } else { + DARecoveryProfile::FullNode + }, + import_queue: import_queue_service, + relay_chain_slot_duration, + recovery_handle: Box::new(overseer_handle.clone()), + sync_service: sync_service.clone(), + })?; + if validator { - let parachain_consensus = build_consensus( + start_consensus::( client.clone(), + backend.clone(), block_import, prometheus_registry.as_ref(), telemetry.as_ref().map(|t| t.handle()), &task_manager, relay_chain_interface.clone(), transaction_pool, - sync_service.clone(), + sync_service, params.keystore_container.keystore(), - force_authoring, - id, - )?; - - let spawner = task_manager.spawn_handle(); - let params = StartCollatorParams { - para_id: id, - block_status: client.clone(), - announce_block, - client: client.clone(), - task_manager: &mut task_manager, - relay_chain_interface, - sync_service: sync_service.clone(), - spawner, - parachain_consensus, - import_queue: import_queue_service, - collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, - recovery_handle: Box::new(overseer_handle), - }; - - start_collator(params).await?; - } else { - let params = StartFullNodeParams { - client: client.clone(), + id, + collator_key.expect("Collator key not provided"), + overseer_handle, announce_block, - task_manager: &mut task_manager, - para_id: id, - relay_chain_interface, - sync_service, - relay_chain_slot_duration, - import_queue: import_queue_service, - recovery_handle: Box::new(overseer_handle), - }; - - start_full_node(params)?; + )?; } start_network.start_network(); @@ -448,17 +403,14 @@ pub fn build_import_queue( config: &Configuration, telemetry: Option, task_manager: &TaskManager, -) -> Result< - sc_consensus::DefaultImportQueue>>, - sc_service::Error, -> +) -> Result, sc_service::Error> where RE: sc_executor::NativeExecutionDispatch + 'static, API: ConstructRuntimeApi>> + Send + Sync + 'static, API::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::Metadata + sp_session::SessionKeys - + sp_api::ApiExt, Block>> + + sp_api::ApiExt + sp_offchain::OffchainWorkerApi + sp_block_builder::BlockBuilder + substrate_frame_rpc_system::AccountNonceApi @@ -505,57 +457,66 @@ where API::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::Metadata + sp_session::SessionKeys - + sp_api::ApiExt, Block>> + + sp_api::ApiExt + sp_offchain::OffchainWorkerApi + sp_block_builder::BlockBuilder + substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + sp_consensus_aura::AuraApi - + cumulus_primitives_core::CollectCollationInfo, + + cumulus_primitives_core::CollectCollationInfo + + cumulus_primitives_aura::AuraUnincludedSegmentApi, sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, { - start_node_impl::( + start_node_impl::( parachain_config, polkadot_config, collator_options, id, |_| Ok(RpcModule::new(())), build_import_queue::, - build_consensus::, hwbench, ) .await } #[allow(clippy::too_many_arguments)] -fn build_consensus( - client: Arc>, - block_import: ParachainBlockImport, +fn start_consensus( + client: Arc>, + backend: Arc, + block_import: ParachainBlockImport, prometheus_registry: Option<&Registry>, telemetry: Option, task_manager: &TaskManager, relay_chain_interface: Arc, - transaction_pool: Arc>>, + transaction_pool: Arc>>, sync_oracle: Arc>, keystore: KeystorePtr, - force_authoring: bool, - id: ParaId, -) -> Result>, sc_service::Error> + relay_chain_slot_duration: Duration, + para_id: ParaId, + collator_key: CollatorPair, + overseer_handle: OverseerHandle, + announce_block: Arc>) + Send + Sync>, +) -> Result<(), sc_service::Error> where - RE: sc_executor::NativeExecutionDispatch + 'static, - API: ConstructRuntimeApi>> + Send + Sync + 'static, - API::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + RuntimeApi: ConstructRuntimeApi>> + + Send + + Sync + + 'static, + RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::Metadata + sp_session::SessionKeys - + sp_api::ApiExt, Block>> + + sp_api::ApiExt + sp_offchain::OffchainWorkerApi + sp_block_builder::BlockBuilder - + substrate_frame_rpc_system::AccountNonceApi + + cumulus_primitives_core::CollectCollationInfo + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + + substrate_frame_rpc_system::AccountNonceApi + sp_consensus_aura::AuraApi - + cumulus_primitives_core::CollectCollationInfo, - sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, + + cumulus_primitives_aura::AuraUnincludedSegmentApi, + Executor: sc_executor::NativeExecutionDispatch + 'static, { + use cumulus_client_consensus_aura::collators::lookahead::{self as aura, Params as AuraParams}; + let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( @@ -563,55 +524,41 @@ where client.clone(), transaction_pool, prometheus_registry, - telemetry.clone(), + telemetry, ); - let params = BuildAuraConsensusParams { - proposer_factory, - create_inherent_data_providers: move |_, (relay_parent, validation_data)| { - let relay_chain_interface = relay_chain_interface.clone(); - async move { - let parachain_inherent = cumulus_primitives_parachain_inherent::ParachainInherentData::create_at( - relay_parent, - &relay_chain_interface, - &validation_data, - id, - ) - .await; - let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + let proposer = Proposer::new(proposer_factory); - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( - *timestamp, - slot_duration, - ); + let collator_service = CollatorService::new( + client.clone(), + Arc::new(task_manager.spawn_handle()), + announce_block, + client.clone(), + ); - let parachain_inherent = parachain_inherent.ok_or_else(|| { - Box::::from("Failed to create parachain inherent") - })?; - Ok((slot, timestamp, parachain_inherent)) - } - }, + let params = AuraParams { + create_inherent_data_providers: move |_, ()| async move { Ok(()) }, block_import, - para_client: client, - backoff_authoring_blocks: Option::<()>::None, + para_client: client.clone(), + para_backend: backend, + relay_client: relay_chain_interface, + code_hash_provider: move |block_hash| client.code_at(block_hash).ok().map(|c| ValidationCode::from(c).hash()), sync_oracle, keystore, - force_authoring, + collator_key, + para_id, + overseer_handle, slot_duration, - // We got around 500ms for proposing - block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32), - // And a maximum of 750ms if slots are skipped - max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)), - telemetry, + relay_chain_slot_duration, + proposer, + collator_service, + authoring_duration: Duration::from_millis(AUTHORING_DURATION), }; - Ok(AuraConsensus::build::< - sp_consensus_aura::sr25519::AuthorityPair, - _, - _, - _, - _, - _, - _, - >(params)) + let fut = aura::run::(params); + task_manager + .spawn_essential_handle() + .spawn(TASK_MANAGER_IDENTIFIER, None, fut); + + Ok(()) } diff --git a/nodes/standalone/src/cli.rs b/nodes/standalone/src/cli.rs index bf2d98b7c..3553ef8a1 100644 --- a/nodes/standalone/src/cli.rs +++ b/nodes/standalone/src/cli.rs @@ -60,13 +60,6 @@ pub enum Subcommand { #[command(subcommand)] Benchmark(frame_benchmarking_cli::BenchmarkCmd), - /// Try some command against runtime state. - #[cfg(feature = "try-runtime")] - TryRuntime(try_runtime_cli::TryRuntimeCmd), - - /// Try some command against runtime state. Note: `try-runtime` feature must - /// be enabled. - #[cfg(not(feature = "try-runtime"))] TryRuntime, /// Db meta columns information. diff --git a/nodes/standalone/src/command.rs b/nodes/standalone/src/command.rs index 5344f19f0..4b06768a8 100644 --- a/nodes/standalone/src/command.rs +++ b/nodes/standalone/src/command.rs @@ -196,31 +196,7 @@ pub fn run() -> sc_cli::Result<()> { } }) } - #[cfg(feature = "try-runtime")] - Some(Subcommand::TryRuntime(cmd)) => { - use try_runtime_cli::block_building_info::timestamp_with_aura_info; - - let runner = cli.create_runner(cmd)?; - runner.async_run(|config| { - // we don't need any of the components of new_partial, just a runtime, or a task - // manager to do `async_run`. - let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry); - let task_manager = sc_service::TaskManager::new(config.tokio_handle.clone(), registry) - .map_err(|e| sc_cli::Error::Service(sc_service::Error::Prometheus(e)))?; - let info_provider = timestamp_with_aura_info(10_000); - Ok(( - cmd.run::::ExtendHostFunctions, - >, _>(Some(info_provider)), - task_manager, - )) - }) - } - #[cfg(not(feature = "try-runtime"))] - Some(Subcommand::TryRuntime) => Err("TryRuntime wasn't enabled when building the standalone node. \ - You can enable it with `--features try-runtime`." - .into()), + Some(Subcommand::TryRuntime) => Err("The `try-runtime` subcommand has been migrated to a standalone CLI (https://github.com/paritytech/try-runtime-cli). It is no longer being maintained here.".into()), Some(Subcommand::ChainInfo(cmd)) => { let runner = cli.create_runner(cmd)?; runner.sync_run(|config| cmd.run::(&config)) diff --git a/nodes/standalone/src/service.rs b/nodes/standalone/src/service.rs index 7934b50fa..503f0a023 100644 --- a/nodes/standalone/src/service.rs +++ b/nodes/standalone/src/service.rs @@ -52,11 +52,16 @@ pub(crate) type FullClient = sc_service::TFullClient; type FullSelectChain = sc_consensus::LongestChain; +/// The minimum period of blocks on which justifications will be +/// imported and generated. +/// Value is copied from the solo chain template: +const GRANDPA_JUSTIFICATION_PERIOD: u32 = 512; + type PartialComponents = sc_service::PartialComponents< FullClient, FullBackend, FullSelectChain, - sc_consensus::DefaultImportQueue, + sc_consensus::DefaultImportQueue, sc_transaction_pool::FullPool, ( sc_consensus_grandpa::GrandpaBlockImport, @@ -103,6 +108,7 @@ pub fn new_partial(config: &Configuration) -> Result), select_chain.clone(), telemetry.as_ref().map(|x| x.handle()), @@ -297,7 +303,7 @@ pub fn new_full(config: Configuration) -> Result { let grandpa_config = sc_consensus_grandpa::Config { // FIXME #1578 make this available through chainspec gossip_duration: Duration::from_millis(333), - justification_period: 512, + justification_generation_period: GRANDPA_JUSTIFICATION_PERIOD, name: Some(name), observer_enabled: false, keystore, diff --git a/pallets/attestation/Cargo.toml b/pallets/attestation/Cargo.toml index 2c426d6e8..1237ac0f2 100644 --- a/pallets/attestation/Cargo.toml +++ b/pallets/attestation/Cargo.toml @@ -43,6 +43,7 @@ sp-io = { workspace = true, optional = true } sp-keystore = { workspace = true, optional = true } sp-runtime = { workspace = true } sp-std = { workspace = true } +sp-weights = { workspace = true } [features] default = ["std"] diff --git a/pallets/attestation/src/access_control.rs b/pallets/attestation/src/access_control.rs index 3784a2210..e9e82ad99 100644 --- a/pallets/attestation/src/access_control.rs +++ b/pallets/attestation/src/access_control.rs @@ -16,8 +16,8 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use frame_support::dispatch::Weight; use sp_runtime::DispatchError; +use sp_weights::Weight; /// Allow for more complex schemes on who can attest, revoke and remove. pub trait AttestationAccessControl { diff --git a/pallets/attestation/src/mock.rs b/pallets/attestation/src/mock.rs index e8c9a213b..58576d5b7 100644 --- a/pallets/attestation/src/mock.rs +++ b/pallets/attestation/src/mock.rs @@ -23,11 +23,12 @@ //! other tests. Internal functions/structs can only be used in attestation //! tests. -use frame_support::{dispatch::Weight, traits::Get}; +use frame_support::traits::Get; use parity_scale_codec::{Decode, Encode}; use scale_info::TypeInfo; use sp_core::{sr25519, H256}; use sp_runtime::{traits::IdentifyAccount, DispatchError, MultiSigner}; +use sp_weights::Weight; use ctype::CtypeHashOf; use kilt_support::{mock::SubjectId, traits::StorageDepositCollector, Deposit}; diff --git a/pallets/ctype/src/ctype_entry.rs b/pallets/ctype/src/ctype_entry.rs index 96846c994..04c198dca 100644 --- a/pallets/ctype/src/ctype_entry.rs +++ b/pallets/ctype/src/ctype_entry.rs @@ -1,6 +1,6 @@ -use frame_support::RuntimeDebug; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; +use sp_runtime::RuntimeDebug; /// Creation details of a CType. #[derive(Encode, Decode, RuntimeDebug, MaxEncodedLen, Eq, PartialEq, TypeInfo)] diff --git a/pallets/delegation/Cargo.toml b/pallets/delegation/Cargo.toml index 179235ba4..0c6a04f53 100644 --- a/pallets/delegation/Cargo.toml +++ b/pallets/delegation/Cargo.toml @@ -46,6 +46,7 @@ sp-io = { workspace = true, optional = true } sp-keystore = { workspace = true, optional = true } sp-runtime = { workspace = true } sp-std = { workspace = true } +sp-weights = { workspace = true } [features] default = ["std"] diff --git a/pallets/delegation/src/access_control.rs b/pallets/delegation/src/access_control.rs index 73d96ae7e..9b9b9f82c 100644 --- a/pallets/delegation/src/access_control.rs +++ b/pallets/delegation/src/access_control.rs @@ -16,10 +16,11 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use frame_support::{dispatch::Weight, ensure}; +use frame_support::ensure; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; use sp_runtime::DispatchError; +use sp_weights::Weight; use attestation::ClaimHashOf; use ctype::CtypeHashOf; diff --git a/pallets/did/Cargo.toml b/pallets/did/Cargo.toml index e43c3c6ce..1f52b019d 100644 --- a/pallets/did/Cargo.toml +++ b/pallets/did/Cargo.toml @@ -43,6 +43,7 @@ sp-core = { workspace = true } sp-io = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } +sp-weights = { workspace = true } # Benchmarking dependencies frame-benchmarking = { workspace = true, optional = true } diff --git a/pallets/did/src/benchmarking.rs b/pallets/did/src/benchmarking.rs index 840df4ee2..e7195a1c9 100644 --- a/pallets/did/src/benchmarking.rs +++ b/pallets/did/src/benchmarking.rs @@ -17,7 +17,7 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org use super::*; -use frame_benchmarking::{account, benchmarks, Zero}; +use frame_benchmarking::{account, benchmarks}; use frame_support::{ assert_ok, traits::fungible::{Inspect, Mutate, MutateHold}, @@ -26,7 +26,10 @@ use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin}; use parity_scale_codec::Encode; use sp_core::{crypto::KeyTypeId, ecdsa, ed25519, sr25519}; use sp_io::crypto::{ecdsa_generate, ecdsa_sign, ed25519_generate, ed25519_sign, sr25519_generate, sr25519_sign}; -use sp_runtime::{traits::IdentifyAccount, AccountId32, MultiSigner}; +use sp_runtime::{ + traits::{IdentifyAccount, Zero}, + AccountId32, MultiSigner, +}; use sp_std::{convert::TryInto, vec::Vec}; use kilt_support::{signature::VerifySignature, Deposit}; diff --git a/pallets/did/src/did_details.rs b/pallets/did/src/did_details.rs index 29a2a24bd..f31974d4c 100644 --- a/pallets/did/src/did_details.rs +++ b/pallets/did/src/did_details.rs @@ -20,7 +20,6 @@ use frame_support::{ ensure, storage::{bounded_btree_map::BoundedBTreeMap, bounded_btree_set::BoundedBTreeSet}, traits::Get, - RuntimeDebug, }; use frame_system::pallet_prelude::BlockNumberFor; use kilt_support::Deposit; @@ -29,7 +28,7 @@ use scale_info::TypeInfo; use sp_core::{ecdsa, ed25519, sr25519}; use sp_runtime::{ traits::{IdentifyAccount, Verify, Zero}, - MultiSignature, SaturatedConversion, Saturating, + MultiSignature, RuntimeDebug, SaturatedConversion, Saturating, }; use sp_std::{convert::TryInto, vec::Vec}; diff --git a/pallets/did/src/lib.rs b/pallets/did/src/lib.rs index 94c630e91..52967d44c 100644 --- a/pallets/did/src/lib.rs +++ b/pallets/did/src/lib.rs @@ -118,7 +118,7 @@ pub use crate::{ use errors::{DidError, InputError, SignatureError, StorageError}; use frame_support::{ - dispatch::{DispatchError, DispatchResult, Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{DispatchResult, GetDispatchInfo, PostDispatchInfo}, ensure, storage::types::StorageMap, traits::{Get, OnUnbalanced}, @@ -126,6 +126,7 @@ use frame_support::{ }; use frame_system::ensure_signed; use parity_scale_codec::Encode; +use sp_runtime::{traits::Dispatchable, DispatchError}; use sp_runtime::{ traits::{Saturating, Zero}, SaturatedConversion, diff --git a/pallets/did/src/origin.rs b/pallets/did/src/origin.rs index c007da521..c356cf54e 100644 --- a/pallets/did/src/origin.rs +++ b/pallets/did/src/origin.rs @@ -16,12 +16,9 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use frame_support::{ - codec::{Decode, Encode}, - traits::{EnsureOrigin, EnsureOriginWithArg}, -}; +use frame_support::traits::{EnsureOrigin, EnsureOriginWithArg}; use kilt_support::traits::CallSources; -use parity_scale_codec::MaxEncodedLen; +use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; use sp_runtime::RuntimeDebug; use sp_std::marker::PhantomData; diff --git a/pallets/did/src/service_endpoints.rs b/pallets/did/src/service_endpoints.rs index 8c1d3400a..f54d1d0d3 100644 --- a/pallets/did/src/service_endpoints.rs +++ b/pallets/did/src/service_endpoints.rs @@ -17,10 +17,10 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org use crate::{errors, Config}; -use frame_support::{ensure, traits::Get, BoundedVec, RuntimeDebug}; +use frame_support::{ensure, traits::Get, BoundedVec}; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; -use sp_runtime::traits::SaturatedConversion; +use sp_runtime::{traits::SaturatedConversion, RuntimeDebug}; use sp_std::str; #[cfg(any(test, feature = "runtime-benchmarks"))] use sp_std::{convert::TryInto, vec::Vec}; diff --git a/pallets/did/src/signature.rs b/pallets/did/src/signature.rs index 9f79e1ec3..0c482e414 100644 --- a/pallets/did/src/signature.rs +++ b/pallets/did/src/signature.rs @@ -16,10 +16,10 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use frame_support::dispatch; use kilt_support::signature::{SignatureVerificationError, SignatureVerificationResult, VerifySignature}; use sp_runtime::SaturatedConversion; use sp_std::{marker::PhantomData, vec::Vec}; +use sp_weights::Weight; use crate::{ did_details::{DidSignature, DidVerificationKeyRelationship}, @@ -57,7 +57,7 @@ where }) } - fn weight(payload_byte_length: usize) -> dispatch::Weight { + fn weight(payload_byte_length: usize) -> Weight { ::WeightInfo::signature_verification_sr25519(payload_byte_length.saturated_into()) .max(::WeightInfo::signature_verification_ed25519( payload_byte_length.saturated_into(), diff --git a/pallets/pallet-configuration/src/configuration.rs b/pallets/pallet-configuration/src/configuration.rs index de14209ee..ec9c7106d 100644 --- a/pallets/pallet-configuration/src/configuration.rs +++ b/pallets/pallet-configuration/src/configuration.rs @@ -16,9 +16,9 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use frame_support::RuntimeDebug; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; +use sp_runtime::RuntimeDebug; /// Configuration for the runtime. #[derive(Clone, Encode, Decode, RuntimeDebug, MaxEncodedLen, Eq, PartialEq, TypeInfo)] diff --git a/pallets/pallet-deposit-storage/src/benchmarking.rs b/pallets/pallet-deposit-storage/src/benchmarking.rs index d6c0200e9..89d1133e4 100644 --- a/pallets/pallet-deposit-storage/src/benchmarking.rs +++ b/pallets/pallet-deposit-storage/src/benchmarking.rs @@ -27,11 +27,10 @@ mod benchmarks { use frame_system::RawOrigin; use kilt_support::Deposit; use sp_runtime::SaturatedConversion; + use sp_std::vec; use crate::{traits::BenchmarkHooks, Call, Config, DepositEntryOf, Deposits, HoldReason, Pallet}; - use super::*; - const KILT: u128 = 10u128.pow(15); #[benchmark] diff --git a/pallets/pallet-did-lookup/src/account.rs b/pallets/pallet-did-lookup/src/account.rs index a383504f9..c2fab9e29 100644 --- a/pallets/pallet-did-lookup/src/account.rs +++ b/pallets/pallet-did-lookup/src/account.rs @@ -23,12 +23,13 @@ //! //! It includes the Verify and IdentifyAccount traits for the AccountId20 -use frame_support::{crypto::ecdsa::ECDSAExt, RuntimeDebug}; +use frame_support::crypto::ecdsa::ECDSAExt; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; use serde::{Deserialize, Serialize}; use sha3::{Digest, Keccak256}; use sp_core::{ecdsa, H160, H256}; +use sp_runtime::RuntimeDebug; /// The AccountId20 type. /// It is a 20-byte Ethereum address. diff --git a/pallets/pallet-dip-consumer/Cargo.toml b/pallets/pallet-dip-consumer/Cargo.toml index 6f6aaffa0..7b36d4490 100644 --- a/pallets/pallet-dip-consumer/Cargo.toml +++ b/pallets/pallet-dip-consumer/Cargo.toml @@ -28,6 +28,7 @@ kilt-support = { workspace = true } log = { workspace = true } parity-scale-codec = { workspace = true, features = ["derive"] } scale-info = { workspace = true, features = ["derive"] } +sp-runtime = { workspace = true } sp-std = { workspace = true } # Benchmarks diff --git a/pallets/pallet-dip-consumer/src/lib.rs b/pallets/pallet-dip-consumer/src/lib.rs index ab72c18e7..1f538216e 100644 --- a/pallets/pallet-dip-consumer/src/lib.rs +++ b/pallets/pallet-dip-consumer/src/lib.rs @@ -41,14 +41,15 @@ pub mod pallet { use super::*; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, pallet_prelude::*, traits::{Contains, EnsureOriginWithArg}, }; use frame_system::pallet_prelude::*; use parity_scale_codec::{FullCodec, MaxEncodedLen}; use scale_info::TypeInfo; - use sp_std::boxed::Box; + use sp_runtime::traits::Dispatchable; + use sp_std::{boxed::Box, fmt::Debug}; use crate::traits::IdentityProofVerifier; diff --git a/pallets/pallet-dip-consumer/src/origin.rs b/pallets/pallet-dip-consumer/src/origin.rs index 7e8d52782..dd95e6577 100644 --- a/pallets/pallet-dip-consumer/src/origin.rs +++ b/pallets/pallet-dip-consumer/src/origin.rs @@ -16,10 +16,11 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use frame_support::{traits::EnsureOrigin, RuntimeDebug}; +use frame_support::traits::EnsureOrigin; use kilt_support::traits::CallSources; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; +use sp_runtime::RuntimeDebug; use sp_std::marker::PhantomData; /// An origin passed down to the to-be-dispatched `Call` upon successful DIP diff --git a/pallets/pallet-dip-provider/src/benchmarking.rs b/pallets/pallet-dip-provider/src/benchmarking.rs index 31aa3e2e8..1fa9f1c54 100644 --- a/pallets/pallet-dip-provider/src/benchmarking.rs +++ b/pallets/pallet-dip-provider/src/benchmarking.rs @@ -22,6 +22,7 @@ use kilt_support::{ benchmark::IdentityContext, traits::{GenerateBenchmarkOrigin, GetWorstCase, Instanciate}, }; +use sp_std::vec; #[benchmarks( where diff --git a/pallets/pallet-migration/src/mock.rs b/pallets/pallet-migration/src/mock.rs index 4a21c99c6..1310208ab 100644 --- a/pallets/pallet-migration/src/mock.rs +++ b/pallets/pallet-migration/src/mock.rs @@ -60,7 +60,7 @@ pub mod runtime { use sp_core::{ed25519, ConstU128, ConstU32}; use sp_runtime::{ traits::{BlakeTwo256, IdentifyAccount, IdentityLookup, Verify}, - AccountId32, BuildStorage, MultiSignature, MultiSigner, Perquintill, + AccountId32, BuildStorage, MultiSignature, MultiSigner, Perquintill, RuntimeDebug, }; use crate::{self as migration, Config, MigratedKeys}; @@ -342,18 +342,7 @@ pub mod runtime { } #[derive( - Default, - Clone, - Copy, - Encode, - Decode, - MaxEncodedLen, - sp_runtime::RuntimeDebug, - Eq, - PartialEq, - Ord, - PartialOrd, - TypeInfo, + Default, Clone, Copy, Encode, Decode, MaxEncodedLen, RuntimeDebug, Eq, PartialEq, Ord, PartialOrd, TypeInfo, )] pub struct TestSubjectId([u8; 32]); diff --git a/pallets/pallet-relay-store/Cargo.toml b/pallets/pallet-relay-store/Cargo.toml index 7f573ff9c..04cc6522a 100644 --- a/pallets/pallet-relay-store/Cargo.toml +++ b/pallets/pallet-relay-store/Cargo.toml @@ -20,7 +20,7 @@ sp-runtime = { workspace = true, features = ["std"] } sp-trie = { workspace = true, features = ["std"] } [dependencies] -cumulus-pallet-parachain-system = { workspace = true } +cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook"] } cumulus-primitives-core = { workspace = true } frame-support = { workspace = true } frame-system = { workspace = true } diff --git a/pallets/pallet-relay-store/src/benchmarking.rs b/pallets/pallet-relay-store/src/benchmarking.rs index df5c089ef..f103b8a2a 100644 --- a/pallets/pallet-relay-store/src/benchmarking.rs +++ b/pallets/pallet-relay-store/src/benchmarking.rs @@ -18,6 +18,7 @@ use crate::{Config, Pallet}; use frame_benchmarking::v2::*; +use sp_std::{vec, vec::Vec}; #[benchmarks( where diff --git a/pallets/pallet-relay-store/src/mock.rs b/pallets/pallet-relay-store/src/mock.rs index 8ee0e87c7..772ef379e 100644 --- a/pallets/pallet-relay-store/src/mock.rs +++ b/pallets/pallet-relay-store/src/mock.rs @@ -81,6 +81,7 @@ impl cumulus_pallet_parachain_system::Config for TestRuntime { type RuntimeEvent = RuntimeEvent; type SelfParaId = ParachainId; type XcmpMessageHandler = (); + type ConsensusHook = cumulus_pallet_parachain_system::ExpectParentIncluded; } impl crate::Config for TestRuntime { diff --git a/pallets/pallet-web3-names/src/benchmarking.rs b/pallets/pallet-web3-names/src/benchmarking.rs index 0bbdcc54a..0039b6390 100644 --- a/pallets/pallet-web3-names/src/benchmarking.rs +++ b/pallets/pallet-web3-names/src/benchmarking.rs @@ -17,10 +17,10 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org #![cfg(feature = "runtime-benchmarks")] -use frame_benchmarking::{account, benchmarks, vec, Vec, Zero}; +use frame_benchmarking::{account, benchmarks}; use frame_support::{ pallet_prelude::EnsureOrigin, - sp_runtime::SaturatedConversion, + sp_runtime::{traits::Zero, SaturatedConversion}, traits::{ fungible::{Inspect, Mutate}, Get, @@ -29,6 +29,7 @@ use frame_support::{ }; use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin}; use sp_runtime::app_crypto::sr25519; +use sp_std::{vec, vec::Vec}; use kilt_support::{traits::GenerateBenchmarkOrigin, Deposit}; diff --git a/pallets/pallet-web3-names/src/web3_name.rs b/pallets/pallet-web3-names/src/web3_name.rs index 474a327c2..663e1ad16 100644 --- a/pallets/pallet-web3-names/src/web3_name.rs +++ b/pallets/pallet-web3-names/src/web3_name.rs @@ -18,9 +18,10 @@ use sp_std::{fmt::Debug, marker::PhantomData, ops::Deref, vec::Vec}; -use frame_support::{ensure, sp_runtime::SaturatedConversion, traits::Get, BoundedVec, RuntimeDebug}; +use frame_support::{ensure, traits::Get, BoundedVec}; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; +use sp_runtime::{RuntimeDebug, SaturatedConversion}; use crate::{Config, Error}; diff --git a/pallets/parachain-staking/src/benchmarking.rs b/pallets/parachain-staking/src/benchmarking.rs index 599f00879..0c9f7087b 100644 --- a/pallets/parachain-staking/src/benchmarking.rs +++ b/pallets/parachain-staking/src/benchmarking.rs @@ -19,7 +19,7 @@ //! Benchmarking use crate::{types::RoundInfo, *}; -use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, Zero}; +use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite}; use frame_support::{ assert_ok, traits::{ @@ -30,7 +30,7 @@ use frame_support::{ use frame_system::{pallet_prelude::BlockNumberFor, Pallet as System, RawOrigin}; use pallet_session::Pallet as Session; use sp_runtime::{ - traits::{One, SaturatedConversion, StaticLookup}, + traits::{One, SaturatedConversion, StaticLookup, Zero}, Perquintill, }; use sp_std::{convert::TryInto, vec::Vec}; diff --git a/pallets/parachain-staking/src/set.rs b/pallets/parachain-staking/src/set.rs index 634c743e4..dbb60c1bf 100644 --- a/pallets/parachain-staking/src/set.rs +++ b/pallets/parachain-staking/src/set.rs @@ -16,10 +16,10 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use frame_support::{traits::Get, BoundedVec, DefaultNoBound, RuntimeDebug}; +use frame_support::{traits::Get, BoundedVec, DefaultNoBound}; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; -use sp_runtime::{traits::Zero, SaturatedConversion}; +use sp_runtime::{traits::Zero, RuntimeDebug, SaturatedConversion}; use sp_std::{ cmp::Ordering, convert::TryInto, diff --git a/pallets/public-credentials/Cargo.toml b/pallets/public-credentials/Cargo.toml index 529e7d56a..3c91efaa5 100644 --- a/pallets/public-credentials/Cargo.toml +++ b/pallets/public-credentials/Cargo.toml @@ -37,6 +37,7 @@ sp-io = { workspace = true, optional = true } sp-keystore = { workspace = true, optional = true } sp-runtime = { workspace = true } sp-std = { workspace = true } +sp-weights = { workspace = true } [features] default = ["std"] diff --git a/pallets/public-credentials/src/access_control.rs b/pallets/public-credentials/src/access_control.rs index 97697d139..5ddfdc6ac 100644 --- a/pallets/public-credentials/src/access_control.rs +++ b/pallets/public-credentials/src/access_control.rs @@ -16,8 +16,8 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use frame_support::dispatch::Weight; use sp_runtime::DispatchError; +use sp_weights::Weight; pub trait AccessControl { /// Decides whether the account is allowed to issue a credential with the diff --git a/pallets/public-credentials/src/benchmarking.rs b/pallets/public-credentials/src/benchmarking.rs index 3fbbdd63c..b2b67ffa3 100644 --- a/pallets/public-credentials/src/benchmarking.rs +++ b/pallets/public-credentials/src/benchmarking.rs @@ -16,9 +16,10 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use frame_benchmarking::{account, benchmarks, Zero}; +use frame_benchmarking::{account, benchmarks}; use frame_support::{ dispatch::RawOrigin, + sp_runtime::traits::Zero, traits::{fungible::Mutate, Get, ReservableCurrency}, BoundedVec, }; diff --git a/pallets/public-credentials/src/credentials.rs b/pallets/public-credentials/src/credentials.rs index e499f08df..1800c98b9 100644 --- a/pallets/public-credentials/src/credentials.rs +++ b/pallets/public-credentials/src/credentials.rs @@ -19,7 +19,7 @@ use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; -use frame_support::RuntimeDebug; +use sp_runtime::RuntimeDebug; use kilt_support::Deposit; diff --git a/pallets/public-credentials/src/mock.rs b/pallets/public-credentials/src/mock.rs index a44456303..e7825522d 100644 --- a/pallets/public-credentials/src/mock.rs +++ b/pallets/public-credentials/src/mock.rs @@ -195,7 +195,7 @@ pub(crate) mod runtime { use sp_core::{sr25519, Pair}; use sp_runtime::{ traits::{BlakeTwo256, IdentifyAccount, IdentityLookup, Verify}, - BuildStorage, MultiSignature, MultiSigner, + BuildStorage, MultiSignature, MultiSigner, RuntimeDebug, }; use kilt_support::mock::{mock_origin, SubjectId}; @@ -210,18 +210,7 @@ pub(crate) mod runtime { pub(crate) type AccountId = ::AccountId; #[derive( - Default, - Clone, - Copy, - Encode, - Decode, - MaxEncodedLen, - sp_runtime::RuntimeDebug, - Eq, - PartialEq, - Ord, - PartialOrd, - TypeInfo, + Default, Clone, Copy, Encode, Decode, MaxEncodedLen, RuntimeDebug, Eq, PartialEq, Ord, PartialOrd, TypeInfo, )] pub struct TestSubjectId(pub [u8; 32]); diff --git a/runtime-api/did/Cargo.toml b/runtime-api/did/Cargo.toml index 639da5ac0..51f3f0abc 100644 --- a/runtime-api/did/Cargo.toml +++ b/runtime-api/did/Cargo.toml @@ -12,11 +12,9 @@ version = { workspace = true } [dependencies] # External dependencies -frame-system = { workspace = true, default-features = false } +frame-system = { workspace = true, default-features = false } parity-scale-codec = { workspace = true, features = ["derive"] } -scale-info = { workspace = true, default-features = false, features = [ - "derive", -] } +scale-info = { workspace = true, default-features = false, features = ["derive"] } # Internal dependencies did = { workspace = true } diff --git a/runtimes/clone/Cargo.toml b/runtimes/clone/Cargo.toml index 9c09deced..eb048c830 100644 --- a/runtimes/clone/Cargo.toml +++ b/runtimes/clone/Cargo.toml @@ -60,9 +60,10 @@ pallet-transaction-payment = { workspace = true } # Cumulus dependencies cumulus-pallet-aura-ext = { workspace = true } cumulus-pallet-dmp-queue = { workspace = true } -cumulus-pallet-parachain-system = { workspace = true } +cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook"] } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } +cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-timestamp = { workspace = true } cumulus-primitives-utility = { workspace = true } diff --git a/runtimes/clone/src/lib.rs b/runtimes/clone/src/lib.rs index cd89eeecb..72e820d36 100644 --- a/runtimes/clone/src/lib.rs +++ b/runtimes/clone/src/lib.rs @@ -25,7 +25,7 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); -use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; +use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases; use frame_support::{ construct_runtime, parameter_types, traits::Everything, @@ -47,7 +47,10 @@ use sp_version::RuntimeVersion; use xcm_executor::XcmExecutor; use runtime_common::{ - constants::{self, EXISTENTIAL_DEPOSIT}, + constants::{ + self, BLOCK_PROCESSING_VELOCITY, EXISTENTIAL_DEPOSIT, RELAY_CHAIN_SLOT_DURATION_MILLIS, SLOT_DURATION, + UNINCLUDED_SEGMENT_CAPACITY, + }, fees::WeightToFee, AccountId, AuthorityId, Balance, BlockHashCount, BlockLength, BlockWeights, Hash, Header, Nonce, Signature, SlowAdjustingFeeUpdate, @@ -204,6 +207,13 @@ parameter_types! { pub const ReservedDmpWeight: Weight = constants::MAXIMUM_BLOCK_WEIGHT.saturating_div(4); } +type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook< + Runtime, + RELAY_CHAIN_SLOT_DURATION_MILLIS, + BLOCK_PROCESSING_VELOCITY, + UNINCLUDED_SEGMENT_CAPACITY, +>; + impl cumulus_pallet_parachain_system::Config for Runtime { type RuntimeEvent = RuntimeEvent; type OnSystemEvent = (); @@ -213,7 +223,8 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type ReservedDmpWeight = ReservedDmpWeight; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; - type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; + type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases; + type ConsensusHook = ConsensusHook; } impl parachain_info::Config for Runtime {} @@ -506,7 +517,7 @@ impl_runtime_apis! { impl sp_consensus_aura::AuraApi for Runtime { fn slot_duration() -> sp_consensus_aura::SlotDuration { - sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration()) + sp_consensus_aura::SlotDuration::from_millis(SLOT_DURATION) } fn authorities() -> Vec { @@ -514,6 +525,15 @@ impl_runtime_apis! { } } + impl cumulus_primitives_aura::AuraUnincludedSegmentApi for Runtime { + fn can_build_upon( + included_hash: ::Hash, + slot: cumulus_primitives_aura::Slot, + ) -> bool { + ConsensusHook::can_build_upon(included_hash, slot) + } + } + impl cumulus_primitives_core::CollectCollationInfo for Runtime { fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo { ParachainSystem::collect_collation_info(header) @@ -543,10 +563,11 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey}; + use frame_benchmarking::{Benchmarking, BenchmarkBatch}; use frame_system_benchmarking::Pallet as SystemBench; use cumulus_pallet_session_benchmarking::Pallet as SessionBench; use frame_benchmarking::baseline::Pallet as Baseline; + use frame_support::traits::TrackedStorageKey; impl frame_system_benchmarking::Config for Runtime {} impl cumulus_pallet_session_benchmarking::Config for Runtime {} @@ -602,30 +623,7 @@ impl_runtime_apis! { } } -struct CheckInherents; - -impl cumulus_pallet_parachain_system::CheckInherents for CheckInherents { - fn check_inherents( - block: &Block, - relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof, - ) -> sp_inherents::CheckInherentsResult { - let relay_chain_slot = relay_state_proof - .read_slot() - .expect("Could not read the relay chain slot from the proof"); - - let inherent_data = cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration( - relay_chain_slot, - sp_std::time::Duration::from_secs(6), - ) - .create_inherent_data() - .expect("Could not create the timestamp inherent data"); - - inherent_data.check_extrinsics(block) - } -} - cumulus_pallet_parachain_system::register_validate_block! { Runtime = Runtime, BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::, - CheckInherents = CheckInherents, } diff --git a/runtimes/common/Cargo.toml b/runtimes/common/Cargo.toml index 03559ab1e..744b91ae8 100644 --- a/runtimes/common/Cargo.toml +++ b/runtimes/common/Cargo.toml @@ -53,6 +53,7 @@ sp-io = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } sp-trie = { workspace = true } +sp-weights = { workspace = true } # Cumulus dependencies cumulus-primitives-core = { workspace = true } diff --git a/runtimes/common/src/authorization.rs b/runtimes/common/src/authorization.rs index e00867a43..3af85737f 100644 --- a/runtimes/common/src/authorization.rs +++ b/runtimes/common/src/authorization.rs @@ -15,10 +15,10 @@ // along with this program. If not, see . // If you feel like getting in touch with us, you can do so at info@botlabs.org -use frame_support::dispatch::Weight; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; use sp_runtime::DispatchError; +use sp_weights::Weight; use attestation::AttestationAccessControl; use public_credentials::PublicCredentialsAccessControl; @@ -38,12 +38,7 @@ impl where DelegationAc: AttestationAccessControl, { - fn can_attest( - &self, - who: &AttesterId, - ctype: &Ctype, - claim: &ClaimHash, - ) -> Result { + fn can_attest(&self, who: &AttesterId, ctype: &Ctype, claim: &ClaimHash) -> Result { let PalletAuthorize::Delegation(ac) = self; ac.can_attest(who, ctype, claim) } @@ -54,7 +49,7 @@ where ctype: &Ctype, claim: &ClaimHash, auth_id: &AuthorizationId, - ) -> Result { + ) -> Result { let (PalletAuthorize::Delegation(ac), AuthorizationId::Delegation(auth_id)) = (self, auth_id); ac.can_revoke(who, ctype, claim, auth_id) } @@ -65,7 +60,7 @@ where ctype: &Ctype, claim: &ClaimHash, auth_id: &AuthorizationId, - ) -> Result { + ) -> Result { let (PalletAuthorize::Delegation(ac), AuthorizationId::Delegation(auth_id)) = (self, auth_id); ac.can_remove(who, ctype, claim, auth_id) } @@ -100,7 +95,7 @@ where who: &AttesterId, ctype: &Ctype, credential_id: &CredentialId, - ) -> Result { + ) -> Result { let PalletAuthorize::Delegation(ac) = self; ac.can_issue(who, ctype, credential_id) } @@ -111,7 +106,7 @@ where ctype: &Ctype, credential_id: &CredentialId, auth_id: &AuthorizationId, - ) -> Result { + ) -> Result { let (PalletAuthorize::Delegation(ac), AuthorizationId::Delegation(auth_id)) = (self, auth_id); ac.can_revoke(who, ctype, credential_id, auth_id) } @@ -122,7 +117,7 @@ where ctype: &Ctype, credential_id: &CredentialId, auth_id: &AuthorizationId, - ) -> Result { + ) -> Result { let (PalletAuthorize::Delegation(ac), AuthorizationId::Delegation(auth_id)) = (self, auth_id); ac.can_unrevoke(who, ctype, credential_id, auth_id) } @@ -133,7 +128,7 @@ where ctype: &Ctype, credential_id: &CredentialId, auth_id: &AuthorizationId, - ) -> Result { + ) -> Result { let (PalletAuthorize::Delegation(ac), AuthorizationId::Delegation(auth_id)) = (self, auth_id); ac.can_remove(who, ctype, credential_id, auth_id) } diff --git a/runtimes/common/src/constants.rs b/runtimes/common/src/constants.rs index 86abaa735..62ce3c8ed 100644 --- a/runtimes/common/src/constants.rs +++ b/runtimes/common/src/constants.rs @@ -27,6 +27,15 @@ use parachain_staking::InflationInfo; use crate::{Balance, BlockNumber}; +/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included into the +/// relay chain. +pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1; +/// How many parachain blocks are processed by the relay chain per parent. Limits the number of +/// blocks authored per slot. +pub const BLOCK_PROCESSING_VELOCITY: u32 = 1; +/// Relay chain slot duration, in milliseconds. +pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000; + /// This determines the average expected block time that we are targetting. /// Blocks will be produced at a minimum duration defined by `SLOT_DURATION`. /// `SLOT_DURATION` is picked up by `pallet_timestamp` which is in turn picked diff --git a/runtimes/common/src/dip/did/mod.rs b/runtimes/common/src/dip/did/mod.rs index a8533aafd..113637bd7 100644 --- a/runtimes/common/src/dip/did/mod.rs +++ b/runtimes/common/src/dip/did/mod.rs @@ -182,10 +182,13 @@ where did_details::DidVerificationKey, mock_utils::{generate_base_did_creation_details, get_key_agreement_keys}, }; - use frame_benchmarking::{vec, Zero}; use frame_support::traits::fungible::Mutate; use sp_io::crypto::{ed25519_generate, sr25519_generate}; - use sp_runtime::{traits::Get, KeyTypeId}; + use sp_runtime::{ + traits::{Get, Zero}, + KeyTypeId, + }; + use sp_std::vec; use crate::constants::KILT; diff --git a/runtimes/common/src/dip/merkle/mod.rs b/runtimes/common/src/dip/merkle/mod.rs index 7c5492c97..c8d7271e5 100644 --- a/runtimes/common/src/dip/merkle/mod.rs +++ b/runtimes/common/src/dip/merkle/mod.rs @@ -17,7 +17,6 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org use did::KeyIdOf; -use frame_support::RuntimeDebug; use frame_system::pallet_prelude::BlockNumberFor; use kilt_dip_primitives::DidMerkleProof; use pallet_did_lookup::linkable_account::LinkableAccountId; @@ -27,6 +26,7 @@ use pallet_dip_provider::{ }; use parity_scale_codec::{Decode, Encode}; use scale_info::TypeInfo; +use sp_runtime::RuntimeDebug; use sp_std::marker::PhantomData; use crate::dip::did::LinkedDidInfoOf; diff --git a/runtimes/common/src/xcm_config.rs b/runtimes/common/src/xcm_config.rs index 2d036fb34..12e0cc1ed 100644 --- a/runtimes/common/src/xcm_config.rs +++ b/runtimes/common/src/xcm_config.rs @@ -17,7 +17,7 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org use core::{marker::PhantomData, ops::ControlFlow}; -use frame_support::{log, match_types, parameter_types, traits::ProcessMessageError, weights::Weight}; +use frame_support::{match_types, parameter_types, traits::ProcessMessageError, weights::Weight}; use polkadot_parachain::primitives::Sibling; use xcm::v3::prelude::*; use xcm_builder::{AccountId32Aliases, CurrencyAdapter, IsConcrete, ParentIsPreset, SiblingParachainConvertsVia}; diff --git a/runtimes/kestrel/src/lib.rs b/runtimes/kestrel/src/lib.rs index 9f3d7e9ae..a58533235 100644 --- a/runtimes/kestrel/src/lib.rs +++ b/runtimes/kestrel/src/lib.rs @@ -195,8 +195,12 @@ impl frame_system::Config for Runtime { type MaxConsumers = frame_support::traits::ConstU32<16>; } +/// Maximum number of nominators per validator. +const MAX_NOMINATORS: u32 = 8; + parameter_types! { pub const MaxAuthorities: u32 = constants::staking::MAX_CANDIDATES; + pub const MaxNominators: u32 = MAX_NOMINATORS; } impl pallet_aura::Config for Runtime { @@ -209,6 +213,7 @@ impl pallet_aura::Config for Runtime { impl pallet_grandpa::Config for Runtime { type RuntimeEvent = RuntimeEvent; type KeyOwnerProof = sp_core::Void; + type MaxNominators = MaxNominators; type WeightInfo = (); type MaxAuthorities = MaxAuthorities; // This is a purely random value @@ -1115,9 +1120,10 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey}; + use frame_benchmarking::{Benchmarking, BenchmarkBatch}; use frame_system_benchmarking::Pallet as SystemBench; use frame_benchmarking::baseline::Pallet as Baseline; + use frame_support::traits::TrackedStorageKey; impl frame_system_benchmarking::Config for Runtime {} impl frame_benchmarking::baseline::Config for Runtime {} diff --git a/runtimes/peregrine/Cargo.toml b/runtimes/peregrine/Cargo.toml index e895f3873..4033de7e0 100644 --- a/runtimes/peregrine/Cargo.toml +++ b/runtimes/peregrine/Cargo.toml @@ -89,9 +89,10 @@ pallet-vesting = { workspace = true } # Cumulus dependencies cumulus-pallet-aura-ext = { workspace = true } cumulus-pallet-dmp-queue = { workspace = true } -cumulus-pallet-parachain-system = { workspace = true } +cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook"] } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } +cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-timestamp = { workspace = true } cumulus-primitives-utility = { workspace = true } @@ -166,6 +167,7 @@ std = [ "cumulus-pallet-session-benchmarking/std", "cumulus-pallet-xcm/std", "cumulus-pallet-xcmp-queue/std", + "cumulus-primitives-aura/std", "cumulus-primitives-core/std", "cumulus-primitives-timestamp/std", "cumulus-primitives-utility/std", diff --git a/runtimes/peregrine/src/lib.rs b/runtimes/peregrine/src/lib.rs index 71bde99e1..66d80d9c5 100644 --- a/runtimes/peregrine/src/lib.rs +++ b/runtimes/peregrine/src/lib.rs @@ -25,7 +25,7 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); -use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; +use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases; use frame_support::{ construct_runtime, parameter_types, traits::{ConstU32, EitherOfDiverse, Everything, InstanceFilter, PrivilegeCmp}, @@ -57,7 +57,10 @@ pub use public_credentials; use runtime_common::{ assets::{AssetDid, PublicCredentialsFilter}, authorization::{AuthorizationId, PalletAuthorize}, - constants::{self, UnvestedFundsAllowedWithdrawReasons, EXISTENTIAL_DEPOSIT, KILT}, + constants::{ + self, UnvestedFundsAllowedWithdrawReasons, BLOCK_PROCESSING_VELOCITY, EXISTENTIAL_DEPOSIT, KILT, + RELAY_CHAIN_SLOT_DURATION_MILLIS, SLOT_DURATION, UNINCLUDED_SEGMENT_CAPACITY, + }, dip::merkle::{CompleteMerkleProof, DidMerkleProofOf, DidMerkleRootGenerator}, errors::PublicCredentialsApiError, fees::{ToAuthor, WeightToFee}, @@ -249,9 +252,17 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type ReservedDmpWeight = ReservedDmpWeight; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; - type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; + type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases; + type ConsensusHook = ConsensusHook; } +type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook< + Runtime, + RELAY_CHAIN_SLOT_DURATION_MILLIS, + BLOCK_PROCESSING_VELOCITY, + UNINCLUDED_SEGMENT_CAPACITY, +>; + impl parachain_info::Config for Runtime {} impl cumulus_pallet_aura_ext::Config for Runtime {} @@ -1260,13 +1271,21 @@ impl_runtime_apis! { impl sp_consensus_aura::AuraApi for Runtime { fn slot_duration() -> sp_consensus_aura::SlotDuration { - sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration()) + sp_consensus_aura::SlotDuration::from_millis(SLOT_DURATION) } fn authorities() -> Vec { Aura::authorities().into_inner() } } + impl cumulus_primitives_aura::AuraUnincludedSegmentApi for Runtime { + fn can_build_upon( + included_hash: ::Hash, + slot: cumulus_primitives_aura::Slot, + ) -> bool { + ConsensusHook::can_build_upon(included_hash, slot) + } + } impl cumulus_primitives_core::CollectCollationInfo for Runtime { fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo { @@ -1427,10 +1446,11 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey}; + use frame_benchmarking::{Benchmarking, BenchmarkBatch}; use frame_system_benchmarking::Pallet as SystemBench; use cumulus_pallet_session_benchmarking::Pallet as SessionBench; use frame_benchmarking::baseline::Pallet as Baseline; + use frame_support::traits::TrackedStorageKey; impl frame_system_benchmarking::Config for Runtime {} impl cumulus_pallet_session_benchmarking::Config for Runtime {} @@ -1485,31 +1505,7 @@ impl_runtime_apis! { } } } - -struct CheckInherents; - -impl cumulus_pallet_parachain_system::CheckInherents for CheckInherents { - fn check_inherents( - block: &Block, - relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof, - ) -> sp_inherents::CheckInherentsResult { - let relay_chain_slot = relay_state_proof - .read_slot() - .expect("Could not read the relay chain slot from the proof"); - - let inherent_data = cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration( - relay_chain_slot, - sp_std::time::Duration::from_secs(6), - ) - .create_inherent_data() - .expect("Could not create the timestamp inherent data"); - - inherent_data.check_extrinsics(block) - } -} - cumulus_pallet_parachain_system::register_validate_block! { Runtime = Runtime, BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::, - CheckInherents = CheckInherents, } diff --git a/runtimes/spiritnet/Cargo.toml b/runtimes/spiritnet/Cargo.toml index 6bfc858a0..fb4fb9bcb 100644 --- a/runtimes/spiritnet/Cargo.toml +++ b/runtimes/spiritnet/Cargo.toml @@ -87,9 +87,10 @@ pallet-vesting = { workspace = true } # Cumulus dependencies cumulus-pallet-aura-ext = { workspace = true } cumulus-pallet-dmp-queue = { workspace = true } -cumulus-pallet-parachain-system = { workspace = true } +cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook"] } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } +cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-timestamp = { workspace = true } cumulus-primitives-utility = { workspace = true } @@ -163,6 +164,7 @@ std = [ "cumulus-pallet-session-benchmarking/std", "cumulus-pallet-xcm/std", "cumulus-pallet-xcmp-queue/std", + "cumulus-primitives-aura/std", "cumulus-primitives-core/std", "cumulus-primitives-timestamp/std", "cumulus-primitives-utility/std", diff --git a/runtimes/spiritnet/src/lib.rs b/runtimes/spiritnet/src/lib.rs index 1a3bef5f9..fc900b00f 100644 --- a/runtimes/spiritnet/src/lib.rs +++ b/runtimes/spiritnet/src/lib.rs @@ -25,7 +25,7 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); -use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; +use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases; use frame_support::{ construct_runtime, parameter_types, traits::{ConstU32, EitherOfDiverse, Everything, InstanceFilter, PrivilegeCmp}, @@ -57,7 +57,10 @@ pub use public_credentials; use runtime_common::{ assets::{AssetDid, PublicCredentialsFilter}, authorization::{AuthorizationId, PalletAuthorize}, - constants::{self, UnvestedFundsAllowedWithdrawReasons, EXISTENTIAL_DEPOSIT, KILT}, + constants::{ + self, UnvestedFundsAllowedWithdrawReasons, BLOCK_PROCESSING_VELOCITY, EXISTENTIAL_DEPOSIT, KILT, + RELAY_CHAIN_SLOT_DURATION_MILLIS, SLOT_DURATION, UNINCLUDED_SEGMENT_CAPACITY, + }, dip::merkle::{CompleteMerkleProof, DidMerkleProofOf, DidMerkleRootGenerator}, errors::PublicCredentialsApiError, fees::{ToAuthor, WeightToFee}, @@ -233,6 +236,13 @@ parameter_types! { pub const ReservedDmpWeight: Weight = constants::MAXIMUM_BLOCK_WEIGHT.saturating_div(4); } +type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook< + Runtime, + RELAY_CHAIN_SLOT_DURATION_MILLIS, + BLOCK_PROCESSING_VELOCITY, + UNINCLUDED_SEGMENT_CAPACITY, +>; + impl cumulus_pallet_parachain_system::Config for Runtime { type RuntimeEvent = RuntimeEvent; type OnSystemEvent = (); @@ -242,7 +252,8 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type ReservedDmpWeight = ReservedDmpWeight; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; - type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; + type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases; + type ConsensusHook = ConsensusHook; } impl parachain_info::Config for Runtime {} @@ -1250,7 +1261,7 @@ impl_runtime_apis! { impl sp_consensus_aura::AuraApi for Runtime { fn slot_duration() -> sp_consensus_aura::SlotDuration { - sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration()) + sp_consensus_aura::SlotDuration::from_millis(SLOT_DURATION) } fn authorities() -> Vec { @@ -1258,6 +1269,15 @@ impl_runtime_apis! { } } + impl cumulus_primitives_aura::AuraUnincludedSegmentApi for Runtime { + fn can_build_upon( + included_hash: ::Hash, + slot: cumulus_primitives_aura::Slot, + ) -> bool { + ConsensusHook::can_build_upon(included_hash, slot) + } + } + impl cumulus_primitives_core::CollectCollationInfo for Runtime { fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo { ParachainSystem::collect_collation_info(header) @@ -1417,10 +1437,11 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey}; + use frame_benchmarking::{Benchmarking, BenchmarkBatch}; use frame_system_benchmarking::Pallet as SystemBench; use cumulus_pallet_session_benchmarking::Pallet as SessionBench; use frame_benchmarking::baseline::Pallet as Baseline; + use frame_support::traits::TrackedStorageKey; impl frame_system_benchmarking::Config for Runtime {} impl cumulus_pallet_session_benchmarking::Config for Runtime {} @@ -1476,30 +1497,7 @@ impl_runtime_apis! { } } -struct CheckInherents; - -impl cumulus_pallet_parachain_system::CheckInherents for CheckInherents { - fn check_inherents( - block: &Block, - relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof, - ) -> sp_inherents::CheckInherentsResult { - let relay_chain_slot = relay_state_proof - .read_slot() - .expect("Could not read the relay chain slot from the proof"); - - let inherent_data = cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration( - relay_chain_slot, - sp_std::time::Duration::from_secs(6), - ) - .create_inherent_data() - .expect("Could not create the timestamp inherent data"); - - inherent_data.check_extrinsics(block) - } -} - cumulus_pallet_parachain_system::register_validate_block! { Runtime = Runtime, BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::, - CheckInherents = CheckInherents, } diff --git a/scripts/diff-runtimes.sh b/scripts/diff-runtimes.sh old mode 100644 new mode 100755 diff --git a/support/Cargo.toml b/support/Cargo.toml index 08ab42554..78fd81e27 100644 --- a/support/Cargo.toml +++ b/support/Cargo.toml @@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] # External dependencies + log = { workspace = true } parity-scale-codec = { workspace = true, features = ["derive"] } scale-info = { workspace = true, features = ["derive"] } @@ -26,6 +27,7 @@ pallet-balances = { workspace = true } sp-core = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } +sp-weights = { workspace = true } # std dependencies serde = { workspace = true, features = ["derive"] } @@ -47,5 +49,6 @@ std = [ "sp-core/std", "sp-runtime/std", "sp-std/std", + "sp-weights/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/support/src/signature.rs b/support/src/signature.rs index 7c592ddaf..017d313b2 100644 --- a/support/src/signature.rs +++ b/support/src/signature.rs @@ -16,8 +16,8 @@ // If you feel like getting in touch with us, you can do so at info@botlabs.org -use frame_support::dispatch::Weight; use scale_info::TypeInfo; +use sp_weights::Weight; #[cfg(any(test, feature = "mock", feature = "runtime-benchmarks"))] use sp_std::marker::PhantomData;