From 077dc5dfb61bfa1548fe7d0345b75eb5390d718d Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Tue, 10 May 2022 18:37:45 +0800 Subject: [PATCH 01/59] Anchor `polkadot-v0.9.17` and Disable `darwinia-bridges-substrate` --- Cargo.lock | 3775 ++++++++++++++----------- Cargo.toml | 94 +- primitives/Cargo.toml | 4 +- rpc/Cargo.toml | 18 +- runtime/common/Cargo.toml | 30 +- runtime/crab-parachain/Cargo.toml | 90 +- runtime/darwinia-parachain/Cargo.toml | 78 +- runtime/pangolin-parachain/Cargo.toml | 132 +- 8 files changed, 2356 insertions(+), 1865 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0c041c23..cd8d9bca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -425,7 +425,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "beefy-primitives", "fnv", @@ -440,12 +440,12 @@ dependencies = [ "sc-network-gossip", "sc-utils", "sp-api", - "sp-application-crypto", - "sp-arithmetic", + "sp-application-crypto 5.0.0", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-blockchain", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 5.0.0", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", "substrate-prometheus-endpoint", "thiserror", "wasm-timer", @@ -454,11 +454,10 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "beefy-gadget", "beefy-primitives", - "derive_more", "futures 0.3.21", "jsonrpc-core", "jsonrpc-core-client", @@ -470,28 +469,28 @@ dependencies = [ "sc-rpc", "sc-utils", "serde", - "sp-core", - "sp-runtime", + "sp-core 5.0.0", + "sp-runtime 5.0.0", "thiserror", ] [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto", - "sp-core", - "sp-runtime", - "sp-std", + "sp-application-crypto 5.0.0", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -540,22 +539,10 @@ version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" dependencies = [ - "funty 1.1.0", - "radium 0.6.2", - "tap", - "wyz 0.2.0", -] - -[[package]] -name = "bitvec" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" -dependencies = [ - "funty 2.0.0", - "radium 0.7.0", + "funty", + "radium", "tap", - "wyz 0.5.0", + "wyz", ] [[package]] @@ -685,320 +672,154 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bp-darwinia-core" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" -dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bp-header-chain" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" -dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "finality-grandpa", - "frame-support", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", -] - [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "finality-grandpa", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", "serde", - "sp-core", + "sp-core 5.0.0", "sp-finality-grandpa", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "frame-support", + "bp-runtime", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-std", -] - -[[package]] -name = "bp-message-dispatch" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" -dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "frame-support", - "parity-scale-codec", - "scale-info", - "sp-std", -] - -[[package]] -name = "bp-messages" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" -dependencies = [ - "bitvec 0.20.4", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-std", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec 0.20.4", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "frame-support", - "frame-system", + "bitvec", + "bp-runtime", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", - "sp-std", -] - -[[package]] -name = "bp-pangolin" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" -dependencies = [ - "bp-darwinia-core", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "frame-support", - "sp-api", - "sp-runtime", - "sp-std", - "sp-version", -] - -[[package]] -name = "bp-pangolin-parachain" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" -dependencies = [ - "bp-darwinia-core", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "frame-support", - "sp-api", - "sp-runtime", - "sp-std", - "sp-version", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "frame-support", - "frame-system", + "bp-messages", + "bp-runtime", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", "sp-api", - "sp-core", - "sp-runtime", - "sp-std", - "sp-version", -] - -[[package]] -name = "bp-polkadot-core" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" -dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-core", - "sp-runtime", - "sp-std", - "sp-version", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "frame-support", + "bp-messages", + "bp-polkadot-core", + "bp-runtime", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "smallvec", "sp-api", - "sp-runtime", - "sp-std", - "sp-version", -] - -[[package]] -name = "bp-runtime" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" -dependencies = [ - "frame-support", - "hash-db", - "num-traits", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "hash-db", "num-traits", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", -] - -[[package]] -name = "bp-test-utils" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" -dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "ed25519-dalek", - "finality-grandpa", - "parity-scale-codec", - "sp-application-crypto", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-trie 5.0.0", ] [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", + "bp-header-chain", "ed25519-dalek", "finality-grandpa", "parity-scale-codec", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-finality-grandpa", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", + "bp-messages", + "bp-polkadot-core", "bp-rococo", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", + "bp-runtime", "parity-scale-codec", "sp-api", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bridge-runtime-common" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" -dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "frame-support", - "hash-db", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "pallet-transaction-payment", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "frame-support", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "hash-db", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "pallet-transaction-payment", + "pallet-bridge-dispatch", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-trie 5.0.0", ] [[package]] @@ -1225,12 +1046,51 @@ dependencies = [ "ansi_term", "atty", "bitflags", - "strsim", - "textwrap", + "strsim 0.8.0", + "textwrap 0.11.0", "unicode-width", "vec_map", ] +[[package]] +name = "clap" +version = "3.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47582c09be7c8b32c0ab3a6181825ababb713fde6fff20fc573a3870dd45c6a0" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "lazy_static", + "strsim 0.10.0", + "termcolor", + "textwrap 0.15.0", +] + +[[package]] +name = "clap_derive" +version = "3.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" +dependencies = [ + "heck 0.4.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +dependencies = [ + "os_str_bytes", +] + [[package]] name = "cloudabi" version = "0.0.3" @@ -1320,44 +1180,43 @@ dependencies = [ "dc-common-runtime", "dc-primitives", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "frame-system-rpc-runtime-api", "frame-try-runtime", "pallet-aura", "pallet-authorship", "pallet-balances", "pallet-collator-selection", - "pallet-fee-market-rpc-runtime-api", "pallet-multisig", "pallet-proxy", "pallet-session", "pallet-sudo", "pallet-timestamp", - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "pallet-xcm", + "pallet-xcm 0.9.17", "parachain-info", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.17", "scale-info", "smallvec", "sp-api", "sp-block-builder", "sp-consensus-aura", - "sp-core", - "sp-inherents", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-offchain", - "sp-runtime", + "sp-runtime 5.0.0", "sp-session", - "sp-std", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-transaction-pool", - "sp-version", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.17", + "xcm-builder 0.9.17", + "xcm-executor 0.9.17", ] [[package]] @@ -1545,7 +1404,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" dependencies = [ - "sct", + "sct 0.6.1", ] [[package]] @@ -1581,17 +1440,17 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ + "clap 3.1.17", "sc-cli", "sc-service", - "structopt", ] [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1607,15 +1466,15 @@ dependencies = [ "sc-client-api", "sp-api", "sp-consensus", - "sp-core", - "sp-runtime", + "sp-core 5.0.0", + "sp-runtime 5.0.0", "tracing", ] [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1628,15 +1487,15 @@ dependencies = [ "sc-consensus-slots", "sc-telemetry", "sp-api", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", "substrate-prometheus-endpoint", "tracing", ] @@ -1644,7 +1503,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -1657,31 +1516,31 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-runtime", - "sp-trie", + "sp-runtime 5.0.0", + "sp-trie 5.0.0", "tracing", ] [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", - "parking_lot 0.10.2", + "parking_lot 0.12.0", "sc-client-api", "sc-consensus", "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", "substrate-prometheus-endpoint", "tracing", ] @@ -1689,7 +1548,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -1697,24 +1556,24 @@ dependencies = [ "futures 0.3.21", "futures-timer", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "polkadot-node-primitives", - "polkadot-parachain", + "polkadot-parachain 0.9.17", "polkadot-primitives", "sc-client-api", "sp-api", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", "tracing", ] [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", @@ -1731,14 +1590,14 @@ dependencies = [ "sp-api", "sp-consensus", "sp-maybe-compressed-blob", - "sp-runtime", + "sp-runtime 5.0.0", "tracing", ] [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-client-collator", "cumulus-client-consensus-common", @@ -1746,7 +1605,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "parity-scale-codec", - "parking_lot 0.10.2", + "parking_lot 0.12.0", "polkadot-overseer", "polkadot-primitives", "sc-chain-spec", @@ -1759,81 +1618,81 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", + "sp-core 5.0.0", + "sp-runtime 5.0.0", "tracing", ] [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "pallet-aura", "parity-scale-codec", "scale-info", "serde", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-consensus-aura", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", - "xcm-executor", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "xcm 0.9.17", + "xcm-executor 0.9.17", ] [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "environmental", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "impl-trait-for-tuples", "log", "pallet-balances", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.17", "scale-info", "serde", - "sp-core", - "sp-externalities", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", - "sp-version", - "xcm", + "sp-core 5.0.0", + "sp-externalities 0.11.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-trie 5.0.0", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "xcm 0.9.17", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -1844,58 +1703,58 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "xcm 0.9.17", ] [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", "rand_chacha 0.3.1", "scale-info", - "sp-runtime", - "sp-std", - "xcm", - "xcm-executor", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "xcm 0.9.17", + "xcm-executor 0.9.17", ] [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-core-primitives 0.9.17", + "polkadot-parachain 0.9.17", "polkadot-primitives", "sp-api", - "sp-runtime", - "sp-std", - "sp-trie", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-trie 5.0.0", ] [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1905,76 +1764,76 @@ dependencies = [ "sc-client-api", "scale-info", "sp-api", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-storage", - "sp-trie", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-storage 5.0.0", + "sp-trie 5.0.0", "tracing", ] [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", - "sp-inherents", - "sp-std", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-timestamp", ] [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-core-primitives 0.9.17", + "polkadot-parachain 0.9.17", "polkadot-primitives", - "sp-runtime", - "sp-std", - "sp-trie", - "xcm", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-trie 5.0.0", + "xcm 0.9.17", ] [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "async-trait", "cumulus-primitives-core", "derive_more", "futures 0.3.21", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "polkadot-overseer", "sc-client-api", "sc-service", "sp-api", "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", "thiserror", ] [[package]] name = "cumulus-relay-chain-local" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "polkadot-client", "polkadot-service", "sc-client-api", @@ -1986,23 +1845,23 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", "tracing", ] [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", "polkadot-primitives", - "sp-runtime", - "sp-state-machine", - "sp-std", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -2054,12 +1913,11 @@ dependencies = [ "futures 0.3.21", "jsonrpc-core", "log", - "pallet-fee-market-rpc-runtime-api", "pallet-transaction-payment-rpc", "pangolin-parachain-runtime", "parity-scale-codec", "polkadot-cli", - "polkadot-parachain", + "polkadot-parachain 0.9.17", "polkadot-primitives", "polkadot-service", "sc-basic-authorship", @@ -2080,11 +1938,11 @@ dependencies = [ "sp-block-builder", "sp-consensus", "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-keystore", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-keystore 0.11.0", "sp-offchain", - "sp-runtime", + "sp-runtime 5.0.0", "sp-session", "sp-timestamp", "sp-transaction-pool", @@ -2094,7 +1952,7 @@ dependencies = [ "substrate-prometheus-endpoint", "tempfile", "try-runtime-cli", - "xcm", + "xcm 0.9.17", ] [[package]] @@ -2112,43 +1970,42 @@ dependencies = [ "dc-common-runtime", "dc-primitives", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "frame-system-rpc-runtime-api", "pallet-aura", "pallet-authorship", "pallet-balances", "pallet-collator-selection", - "pallet-fee-market-rpc-runtime-api", "pallet-multisig", "pallet-proxy", "pallet-session", "pallet-sudo", "pallet-timestamp", - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "pallet-xcm", + "pallet-xcm 0.9.16", "parachain-info", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.16", "scale-info", "smallvec", "sp-api", "sp-block-builder", "sp-consensus-aura", - "sp-core", - "sp-inherents", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-offchain", - "sp-runtime", + "sp-runtime 5.0.0", "sp-session", - "sp-std", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-transaction-pool", - "sp-version", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.16", + "xcm-builder 0.9.16", + "xcm-executor 0.9.16", ] [[package]] @@ -2181,27 +2038,23 @@ dependencies = [ name = "dc-common-runtime" version = "5.1.2" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", "dc-primitives", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", "pallet-collator-selection", - "pallet-fee-market", - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "smallvec", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "dc-primitives" version = "5.1.2" dependencies = [ - "sp-core", - "sp-runtime", + "sp-core 5.0.0", + "sp-runtime 5.0.0", ] [[package]] @@ -2210,7 +2063,6 @@ version = "5.1.2" dependencies = [ "dc-primitives", "jsonrpc-core", - "pallet-fee-market-rpc", "pallet-transaction-payment-rpc", "sc-client-api", "sc-rpc", @@ -2613,7 +2465,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "parity-scale-codec", ] @@ -2631,33 +2483,35 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "linregress", "log", "parity-scale-codec", "paste", "scale-info", + "serde", "sp-api", - "sp-application-crypto", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-application-crypto 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-runtime-interface 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-storage 5.0.0", ] [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "Inflector", "chrono", + "clap 3.1.17", "frame-benchmarking", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "handlebars", "linked-hash-map", "log", @@ -2667,42 +2521,42 @@ dependencies = [ "sc-executor", "sc-service", "serde", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "structopt", + "serde_json", + "sp-core 5.0.0", + "sp-externalities 0.11.0", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-arithmetic", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-npos-elections", - "sp-std", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-tracing", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -2724,7 +2578,36 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19 dependencies = [ "bitflags", "frame-metadata", - "frame-support-procedural", + "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "impl-trait-for-tuples", + "log", + "once_cell", + "parity-scale-codec", + "paste", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-core 4.1.0-dev", + "sp-core-hashing-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-io 4.0.0", + "sp-runtime 4.1.0-dev", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-state-machine 0.10.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "tt-call", +] + +[[package]] +name = "frame-support" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "bitflags", + "frame-metadata", + "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "impl-trait-for-tuples", "log", "once_cell", @@ -2733,16 +2616,16 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic", - "sp-core", - "sp-core-hashing-proc-macro", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-state-machine", - "sp-std", - "sp-tracing", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core 5.0.0", + "sp-core-hashing-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-state-machine 0.11.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "tt-call", ] @@ -2752,7 +2635,19 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" dependencies = [ "Inflector", - "frame-support-procedural-tools", + "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "frame-support-procedural" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "Inflector", + "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "proc-macro2", "quote", "syn", @@ -2763,7 +2658,19 @@ name = "frame-support-procedural-tools" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" dependencies = [ - "frame-support-procedural-tools-derive", + "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "frame-support-procedural-tools" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "proc-macro-crate 1.1.3", "proc-macro2", "quote", @@ -2780,27 +2687,54 @@ dependencies = [ "syn", ] +[[package]] +name = "frame-support-procedural-tools-derive" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "frame-system" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 4.1.0-dev", + "sp-io 4.0.0", + "sp-runtime 4.1.0-dev", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", +] + +[[package]] +name = "frame-system" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-version", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "parity-scale-codec", "sp-api", @@ -2809,12 +2743,12 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-api", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -2867,12 +2801,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures" version = "0.1.31" @@ -2961,8 +2889,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" dependencies = [ "futures-io", - "rustls", - "webpki", + "rustls 0.19.1", + "webpki 0.21.4", ] [[package]] @@ -3321,11 +3249,11 @@ dependencies = [ "futures-util", "hyper", "log", - "rustls", - "rustls-native-certs", + "rustls 0.19.1", + "rustls-native-certs 0.5.0", "tokio", - "tokio-rustls", - "webpki", + "tokio-rustls 0.22.0", + "webpki 0.21.4", ] [[package]] @@ -3679,56 +3607,124 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6373a33d987866ccfe1af4bc11b089dce941764313f9fd8b7cf13fcb51b72dc5" dependencies = [ - "jsonrpsee-proc-macros", - "jsonrpsee-types", + "jsonrpsee-types 0.4.1", "jsonrpsee-utils", - "jsonrpsee-ws-client", + "jsonrpsee-ws-client 0.4.1", ] [[package]] -name = "jsonrpsee-proc-macros" -version = "0.4.1" +name = "jsonrpsee" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d802063f7a3c867456955f9d2f15eb3ee0edb5ec9ec2b5526324756759221c0f" +checksum = "05fd8cd6c6b1bbd06881d2cf88f1fc83cc36c98f2219090f839115fb4a956cb9" dependencies = [ - "log", - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", + "jsonrpsee-core", + "jsonrpsee-proc-macros", + "jsonrpsee-types 0.8.0", + "jsonrpsee-ws-client 0.8.0", ] [[package]] -name = "jsonrpsee-types" -version = "0.4.1" +name = "jsonrpsee-client-transport" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f778cf245158fbd8f5d50823a2e9e4c708a40be164766bd35e9fb1d86715b2" +checksum = "3303cdf246e6ab76e2866fb3d9acb6c76a068b1b28bd923a1b7a8122257ad7b5" +dependencies = [ + "futures 0.3.21", + "http", + "jsonrpsee-core", + "jsonrpsee-types 0.8.0", + "pin-project 1.0.10", + "rustls-native-certs 0.6.2", + "soketto", + "thiserror", + "tokio", + "tokio-rustls 0.23.4", + "tokio-util 0.6.9", + "tracing", + "webpki-roots 0.22.3", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f220b5a238dc7992b90f1144fbf6eaa585872c9376afe6fe6863ffead6191bf3" dependencies = [ "anyhow", + "arrayvec 0.7.2", "async-trait", "beef", "futures-channel", "futures-util", "hyper", - "log", + "jsonrpsee-types 0.8.0", + "rustc-hash", "serde", "serde_json", "soketto", "thiserror", + "tokio", + "tracing", ] [[package]] -name = "jsonrpsee-utils" -version = "0.4.1" +name = "jsonrpsee-proc-macros" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0109c4f972058f3b1925b73a17210aff7b63b65967264d0045d15ee88fe84f0c" +checksum = "4299ebf790ea9de1cb72e73ff2ae44c723ef264299e5e2d5ef46a371eb3ac3d8" dependencies = [ - "arrayvec 0.7.2", - "beef", - "jsonrpsee-types", -] - -[[package]] + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "jsonrpsee-types" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f778cf245158fbd8f5d50823a2e9e4c708a40be164766bd35e9fb1d86715b2" +dependencies = [ + "anyhow", + "async-trait", + "beef", + "futures-channel", + "futures-util", + "hyper", + "log", + "serde", + "serde_json", + "soketto", + "thiserror", +] + +[[package]] +name = "jsonrpsee-types" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b3f601bbbe45cd63f5407b6f7d7950e08a7d4f82aa699ff41a4a5e9e54df58" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "jsonrpsee-utils" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0109c4f972058f3b1925b73a17210aff7b63b65967264d0045d15ee88fe84f0c" +dependencies = [ + "arrayvec 0.7.2", + "beef", + "jsonrpsee-types 0.4.1", +] + +[[package]] name = "jsonrpsee-ws-client" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3739,19 +3735,30 @@ dependencies = [ "fnv", "futures 0.3.21", "http", - "jsonrpsee-types", + "jsonrpsee-types 0.4.1", "log", "pin-project 1.0.10", - "rustls-native-certs", + "rustls-native-certs 0.5.0", "serde", "serde_json", "soketto", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.22.0", "tokio-util 0.6.9", ] +[[package]] +name = "jsonrpsee-ws-client" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5" +dependencies = [ + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-types 0.8.0", +] + [[package]] name = "keccak" version = "0.1.0" @@ -3770,15 +3777,15 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec", "frame-election-provider-support", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "frame-system-rpc-runtime-api", "frame-try-runtime", "kusama-runtime-constants", @@ -3813,12 +3820,12 @@ dependencies = [ "pallet-staking-reward-fn", "pallet-timestamp", "pallet-tips", - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vesting", - "pallet-xcm", + "pallet-xcm 0.9.17", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", @@ -3829,38 +3836,38 @@ dependencies = [ "serde_derive", "smallvec", "sp-api", - "sp-arithmetic", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io 5.0.0", "sp-npos-elections", "sp-offchain", - "sp-runtime", + "sp-runtime 5.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-transaction-pool", - "sp-version", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "static_assertions", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.17", + "xcm-builder 0.9.17", + "xcm-executor 0.9.17", ] [[package]] name = "kusama-runtime-constants" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "polkadot-primitives", "polkadot-runtime-common", "smallvec", - "sp-runtime", + "sp-runtime 5.0.0", ] [[package]] @@ -4412,7 +4419,7 @@ dependencies = [ "rw-stream-sink", "soketto", "url 2.2.2", - "webpki-roots", + "webpki-roots 0.21.1", ] [[package]] @@ -4724,8 +4731,8 @@ dependencies = [ [[package]] name = "metered-channel" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "derive_more", "futures 0.3.21", @@ -5156,6 +5163,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "os_str_bytes" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" + [[package]] name = "owning_ref" version = "0.4.1" @@ -5168,129 +5181,129 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-consensus-aura", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-authority-discovery", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "sp-authorship", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "pallet-authorship", "pallet-session", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io", - "sp-runtime", + "sp-io 5.0.0", + "sp-runtime 5.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "beefy-primitives", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "pallet-session", "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "beefy-merkle-tree", "beefy-primitives", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "hex", "libsecp256k1", "log", @@ -5301,431 +5314,326 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-bridge-dispatch" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" -dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" -dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-bridge-grandpa" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "finality-grandpa", - "frame-support", - "frame-system", + "bp-message-dispatch", + "bp-runtime", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", - "num-traits", "parity-scale-codec", "scale-info", - "serde", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", - "sp-trie", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "bp-test-utils 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", + "bp-header-chain", + "bp-runtime", + "bp-test-utils", "finality-grandpa", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "num-traits", "parity-scale-codec", "scale-info", "serde", "sp-finality-grandpa", - "sp-runtime", - "sp-std", - "sp-trie", -] - -[[package]] -name = "pallet-bridge-messages" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" -dependencies = [ - "bitvec 0.20.4", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "frame-support", - "frame-system", - "log", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-trie 5.0.0", ] [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec 0.20.4", - "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "frame-support", - "frame-system", + "bitvec", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "pallet-authorship", "pallet-session", "parity-scale-codec", - "rand 0.7.3", + "rand 0.8.5", "scale-info", "serde", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-runtime 5.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ + "frame-benchmarking", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", + "rand 0.7.3", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core 5.0.0", + "sp-io 5.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "static_assertions", + "strum", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 5.0.0", + "sp-io 5.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-fee-market" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" -dependencies = [ - "bitvec 1.0.0", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "frame-support", - "frame-system", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "pallet-timestamp", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-fee-market-rpc" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" -dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "pallet-fee-market-rpc-runtime-api", - "parity-scale-codec", - "sp-api", - "sp-blockchain", - "sp-runtime", -] - -[[package]] -name = "pallet-fee-market-rpc-runtime-api" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16#be5c97b1528e7a853005e6ac1cea977a5e89c1ab" -dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "parity-scale-codec", - "serde", - "sp-api", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-runtime", - "sp-std", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "pallet-authorship", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-core", + "sp-application-crypto 5.0.0", + "sp-core 5.0.0", "sp-finality-grandpa", - "sp-io", - "sp-runtime", + "sp-io 5.0.0", + "sp-runtime 5.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "enumflags2", "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-application-crypto 5.0.0", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 5.0.0", + "sp-io 5.0.0", "sp-keyring", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "pallet-mmr-primitives", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", "serde", "sp-api", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5735,175 +5643,175 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 5.0.0", + "sp-runtime 5.0.0", ] [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-runtime 5.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "impl-trait-for-tuples", "log", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", "sp-session", - "sp-staking", - "sp-std", - "sp-trie", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-trie 5.0.0", ] [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "pallet-authorship", "pallet-session", "parity-scale-codec", "scale-info", "serde", - "sp-application-crypto", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-application-crypto 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -5914,59 +5822,59 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "log", - "sp-arithmetic", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", "scale-info", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-timestamp", ] [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "pallet-treasury", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -5974,22 +5882,39 @@ name = "pallet-transaction-payment" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-core 4.1.0-dev", + "sp-io 4.0.0", + "sp-runtime 4.1.0-dev", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", +] + +[[package]] +name = "pallet-transaction-payment" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5998,65 +5923,65 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-blockchain", - "sp-core", + "sp-core 5.0.0", "sp-rpc", - "sp-runtime", + "sp-runtime 5.0.0", ] [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "sp-api", - "sp-runtime", + "sp-runtime 5.0.0", ] [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -6064,30 +5989,41 @@ name = "pallet-xcm" version = "0.9.16" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 4.1.0-dev", + "sp-runtime 4.1.0-dev", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "xcm 0.9.16", + "xcm-executor 0.9.16", +] + +[[package]] +name = "pallet-xcm" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +dependencies = [ + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std", - "xcm", - "xcm-executor", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "xcm 0.9.17", + "xcm-executor 0.9.17", ] [[package]] name = "pangolin-parachain-runtime" version = "5.1.2" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-pangolin", - "bp-pangolin-parachain", - "bp-polkadot-core 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -6099,57 +6035,52 @@ dependencies = [ "dc-common-runtime", "dc-primitives", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "frame-system-rpc-runtime-api", "pallet-aura", "pallet-authorship", "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.16)", "pallet-collator-selection", - "pallet-fee-market", - "pallet-fee-market-rpc-runtime-api", "pallet-multisig", "pallet-proxy", "pallet-session", "pallet-sudo", "pallet-timestamp", - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "pallet-xcm", + "pallet-xcm 0.9.17", "parachain-info", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.17", "scale-info", "smallvec", "sp-api", "sp-block-builder", "sp-consensus-aura", - "sp-core", - "sp-inherents", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-offchain", - "sp-runtime", + "sp-runtime 5.0.0", "sp-session", - "sp-std", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-transaction-pool", - "sp-version", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.17", + "xcm-builder 0.9.17", + "xcm-executor 0.9.17", ] [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "scale-info", "serde", @@ -6181,7 +6112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" dependencies = [ "arrayvec 0.7.2", - "bitvec 0.20.4", + "bitvec", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive", @@ -6309,6 +6240,16 @@ dependencies = [ "parking_lot_core 0.8.5", ] +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api 0.4.7", + "parking_lot_core 0.9.3", +] + [[package]] name = "parking_lot_core" version = "0.7.2" @@ -6337,6 +6278,19 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "parking_lot_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.13", + "smallvec", + "windows-sys", +] + [[package]] name = "paste" version = "1.0.7" @@ -6504,8 +6458,8 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "polkadot-approval-distribution" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -6518,8 +6472,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -6531,8 +6485,8 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "derive_more", "futures 0.3.21", @@ -6545,16 +6499,16 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", - "sp-core", - "sp-keystore", + "sp-core 5.0.0", + "sp-keystore 0.11.0", "thiserror", "tracing", ] [[package]] name = "polkadot-availability-recovery" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "futures 0.3.21", "lru 0.7.5", @@ -6573,9 +6527,10 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ + "clap 3.1.17", "frame-benchmarking-cli", "futures 0.3.21", "log", @@ -6586,9 +6541,8 @@ dependencies = [ "sc-cli", "sc-service", "sc-tracing", - "sp-core", - "sp-trie", - "structopt", + "sp-core 5.0.0", + "sp-trie 5.0.0", "substrate-build-script-utils", "thiserror", "try-runtime-cli", @@ -6596,8 +6550,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6619,16 +6573,16 @@ dependencies = [ "sp-consensus-babe", "sp-finality-grandpa", "sp-offchain", - "sp-runtime", + "sp-runtime 5.0.0", "sp-session", - "sp-storage", + "sp-storage 5.0.0", "sp-transaction-pool", ] [[package]] name = "polkadot-collator-protocol" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "always-assert", "derive_more", @@ -6639,9 +6593,9 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 5.0.0", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", "thiserror", "tracing", ] @@ -6654,15 +6608,28 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 4.1.0-dev", + "sp-runtime 4.1.0-dev", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", +] + +[[package]] +name = "polkadot-core-primitives" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +dependencies = [ + "parity-scale-codec", + "parity-util-mem", + "scale-info", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "polkadot-dispute-distribution" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "derive_more", "futures 0.3.21", @@ -6675,30 +6642,30 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "sc-network", - "sp-application-crypto", - "sp-keystore", + "sp-application-crypto 5.0.0", + "sp-keystore 0.11.0", "thiserror", "tracing", ] [[package]] name = "polkadot-erasure-coding" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", - "sp-core", - "sp-trie", + "sp-core 5.0.0", + "sp-trie 5.0.0", "thiserror", ] [[package]] name = "polkadot-gossip-support" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "futures 0.3.21", "futures-timer", @@ -6709,16 +6676,16 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 5.0.0", + "sp-core 5.0.0", + "sp-keystore 0.11.0", "tracing", ] [[package]] name = "polkadot-network-bridge" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "async-trait", "futures 0.3.21", @@ -6736,8 +6703,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "futures 0.3.21", "parity-scale-codec", @@ -6746,7 +6713,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core", + "sp-core 5.0.0", "sp-maybe-compressed-blob", "thiserror", "tracing", @@ -6754,10 +6721,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec 0.20.4", + "bitvec", "derive_more", "futures 0.3.21", "futures-timer", @@ -6773,19 +6740,19 @@ dependencies = [ "polkadot-primitives", "sc-keystore", "schnorrkel", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-consensus", "sp-consensus-slots", - "sp-runtime", + "sp-runtime 5.0.0", "tracing", ] [[package]] name = "polkadot-node-core-av-store" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec 0.20.4", + "bitvec", "futures 0.3.21", "futures-timer", "kvdb", @@ -6802,10 +6769,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec 0.20.4", + "bitvec", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -6813,21 +6780,21 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-statement-table", - "sp-keystore", + "sp-keystore 0.11.0", "thiserror", "tracing", ] [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-keystore", + "sp-keystore 0.11.0", "thiserror", "tracing", "wasm-timer", @@ -6835,8 +6802,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "async-trait", "futures 0.3.21", @@ -6845,7 +6812,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-parachain", + "polkadot-parachain 0.9.17", "polkadot-primitives", "sp-maybe-compressed-blob", "tracing", @@ -6853,8 +6820,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -6868,8 +6835,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "futures 0.3.21", "futures-timer", @@ -6885,8 +6852,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "futures 0.3.21", "kvdb", @@ -6903,8 +6870,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "async-trait", "futures 0.3.21", @@ -6912,18 +6879,18 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-primitives", "sp-blockchain", - "sp-inherents", - "sp-runtime", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", "thiserror", "tracing", ] [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec 0.20.4", + "bitvec", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -6937,8 +6904,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "always-assert", "assert_matches", @@ -6948,27 +6915,27 @@ dependencies = [ "futures-timer", "parity-scale-codec", "pin-project 1.0.10", - "polkadot-core-primitives", + "polkadot-core-primitives 0.9.17", "polkadot-node-subsystem-util", - "polkadot-parachain", + "polkadot-parachain 0.9.17", "rand 0.8.5", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", "slotmap", - "sp-core", - "sp-externalities", - "sp-io", + "sp-core 5.0.0", + "sp-externalities 0.11.0", + "sp-io 5.0.0", "sp-maybe-compressed-blob", - "sp-tracing", - "sp-wasm-interface", + "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-wasm-interface 5.0.0", "tracing", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "futures 0.3.21", "polkadot-node-primitives", @@ -6976,15 +6943,15 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", - "sp-keystore", + "sp-keystore 0.11.0", "thiserror", "tracing", ] [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "futures 0.3.21", "memory-lru", @@ -6995,14 +6962,14 @@ dependencies = [ "sp-api", "sp-authority-discovery", "sp-consensus-babe", - "sp-core", + "sp-core 5.0.0", "tracing", ] [[package]] name = "polkadot-node-jaeger" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "async-std", "lazy_static", @@ -7013,14 +6980,14 @@ dependencies = [ "polkadot-node-primitives", "polkadot-primitives", "sc-network", - "sp-core", + "sp-core 5.0.0", "thiserror", ] [[package]] name = "polkadot-node-metrics" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "bs58", "futures 0.3.21", @@ -7038,8 +7005,8 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "async-trait", "derive_more", @@ -7050,27 +7017,27 @@ dependencies = [ "polkadot-primitives", "sc-authority-discovery", "sc-network", - "strum 0.23.0", + "strum", "thiserror", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "bounded-vec", "futures 0.3.21", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.17", "polkadot-primitives", "schnorrkel", "serde", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-consensus-babe", "sp-consensus-vrf", - "sp-core", - "sp-keystore", + "sp-core 5.0.0", + "sp-keystore 0.11.0", "sp-maybe-compressed-blob", "thiserror", "zstd", @@ -7078,8 +7045,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7088,8 +7055,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "derive_more", "futures 0.3.21", @@ -7107,8 +7074,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "async-trait", "derive_more", @@ -7126,17 +7093,17 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "rand 0.8.5", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 5.0.0", + "sp-core 5.0.0", + "sp-keystore 0.11.0", "thiserror", "tracing", ] [[package]] name = "polkadot-overseer" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7156,8 +7123,8 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "async-trait", "futures 0.3.21", @@ -7173,8 +7140,8 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -7188,21 +7155,38 @@ version = "0.9.16" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "derive_more", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "parity-scale-codec", + "parity-util-mem", + "polkadot-core-primitives 0.9.16", + "scale-info", + "serde", + "sp-core 4.1.0-dev", + "sp-runtime 4.1.0-dev", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", +] + +[[package]] +name = "polkadot-parachain" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +dependencies = [ + "derive_more", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "parity-scale-codec", "parity-util-mem", - "polkadot-core-primitives", + "polkadot-core-primitives 0.9.17", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "polkadot-performance-test" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "env_logger", "kusama-runtime", @@ -7216,38 +7200,38 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec 0.20.4", - "frame-system", + "bitvec", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "hex-literal", "parity-scale-codec", "parity-util-mem", - "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-core-primitives 0.9.17", + "polkadot-parachain 0.9.17", "scale-info", "serde", "sp-api", - "sp-application-crypto", - "sp-arithmetic", + "sp-application-crypto 5.0.0", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-authority-discovery", "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-staking", - "sp-std", - "sp-trie", - "sp-version", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io 5.0.0", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-trie 5.0.0", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "polkadot-rpc" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7270,22 +7254,22 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-keystore", - "sp-runtime", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", "substrate-frame-rpc-system", ] [[package]] name = "polkadot-runtime" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec", "frame-election-provider-support", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "frame-system-rpc-runtime-api", "frame-try-runtime", "log", @@ -7316,12 +7300,12 @@ dependencies = [ "pallet-staking-reward-curve", "pallet-timestamp", "pallet-tips", - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vesting", - "pallet-xcm", + "pallet-xcm 0.9.17", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", @@ -7336,34 +7320,34 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io 5.0.0", "sp-npos-elections", "sp-offchain", - "sp-runtime", + "sp-runtime 5.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-transaction-pool", - "sp-version", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "static_assertions", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.17", + "xcm-builder 0.9.17", + "xcm-executor 0.9.17", ] [[package]] name = "polkadot-runtime-common" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "impl-trait-for-tuples", "libsecp256k1", "log", @@ -7375,7 +7359,7 @@ dependencies = [ "pallet-session", "pallet-staking", "pallet-timestamp", - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "pallet-treasury", "pallet-vesting", "parity-scale-codec", @@ -7387,52 +7371,52 @@ dependencies = [ "serde_derive", "slot-range-helper", "sp-api", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io 5.0.0", "sp-npos-elections", - "sp-runtime", + "sp-runtime 5.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "static_assertions", - "xcm", + "xcm 0.9.17", ] [[package]] name = "polkadot-runtime-constants" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "polkadot-primitives", "polkadot-runtime-common", "smallvec", - "sp-runtime", + "sp-runtime 5.0.0", ] [[package]] name = "polkadot-runtime-metrics" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "bs58", "parity-scale-codec", "polkadot-primitives", - "sp-std", - "sp-tracing", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "polkadot-runtime-parachains" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "bitflags", - "bitvec 0.20.4", + "bitvec", "derive_more", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "log", "pallet-authority-discovery", "pallet-authorship", @@ -7451,22 +7435,22 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io 5.0.0", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", "sp-session", - "sp-staking", - "sp-std", - "xcm", - "xcm-executor", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "xcm 0.9.17", + "xcm-executor 0.9.17", ] [[package]] name = "polkadot-service" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "async-trait", "beefy-gadget", @@ -7509,7 +7493,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-parachain", + "polkadot-parachain 0.9.17", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", @@ -7544,19 +7528,19 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core", + "sp-core 5.0.0", "sp-finality-grandpa", - "sp-inherents", - "sp-io", - "sp-keystore", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io 5.0.0", + "sp-keystore 0.11.0", "sp-offchain", - "sp-runtime", + "sp-runtime 5.0.0", "sp-session", - "sp-state-machine", - "sp-storage", + "sp-state-machine 0.11.0", + "sp-storage 5.0.0", "sp-timestamp", "sp-transaction-pool", - "sp-trie", + "sp-trie 5.0.0", "substrate-prometheus-endpoint", "thiserror", "tracing", @@ -7564,8 +7548,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "arrayvec 0.5.2", "derive_more", @@ -7577,20 +7561,20 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-keystore", - "sp-staking", + "sp-keystore 0.11.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "thiserror", "tracing", ] [[package]] name = "polkadot-statement-table" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "parity-scale-codec", "polkadot-primitives", - "sp-core", + "sp-core 5.0.0", ] [[package]] @@ -7815,12 +7799,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - [[package]] name = "rand" version = "0.7.3" @@ -8054,18 +8032,18 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "env_logger", - "jsonrpsee", + "jsonrpsee 0.8.0", "log", "parity-scale-codec", "serde", "serde_json", - "sp-core", - "sp-io", - "sp-runtime", - "sp-version", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -8130,18 +8108,18 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "beefy-primitives", - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", + "bp-messages", "bp-rococo", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", + "bp-runtime", "bp-wococo", - "bridge-runtime-common 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", + "bridge-runtime-common", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "frame-system-rpc-runtime-api", "log", "pallet-authority-discovery", @@ -8150,9 +8128,9 @@ dependencies = [ "pallet-balances", "pallet-beefy", "pallet-beefy-mmr", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", + "pallet-bridge-dispatch", + "pallet-bridge-grandpa", + "pallet-bridge-messages", "pallet-collective", "pallet-grandpa", "pallet-im-online", @@ -8167,12 +8145,12 @@ dependencies = [ "pallet-staking", "pallet-sudo", "pallet-timestamp", - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "pallet-xcm", + "pallet-xcm 0.9.17", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.17", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -8185,32 +8163,32 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io 5.0.0", "sp-offchain", - "sp-runtime", + "sp-runtime 5.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-transaction-pool", - "sp-version", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.17", + "xcm-builder 0.9.17", + "xcm-executor 0.9.17", ] [[package]] name = "rococo-runtime-constants" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "polkadot-primitives", "polkadot-runtime-common", "smallvec", - "sp-runtime", + "sp-runtime 5.0.0", ] [[package]] @@ -8282,8 +8260,20 @@ dependencies = [ "base64", "log", "ring", - "sct", - "webpki", + "sct 0.6.1", + "webpki 0.21.4", +] + +[[package]] +name = "rustls" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" +dependencies = [ + "log", + "ring", + "sct 0.7.0", + "webpki 0.22.0", ] [[package]] @@ -8293,11 +8283,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" dependencies = [ "openssl-probe", - "rustls", + "rustls 0.19.1", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +dependencies = [ + "openssl-probe", + "rustls-pemfile", "schannel", "security-framework", ] +[[package]] +name = "rustls-pemfile" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" +dependencies = [ + "base64", +] + [[package]] name = "rustversion" version = "1.0.6" @@ -8342,21 +8353,20 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "log", - "sp-core", - "sp-wasm-interface", + "sp-core 5.0.0", + "sp-wasm-interface 5.0.0", "thiserror", ] [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", - "derive_more", "futures 0.3.21", "futures-timer", "ip_network", @@ -8371,16 +8381,17 @@ dependencies = [ "sp-api", "sp-authority-discovery", "sp-blockchain", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 5.0.0", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "futures 0.3.21", "futures-timer", @@ -8394,32 +8405,32 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", "substrate-prometheus-endpoint", ] [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "parity-scale-codec", "sc-client-api", "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", ] [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.3", @@ -8429,14 +8440,14 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core", - "sp-runtime", + "sp-core 5.0.0", + "sp-runtime 5.0.0", ] [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -8447,9 +8458,10 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "chrono", + "clap 3.1.17", "fdlimit", "futures 0.3.21", "hex", @@ -8470,13 +8482,12 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core", + "sp-core 5.0.0", "sp-keyring", - "sp-keystore", - "sp-panic-handler", - "sp-runtime", - "sp-version", - "structopt", + "sp-keystore 0.11.0", + "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "thiserror", "tiny-bip39", "tokio", @@ -8485,7 +8496,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "fnv", "futures 0.3.21", @@ -8499,21 +8510,21 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 5.0.0", "sp-database", - "sp-externalities", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-storage", - "sp-trie", + "sp-externalities 0.11.0", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", + "sp-storage 5.0.0", + "sp-trie 5.0.0", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "hash-db", "kvdb", @@ -8526,19 +8537,19 @@ dependencies = [ "parking_lot 0.11.2", "sc-client-api", "sc-state-db", - "sp-arithmetic", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-blockchain", - "sp-core", + "sp-core 5.0.0", "sp-database", - "sp-runtime", - "sp-state-machine", - "sp-trie", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", + "sp-trie 5.0.0", ] [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", "futures 0.3.21", @@ -8552,9 +8563,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -8562,10 +8573,9 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", - "derive_more", "futures 0.3.21", "log", "parity-scale-codec", @@ -8575,26 +8585,26 @@ dependencies = [ "sc-consensus-slots", "sc-telemetry", "sp-api", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", - "derive_more", "fork-tree", "futures 0.3.21", "log", @@ -8615,28 +8625,28 @@ dependencies = [ "schnorrkel", "serde", "sp-api", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-version", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io 5.0.0", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "derive_more", "futures 0.3.21", "jsonrpc-core", "jsonrpc-core-client", @@ -8646,32 +8656,33 @@ dependencies = [ "sc-rpc-api", "serde", "sp-api", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 5.0.0", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", + "thiserror", ] [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "fork-tree", "parity-scale-codec", "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime", + "sp-runtime 5.0.0", ] [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", "futures 0.3.21", @@ -8681,14 +8692,14 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", "sp-timestamp", "thiserror", ] @@ -8696,18 +8707,18 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "sc-client-api", "sp-authorship", - "sp-runtime", + "sp-runtime 5.0.0", "thiserror", ] [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "lazy_static", "libsecp256k1", @@ -8719,32 +8730,31 @@ dependencies = [ "sc-executor-wasmi", "sc-executor-wasmtime", "sp-api", - "sp-core", - "sp-core-hashing-proc-macro", - "sp-externalities", - "sp-io", - "sp-panic-handler", - "sp-runtime-interface", + "sp-core 5.0.0", + "sp-core-hashing-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-externalities 0.11.0", + "sp-io 5.0.0", + "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime-interface 5.0.0", "sp-tasks", - "sp-trie", - "sp-version", - "sp-wasm-interface", + "sp-trie 5.0.0", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-wasm-interface 5.0.0", "wasmi", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "derive_more", "environmental", "parity-scale-codec", "sc-allocator", - "sp-core", + "sp-core 5.0.0", "sp-maybe-compressed-blob", "sp-serializer", - "sp-wasm-interface", + "sp-wasm-interface 5.0.0", "thiserror", "wasm-instrument", "wasmi", @@ -8753,23 +8763,23 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "log", "parity-scale-codec", "sc-allocator", "sc-executor-common", "scoped-tls", - "sp-core", - "sp-runtime-interface", - "sp-wasm-interface", + "sp-core 5.0.0", + "sp-runtime-interface 5.0.0", + "sp-wasm-interface 5.0.0", "wasmi", ] [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8778,19 +8788,18 @@ dependencies = [ "parity-wasm 0.42.2", "sc-allocator", "sc-executor-common", - "sp-core", - "sp-runtime-interface", - "sp-wasm-interface", + "sp-core 5.0.0", + "sp-runtime-interface 5.0.0", + "sp-wasm-interface 5.0.0", "wasmtime", ] [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", - "derive_more", "dyn-clone", "finality-grandpa", "fork-tree", @@ -8811,23 +8820,23 @@ dependencies = [ "sc-utils", "serde_json", "sp-api", - "sp-application-crypto", - "sp-arithmetic", + "sp-application-crypto 5.0.0", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 5.0.0", "sp-finality-grandpa", - "sp-keystore", - "sp-runtime", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "derive_more", "finality-grandpa", "futures 0.3.21", "jsonrpc-core", @@ -8842,14 +8851,15 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "thiserror", ] [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "ansi_term", "futures 0.3.21", @@ -8860,28 +8870,28 @@ dependencies = [ "sc-network", "sc-transaction-pool-api", "sp-blockchain", - "sp-runtime", + "sp-runtime 5.0.0", ] [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", - "derive_more", "hex", "parking_lot 0.11.2", "serde_json", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 5.0.0", + "sp-core 5.0.0", + "sp-keystore 0.11.0", + "thiserror", ] [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-std", "async-trait", @@ -8889,7 +8899,6 @@ dependencies = [ "bitflags", "bytes 1.1.0", "cid", - "derive_more", "either", "fnv", "fork-tree", @@ -8916,12 +8925,12 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-arithmetic", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 5.0.0", "sp-finality-grandpa", - "sp-runtime", + "sp-runtime 5.0.0", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint 0.6.0", @@ -8932,7 +8941,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "futures 0.3.21", "futures-timer", @@ -8940,7 +8949,7 @@ dependencies = [ "log", "lru 0.7.5", "sc-network", - "sp-runtime", + "sp-runtime 5.0.0", "substrate-prometheus-endpoint", "tracing", ] @@ -8948,7 +8957,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "bytes 1.1.0", "fnv", @@ -8966,9 +8975,9 @@ dependencies = [ "sc-network", "sc-utils", "sp-api", - "sp-core", + "sp-core 5.0.0", "sp-offchain", - "sp-runtime", + "sp-runtime 5.0.0", "threadpool", "tracing", ] @@ -8976,7 +8985,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "futures 0.3.21", "libp2p", @@ -8989,7 +8998,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8998,7 +9007,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "futures 0.3.21", "hash-db", @@ -9017,19 +9026,19 @@ dependencies = [ "serde_json", "sp-api", "sp-blockchain", - "sp-core", - "sp-keystore", + "sp-core 5.0.0", + "sp-keystore 0.11.0", "sp-offchain", "sp-rpc", - "sp-runtime", + "sp-runtime 5.0.0", "sp-session", - "sp-version", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -9043,18 +9052,18 @@ dependencies = [ "sc-transaction-pool-api", "serde", "serde_json", - "sp-core", + "sp-core 5.0.0", "sp-rpc", - "sp-runtime", - "sp-tracing", - "sp-version", + "sp-runtime 5.0.0", + "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "thiserror", ] [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -9071,7 +9080,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", "directories", @@ -9107,23 +9116,23 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-externalities", - "sp-inherents", - "sp-keystore", - "sp-runtime", + "sp-core 5.0.0", + "sp-externalities 0.11.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", "sp-session", - "sp-state-machine", - "sp-storage", - "sp-tracing", + "sp-state-machine 0.11.0", + "sp-storage 5.0.0", + "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie", - "sp-version", + "sp-trie 5.0.0", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -9135,7 +9144,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "log", "parity-scale-codec", @@ -9143,13 +9152,13 @@ dependencies = [ "parity-util-mem-derive", "parking_lot 0.11.2", "sc-client-api", - "sp-core", + "sp-core 5.0.0", ] [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9164,14 +9173,14 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-runtime", + "sp-runtime 5.0.0", "thiserror", ] [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "chrono", "futures 0.3.21", @@ -9189,7 +9198,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "ansi_term", "atty", @@ -9207,10 +9216,10 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core", + "sp-core 5.0.0", "sp-rpc", - "sp-runtime", - "sp-tracing", + "sp-runtime 5.0.0", + "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "thiserror", "tracing", "tracing-log", @@ -9220,7 +9229,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -9231,7 +9240,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "futures 0.3.21", "futures-timer", @@ -9247,9 +9256,9 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-tracing", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -9258,21 +9267,20 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "derive_more", "futures 0.3.21", "log", "serde", "sp-blockchain", - "sp-runtime", + "sp-runtime 5.0.0", "thiserror", ] [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "futures 0.3.21", "futures-timer", @@ -9287,7 +9295,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" dependencies = [ - "bitvec 0.20.4", + "bitvec", "cfg-if 1.0.0", "derive_more", "parity-scale-codec", @@ -9357,6 +9365,16 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "secrecy" version = "0.8.0" @@ -9595,14 +9613,14 @@ checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "slot-range-helper" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "enumn", "parity-scale-codec", "paste", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -9684,24 +9702,24 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "hash-db", "log", "parity-scale-codec", "sp-api-proc-macro", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-version", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "thiserror", ] [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.3", @@ -9718,9 +9736,22 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-std", + "sp-core 4.1.0-dev", + "sp-io 4.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", +] + +[[package]] +name = "sp-application-crypto" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -9733,52 +9764,67 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "static_assertions", +] + +[[package]] +name = "sp-arithmetic" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "static_assertions", ] [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto", - "sp-runtime", - "sp-std", + "sp-application-crypto 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", "parity-scale-codec", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "parity-scale-codec", "sp-api", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "futures 0.3.21", "log", @@ -9788,52 +9834,52 @@ dependencies = [ "sp-api", "sp-consensus", "sp-database", - "sp-runtime", - "sp-state-machine", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", "thiserror", ] [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "log", "parity-scale-codec", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-version", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "thiserror", ] [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-consensus", "sp-consensus-slots", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-timestamp", ] [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", "merlin", @@ -9841,40 +9887,40 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", + "sp-application-crypto 5.0.0", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "sp-timestamp", ] [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-runtime", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", ] [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "parity-scale-codec", "schnorrkel", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -9909,12 +9955,60 @@ dependencies = [ "secrecy", "serde", "sha2 0.10.2", - "sp-core-hashing", - "sp-debug-derive", - "sp-externalities", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-externalities 0.10.0", + "sp-runtime-interface 4.1.0-dev", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-storage 4.0.0", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tiny-bip39", + "tiny-keccak", + "twox-hash", + "wasmi", + "zeroize", +] + +[[package]] +name = "sp-core" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "base58", + "bitflags", + "blake2-rfc", + "byteorder", + "dyn-clonable", + "ed25519-dalek", + "futures 0.3.21", + "hash-db", + "hash256-std-hasher", + "hex", + "impl-serde", + "lazy_static", + "libsecp256k1", + "log", + "merlin", + "num-traits", + "parity-scale-codec", + "parity-util-mem", + "parking_lot 0.11.2", + "primitive-types", + "rand 0.7.3", + "regex", + "scale-info", + "schnorrkel", + "secrecy", + "serde", + "sha2 0.10.2", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-externalities 0.11.0", + "sp-runtime-interface 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-storage 5.0.0", "ss58-registry", "substrate-bip39", "thiserror", @@ -9933,7 +10027,20 @@ dependencies = [ "blake2-rfc", "byteorder", "sha2 0.10.2", - "sp-std", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "tiny-keccak", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "blake2-rfc", + "byteorder", + "sha2 0.10.2", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "tiny-keccak", "twox-hash", ] @@ -9945,14 +10052,25 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19 dependencies = [ "proc-macro2", "quote", - "sp-core-hashing", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", "syn", ] [[package]] -name = "sp-database" +name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "proc-macro2", + "quote", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "syn", +] + +[[package]] +name = "sp-database" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "kvdb", "parking_lot 0.11.2", @@ -9968,6 +10086,16 @@ dependencies = [ "syn", ] +[[package]] +name = "sp-debug-derive" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sp-externalities" version = "0.10.0" @@ -9975,14 +10103,25 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19 dependencies = [ "environmental", "parity-scale-codec", - "sp-std", - "sp-storage", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-storage 4.0.0", +] + +[[package]] +name = "sp-externalities" +version = "0.11.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-storage 5.0.0", ] [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "finality-grandpa", "log", @@ -9990,11 +10129,11 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "sp-runtime", - "sp-std", + "sp-application-crypto 5.0.0", + "sp-core 5.0.0", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -10005,9 +10144,23 @@ dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 4.1.0-dev", + "sp-runtime 4.1.0-dev", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "thiserror", +] + +[[package]] +name = "sp-inherents" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "async-trait", + "impl-trait-for-tuples", + "parity-scale-codec", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "thiserror", ] @@ -10022,28 +10175,52 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.11.2", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime-interface", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-trie", - "sp-wasm-interface", + "sp-core 4.1.0-dev", + "sp-externalities 0.10.0", + "sp-keystore 0.10.0", + "sp-runtime-interface 4.1.0-dev", + "sp-state-machine 0.10.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-trie 4.0.0", + "sp-wasm-interface 4.1.0-dev", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-io" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "futures 0.3.21", + "hash-db", + "libsecp256k1", + "log", + "parity-scale-codec", + "parking_lot 0.11.2", + "sp-core 5.0.0", + "sp-externalities 0.11.0", + "sp-keystore 0.11.0", + "sp-runtime-interface 5.0.0", + "sp-state-machine 0.11.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-trie 5.0.0", + "sp-wasm-interface 5.0.0", "tracing", "tracing-core", ] [[package]] name = "sp-keyring" -version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "lazy_static", - "sp-core", - "sp-runtime", - "strum 0.22.0", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "strum", ] [[package]] @@ -10058,38 +10235,55 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.2", "schnorrkel", + "sp-core 4.1.0-dev", + "sp-externalities 0.10.0", +] + +[[package]] +name = "sp-keystore" +version = "0.11.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "async-trait", + "futures 0.3.21", + "merlin", + "parity-scale-codec", + "parking_lot 0.11.2", + "schnorrkel", "serde", - "sp-core", - "sp-externalities", + "sp-core 5.0.0", + "sp-externalities 0.11.0", + "thiserror", ] [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ + "thiserror", "zstd", ] [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core 5.0.0", "sp-npos-elections-solution-type", - "sp-runtime", - "sp-std", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -10100,11 +10294,11 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "sp-api", - "sp-core", - "sp-runtime", + "sp-core 5.0.0", + "sp-runtime 5.0.0", ] [[package]] @@ -10117,14 +10311,24 @@ dependencies = [ "regex", ] +[[package]] +name = "sp-panic-handler" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + [[package]] name = "sp-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "rustc-hash", "serde", - "sp-core", + "sp-core 5.0.0", ] [[package]] @@ -10142,11 +10346,33 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-std", + "sp-application-crypto 4.0.0", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-core 4.1.0-dev", + "sp-io 4.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", +] + +[[package]] +name = "sp-runtime" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "parity-util-mem", + "paste", + "rand 0.7.3", + "scale-info", + "serde", + "sp-application-crypto 5.0.0", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -10157,12 +10383,29 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-storage", - "sp-tracing", - "sp-wasm-interface", + "sp-externalities 0.10.0", + "sp-runtime-interface-proc-macro 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-storage 4.0.0", + "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-wasm-interface 4.1.0-dev", + "static_assertions", +] + +[[package]] +name = "sp-runtime-interface" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.11.0", + "sp-runtime-interface-proc-macro 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-storage 5.0.0", + "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-wasm-interface 5.0.0", "static_assertions", ] @@ -10178,10 +10421,22 @@ dependencies = [ "syn", ] +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "Inflector", + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "serde", "serde_json", @@ -10190,15 +10445,15 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-core", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-core 5.0.0", + "sp-runtime 5.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -10208,8 +10463,19 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19 dependencies = [ "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 4.1.0-dev", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", +] + +[[package]] +name = "sp-staking" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] @@ -10224,11 +10490,34 @@ dependencies = [ "parking_lot 0.11.2", "rand 0.7.3", "smallvec", - "sp-core", - "sp-externalities", - "sp-panic-handler", - "sp-std", - "sp-trie", + "sp-core 4.1.0-dev", + "sp-externalities 0.10.0", + "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-trie 4.0.0", + "thiserror", + "tracing", + "trie-db", + "trie-root", +] + +[[package]] +name = "sp-state-machine" +version = "0.11.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "hash-db", + "log", + "num-traits", + "parity-scale-codec", + "parking_lot 0.11.2", + "rand 0.7.3", + "smallvec", + "sp-core 5.0.0", + "sp-externalities 0.11.0", + "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-trie 5.0.0", "thiserror", "tracing", "trie-db", @@ -10240,6 +10529,11 @@ name = "sp-std" version = "4.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +[[package]] +name = "sp-std" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" + [[package]] name = "sp-storage" version = "4.0.0" @@ -10249,36 +10543,49 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", +] + +[[package]] +name = "sp-storage" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "log", - "sp-core", - "sp-externalities", - "sp-io", - "sp-runtime-interface", - "sp-std", + "sp-core 5.0.0", + "sp-externalities 0.11.0", + "sp-io 5.0.0", + "sp-runtime-interface 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", ] [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", "futures-timer", "log", "parity-scale-codec", "sp-api", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "thiserror", ] @@ -10288,7 +10595,19 @@ version = "4.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" dependencies = [ "parity-scale-codec", - "sp-std", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sp-tracing" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "parity-scale-codec", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "tracing", "tracing-core", "tracing-subscriber", @@ -10297,26 +10616,26 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "sp-api", - "sp-runtime", + "sp-runtime 5.0.0", ] [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-trait", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-std", - "sp-trie", + "sp-core 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-trie 5.0.0", ] [[package]] @@ -10328,8 +10647,23 @@ dependencies = [ "memory-db", "parity-scale-codec", "scale-info", - "sp-core", - "sp-std", + "sp-core 4.1.0-dev", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "trie-db", + "trie-root", +] + +[[package]] +name = "sp-trie" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "hash-db", + "memory-db", + "parity-scale-codec", + "scale-info", + "sp-core 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "trie-db", "trie-root", ] @@ -10344,10 +10678,27 @@ dependencies = [ "parity-wasm 0.42.2", "scale-info", "serde", - "sp-core-hashing-proc-macro", - "sp-runtime", - "sp-std", - "sp-version-proc-macro", + "sp-core-hashing-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-runtime 4.1.0-dev", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "thiserror", +] + +[[package]] +name = "sp-version" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "parity-wasm 0.42.2", + "scale-info", + "serde", + "sp-core-hashing-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "thiserror", ] @@ -10362,6 +10713,17 @@ dependencies = [ "syn", ] +[[package]] +name = "sp-version-proc-macro" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "parity-scale-codec", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sp-wasm-interface" version = "4.1.0-dev" @@ -10370,7 +10732,19 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "wasmi", +] + +[[package]] +name = "sp-wasm-interface" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +dependencies = [ + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "wasmi", "wasmtime", ] @@ -10452,13 +10826,19 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + [[package]] name = "structopt" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" dependencies = [ - "clap", + "clap 2.34.0", "lazy_static", "structopt-derive", ] @@ -10476,34 +10856,13 @@ dependencies = [ "syn", ] -[[package]] -name = "strum" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" -dependencies = [ - "strum_macros 0.22.0", -] - [[package]] name = "strum" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" dependencies = [ - "strum_macros 0.23.1", -] - -[[package]] -name = "strum_macros" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn", + "strum_macros", ] [[package]] @@ -10535,7 +10894,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "platforms", ] @@ -10543,7 +10902,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", @@ -10558,33 +10917,34 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 5.0.0", + "sp-runtime 5.0.0", ] [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "async-std", - "derive_more", "futures-util", "hyper", "log", "prometheus", + "thiserror", "tokio", ] [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", "sp-maybe-compressed-blob", + "strum", "tempfile", "toml", "walkdir", @@ -10664,6 +11024,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "textwrap" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" + [[package]] name = "thiserror" version = "1.0.30" @@ -10805,9 +11171,20 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "rustls", + "rustls 0.19.1", "tokio", - "webpki", + "webpki 0.21.4", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls 0.20.4", + "tokio", + "webpki 0.22.0", ] [[package]] @@ -11026,9 +11403,10 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "jsonrpsee", + "clap 3.1.17", + "jsonrpsee 0.4.1", "log", "parity-scale-codec", "remote-externalities", @@ -11037,14 +11415,13 @@ dependencies = [ "sc-executor", "sc-service", "serde", - "sp-core", - "sp-externalities", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-version", - "structopt", + "sp-core 5.0.0", + "sp-externalities 0.11.0", + "sp-io 5.0.0", + "sp-keystore 0.11.0", + "sp-runtime 5.0.0", + "sp-state-machine 0.11.0", + "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "zstd", ] @@ -11589,13 +11966,32 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "webpki-roots" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" dependencies = [ - "webpki", + "webpki 0.21.4", +] + +[[package]] +name = "webpki-roots" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" +dependencies = [ + "webpki 0.22.0", ] [[package]] @@ -11667,6 +12063,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[package]] name = "winreg" version = "0.6.2" @@ -11692,15 +12131,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" -[[package]] -name = "wyz" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" -dependencies = [ - "tap", -] - [[package]] name = "x25519-dalek" version = "1.1.1" @@ -11722,7 +12152,20 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "xcm-procedural", + "xcm-procedural 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", +] + +[[package]] +name = "xcm" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +dependencies = [ + "derivative", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "xcm-procedural 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", ] [[package]] @@ -11730,19 +12173,39 @@ name = "xcm-builder" version = "0.9.16" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", "log", - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.16", "scale-info", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", - "xcm-executor", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-io 4.0.0", + "sp-runtime 4.1.0-dev", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "xcm 0.9.16", + "xcm-executor 0.9.16", +] + +[[package]] +name = "xcm-builder" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +dependencies = [ + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "log", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "parity-scale-codec", + "polkadot-parachain 0.9.17", + "scale-info", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "xcm 0.9.17", + "xcm-executor 0.9.17", ] [[package]] @@ -11750,16 +12213,33 @@ name = "xcm-executor" version = "0.9.16" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-core 4.1.0-dev", + "sp-io 4.0.0", + "sp-runtime 4.1.0-dev", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "xcm 0.9.16", +] + +[[package]] +name = "xcm-executor" +version = "0.9.17" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +dependencies = [ + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", + "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core 5.0.0", + "sp-io 5.0.0", + "sp-runtime 5.0.0", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "xcm 0.9.17", ] [[package]] @@ -11773,6 +12253,17 @@ dependencies = [ "syn", ] +[[package]] +name = "xcm-procedural" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "yamux" version = "0.9.0" diff --git a/Cargo.toml b/Cargo.toml index 8b4235ae..34ab9363 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,61 +44,61 @@ dc-rpc = { path = "rpc" } pangolin-parachain-runtime = { path = "runtime/pangolin-parachain" } # substrate -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } # cumulus -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } # darwinia-network -pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } +# pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } # polkadot -polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [workspace] members = [ diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 2dafae92..301e008f 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -11,8 +11,8 @@ version = "5.1.2" [dependencies] # substrate -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 7557038f..c731e7d9 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -14,13 +14,13 @@ version = "5.1.2" jsonrpc-core = { version = "18.0" } # darwinia-network dc-primitives = { path = "../primitives" } -pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } +# pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } # paritytech -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 201d604d..44d15998 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -13,21 +13,21 @@ version = "5.1.2" # crates.io smallvec = { version = "1.8" } # cumulus -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } # darwinia-bridges-substrate -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } +# bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } # darwinia-collator dc-primitives = { default-features = false, path = "../../primitives" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] @@ -36,10 +36,10 @@ std = [ # cumulus "pallet-collator-selection/std", # darwinia-bridges-substrate - "bp-messages/std", - "bridge-runtime-common/std", - "pallet-bridge-dispatch/std", - "pallet-fee-market/std", + # "bp-messages/std", + # "bridge-runtime-common/std", + # "pallet-bridge-dispatch/std", + # "pallet-fee-market/std", # darwinia-collator "dc-primitives/std", # substrate diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 62264531..b25504df 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -17,57 +17,57 @@ codec = { package = "parity-scale-codec", version = "2.3", default-feature scale-info = { version = "1.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } +# pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } # substrate -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] @@ -89,7 +89,7 @@ std = [ # darwinia "dc-common-runtime/std", "dc-primitives/std", - "pallet-fee-market-rpc-runtime-api/std", + # "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 34f89104..93701c30 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -16,20 +16,20 @@ codec = { package = "parity-scale-codec", version = "2.3", default-features scale-info = { version = "1.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } +# pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } @@ -37,35 +37,35 @@ xcm = { default-features = false, git = "https://github.com/parit xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } # substrate -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] @@ -84,7 +84,7 @@ std = [ "parachain-info/std", "dc-common-runtime/std", "dc-primitives/std", - "pallet-fee-market-rpc-runtime-api/std", + # "pallet-fee-market-rpc-runtime-api/std", "pallet-xcm/std", "polkadot-parachain/std", "xcm/std", diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 7d520294..20ac7402 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -16,68 +16,68 @@ codec = { package = "parity-scale-codec", version = "2.3", default-features scale-info = { version = "1.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # darwinia-bridges-substrate -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.16" } +# bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +# pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } # substrate -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] @@ -100,18 +100,18 @@ std = [ "dc-common-runtime/std", "dc-primitives/std", # darwinia-bridges-substrate - "bp-pangolin/std", - "bp-message-dispatch/std", - "bp-messages/std", - "bp-runtime/std", - "bp-polkadot-core/std", - "bp-pangolin-parachain/std", - "bridge-runtime-common/std", - "pallet-bridge-dispatch/std", - "pallet-bridge-grandpa/std", - "pallet-bridge-messages/std", - "pallet-fee-market/std", - "pallet-fee-market-rpc-runtime-api/std", + # "bp-pangolin/std", + # "bp-message-dispatch/std", + # "bp-messages/std", + # "bp-runtime/std", + # "bp-polkadot-core/std", + # "bp-pangolin-parachain/std", + # "bridge-runtime-common/std", + # "pallet-bridge-dispatch/std", + # "pallet-bridge-grandpa/std", + # "pallet-bridge-messages/std", + # "pallet-fee-market/std", + # "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", From 40ad06892b70a6b7887701c1746be6007f0bfb98 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Wed, 11 May 2022 10:20:49 +0800 Subject: [PATCH 02/59] Companion for Cumulus#896 --- runtime/crab-parachain/src/pallets/xcmp_queue.rs | 2 ++ runtime/darwinia-parachain/src/pallets/xcmp_queue.rs | 2 ++ runtime/pangolin-parachain/src/pallets/xcmp_queue.rs | 2 ++ 3 files changed, 6 insertions(+) diff --git a/runtime/crab-parachain/src/pallets/xcmp_queue.rs b/runtime/crab-parachain/src/pallets/xcmp_queue.rs index d0a62a78..8193cca2 100644 --- a/runtime/crab-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/crab-parachain/src/pallets/xcmp_queue.rs @@ -11,4 +11,6 @@ impl Config for Runtime { type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; type ExecuteOverweightOrigin = EnsureRoot; + type ControllerOrigin = EnsureRoot; + type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; } diff --git a/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs b/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs index d0a62a78..8193cca2 100644 --- a/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs @@ -11,4 +11,6 @@ impl Config for Runtime { type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; type ExecuteOverweightOrigin = EnsureRoot; + type ControllerOrigin = EnsureRoot; + type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; } diff --git a/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs b/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs index d0a62a78..8193cca2 100644 --- a/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs @@ -11,4 +11,6 @@ impl Config for Runtime { type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; type ExecuteOverweightOrigin = EnsureRoot; + type ControllerOrigin = EnsureRoot; + type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; } From cfca821c52aaa76e09498df39ef4bdf57cbe5fc5 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Wed, 11 May 2022 10:39:04 +0800 Subject: [PATCH 03/59] Companion for Cumulus#1008 --- src/command.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/command.rs b/src/command.rs index 5e858644..5ac72d84 100644 --- a/src/command.rs +++ b/src/command.rs @@ -566,4 +566,8 @@ impl CliConfiguration for RelayChainCli { ) -> Result> { self.base.base.telemetry_endpoints(chain_spec) } + + fn node_name(&self) -> Result { + self.base.base.node_name() + } } From 8988a3ff19fbfe45e3d294c3352f9bc3814d3e7f Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Thu, 12 May 2022 17:11:38 +0800 Subject: [PATCH 04/59] Bump Deps --- Cargo.lock | 3162 +++++++++++-------------- Cargo.toml | 2 +- rpc/Cargo.toml | 2 +- runtime/common/Cargo.toml | 16 +- runtime/crab-parachain/Cargo.toml | 4 +- runtime/darwinia-parachain/Cargo.toml | 14 +- runtime/pangolin-parachain/Cargo.toml | 48 +- 7 files changed, 1476 insertions(+), 1772 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cd8d9bca..33844f7e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -99,9 +99,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" +checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" [[package]] name = "approx" @@ -247,9 +247,9 @@ dependencies = [ [[package]] name = "async-process" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83137067e3a2a6a06d67168e49e68a0957d215410473a740cea95a2425c0b7c6" +checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c" dependencies = [ "async-io", "blocking", @@ -285,7 +285,7 @@ dependencies = [ "memchr", "num_cpus", "once_cell", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "pin-utils", "slab", "wasm-bindgen-futures", @@ -332,7 +332,7 @@ dependencies = [ "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", ] [[package]] @@ -345,7 +345,7 @@ dependencies = [ "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", ] [[package]] @@ -382,24 +382,24 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" +checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object", + "object 0.28.4", "rustc-demangle", ] [[package]] name = "base-x" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" +checksum = "dc19a4937b4fbd3fe3379793130e42060d10627a360f2127802b10b87e7baf74" [[package]] name = "base58" @@ -440,12 +440,12 @@ dependencies = [ "sc-network-gossip", "sc-utils", "sp-api", - "sp-application-crypto 5.0.0", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-application-crypto", + "sp-arithmetic", "sp-blockchain", - "sp-core 5.0.0", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", "wasm-timer", @@ -469,8 +469,8 @@ dependencies = [ "sc-rpc", "sc-utils", "serde", - "sp-core 5.0.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-runtime", "thiserror", ] @@ -487,10 +487,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 5.0.0", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-application-crypto", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -539,10 +539,22 @@ version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" dependencies = [ - "funty", - "radium", + "funty 1.1.0", + "radium 0.6.2", + "tap", + "wyz 0.2.0", +] + +[[package]] +name = "bitvec" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" +dependencies = [ + "funty 2.0.0", + "radium 0.7.0", "tap", - "wyz", + "wyz 0.5.0", ] [[package]] @@ -672,20 +684,65 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bp-darwinia-core" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-header-chain" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "finality-grandpa", + "frame-support", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-finality-grandpa", + "sp-runtime", + "sp-std", +] + [[package]] name = "bp-header-chain" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "finality-grandpa", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", "parity-scale-codec", "scale-info", "serde", - "sp-core 5.0.0", + "sp-core", "sp-finality-grandpa", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-message-dispatch" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "frame-support", + "parity-scale-codec", + "scale-info", + "sp-std", ] [[package]] @@ -693,11 +750,28 @@ name = "bp-message-dispatch" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "frame-support", + "parity-scale-codec", + "scale-info", + "sp-std", +] + +[[package]] +name = "bp-messages" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "bitvec 0.20.4", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", + "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "serde", + "sp-core", + "sp-std", ] [[package]] @@ -705,15 +779,63 @@ name = "bp-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec", - "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "bitvec 0.20.4", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std", +] + +[[package]] +name = "bp-pangolin" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "bp-darwinia-core", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", + "sp-version", +] + +[[package]] +name = "bp-pangolin-parachain" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "bp-darwinia-core", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", + "sp-version", +] + +[[package]] +name = "bp-polkadot-core" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-core", + "sp-runtime", + "sp-std", + "sp-version", ] [[package]] @@ -721,17 +843,17 @@ name = "bp-polkadot-core" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-messages", - "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-api", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-runtime", + "sp-std", + "sp-version", ] [[package]] @@ -739,16 +861,34 @@ name = "bp-rococo" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-messages", - "bp-polkadot-core", - "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "frame-support", "parity-scale-codec", "smallvec", "sp-api", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", + "sp-version", +] + +[[package]] +name = "bp-runtime" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "frame-support", + "hash-db", + "num-traits", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", ] [[package]] @@ -756,17 +896,32 @@ name = "bp-runtime" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", "hash-db", "num-traits", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-trie 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", +] + +[[package]] +name = "bp-test-utils" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "ed25519-dalek", + "finality-grandpa", + "parity-scale-codec", + "sp-application-crypto", + "sp-finality-grandpa", + "sp-runtime", + "sp-std", ] [[package]] @@ -774,14 +929,14 @@ name = "bp-test-utils" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-header-chain", + "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", "ed25519-dalek", "finality-grandpa", "parity-scale-codec", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-finality-grandpa", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -789,14 +944,37 @@ name = "bp-wococo" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-messages", - "bp-polkadot-core", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", "bp-rococo", - "bp-runtime", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", "parity-scale-codec", "sp-api", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bridge-runtime-common" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "frame-support", + "hash-db", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "pallet-transaction-payment", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", ] [[package]] @@ -804,22 +982,22 @@ name = "bridge-runtime-common" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-message-dispatch", - "bp-messages", - "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "frame-support", "hash-db", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", - "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "pallet-transaction-payment", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-trie 5.0.0", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", ] [[package]] @@ -894,9 +1072,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "camino" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3132262930b0522068049f5870a856ab8affc80c70d08b6ecb785771a6fc23" +checksum = "07fd178c5af4d59e83498ef15cf3f154e1a6f9d091270cb86283c65ef44e9ef0" dependencies = [ "serde", ] @@ -918,7 +1096,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.7", + "semver 1.0.9", "serde", "serde_json", ] @@ -1054,9 +1232,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.17" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47582c09be7c8b32c0ab3a6181825ababb713fde6fff20fc573a3870dd45c6a0" +checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" dependencies = [ "atty", "bitflags", @@ -1071,9 +1249,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.1.7" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" +checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -1180,43 +1358,44 @@ dependencies = [ "dc-common-runtime", "dc-primitives", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "frame-try-runtime", "pallet-aura", "pallet-authorship", "pallet-balances", "pallet-collator-selection", + "pallet-fee-market-rpc-runtime-api", "pallet-multisig", "pallet-proxy", "pallet-session", "pallet-sudo", "pallet-timestamp", - "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "pallet-xcm 0.9.17", + "pallet-xcm", "parachain-info", "parity-scale-codec", - "polkadot-parachain 0.9.17", + "polkadot-parachain", "scale-info", "smallvec", "sp-api", "sp-block-builder", "sp-consensus-aura", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-inherents", "sp-offchain", - "sp-runtime 5.0.0", + "sp-runtime", "sp-session", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std", "sp-transaction-pool", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version", "substrate-wasm-builder", - "xcm 0.9.17", - "xcm-builder 0.9.17", - "xcm-executor 0.9.17", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -1442,7 +1621,7 @@ name = "cumulus-client-cli" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ - "clap 3.1.17", + "clap 3.1.18", "sc-cli", "sc-service", ] @@ -1466,8 +1645,8 @@ dependencies = [ "sc-client-api", "sp-api", "sp-consensus", - "sp-core 5.0.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-runtime", "tracing", ] @@ -1487,15 +1666,15 @@ dependencies = [ "sc-consensus-slots", "sc-telemetry", "sp-api", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] @@ -1516,8 +1695,8 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-runtime 5.0.0", - "sp-trie 5.0.0", + "sp-runtime", + "sp-trie", "tracing", ] @@ -1538,9 +1717,9 @@ dependencies = [ "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", + "sp-core", + "sp-inherents", + "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] @@ -1558,15 +1737,15 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-primitives", - "polkadot-parachain 0.9.17", + "polkadot-parachain", "polkadot-primitives", "sc-client-api", "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", + "sp-core", + "sp-runtime", + "sp-state-machine", "tracing", ] @@ -1590,7 +1769,7 @@ dependencies = [ "sp-api", "sp-consensus", "sp-maybe-compressed-blob", - "sp-runtime 5.0.0", + "sp-runtime", "tracing", ] @@ -1618,8 +1797,8 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 5.0.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-runtime", "tracing", ] @@ -1629,16 +1808,16 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "pallet-aura", "parity-scale-codec", "scale-info", "serde", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-consensus-aura", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -1647,16 +1826,16 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "xcm 0.9.17", - "xcm-executor 0.9.17", + "sp-io", + "sp-runtime", + "sp-std", + "xcm", + "xcm-executor", ] [[package]] @@ -1668,25 +1847,25 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "environmental", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log", "pallet-balances", "parity-scale-codec", - "polkadot-parachain 0.9.17", + "polkadot-parachain", "scale-info", "serde", - "sp-core 5.0.0", - "sp-externalities 0.11.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-trie 5.0.0", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "xcm 0.9.17", + "sp-core", + "sp-externalities", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", + "sp-version", + "xcm", ] [[package]] @@ -1706,15 +1885,15 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "serde", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "xcm 0.9.17", + "sp-io", + "sp-runtime", + "sp-std", + "xcm", ] [[package]] @@ -1723,16 +1902,16 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "rand_chacha 0.3.1", "scale-info", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "xcm 0.9.17", - "xcm-executor 0.9.17", + "sp-runtime", + "sp-std", + "xcm", + "xcm-executor", ] [[package]] @@ -1740,15 +1919,15 @@ name = "cumulus-primitives-core" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", "parity-scale-codec", - "polkadot-core-primitives 0.9.17", - "polkadot-parachain 0.9.17", + "polkadot-core-primitives", + "polkadot-parachain", "polkadot-primitives", "sp-api", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-trie 5.0.0", + "sp-runtime", + "sp-std", + "sp-trie", ] [[package]] @@ -1764,13 +1943,13 @@ dependencies = [ "sc-client-api", "scale-info", "sp-api", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-storage 5.0.0", - "sp-trie 5.0.0", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-storage", + "sp-trie", "tracing", ] @@ -1780,8 +1959,8 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-inherents", + "sp-std", "sp-timestamp", ] @@ -1791,15 +1970,15 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", "parity-scale-codec", - "polkadot-core-primitives 0.9.17", - "polkadot-parachain 0.9.17", + "polkadot-core-primitives", + "polkadot-parachain", "polkadot-primitives", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-trie 5.0.0", - "xcm 0.9.17", + "sp-runtime", + "sp-std", + "sp-trie", + "xcm", ] [[package]] @@ -1817,9 +1996,9 @@ dependencies = [ "sc-service", "sp-api", "sp-blockchain", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", + "sp-core", + "sp-runtime", + "sp-state-machine", "thiserror", ] @@ -1845,9 +2024,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", + "sp-core", + "sp-runtime", + "sp-state-machine", "tracing", ] @@ -1859,9 +2038,9 @@ dependencies = [ "cumulus-primitives-core", "parity-scale-codec", "polkadot-primitives", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-state-machine", + "sp-std", ] [[package]] @@ -1913,11 +2092,12 @@ dependencies = [ "futures 0.3.21", "jsonrpc-core", "log", + "pallet-fee-market-rpc-runtime-api", "pallet-transaction-payment-rpc", "pangolin-parachain-runtime", "parity-scale-codec", "polkadot-cli", - "polkadot-parachain 0.9.17", + "polkadot-parachain", "polkadot-primitives", "polkadot-service", "sc-basic-authorship", @@ -1938,11 +2118,11 @@ dependencies = [ "sp-block-builder", "sp-consensus", "sp-consensus-aura", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-keystore 0.11.0", + "sp-core", + "sp-inherents", + "sp-keystore", "sp-offchain", - "sp-runtime 5.0.0", + "sp-runtime", "sp-session", "sp-timestamp", "sp-transaction-pool", @@ -1952,7 +2132,7 @@ dependencies = [ "substrate-prometheus-endpoint", "tempfile", "try-runtime-cli", - "xcm 0.9.17", + "xcm", ] [[package]] @@ -1970,42 +2150,43 @@ dependencies = [ "dc-common-runtime", "dc-primitives", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "pallet-aura", "pallet-authorship", "pallet-balances", "pallet-collator-selection", + "pallet-fee-market-rpc-runtime-api", "pallet-multisig", "pallet-proxy", "pallet-session", "pallet-sudo", "pallet-timestamp", - "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "pallet-xcm 0.9.16", + "pallet-xcm", "parachain-info", "parity-scale-codec", - "polkadot-parachain 0.9.16", + "polkadot-parachain", "scale-info", "smallvec", "sp-api", "sp-block-builder", "sp-consensus-aura", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-inherents", "sp-offchain", - "sp-runtime 5.0.0", + "sp-runtime", "sp-session", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std", "sp-transaction-pool", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version", "substrate-wasm-builder", - "xcm 0.9.16", - "xcm-builder 0.9.16", - "xcm-executor 0.9.16", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -2038,23 +2219,27 @@ dependencies = [ name = "dc-common-runtime" version = "5.1.2" dependencies = [ + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", "dc-primitives", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "pallet-balances", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", "pallet-collator-selection", - "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "pallet-fee-market", + "pallet-transaction-payment", "smallvec", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] name = "dc-primitives" version = "5.1.2" dependencies = [ - "sp-core 5.0.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-runtime", ] [[package]] @@ -2063,6 +2248,7 @@ version = "5.1.2" dependencies = [ "dc-primitives", "jsonrpc-core", + "pallet-fee-market-rpc", "pallet-transaction-payment-rpc", "sc-client-api", "sc-rpc", @@ -2217,9 +2403,9 @@ checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" [[package]] name = "ed25519" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d5c4b5e5959dc2c2b89918d8e2cc40fcdd623cef026ed09d2f0ee05199dc8e4" +checksum = "d916019f70ae3a1faa1195685e290287f39207d38e6dfee727197cffcc002214" dependencies = [ "signature", ] @@ -2278,9 +2464,9 @@ dependencies = [ [[package]] name = "enumn" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e58b112d5099aa0857c5d05f0eacab86406dd8c0f85fe5d320a13256d29ecf4" +checksum = "052bc8773a98bd051ff37db74a8a25f00e6bfa2cbd03373390c72e9f7afbf344" dependencies = [ "proc-macro2", "quote", @@ -2327,33 +2513,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ethbloom" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8" -dependencies = [ - "crunchy", - "fixed-hash", - "impl-rlp", - "impl-serde", - "tiny-keccak", -] - -[[package]] -name = "ethereum-types" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf" -dependencies = [ - "ethbloom", - "fixed-hash", - "impl-rlp", - "impl-serde", - "primitive-types", - "uint", -] - [[package]] name = "event-listener" version = "2.5.2" @@ -2445,9 +2604,9 @@ checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" dependencies = [ "cfg-if 1.0.0", "crc32fast", @@ -2485,8 +2644,8 @@ name = "frame-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "linregress", "log", "parity-scale-codec", @@ -2494,12 +2653,12 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-runtime-interface 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-storage 5.0.0", + "sp-application-crypto", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "sp-storage", ] [[package]] @@ -2509,9 +2668,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "Inflector", "chrono", - "clap 3.1.17", + "clap 3.1.18", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", "handlebars", "linked-hash-map", "log", @@ -2522,11 +2681,11 @@ dependencies = [ "sc-service", "serde", "serde_json", - "sp-core 5.0.0", - "sp-externalities 0.11.0", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", + "sp-core", + "sp-externalities", + "sp-keystore", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -2534,13 +2693,13 @@ name = "frame-election-provider-support" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-arithmetic", "sp-npos-elections", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std", ] [[package]] @@ -2548,15 +2707,15 @@ name = "frame-executive" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", ] [[package]] @@ -2571,35 +2730,6 @@ dependencies = [ "serde", ] -[[package]] -name = "frame-support" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "bitflags", - "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "impl-trait-for-tuples", - "log", - "once_cell", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "smallvec", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-core 4.1.0-dev", - "sp-core-hashing-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-io 4.0.0", - "sp-runtime 4.1.0-dev", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-state-machine 0.10.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "tt-call", -] - [[package]] name = "frame-support" version = "4.0.0-dev" @@ -2607,7 +2737,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "bitflags", "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support-procedural", "impl-trait-for-tuples", "log", "once_cell", @@ -2616,50 +2746,26 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-core 5.0.0", - "sp-core-hashing-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-state-machine 0.11.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-arithmetic", + "sp-core", + "sp-core-hashing-proc-macro", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-state-machine", + "sp-std", + "sp-tracing", "tt-call", ] -[[package]] -name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "Inflector", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "frame-support-procedural" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "Inflector", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "frame-support-procedural-tools" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "proc-macro-crate 1.1.3", + "frame-support-procedural-tools", "proc-macro2", "quote", "syn", @@ -2670,23 +2776,13 @@ name = "frame-support-procedural-tools" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", ] -[[package]] -name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" @@ -2697,38 +2793,21 @@ dependencies = [ "syn", ] -[[package]] -name = "frame-system" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 4.1.0-dev", - "sp-io 4.0.0", - "sp-runtime 4.1.0-dev", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", -] - [[package]] name = "frame-system" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-version", ] [[package]] @@ -2745,10 +2824,10 @@ name = "frame-try-runtime" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", "sp-api", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -2801,6 +2880,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futures" version = "0.1.31" @@ -2867,7 +2952,7 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "waker-fn", ] @@ -2925,7 +3010,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "pin-utils", "slab", ] @@ -3015,9 +3100,9 @@ dependencies = [ [[package]] name = "gloo-timers" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e" +checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" dependencies = [ "futures-channel", "futures-core", @@ -3084,9 +3169,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" +checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" dependencies = [ "ahash", ] @@ -3177,9 +3262,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" dependencies = [ "bytes 1.1.0", "fnv", @@ -3194,14 +3279,14 @@ checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ "bytes 1.1.0", "http", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", ] [[package]] name = "httparse" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" +checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" [[package]] name = "httpdate" @@ -3231,7 +3316,7 @@ dependencies = [ "httparse", "httpdate", "itoa 1.0.1", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "socket2 0.4.4", "tokio", "tower-service", @@ -3324,15 +3409,6 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "impl-rlp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -dependencies = [ - "rlp", -] - [[package]] name = "impl-serde" version = "0.3.2" @@ -3426,9 +3502,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c" +checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] name = "itertools" @@ -3781,11 +3857,11 @@ version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 0.20.4", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "frame-try-runtime", "kusama-runtime-constants", @@ -3820,12 +3896,12 @@ dependencies = [ "pallet-staking-reward-fn", "pallet-timestamp", "pallet-tips", - "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vesting", - "pallet-xcm 0.9.17", + "pallet-xcm", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", @@ -3836,26 +3912,26 @@ dependencies = [ "serde_derive", "smallvec", "sp-api", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-io 5.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-npos-elections", "sp-offchain", - "sp-runtime 5.0.0", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-staking", + "sp-std", "sp-transaction-pool", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version", "static_assertions", "substrate-wasm-builder", - "xcm 0.9.17", - "xcm-builder 0.9.17", - "xcm-executor 0.9.17", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -3863,11 +3939,11 @@ name = "kusama-runtime-constants" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", - "sp-runtime 5.0.0", + "sp-runtime", ] [[package]] @@ -3932,9 +4008,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.122" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259" +checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" [[package]] name = "libloading" @@ -4497,9 +4573,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f35facd4a5673cb5a48822be2be1d4236c1c99cb4113cab7061ac720d5bf859" +checksum = "92e7e15d7610cce1d9752e137625f14e61a28cd45929b6e12e47b50fe154ee2e" dependencies = [ "cc", "pkg-config", @@ -4558,9 +4634,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if 1.0.0", "value-bag", @@ -4660,9 +4736,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" @@ -4760,12 +4836,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" dependencies = [ "adler", - "autocfg", ] [[package]] @@ -4781,7 +4856,7 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow 0.2.2", + "miow", "net2", "slab", "winapi 0.2.8", @@ -4789,16 +4864,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" +checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" dependencies = [ "libc", "log", - "miow 0.3.7", - "ntapi", "wasi 0.11.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "windows-sys", ] [[package]] @@ -4825,15 +4898,6 @@ dependencies = [ "ws2_32-sys", ] -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "more-asserts" version = "0.2.2" @@ -5004,15 +5068,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "num-bigint" version = "0.2.6" @@ -5026,9 +5081,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" +checksum = "97fbc387afefefd5e9e39493299f3069e14a140dd34dc19b4c1c1a8fddb6a790" dependencies = [ "num-traits", ] @@ -5045,9 +5100,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -5078,9 +5133,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", "libm", @@ -5107,6 +5162,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.28.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.10.0" @@ -5183,15 +5247,15 @@ name = "pallet-aura" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-consensus-aura", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5199,15 +5263,15 @@ name = "pallet-authority-discovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-authority-discovery", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5215,14 +5279,14 @@ name = "pallet-authorship" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "sp-authorship", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5231,22 +5295,22 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io 5.0.0", - "sp-runtime 5.0.0", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-staking", + "sp-std", ] [[package]] @@ -5255,13 +5319,13 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5270,13 +5334,13 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5285,14 +5349,14 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "beefy-primitives", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "pallet-session", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5302,8 +5366,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "beefy-merkle-tree", "beefy-primitives", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "hex", "libsecp256k1", "log", @@ -5314,10 +5378,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5325,16 +5389,33 @@ name = "pallet-bounties" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-bridge-dispatch" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -5342,79 +5423,122 @@ name = "pallet-bridge-dispatch" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bp-message-dispatch", - "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" dependencies = [ - "bp-header-chain", - "bp-runtime", - "bp-test-utils", + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", "finality-grandpa", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "num-traits", "parity-scale-codec", "scale-info", "serde", "sp-finality-grandpa", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-trie 5.0.0", + "sp-runtime", + "sp-std", + "sp-trie", ] [[package]] -name = "pallet-bridge-messages" +name = "pallet-bridge-grandpa" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec", - "bp-message-dispatch", - "bp-messages", - "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-test-utils 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "finality-grandpa", + "frame-support", + "frame-system", "log", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-finality-grandpa", + "sp-runtime", + "sp-std", + "sp-trie", ] [[package]] -name = "pallet-collator-selection" -version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +name = "pallet-bridge-messages" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" dependencies = [ - "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "bitvec 0.20.4", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", - "pallet-authorship", - "pallet-session", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-bridge-messages" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +dependencies = [ + "bitvec 0.20.4", + "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "frame-support", + "frame-system", + "log", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-collator-selection" +version = "3.0.0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-authorship", + "pallet-session", "parity-scale-codec", "rand 0.8.5", "scale-info", "serde", - "sp-runtime 5.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -5423,15 +5547,15 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5440,14 +5564,14 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "serde", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5457,18 +5581,18 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "rand 0.7.3", "scale-info", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-core 5.0.0", - "sp-io 5.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", "sp-npos-elections", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", "static_assertions", "strum", ] @@ -5478,16 +5602,64 @@ name = "pallet-elections-phragmen" version = "5.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-io 5.0.0", + "sp-core", + "sp-io", "sp-npos-elections", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-fee-market" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "bitvec 1.0.0", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-fee-market-rpc" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "jsonrpc-core", + "jsonrpc-core-client", + "jsonrpc-derive", + "pallet-fee-market-rpc-runtime-api", + "parity-scale-codec", + "sp-api", + "sp-blockchain", + "sp-runtime", +] + +[[package]] +name = "pallet-fee-market-rpc-runtime-api" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +dependencies = [ + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "parity-scale-codec", + "serde", + "sp-api", + "sp-runtime", + "sp-std", ] [[package]] @@ -5496,13 +5668,13 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-arithmetic", + "sp-runtime", + "sp-std", ] [[package]] @@ -5511,21 +5683,21 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 5.0.0", - "sp-core 5.0.0", + "sp-application-crypto", + "sp-core", "sp-finality-grandpa", - "sp-io 5.0.0", - "sp-runtime 5.0.0", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-staking", + "sp-std", ] [[package]] @@ -5535,13 +5707,13 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "enumflags2", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5549,18 +5721,18 @@ name = "pallet-im-online" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto 5.0.0", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -5568,15 +5740,15 @@ name = "pallet-indices" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-io 5.0.0", + "sp-core", + "sp-io", "sp-keyring", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5585,15 +5757,15 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5603,15 +5775,15 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "pallet-mmr-primitives", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5619,15 +5791,15 @@ name = "pallet-mmr-primitives" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "serde", "sp-api", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -5643,8 +5815,8 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 5.0.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-runtime", ] [[package]] @@ -5652,13 +5824,13 @@ name = "pallet-multisig" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5666,13 +5838,13 @@ name = "pallet-nicks" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5680,16 +5852,16 @@ name = "pallet-offences" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 5.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -5698,14 +5870,14 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5713,13 +5885,13 @@ name = "pallet-proxy" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5727,13 +5899,13 @@ name = "pallet-recovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5742,14 +5914,14 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5757,20 +5929,20 @@ name = "pallet-session" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-trie 5.0.0", + "sp-staking", + "sp-std", + "sp-trie", ] [[package]] @@ -5778,13 +5950,13 @@ name = "pallet-society" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5793,19 +5965,19 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", "parity-scale-codec", "scale-info", "serde", - "sp-application-crypto 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-application-crypto", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -5825,7 +5997,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "log", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-arithmetic", ] [[package]] @@ -5833,13 +6005,13 @@ name = "pallet-sudo" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5848,14 +6020,14 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-inherents", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -5864,34 +6036,17 @@ name = "pallet-tips" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "pallet-treasury", "parity-scale-codec", "scale-info", "serde", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", -] - -[[package]] -name = "pallet-transaction-payment" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "parity-scale-codec", - "scale-info", - "serde", - "smallvec", - "sp-core 4.1.0-dev", - "sp-io 4.0.0", - "sp-runtime 4.1.0-dev", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5899,16 +6054,16 @@ name = "pallet-transaction-payment" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5923,9 +6078,9 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-blockchain", - "sp-core 5.0.0", + "sp-core", "sp-rpc", - "sp-runtime 5.0.0", + "sp-runtime", ] [[package]] @@ -5933,10 +6088,10 @@ name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "pallet-transaction-payment", "parity-scale-codec", "sp-api", - "sp-runtime 5.0.0", + "sp-runtime", ] [[package]] @@ -5944,15 +6099,15 @@ name = "pallet-treasury" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5960,14 +6115,14 @@ name = "pallet-utility" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5975,31 +6130,13 @@ name = "pallet-vesting" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "log", - "parity-scale-codec", - "scale-info", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", -] - -[[package]] -name = "pallet-xcm" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "serde", - "sp-core 4.1.0-dev", - "sp-runtime 4.1.0-dev", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "xcm 0.9.16", - "xcm-executor 0.9.16", + "sp-runtime", + "sp-std", ] [[package]] @@ -6007,23 +6144,30 @@ name = "pallet-xcm" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "xcm 0.9.17", - "xcm-executor 0.9.17", + "sp-core", + "sp-runtime", + "sp-std", + "xcm", + "xcm-executor", ] [[package]] name = "pangolin-parachain-runtime" version = "5.1.2" dependencies = [ + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-pangolin", + "bp-pangolin-parachain", + "bp-polkadot-core 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -6035,42 +6179,47 @@ dependencies = [ "dc-common-runtime", "dc-primitives", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "pallet-aura", "pallet-authorship", "pallet-balances", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", "pallet-collator-selection", + "pallet-fee-market", + "pallet-fee-market-rpc-runtime-api", "pallet-multisig", "pallet-proxy", "pallet-session", "pallet-sudo", "pallet-timestamp", - "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "pallet-xcm 0.9.17", + "pallet-xcm", "parachain-info", "parity-scale-codec", - "polkadot-parachain 0.9.17", + "polkadot-parachain", "scale-info", "smallvec", "sp-api", "sp-block-builder", "sp-consensus-aura", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-inherents", "sp-offchain", - "sp-runtime 5.0.0", + "sp-runtime", "sp-session", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std", "sp-transaction-pool", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version", "substrate-wasm-builder", - "xcm 0.9.17", - "xcm-builder 0.9.17", - "xcm-executor 0.9.17", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -6079,8 +6228,8 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "serde", @@ -6088,9 +6237,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.3.11" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e7f385d61562f5834282b90aa50b41f38a35cf64d5209b8b05487b50553dbe" +checksum = "55a7901b85874402471e131de3332dde0e51f38432c69a3853627c8e25433048" dependencies = [ "blake2-rfc", "crc32fast", @@ -6112,7 +6261,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" dependencies = [ "arrayvec 0.7.2", - "bitvec", + "bitvec 0.20.4", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive", @@ -6158,10 +6307,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f4cb4e169446179cbc6b8b6320cc9fca49bd2e94e8db25f25f200a8ea774770" dependencies = [ "cfg-if 1.0.0", - "ethereum-types", "hashbrown 0.11.2", "impl-trait-for-tuples", - "lru 0.6.6", "parity-util-mem-derive", "parking_lot 0.11.2", "primitive-types", @@ -6434,9 +6581,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -6499,8 +6646,8 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", - "sp-core 5.0.0", - "sp-keystore 0.11.0", + "sp-core", + "sp-keystore", "thiserror", "tracing", ] @@ -6530,7 +6677,7 @@ name = "polkadot-cli" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "clap 3.1.17", + "clap 3.1.18", "frame-benchmarking-cli", "futures 0.3.21", "log", @@ -6541,8 +6688,8 @@ dependencies = [ "sc-cli", "sc-service", "sc-tracing", - "sp-core 5.0.0", - "sp-trie 5.0.0", + "sp-core", + "sp-trie", "substrate-build-script-utils", "thiserror", "try-runtime-cli", @@ -6573,9 +6720,9 @@ dependencies = [ "sp-consensus-babe", "sp-finality-grandpa", "sp-offchain", - "sp-runtime 5.0.0", + "sp-runtime", "sp-session", - "sp-storage 5.0.0", + "sp-storage", "sp-transaction-pool", ] @@ -6593,26 +6740,13 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core 5.0.0", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-keystore", + "sp-runtime", "thiserror", "tracing", ] -[[package]] -name = "polkadot-core-primitives" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" -dependencies = [ - "parity-scale-codec", - "parity-util-mem", - "scale-info", - "sp-core 4.1.0-dev", - "sp-runtime 4.1.0-dev", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", -] - [[package]] name = "polkadot-core-primitives" version = "0.9.17" @@ -6621,9 +6755,9 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "scale-info", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -6642,8 +6776,8 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "sc-network", - "sp-application-crypto 5.0.0", - "sp-keystore 0.11.0", + "sp-application-crypto", + "sp-keystore", "thiserror", "tracing", ] @@ -6657,8 +6791,8 @@ dependencies = [ "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", - "sp-core 5.0.0", - "sp-trie 5.0.0", + "sp-core", + "sp-trie", "thiserror", ] @@ -6676,9 +6810,9 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", - "sp-application-crypto 5.0.0", - "sp-core 5.0.0", - "sp-keystore 0.11.0", + "sp-application-crypto", + "sp-core", + "sp-keystore", "tracing", ] @@ -6713,7 +6847,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core 5.0.0", + "sp-core", "sp-maybe-compressed-blob", "thiserror", "tracing", @@ -6724,7 +6858,7 @@ name = "polkadot-node-core-approval-voting" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec", + "bitvec 0.20.4", "derive_more", "futures 0.3.21", "futures-timer", @@ -6740,10 +6874,10 @@ dependencies = [ "polkadot-primitives", "sc-keystore", "schnorrkel", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", - "sp-runtime 5.0.0", + "sp-runtime", "tracing", ] @@ -6752,7 +6886,7 @@ name = "polkadot-node-core-av-store" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec", + "bitvec 0.20.4", "futures 0.3.21", "futures-timer", "kvdb", @@ -6772,7 +6906,7 @@ name = "polkadot-node-core-backing" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec", + "bitvec 0.20.4", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -6780,7 +6914,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-statement-table", - "sp-keystore 0.11.0", + "sp-keystore", "thiserror", "tracing", ] @@ -6794,7 +6928,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-keystore 0.11.0", + "sp-keystore", "thiserror", "tracing", "wasm-timer", @@ -6812,7 +6946,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-parachain 0.9.17", + "polkadot-parachain", "polkadot-primitives", "sp-maybe-compressed-blob", "tracing", @@ -6879,8 +7013,8 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-primitives", "sp-blockchain", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", + "sp-inherents", + "sp-runtime", "thiserror", "tracing", ] @@ -6890,7 +7024,7 @@ name = "polkadot-node-core-provisioner" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec", + "bitvec 0.20.4", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -6915,20 +7049,20 @@ dependencies = [ "futures-timer", "parity-scale-codec", "pin-project 1.0.10", - "polkadot-core-primitives 0.9.17", + "polkadot-core-primitives", "polkadot-node-subsystem-util", - "polkadot-parachain 0.9.17", + "polkadot-parachain", "rand 0.8.5", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", "slotmap", - "sp-core 5.0.0", - "sp-externalities 0.11.0", - "sp-io 5.0.0", + "sp-core", + "sp-externalities", + "sp-io", "sp-maybe-compressed-blob", - "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-wasm-interface 5.0.0", + "sp-tracing", + "sp-wasm-interface", "tracing", ] @@ -6943,7 +7077,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", - "sp-keystore 0.11.0", + "sp-keystore", "thiserror", "tracing", ] @@ -6962,7 +7096,7 @@ dependencies = [ "sp-api", "sp-authority-discovery", "sp-consensus-babe", - "sp-core 5.0.0", + "sp-core", "tracing", ] @@ -6980,7 +7114,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-primitives", "sc-network", - "sp-core 5.0.0", + "sp-core", "thiserror", ] @@ -7029,15 +7163,15 @@ dependencies = [ "bounded-vec", "futures 0.3.21", "parity-scale-codec", - "polkadot-parachain 0.9.17", + "polkadot-parachain", "polkadot-primitives", "schnorrkel", "serde", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", - "sp-core 5.0.0", - "sp-keystore 0.11.0", + "sp-core", + "sp-keystore", "sp-maybe-compressed-blob", "thiserror", "zstd", @@ -7093,9 +7227,9 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "rand 0.8.5", - "sp-application-crypto 5.0.0", - "sp-core 5.0.0", - "sp-keystore 0.11.0", + "sp-application-crypto", + "sp-core", + "sp-keystore", "thiserror", "tracing", ] @@ -7149,38 +7283,21 @@ dependencies = [ "syn", ] -[[package]] -name = "polkadot-parachain" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" -dependencies = [ - "derive_more", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "parity-scale-codec", - "parity-util-mem", - "polkadot-core-primitives 0.9.16", - "scale-info", - "serde", - "sp-core 4.1.0-dev", - "sp-runtime 4.1.0-dev", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", -] - [[package]] name = "polkadot-parachain" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "derive_more", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", "parity-scale-codec", "parity-util-mem", - "polkadot-core-primitives 0.9.17", + "polkadot-core-primitives", "scale-info", "serde", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -7203,29 +7320,29 @@ name = "polkadot-primitives" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "bitvec", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "bitvec 0.20.4", + "frame-system", "hex-literal", "parity-scale-codec", "parity-util-mem", - "polkadot-core-primitives 0.9.17", - "polkadot-parachain 0.9.17", + "polkadot-core-primitives", + "polkadot-parachain", "scale-info", "serde", "sp-api", - "sp-application-crypto 5.0.0", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-application-crypto", + "sp-arithmetic", "sp-authority-discovery", "sp-consensus-slots", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-io 5.0.0", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-trie 5.0.0", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-trie", + "sp-version", ] [[package]] @@ -7254,8 +7371,8 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", + "sp-keystore", + "sp-runtime", "substrate-frame-rpc-system", ] @@ -7265,11 +7382,11 @@ version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 0.20.4", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "frame-try-runtime", "log", @@ -7300,12 +7417,12 @@ dependencies = [ "pallet-staking-reward-curve", "pallet-timestamp", "pallet-tips", - "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vesting", - "pallet-xcm 0.9.17", + "pallet-xcm", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", @@ -7320,22 +7437,22 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-io 5.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-npos-elections", "sp-offchain", - "sp-runtime 5.0.0", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-staking", + "sp-std", "sp-transaction-pool", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version", "static_assertions", "substrate-wasm-builder", - "xcm 0.9.17", - "xcm-builder 0.9.17", - "xcm-executor 0.9.17", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -7344,10 +7461,10 @@ version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 0.20.4", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "libsecp256k1", "log", @@ -7359,7 +7476,7 @@ dependencies = [ "pallet-session", "pallet-staking", "pallet-timestamp", - "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", "parity-scale-codec", @@ -7371,16 +7488,16 @@ dependencies = [ "serde_derive", "slot-range-helper", "sp-api", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-io 5.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-npos-elections", - "sp-runtime 5.0.0", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-staking", + "sp-std", "static_assertions", - "xcm 0.9.17", + "xcm", ] [[package]] @@ -7388,11 +7505,11 @@ name = "polkadot-runtime-constants" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", - "sp-runtime 5.0.0", + "sp-runtime", ] [[package]] @@ -7403,8 +7520,8 @@ dependencies = [ "bs58", "parity-scale-codec", "polkadot-primitives", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std", + "sp-tracing", ] [[package]] @@ -7413,10 +7530,10 @@ version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "bitflags", - "bitvec", + "bitvec 0.20.4", "derive_more", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", "pallet-authority-discovery", "pallet-authorship", @@ -7435,16 +7552,16 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-io 5.0.0", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "xcm 0.9.17", - "xcm-executor 0.9.17", + "sp-staking", + "sp-std", + "xcm", + "xcm-executor", ] [[package]] @@ -7493,7 +7610,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-parachain 0.9.17", + "polkadot-parachain", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", @@ -7528,19 +7645,19 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 5.0.0", + "sp-core", "sp-finality-grandpa", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-io 5.0.0", - "sp-keystore 0.11.0", + "sp-inherents", + "sp-io", + "sp-keystore", "sp-offchain", - "sp-runtime 5.0.0", + "sp-runtime", "sp-session", - "sp-state-machine 0.11.0", - "sp-storage 5.0.0", + "sp-state-machine", + "sp-storage", "sp-timestamp", "sp-transaction-pool", - "sp-trie 5.0.0", + "sp-trie", "substrate-prometheus-endpoint", "thiserror", "tracing", @@ -7561,8 +7678,8 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-keystore 0.11.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-keystore", + "sp-staking", "thiserror", "tracing", ] @@ -7574,7 +7691,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0e dependencies = [ "parity-scale-codec", "polkadot-primitives", - "sp-core 5.0.0", + "sp-core", ] [[package]] @@ -7627,7 +7744,6 @@ checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ "fixed-hash", "impl-codec", - "impl-rlp", "impl-serde", "scale-info", "uint", @@ -7678,9 +7794,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" +checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa" dependencies = [ "unicode-xid", ] @@ -7786,9 +7902,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ "proc-macro2", ] @@ -7799,6 +7915,12 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.7.3" @@ -7898,9 +8020,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" dependencies = [ "autocfg", "crossbeam-deque", @@ -7910,14 +8032,13 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", "num_cpus", ] @@ -7962,18 +8083,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300f2a835d808734ee295d45007adacb9ebb29dd3ae2424acfa17930cae541da" +checksum = "685d58625b6c2b83e4cc88a27c4bf65adb7b6b16dbdc413e515c9405b47432ab" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" +checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f" dependencies = [ "proc-macro2", "quote", @@ -8040,10 +8161,10 @@ dependencies = [ "parity-scale-codec", "serde", "serde_json", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-version", ] [[package]] @@ -8086,16 +8207,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rlp" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" -dependencies = [ - "bytes 1.1.0", - "rustc-hex", -] - [[package]] name = "rocksdb" version = "0.17.0" @@ -8112,14 +8223,14 @@ version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ "beefy-primitives", - "bp-messages", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", "bp-rococo", - "bp-runtime", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", "bp-wococo", - "bridge-runtime-common", + "bridge-runtime-common 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "log", "pallet-authority-discovery", @@ -8128,9 +8239,9 @@ dependencies = [ "pallet-balances", "pallet-beefy", "pallet-beefy-mmr", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", "pallet-collective", "pallet-grandpa", "pallet-im-online", @@ -8145,12 +8256,12 @@ dependencies = [ "pallet-staking", "pallet-sudo", "pallet-timestamp", - "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "pallet-xcm 0.9.17", + "pallet-xcm", "parity-scale-codec", - "polkadot-parachain 0.9.17", + "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -8163,20 +8274,20 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-io 5.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 5.0.0", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-staking", + "sp-std", "sp-transaction-pool", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version", "substrate-wasm-builder", - "xcm 0.9.17", - "xcm-builder 0.9.17", - "xcm-executor 0.9.17", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -8184,11 +8295,11 @@ name = "rococo-runtime-constants" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", - "sp-runtime 5.0.0", + "sp-runtime", ] [[package]] @@ -8234,7 +8345,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.7", + "semver 1.0.9", ] [[package]] @@ -8356,8 +8467,8 @@ version = "4.1.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "log", - "sp-core 5.0.0", - "sp-wasm-interface 5.0.0", + "sp-core", + "sp-wasm-interface", "thiserror", ] @@ -8381,9 +8492,9 @@ dependencies = [ "sp-api", "sp-authority-discovery", "sp-blockchain", - "sp-core 5.0.0", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -8405,9 +8516,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", + "sp-core", + "sp-inherents", + "sp-runtime", "substrate-prometheus-endpoint", ] @@ -8421,10 +8532,10 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -8440,8 +8551,8 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 5.0.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-runtime", ] [[package]] @@ -8461,7 +8572,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "chrono", - "clap 3.1.17", + "clap 3.1.18", "fdlimit", "futures 0.3.21", "hex", @@ -8482,12 +8593,12 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 5.0.0", + "sp-core", "sp-keyring", - "sp-keystore 0.11.0", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-keystore", + "sp-panic-handler", + "sp-runtime", + "sp-version", "thiserror", "tiny-bip39", "tokio", @@ -8510,14 +8621,14 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 5.0.0", + "sp-core", "sp-database", - "sp-externalities 0.11.0", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", - "sp-storage 5.0.0", - "sp-trie 5.0.0", + "sp-externalities", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "sp-trie", "substrate-prometheus-endpoint", ] @@ -8537,13 +8648,13 @@ dependencies = [ "parking_lot 0.11.2", "sc-client-api", "sc-state-db", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-arithmetic", "sp-blockchain", - "sp-core 5.0.0", + "sp-core", "sp-database", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", - "sp-trie 5.0.0", + "sp-runtime", + "sp-state-machine", + "sp-trie", ] [[package]] @@ -8563,9 +8674,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", + "sp-core", + "sp-runtime", + "sp-state-machine", "substrate-prometheus-endpoint", "thiserror", ] @@ -8585,16 +8696,16 @@ dependencies = [ "sc-consensus-slots", "sc-telemetry", "sp-api", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", "sp-consensus-slots", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -8625,19 +8736,19 @@ dependencies = [ "schnorrkel", "serde", "sp-api", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-io 5.0.0", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-version", "substrate-prometheus-endpoint", "thiserror", ] @@ -8656,13 +8767,13 @@ dependencies = [ "sc-rpc-api", "serde", "sp-api", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 5.0.0", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-keystore", + "sp-runtime", "thiserror", ] @@ -8676,7 +8787,7 @@ dependencies = [ "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime 5.0.0", + "sp-runtime", ] [[package]] @@ -8692,14 +8803,14 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", "sp-timestamp", "thiserror", ] @@ -8711,7 +8822,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "sc-client-api", "sp-authorship", - "sp-runtime 5.0.0", + "sp-runtime", "thiserror", ] @@ -8730,16 +8841,16 @@ dependencies = [ "sc-executor-wasmi", "sc-executor-wasmtime", "sp-api", - "sp-core 5.0.0", - "sp-core-hashing-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-externalities 0.11.0", - "sp-io 5.0.0", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime-interface 5.0.0", + "sp-core", + "sp-core-hashing-proc-macro", + "sp-externalities", + "sp-io", + "sp-panic-handler", + "sp-runtime-interface", "sp-tasks", - "sp-trie 5.0.0", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-wasm-interface 5.0.0", + "sp-trie", + "sp-version", + "sp-wasm-interface", "wasmi", ] @@ -8751,10 +8862,10 @@ dependencies = [ "environmental", "parity-scale-codec", "sc-allocator", - "sp-core 5.0.0", + "sp-core", "sp-maybe-compressed-blob", "sp-serializer", - "sp-wasm-interface 5.0.0", + "sp-wasm-interface", "thiserror", "wasm-instrument", "wasmi", @@ -8770,9 +8881,9 @@ dependencies = [ "sc-allocator", "sc-executor-common", "scoped-tls", - "sp-core 5.0.0", - "sp-runtime-interface 5.0.0", - "sp-wasm-interface 5.0.0", + "sp-core", + "sp-runtime-interface", + "sp-wasm-interface", "wasmi", ] @@ -8788,9 +8899,9 @@ dependencies = [ "parity-wasm 0.42.2", "sc-allocator", "sc-executor-common", - "sp-core 5.0.0", - "sp-runtime-interface 5.0.0", - "sp-wasm-interface 5.0.0", + "sp-core", + "sp-runtime-interface", + "sp-wasm-interface", "wasmtime", ] @@ -8820,14 +8931,14 @@ dependencies = [ "sc-utils", "serde_json", "sp-api", - "sp-application-crypto 5.0.0", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-application-crypto", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 5.0.0", + "sp-core", "sp-finality-grandpa", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -8851,8 +8962,8 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 5.0.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-runtime", "thiserror", ] @@ -8870,7 +8981,7 @@ dependencies = [ "sc-network", "sc-transaction-pool-api", "sp-blockchain", - "sp-runtime 5.0.0", + "sp-runtime", ] [[package]] @@ -8882,9 +8993,9 @@ dependencies = [ "hex", "parking_lot 0.11.2", "serde_json", - "sp-application-crypto 5.0.0", - "sp-core 5.0.0", - "sp-keystore 0.11.0", + "sp-application-crypto", + "sp-core", + "sp-keystore", "thiserror", ] @@ -8925,12 +9036,12 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 5.0.0", + "sp-core", "sp-finality-grandpa", - "sp-runtime 5.0.0", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint 0.6.0", @@ -8949,7 +9060,7 @@ dependencies = [ "log", "lru 0.7.5", "sc-network", - "sp-runtime 5.0.0", + "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] @@ -8975,9 +9086,9 @@ dependencies = [ "sc-network", "sc-utils", "sp-api", - "sp-core 5.0.0", + "sp-core", "sp-offchain", - "sp-runtime 5.0.0", + "sp-runtime", "threadpool", "tracing", ] @@ -9026,13 +9137,13 @@ dependencies = [ "serde_json", "sp-api", "sp-blockchain", - "sp-core 5.0.0", - "sp-keystore 0.11.0", + "sp-core", + "sp-keystore", "sp-offchain", "sp-rpc", - "sp-runtime 5.0.0", + "sp-runtime", "sp-session", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-version", ] [[package]] @@ -9052,11 +9163,11 @@ dependencies = [ "sc-transaction-pool-api", "serde", "serde_json", - "sp-core 5.0.0", + "sp-core", "sp-rpc", - "sp-runtime 5.0.0", - "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-tracing", + "sp-version", "thiserror", ] @@ -9116,23 +9227,23 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 5.0.0", - "sp-externalities 0.11.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-externalities", + "sp-inherents", + "sp-keystore", + "sp-runtime", "sp-session", - "sp-state-machine 0.11.0", - "sp-storage 5.0.0", - "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-state-machine", + "sp-storage", + "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie 5.0.0", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-trie", + "sp-version", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -9152,7 +9263,7 @@ dependencies = [ "parity-util-mem-derive", "parking_lot 0.11.2", "sc-client-api", - "sp-core 5.0.0", + "sp-core", ] [[package]] @@ -9173,7 +9284,7 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-runtime 5.0.0", + "sp-runtime", "thiserror", ] @@ -9216,10 +9327,10 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 5.0.0", + "sp-core", "sp-rpc", - "sp-runtime 5.0.0", - "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-tracing", "thiserror", "tracing", "tracing-log", @@ -9256,9 +9367,9 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-runtime", + "sp-tracing", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -9273,7 +9384,7 @@ dependencies = [ "log", "serde", "sp-blockchain", - "sp-runtime 5.0.0", + "sp-runtime", "thiserror", ] @@ -9295,7 +9406,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" dependencies = [ - "bitvec", + "bitvec 0.20.4", "cfg-if 1.0.0", "derive_more", "parity-scale-codec", @@ -9427,9 +9538,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" +checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" dependencies = [ "serde", ] @@ -9451,18 +9562,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.136" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" dependencies = [ "proc-macro2", "quote", @@ -9471,9 +9582,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" dependencies = [ "itoa 1.0.1", "ryu", @@ -9619,8 +9730,8 @@ dependencies = [ "enumn", "parity-scale-codec", "paste", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -9708,11 +9819,11 @@ dependencies = [ "log", "parity-scale-codec", "sp-api-proc-macro", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-version", "thiserror", ] @@ -9728,19 +9839,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-application-crypto" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 4.1.0-dev", - "sp-io 4.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", -] - [[package]] name = "sp-application-crypto" version = "5.0.0" @@ -9749,24 +9847,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", -] - -[[package]] -name = "sp-arithmetic" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "static_assertions", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -9779,8 +9862,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-debug-derive", + "sp-std", "static_assertions", ] @@ -9792,9 +9875,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-application-crypto", + "sp-runtime", + "sp-std", ] [[package]] @@ -9804,9 +9887,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "async-trait", "parity-scale-codec", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] @@ -9816,9 +9899,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "parity-scale-codec", "sp-api", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] @@ -9834,8 +9917,8 @@ dependencies = [ "sp-api", "sp-consensus", "sp-database", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", + "sp-runtime", + "sp-state-machine", "thiserror", ] @@ -9849,12 +9932,12 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-version", "thiserror", ] @@ -9867,12 +9950,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-inherents", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -9887,15 +9970,15 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 5.0.0", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -9907,8 +9990,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", + "sp-arithmetic", + "sp-runtime", ] [[package]] @@ -9918,57 +10001,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "parity-scale-codec", "schnorrkel", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", -] - -[[package]] -name = "sp-core" -version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "base58", - "bitflags", - "blake2-rfc", - "byteorder", - "dyn-clonable", - "ed25519-dalek", - "futures 0.3.21", - "hash-db", - "hash256-std-hasher", - "hex", - "impl-serde", - "lazy_static", - "libsecp256k1", - "log", - "merlin", - "num-traits", - "parity-scale-codec", - "parity-util-mem", - "parking_lot 0.11.2", - "primitive-types", - "rand 0.7.3", - "regex", - "scale-info", - "schnorrkel", - "secrecy", - "serde", - "sha2 0.10.2", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-externalities 0.10.0", - "sp-runtime-interface 4.1.0-dev", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-storage 4.0.0", - "ss58-registry", - "substrate-bip39", - "thiserror", - "tiny-bip39", - "tiny-keccak", - "twox-hash", - "wasmi", - "zeroize", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -10003,12 +10038,12 @@ dependencies = [ "secrecy", "serde", "sha2 0.10.2", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-externalities 0.11.0", - "sp-runtime-interface 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-storage 5.0.0", + "sp-core-hashing", + "sp-debug-derive", + "sp-externalities", + "sp-runtime-interface", + "sp-std", + "sp-storage", "ss58-registry", "substrate-bip39", "thiserror", @@ -10019,19 +10054,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sp-core-hashing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "blake2-rfc", - "byteorder", - "sha2 0.10.2", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "tiny-keccak", - "twox-hash", -] - [[package]] name = "sp-core-hashing" version = "4.0.0" @@ -10040,22 +10062,11 @@ dependencies = [ "blake2-rfc", "byteorder", "sha2 0.10.2", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std", "tiny-keccak", "twox-hash", ] -[[package]] -name = "sp-core-hashing-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "proc-macro2", - "quote", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "syn", -] - [[package]] name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" @@ -10063,7 +10074,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "proc-macro2", "quote", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core-hashing", "syn", ] @@ -10076,16 +10087,6 @@ dependencies = [ "parking_lot 0.11.2", ] -[[package]] -name = "sp-debug-derive" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-debug-derive" version = "4.0.0" @@ -10096,17 +10097,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-externalities" -version = "0.10.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-storage 4.0.0", -] - [[package]] name = "sp-externalities" version = "0.11.0" @@ -10114,8 +10104,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "environmental", "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-storage 5.0.0", + "sp-std", + "sp-storage", ] [[package]] @@ -10129,25 +10119,11 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 5.0.0", - "sp-core 5.0.0", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", -] - -[[package]] -name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-core 4.1.0-dev", - "sp-runtime 4.1.0-dev", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "thiserror", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "sp-runtime", + "sp-std", ] [[package]] @@ -10158,36 +10134,12 @@ dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-runtime", + "sp-std", "thiserror", ] -[[package]] -name = "sp-io" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "futures 0.3.21", - "hash-db", - "libsecp256k1", - "log", - "parity-scale-codec", - "parking_lot 0.11.2", - "sp-core 4.1.0-dev", - "sp-externalities 0.10.0", - "sp-keystore 0.10.0", - "sp-runtime-interface 4.1.0-dev", - "sp-state-machine 0.10.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-trie 4.0.0", - "sp-wasm-interface 4.1.0-dev", - "tracing", - "tracing-core", -] - [[package]] name = "sp-io" version = "5.0.0" @@ -10199,15 +10151,15 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.11.2", - "sp-core 5.0.0", - "sp-externalities 0.11.0", - "sp-keystore 0.11.0", - "sp-runtime-interface 5.0.0", - "sp-state-machine 0.11.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-trie 5.0.0", - "sp-wasm-interface 5.0.0", + "sp-core", + "sp-externalities", + "sp-keystore", + "sp-runtime-interface", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-trie", + "sp-wasm-interface", "tracing", "tracing-core", ] @@ -10218,27 +10170,11 @@ version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "lazy_static", - "sp-core 5.0.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-runtime", "strum", ] -[[package]] -name = "sp-keystore" -version = "0.10.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "async-trait", - "derive_more", - "futures 0.3.21", - "merlin", - "parity-scale-codec", - "parking_lot 0.11.2", - "schnorrkel", - "sp-core 4.1.0-dev", - "sp-externalities 0.10.0", -] - [[package]] name = "sp-keystore" version = "0.11.0" @@ -10251,8 +10187,8 @@ dependencies = [ "parking_lot 0.11.2", "schnorrkel", "serde", - "sp-core 5.0.0", - "sp-externalities 0.11.0", + "sp-core", + "sp-externalities", "thiserror", ] @@ -10273,11 +10209,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-core 5.0.0", + "sp-arithmetic", + "sp-core", "sp-npos-elections-solution-type", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-runtime", + "sp-std", ] [[package]] @@ -10297,18 +10233,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "sp-api", - "sp-core 5.0.0", - "sp-runtime 5.0.0", -] - -[[package]] -name = "sp-panic-handler" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "backtrace", - "lazy_static", - "regex", + "sp-core", + "sp-runtime", ] [[package]] @@ -10328,29 +10254,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "rustc-hash", "serde", - "sp-core 5.0.0", -] - -[[package]] -name = "sp-runtime" -version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "parity-util-mem", - "paste", - "rand 0.7.3", - "scale-info", - "serde", - "sp-application-crypto 4.0.0", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-core 4.1.0-dev", - "sp-io 4.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-core", ] [[package]] @@ -10368,28 +10272,11 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto 5.0.0", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", -] - -[[package]] -name = "sp-runtime-interface" -version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.10.0", - "sp-runtime-interface-proc-macro 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-storage 4.0.0", - "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-wasm-interface 4.1.0-dev", - "static_assertions", + "sp-application-crypto", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -10400,27 +10287,15 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.11.0", - "sp-runtime-interface-proc-macro 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-storage 5.0.0", - "sp-tracing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-wasm-interface 5.0.0", + "sp-externalities", + "sp-runtime-interface-proc-macro", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "Inflector", - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0" @@ -10450,21 +10325,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-core 5.0.0", - "sp-runtime 5.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", -] - -[[package]] -name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "parity-scale-codec", - "scale-info", - "sp-runtime 4.1.0-dev", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", + "sp-core", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -10474,31 +10338,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "parity-scale-codec", "scale-info", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", -] - -[[package]] -name = "sp-state-machine" -version = "0.10.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "hash-db", - "log", - "num-traits", - "parity-scale-codec", - "parking_lot 0.11.2", - "rand 0.7.3", - "smallvec", - "sp-core 4.1.0-dev", - "sp-externalities 0.10.0", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-trie 4.0.0", - "thiserror", - "tracing", - "trie-db", - "trie-root", + "sp-runtime", + "sp-std", ] [[package]] @@ -10513,40 +10354,22 @@ dependencies = [ "parking_lot 0.11.2", "rand 0.7.3", "smallvec", - "sp-core 5.0.0", - "sp-externalities 0.11.0", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-trie 5.0.0", + "sp-core", + "sp-externalities", + "sp-panic-handler", + "sp-std", + "sp-trie", "thiserror", "tracing", "trie-db", "trie-root", ] -[[package]] -name = "sp-std" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" - [[package]] name = "sp-std" version = "4.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" -[[package]] -name = "sp-storage" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", -] - [[package]] name = "sp-storage" version = "5.0.0" @@ -10556,8 +10379,8 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -10566,11 +10389,11 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "log", - "sp-core 5.0.0", - "sp-externalities 0.11.0", - "sp-io 5.0.0", - "sp-runtime-interface 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-externalities", + "sp-io", + "sp-runtime-interface", + "sp-std", ] [[package]] @@ -10583,31 +10406,19 @@ dependencies = [ "log", "parity-scale-codec", "sp-api", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-inherents", + "sp-runtime", + "sp-std", "thiserror", ] -[[package]] -name = "sp-tracing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "tracing", - "tracing-core", - "tracing-subscriber", -] - [[package]] name = "sp-tracing" version = "4.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std", "tracing", "tracing-core", "tracing-subscriber", @@ -10619,7 +10430,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "sp-api", - "sp-runtime 5.0.0", + "sp-runtime", ] [[package]] @@ -10631,26 +10442,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-trie 5.0.0", -] - -[[package]] -name = "sp-trie" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "hash-db", - "memory-db", - "parity-scale-codec", - "scale-info", - "sp-core 4.1.0-dev", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "trie-db", - "trie-root", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-std", + "sp-trie", ] [[package]] @@ -10662,29 +10458,12 @@ dependencies = [ "memory-db", "parity-scale-codec", "scale-info", - "sp-core 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-std", "trie-db", "trie-root", ] -[[package]] -name = "sp-version" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "parity-wasm 0.42.2", - "scale-info", - "serde", - "sp-core-hashing-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-runtime 4.1.0-dev", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "thiserror", -] - [[package]] name = "sp-version" version = "4.0.0-dev" @@ -10695,24 +10474,13 @@ dependencies = [ "parity-wasm 0.42.2", "scale-info", "serde", - "sp-core-hashing-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core-hashing-proc-macro", + "sp-runtime", + "sp-std", + "sp-version-proc-macro", "thiserror", ] -[[package]] -name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "parity-scale-codec", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" @@ -10724,18 +10492,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-wasm-interface" -version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#19162e43be45817b44c7d48e50d03f074f60fbf4" -dependencies = [ - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "wasmi", -] - [[package]] name = "sp-wasm-interface" version = "5.0.0" @@ -10744,7 +10500,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-std", "wasmi", "wasmtime", ] @@ -10757,9 +10513,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "ss58-registry" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b84a70894df7a73666e0694f44b41a9571625e9546fb58a0818a565d2c7e084" +checksum = "ceb8b72a924ccfe7882d0e26144c114503760a4d1248bb5cd06c8ab2d55404cc" dependencies = [ "Inflector", "num-format", @@ -10917,8 +10673,8 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 5.0.0", - "sp-runtime 5.0.0", + "sp-core", + "sp-runtime", ] [[package]] @@ -10959,9 +10715,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.91" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" +checksum = "04066589568b72ec65f42d65a1a52436e954b168773148893c020269563decf2" dependencies = [ "proc-macro2", "quote", @@ -11032,18 +10788,18 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ "proc-macro2", "quote", @@ -11122,9 +10878,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -11137,17 +10893,17 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.17.0" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395" dependencies = [ "bytes 1.1.0", "libc", "memchr", - "mio 0.8.2", + "mio 0.8.3", "num_cpus", "once_cell", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "signal-hook-registry", "socket2 0.4.4", "tokio-macros", @@ -11194,7 +10950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ "futures-core", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "tokio", ] @@ -11209,7 +10965,7 @@ dependencies = [ "futures-io", "futures-sink", "log", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "tokio", ] @@ -11222,16 +10978,16 @@ dependencies = [ "bytes 1.1.0", "futures-core", "futures-sink", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "tokio", "tracing", ] [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] @@ -11244,21 +11000,21 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.32" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" +checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" dependencies = [ "cfg-if 1.0.0", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" +checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" dependencies = [ "proc-macro2", "quote", @@ -11267,9 +11023,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90442985ee2f57c9e1b548ee72ae842f4a9a20e3f417cc38dbc5dc684d9bb4ee" +checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ "lazy_static", "valuable", @@ -11287,9 +11043,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ "lazy_static", "log", @@ -11316,7 +11072,7 @@ dependencies = [ "chrono", "lazy_static", "matchers", - "parking_lot 0.10.2", + "parking_lot 0.11.2", "regex", "serde", "serde_json", @@ -11336,7 +11092,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d32d034c0d3db64b43c31de38e945f15b40cd4ca6d2dcfc26d4798ce8de4ab83" dependencies = [ "hash-db", - "hashbrown 0.12.0", + "hashbrown 0.12.1", "log", "rustc-hex", "smallvec", @@ -11405,7 +11161,7 @@ name = "try-runtime-cli" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "clap 3.1.17", + "clap 3.1.18", "jsonrpsee 0.4.1", "log", "parity-scale-codec", @@ -11415,13 +11171,13 @@ dependencies = [ "sc-executor", "sc-service", "serde", - "sp-core 5.0.0", - "sp-externalities 0.11.0", - "sp-io 5.0.0", - "sp-keystore 0.11.0", - "sp-runtime 5.0.0", - "sp-state-machine 0.11.0", - "sp-version 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "sp-core", + "sp-externalities", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-version", "zstd", ] @@ -11433,11 +11189,11 @@ checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" [[package]] name = "twox-hash" -version = "1.6.2" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "rand 0.8.5", "static_assertions", ] @@ -11477,9 +11233,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-normalization" @@ -11504,9 +11260,9 @@ checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "unicode-xid" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" [[package]] name = "universal-hash" @@ -11585,9 +11341,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.0.0-alpha.8" +version = "1.0.0-alpha.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" +checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" dependencies = [ "ctor", "version_check", @@ -11808,7 +11564,7 @@ dependencies = [ "lazy_static", "libc", "log", - "object", + "object 0.27.1", "paste", "psm", "rayon", @@ -11860,7 +11616,7 @@ dependencies = [ "gimli", "log", "more-asserts", - "object", + "object 0.27.1", "target-lexicon", "thiserror", "wasmparser", @@ -11879,7 +11635,7 @@ dependencies = [ "indexmap", "log", "more-asserts", - "object", + "object 0.27.1", "serde", "target-lexicon", "thiserror", @@ -11898,7 +11654,7 @@ dependencies = [ "bincode", "cfg-if 1.0.0", "gimli", - "object", + "object 0.27.1", "region", "rustix", "serde", @@ -12131,6 +11887,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +[[package]] +name = "wyz" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +dependencies = [ + "tap", +] + [[package]] name = "x25519-dalek" version = "1.1.1" @@ -12142,19 +11907,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "xcm" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" -dependencies = [ - "derivative", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "scale-info", - "xcm-procedural 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", -] - [[package]] name = "xcm" version = "0.9.17" @@ -12165,27 +11917,7 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "xcm-procedural 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", -] - -[[package]] -name = "xcm-builder" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "log", - "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "parity-scale-codec", - "polkadot-parachain 0.9.16", - "scale-info", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-io 4.0.0", - "sp-runtime 4.1.0-dev", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "xcm 0.9.16", - "xcm-executor 0.9.16", + "xcm-procedural", ] [[package]] @@ -12193,36 +11925,19 @@ name = "xcm-builder" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", + "frame-system", "log", - "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "pallet-transaction-payment", "parity-scale-codec", - "polkadot-parachain 0.9.17", + "polkadot-parachain", "scale-info", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "xcm 0.9.17", - "xcm-executor 0.9.17", -] - -[[package]] -name = "xcm-executor" -version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "sp-core 4.1.0-dev", - "sp-io 4.0.0", - "sp-runtime 4.1.0-dev", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", - "xcm 0.9.16", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", + "xcm", + "xcm-executor", ] [[package]] @@ -12230,27 +11945,16 @@ name = "xcm-executor" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "frame-support", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-arithmetic 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "sp-core 5.0.0", - "sp-io 5.0.0", - "sp-runtime 5.0.0", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", - "xcm 0.9.17", -] - -[[package]] -name = "xcm-procedural" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350" -dependencies = [ - "Inflector", - "proc-macro2", - "quote", - "syn", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "xcm", ] [[package]] @@ -12280,9 +11984,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb5728b8afd3f280a869ce1d4c554ffaed35f45c231fc41bfbd0381bef50317" +checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07" dependencies = [ "zeroize_derive", ] diff --git a/Cargo.toml b/Cargo.toml index 34ab9363..369d170f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,7 +87,7 @@ cumulus-relay-chain-interface = { git = "https://github.com/paritytech/c cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } # darwinia-network -# pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } # polkadot polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index c731e7d9..b29a582a 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -14,7 +14,7 @@ version = "5.1.2" jsonrpc-core = { version = "18.0" } # darwinia-network dc-primitives = { path = "../primitives" } -# pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } # paritytech pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 44d15998..71e43cd2 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -15,10 +15,10 @@ smallvec = { version = "1.8" } # cumulus pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } # darwinia-bridges-substrate -# bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } # darwinia-collator dc-primitives = { default-features = false, path = "../../primitives" } # substrate @@ -36,10 +36,10 @@ std = [ # cumulus "pallet-collator-selection/std", # darwinia-bridges-substrate - # "bp-messages/std", - # "bridge-runtime-common/std", - # "pallet-bridge-dispatch/std", - # "pallet-fee-market/std", + "bp-messages/std", + "bridge-runtime-common/std", + "pallet-bridge-dispatch/std", + "pallet-fee-market/std", # darwinia-collator "dc-primitives/std", # substrate diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index b25504df..3718825f 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -30,7 +30,7 @@ parachain-info = { default-features = false, git = "https://git # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -# pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } @@ -89,7 +89,7 @@ std = [ # darwinia "dc-common-runtime/std", "dc-primitives/std", - # "pallet-fee-market-rpc-runtime-api/std", + "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 93701c30..b43f0889 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -29,13 +29,13 @@ parachain-info = { default-features = false, git = "https://git # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -# pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } # substrate frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } @@ -84,7 +84,7 @@ std = [ "parachain-info/std", "dc-common-runtime/std", "dc-primitives/std", - # "pallet-fee-market-rpc-runtime-api/std", + "pallet-fee-market-rpc-runtime-api/std", "pallet-xcm/std", "polkadot-parachain/std", "xcm/std", diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 20ac7402..99d29607 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -30,18 +30,18 @@ parachain-info = { default-features = false, git = "https://git dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # darwinia-bridges-substrate -# bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -# pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } @@ -100,18 +100,18 @@ std = [ "dc-common-runtime/std", "dc-primitives/std", # darwinia-bridges-substrate - # "bp-pangolin/std", - # "bp-message-dispatch/std", - # "bp-messages/std", - # "bp-runtime/std", - # "bp-polkadot-core/std", - # "bp-pangolin-parachain/std", - # "bridge-runtime-common/std", - # "pallet-bridge-dispatch/std", - # "pallet-bridge-grandpa/std", - # "pallet-bridge-messages/std", - # "pallet-fee-market/std", - # "pallet-fee-market-rpc-runtime-api/std", + "bp-pangolin/std", + "bp-message-dispatch/std", + "bp-messages/std", + "bp-runtime/std", + "bp-polkadot-core/std", + "bp-pangolin-parachain/std", + "bridge-runtime-common/std", + "pallet-bridge-dispatch/std", + "pallet-bridge-grandpa/std", + "pallet-bridge-messages/std", + "pallet-fee-market/std", + "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", From 6e26d329c8ba3fe5cb11d139ae020831dacb9ece Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 16 May 2022 11:45:02 +0800 Subject: [PATCH 05/59] ParentIsDefault -> ParentIsPreset --- runtime/crab-parachain/src/pallets/polkadot_xcm.rs | 2 +- runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs | 2 +- runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs index 4ba7cb89..3ea35a23 100644 --- a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs @@ -56,7 +56,7 @@ pub type Barrier = ( /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. diff --git a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs index cbda83cc..b4b6b347 100644 --- a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs @@ -56,7 +56,7 @@ pub type Barrier = ( /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. diff --git a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs index e7de2661..9d523c20 100644 --- a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs @@ -56,7 +56,7 @@ pub type Barrier = ( /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. From b8120661922785d27d1c32191cb09bd7f6b15492 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 16 May 2022 11:45:02 +0800 Subject: [PATCH 06/59] Revert paritytech/cumulus#901 ParentIsDefault -> ParentIsPreset --- runtime/crab-parachain/src/pallets/polkadot_xcm.rs | 2 +- runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs | 2 +- runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs index 4ba7cb89..3ea35a23 100644 --- a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs @@ -56,7 +56,7 @@ pub type Barrier = ( /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. diff --git a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs index cbda83cc..b4b6b347 100644 --- a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs @@ -56,7 +56,7 @@ pub type Barrier = ( /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. diff --git a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs index e7de2661..9d523c20 100644 --- a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs @@ -56,7 +56,7 @@ pub type Barrier = ( /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. From 8f8c91fb1a8d57de90262e422ae49a0411e4dc8e Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 16 May 2022 13:40:05 +0800 Subject: [PATCH 07/59] Revert paritytech/cumulus#901 --- runtime/crab-parachain/src/pallets/polkadot_xcm.rs | 2 +- runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs | 2 +- runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs index 3ea35a23..ee0e6fdf 100644 --- a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs @@ -55,7 +55,7 @@ pub type Barrier = ( /// when determining ownership of accounts for asset transacting and when attempting to use XCM /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( - // The parent (Relay-chain) origin converts to the default `AccountId`. + // The parent (Relay-chain) origin converts to the parent `AccountId`. ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, diff --git a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs index b4b6b347..5cf4e272 100644 --- a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs @@ -55,7 +55,7 @@ pub type Barrier = ( /// when determining ownership of accounts for asset transacting and when attempting to use XCM /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( - // The parent (Relay-chain) origin converts to the default `AccountId`. + // The parent (Relay-chain) origin converts to the parent `AccountId`. ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, diff --git a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs index 9d523c20..e2dee2e7 100644 --- a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs @@ -55,7 +55,7 @@ pub type Barrier = ( /// when determining ownership of accounts for asset transacting and when attempting to use XCM /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( - // The parent (Relay-chain) origin converts to the default `AccountId`. + // The parent (Relay-chain) origin converts to the parent `AccountId`. ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, From 83f5895b0ccc1ae3d0f27f849642a9959bd13e51 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 16 May 2022 13:51:04 +0800 Subject: [PATCH 08/59] Revert paritytech/cumulus#895 --- Cargo.toml | 2 +- src/cli.rs | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1d3309d6..8201e4d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,12 +40,12 @@ runtime-benchmarks = [ # crates.io array-bytes = { version = "1.5" } async-trait = { version = "0.1" } +clap = { version = "3.0", features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.3" } futures = { version = "0.3" } jsonrpc-core = { version = "18.0" } log = { version = "0.4" } serde = { version = "1.0", features = ["derive"] } -structopt = { version = "0.3" } tempfile = { version = "3.2" } # parachain diff --git a/src/cli.rs b/src/cli.rs index a91e8dfc..479cbb61 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -19,19 +19,19 @@ // --- std --- use std::path::PathBuf; // --- crates.io --- -use structopt::StructOpt; +use clap::{AppSettings, Parser}; // --- darwinia-network --- use crate::chain_spec; /// Sub-commands supported by the collator. -#[derive(Debug, StructOpt)] +#[derive(Debug, clap::Subcommand)] pub enum Subcommand { /// Export the genesis state of the parachain. - #[structopt(name = "export-genesis-state")] + #[clap(name = "export-genesis-state")] ExportGenesisState(ExportGenesisStateCommand), /// Export the genesis wasm of the parachain. - #[structopt(name = "export-genesis-wasm")] + #[clap(name = "export-genesis-wasm")] ExportGenesisWasm(ExportGenesisWasmCommand), /// Build a chain specification. @@ -69,52 +69,52 @@ pub enum Subcommand { } /// Command for exporting the genesis state of the parachain -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub struct ExportGenesisStateCommand { /// Output file name or stdout if unspecified. - #[structopt(parse(from_os_str))] + #[clap(parse(from_os_str))] pub output: Option, /// Write output in binary. Default is to write in hex. - #[structopt(long)] + #[clap(long)] pub raw: bool, /// The name of the chain for that the genesis state should be exported. - #[structopt(long)] + #[clap(long)] pub chain: Option, } /// Command for exporting the genesis wasm file. -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub struct ExportGenesisWasmCommand { /// Output file name or stdout if unspecified. - #[structopt(parse(from_os_str))] + #[clap(parse(from_os_str))] pub output: Option, /// Write output in binary. Default is to write in hex. - #[structopt(short, long)] + #[clap(short, long)] pub raw: bool, /// The name of the chain for that the genesis wasm file should be exported. - #[structopt(long)] + #[clap(long)] pub chain: Option, } -#[derive(Debug, StructOpt)] -#[structopt(settings = &[ - structopt::clap::AppSettings::GlobalVersion, - structopt::clap::AppSettings::ArgsNegateSubcommands, - structopt::clap::AppSettings::SubcommandsNegateReqs, -])] +#[derive(Debug, Parser)] +#[clap(setting( + AppSettings::PropagateVersion | + AppSettings::ArgsNegateSubcommands | + AppSettings::SubcommandsNegateReqs, +))] pub struct Cli { - #[structopt(subcommand)] + #[clap(subcommand)] pub subcommand: Option, - #[structopt(flatten)] + #[clap(flatten)] pub run: cumulus_client_cli::RunCmd, /// Relay chain arguments - #[structopt(raw = true)] + #[clap(raw = true)] pub relay_chain_args: Vec, } @@ -144,7 +144,7 @@ impl RelayChainCli { Self { base_path, chain_id, - base: polkadot_cli::RunCmd::from_iter(relay_chain_args), + base: polkadot_cli::RunCmd::parse_from(relay_chain_args), } } } From 0627f51079cbd5ed6bb1ee579f6dfaed3916fdec Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 16 May 2022 15:28:51 +0800 Subject: [PATCH 09/59] Companion for Cumulus#1035 --- Cargo.lock | 82 ++++++------------------------------------------------ Cargo.toml | 2 +- src/cli.rs | 13 +++++---- 3 files changed, 16 insertions(+), 81 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2744d9a7..3bc27783 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1219,21 +1219,6 @@ dependencies = [ "libloading 0.7.3", ] -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - [[package]] name = "clap" version = "3.1.18" @@ -1246,9 +1231,9 @@ dependencies = [ "clap_lex", "indexmap", "lazy_static", - "strsim 0.10.0", + "strsim", "termcolor", - "textwrap 0.15.0", + "textwrap", ] [[package]] @@ -1629,7 +1614,7 @@ name = "cumulus-client-cli" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" dependencies = [ - "clap 3.1.18", + "clap", "sc-cli", "sc-service", ] @@ -2083,6 +2068,7 @@ version = "5.2.0-rc1" dependencies = [ "array-bytes", "async-trait", + "clap", "crab-parachain-runtime", "cumulus-client-cli", "cumulus-client-consensus-aura", @@ -2136,7 +2122,6 @@ dependencies = [ "sp-session", "sp-timestamp", "sp-transaction-pool", - "structopt", "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", @@ -2683,7 +2668,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22 dependencies = [ "Inflector", "chrono", - "clap 3.1.18", + "clap", "frame-benchmarking", "frame-support", "handlebars", @@ -6794,7 +6779,7 @@ name = "polkadot-cli" version = "0.9.17" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" dependencies = [ - "clap 3.1.18", + "clap", "frame-benchmarking-cli", "futures 0.3.21", "log", @@ -8702,7 +8687,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ "chrono", - "clap 3.1.18", + "clap", "fdlimit", "futures 0.3.21", "hex", @@ -10706,42 +10691,12 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap 2.34.0", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "strum" version = "0.23.0" @@ -10901,15 +10856,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - [[package]] name = "textwrap" version = "0.15.0" @@ -11291,7 +11237,7 @@ name = "try-runtime-cli" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" dependencies = [ - "clap 3.1.18", + "clap", "jsonrpsee 0.4.1", "log", "parity-scale-codec", @@ -11382,12 +11328,6 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - [[package]] name = "unicode-xid" version = "0.2.3" @@ -11485,12 +11425,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.4" diff --git a/Cargo.toml b/Cargo.toml index 8201e4d3..34d5c663 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ runtime-benchmarks = [ # crates.io array-bytes = { version = "1.5" } async-trait = { version = "0.1" } -clap = { version = "3.0", features = ["derive"] } +clap = { version = "3.1", features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.3" } futures = { version = "0.3" } jsonrpc-core = { version = "18.0" } diff --git a/src/cli.rs b/src/cli.rs index 479cbb61..f8ef38d3 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -19,7 +19,7 @@ // --- std --- use std::path::PathBuf; // --- crates.io --- -use clap::{AppSettings, Parser}; +use clap::Parser; // --- darwinia-network --- use crate::chain_spec; @@ -56,6 +56,7 @@ pub enum Subcommand { Revert(sc_cli::RevertCmd), /// Key management CLI utilities + #[clap(subcommand)] Key(sc_cli::KeySubcommand), /// Benchmark runtime pallets. @@ -101,11 +102,11 @@ pub struct ExportGenesisWasmCommand { } #[derive(Debug, Parser)] -#[clap(setting( - AppSettings::PropagateVersion | - AppSettings::ArgsNegateSubcommands | - AppSettings::SubcommandsNegateReqs, -))] +#[clap( + propagate_version = true, + args_conflicts_with_subcommands = true, + subcommand_negates_reqs = true +)] pub struct Cli { #[clap(subcommand)] pub subcommand: Option, From 02cc54683c4fe929133fedd8c3d88bfdd00147af Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 16 May 2022 18:05:54 +0800 Subject: [PATCH 10/59] Anchor polkadot-v0.9.18 --- Cargo.toml | 98 +++++++++++----------- primitives/Cargo.toml | 4 +- rpc/Cargo.toml | 18 ++-- runtime/common/Cargo.toml | 22 ++--- runtime/crab-parachain/Cargo.toml | 96 ++++++++++----------- runtime/darwinia-parachain/Cargo.toml | 94 ++++++++++----------- runtime/pangolin-parachain/Cargo.toml | 116 +++++++++++++------------- 7 files changed, 224 insertions(+), 224 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 34d5c663..e77278c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,63 +56,63 @@ dc-rpc = { path = "rpc" } pangolin-parachain-runtime = { path = "runtime/pangolin-parachain" } # substrate -frame-benchmarking = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-benchmarking-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-benchmarking-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } # cumulus -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-network -pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [workspace] members = [ diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index e125365c..1fed3522 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -11,8 +11,8 @@ version = "5.2.0-rc1" [dependencies] # substrate -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 9f90232d..483001cd 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -14,13 +14,13 @@ version = "5.2.0-rc1" jsonrpc-core = { version = "18.0" } # darwinia-network dc-primitives = { path = "../primitives" } -pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # paritytech -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 166a4bcc..93108c7f 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -13,21 +13,21 @@ version = "5.2.0-rc1" # crates.io smallvec = { version = "1.8" } # cumulus -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-bridges-substrate -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # darwinia-collator dc-primitives = { default-features = false, path = "../../primitives" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index aa6dd17b..2eaaae0d 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -17,61 +17,61 @@ codec = { package = "parity-scale-codec", version = "2.3", default-feature scale-info = { version = "1.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 28d0f901..825db5c7 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -17,60 +17,60 @@ codec = { package = "parity-scale-codec", version = "2.3", default-feature scale-info = { version = "1.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 63176f03..01b5a3ab 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -17,72 +17,72 @@ codec = { package = "parity-scale-codec", version = "2.3", default-feature scale-info = { version = "1.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # darwinia-bridges-substrate -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] From 170ceea4d7638e555765a46e9c9ca6db25a462b5 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 16 May 2022 18:22:52 +0800 Subject: [PATCH 11/59] Disable darwinia-bridges-substrate --- Cargo.toml | 2 +- rpc/Cargo.toml | 2 +- runtime/common/Cargo.toml | 16 ++++---- runtime/crab-parachain/Cargo.toml | 4 +- runtime/darwinia-parachain/Cargo.toml | 4 +- runtime/pangolin-parachain/Cargo.toml | 56 +++++++++++++-------------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e77278c2..261fa634 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,7 +101,7 @@ cumulus-relay-chain-interface = { git = "https://github.com/paritytech/c cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-network -pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 483001cd..eb6e3440 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -14,7 +14,7 @@ version = "5.2.0-rc1" jsonrpc-core = { version = "18.0" } # darwinia-network dc-primitives = { path = "../primitives" } -pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # paritytech pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 93108c7f..562b8a4b 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -15,10 +15,10 @@ smallvec = { version = "1.8" } # cumulus pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-bridges-substrate -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # darwinia-collator dc-primitives = { default-features = false, path = "../../primitives" } # substrate @@ -36,10 +36,10 @@ std = [ # cumulus "pallet-collator-selection/std", # darwinia-bridges-substrate - "bp-messages/std", - "bridge-runtime-common/std", - "pallet-bridge-dispatch/std", - "pallet-fee-market/std", +# "bp-messages/std", +# "bridge-runtime-common/std", +# "pallet-bridge-dispatch/std", +# "pallet-fee-market/std", # darwinia-collator "dc-primitives/std", # substrate diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 2eaaae0d..8111e7a9 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -30,7 +30,7 @@ parachain-info = { default-features = false, git = "https://git # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -93,7 +93,7 @@ std = [ # darwinia "dc-common-runtime/std", "dc-primitives/std", - "pallet-fee-market-rpc-runtime-api/std", +# "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 825db5c7..ccfe8d02 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -30,7 +30,7 @@ parachain-info = { default-features = false, git = "https://git # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -89,7 +89,7 @@ std = [ "parachain-info/std", "dc-common-runtime/std", "dc-primitives/std", - "pallet-fee-market-rpc-runtime-api/std", +# "pallet-fee-market-rpc-runtime-api/std", "pallet-xcm/std", "polkadot-parachain/std", "xcm/std", diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 01b5a3ab..fa2a3627 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -31,18 +31,18 @@ parachain-info = { default-features = false, git = "https://git dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # darwinia-bridges-substrate -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -105,18 +105,18 @@ std = [ "dc-common-runtime/std", "dc-primitives/std", # darwinia-bridges-substrate - "bp-pangolin/std", - "bp-message-dispatch/std", - "bp-messages/std", - "bp-runtime/std", - "bp-polkadot-core/std", - "bp-pangolin-parachain/std", - "bridge-runtime-common/std", - "pallet-bridge-dispatch/std", - "pallet-bridge-grandpa/std", - "pallet-bridge-messages/std", - "pallet-fee-market/std", - "pallet-fee-market-rpc-runtime-api/std", +# "bp-pangolin/std", +# "bp-message-dispatch/std", +# "bp-messages/std", +# "bp-runtime/std", +# "bp-polkadot-core/std", +# "bp-pangolin-parachain/std", +# "bridge-runtime-common/std", +# "pallet-bridge-dispatch/std", +# "pallet-bridge-grandpa/std", +# "pallet-bridge-messages/std", +# "pallet-fee-market/std", +# "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", @@ -158,10 +158,10 @@ runtime-benchmarks = [ # crates.io "array-bytes", # darwinia-bridges-substrate - "bridge-runtime-common/runtime-benchmarks", - "pallet-bridge-grandpa/runtime-benchmarks", - "pallet-bridge-messages/runtime-benchmarks", - "pallet-fee-market/runtime-benchmarks", +# "bridge-runtime-common/runtime-benchmarks", +# "pallet-bridge-grandpa/runtime-benchmarks", +# "pallet-bridge-messages/runtime-benchmarks", +# "pallet-fee-market/runtime-benchmarks", # polkadot "pallet-xcm/runtime-benchmarks", "pallet-xcm-benchmarks", From 4acd0077b4f28ea2cde82e3a48fe24d588ece40f Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 16 May 2022 18:05:54 +0800 Subject: [PATCH 12/59] Anchor polkadot-v0.9.18 --- Cargo.toml | 98 +++++++++++----------- primitives/Cargo.toml | 4 +- rpc/Cargo.toml | 18 ++-- runtime/common/Cargo.toml | 22 ++--- runtime/crab-parachain/Cargo.toml | 96 ++++++++++----------- runtime/darwinia-parachain/Cargo.toml | 94 ++++++++++----------- runtime/pangolin-parachain/Cargo.toml | 116 +++++++++++++------------- 7 files changed, 224 insertions(+), 224 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 34d5c663..e77278c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,63 +56,63 @@ dc-rpc = { path = "rpc" } pangolin-parachain-runtime = { path = "runtime/pangolin-parachain" } # substrate -frame-benchmarking = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-benchmarking-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-benchmarking-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } # cumulus -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-network -pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [workspace] members = [ diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index e125365c..1fed3522 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -11,8 +11,8 @@ version = "5.2.0-rc1" [dependencies] # substrate -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 9f90232d..483001cd 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -14,13 +14,13 @@ version = "5.2.0-rc1" jsonrpc-core = { version = "18.0" } # darwinia-network dc-primitives = { path = "../primitives" } -pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # paritytech -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 166a4bcc..93108c7f 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -13,21 +13,21 @@ version = "5.2.0-rc1" # crates.io smallvec = { version = "1.8" } # cumulus -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-bridges-substrate -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # darwinia-collator dc-primitives = { default-features = false, path = "../../primitives" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index aa6dd17b..2eaaae0d 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -17,61 +17,61 @@ codec = { package = "parity-scale-codec", version = "2.3", default-feature scale-info = { version = "1.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 28d0f901..825db5c7 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -17,60 +17,60 @@ codec = { package = "parity-scale-codec", version = "2.3", default-feature scale-info = { version = "1.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 63176f03..01b5a3ab 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -17,72 +17,72 @@ codec = { package = "parity-scale-codec", version = "2.3", default-feature scale-info = { version = "1.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # darwinia-bridges-substrate -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] From 87157a5001eb5588a2ad21ec808ad4eb2fd0d6cd Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 16 May 2022 18:22:52 +0800 Subject: [PATCH 13/59] Disable darwinia-bridges-substrate --- Cargo.toml | 2 +- rpc/Cargo.toml | 2 +- runtime/common/Cargo.toml | 16 ++++---- runtime/crab-parachain/Cargo.toml | 4 +- runtime/darwinia-parachain/Cargo.toml | 4 +- runtime/pangolin-parachain/Cargo.toml | 56 +++++++++++++-------------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e77278c2..261fa634 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,7 +101,7 @@ cumulus-relay-chain-interface = { git = "https://github.com/paritytech/c cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-network -pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 483001cd..eb6e3440 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -14,7 +14,7 @@ version = "5.2.0-rc1" jsonrpc-core = { version = "18.0" } # darwinia-network dc-primitives = { path = "../primitives" } -pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # paritytech pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 93108c7f..562b8a4b 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -15,10 +15,10 @@ smallvec = { version = "1.8" } # cumulus pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-bridges-substrate -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # darwinia-collator dc-primitives = { default-features = false, path = "../../primitives" } # substrate @@ -36,10 +36,10 @@ std = [ # cumulus "pallet-collator-selection/std", # darwinia-bridges-substrate - "bp-messages/std", - "bridge-runtime-common/std", - "pallet-bridge-dispatch/std", - "pallet-fee-market/std", +# "bp-messages/std", +# "bridge-runtime-common/std", +# "pallet-bridge-dispatch/std", +# "pallet-fee-market/std", # darwinia-collator "dc-primitives/std", # substrate diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 2eaaae0d..8111e7a9 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -30,7 +30,7 @@ parachain-info = { default-features = false, git = "https://git # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -93,7 +93,7 @@ std = [ # darwinia "dc-common-runtime/std", "dc-primitives/std", - "pallet-fee-market-rpc-runtime-api/std", +# "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 825db5c7..ccfe8d02 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -30,7 +30,7 @@ parachain-info = { default-features = false, git = "https://git # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -89,7 +89,7 @@ std = [ "parachain-info/std", "dc-common-runtime/std", "dc-primitives/std", - "pallet-fee-market-rpc-runtime-api/std", +# "pallet-fee-market-rpc-runtime-api/std", "pallet-xcm/std", "polkadot-parachain/std", "xcm/std", diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 01b5a3ab..fa2a3627 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -31,18 +31,18 @@ parachain-info = { default-features = false, git = "https://git dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # darwinia-bridges-substrate -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -105,18 +105,18 @@ std = [ "dc-common-runtime/std", "dc-primitives/std", # darwinia-bridges-substrate - "bp-pangolin/std", - "bp-message-dispatch/std", - "bp-messages/std", - "bp-runtime/std", - "bp-polkadot-core/std", - "bp-pangolin-parachain/std", - "bridge-runtime-common/std", - "pallet-bridge-dispatch/std", - "pallet-bridge-grandpa/std", - "pallet-bridge-messages/std", - "pallet-fee-market/std", - "pallet-fee-market-rpc-runtime-api/std", +# "bp-pangolin/std", +# "bp-message-dispatch/std", +# "bp-messages/std", +# "bp-runtime/std", +# "bp-polkadot-core/std", +# "bp-pangolin-parachain/std", +# "bridge-runtime-common/std", +# "pallet-bridge-dispatch/std", +# "pallet-bridge-grandpa/std", +# "pallet-bridge-messages/std", +# "pallet-fee-market/std", +# "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", @@ -158,10 +158,10 @@ runtime-benchmarks = [ # crates.io "array-bytes", # darwinia-bridges-substrate - "bridge-runtime-common/runtime-benchmarks", - "pallet-bridge-grandpa/runtime-benchmarks", - "pallet-bridge-messages/runtime-benchmarks", - "pallet-fee-market/runtime-benchmarks", +# "bridge-runtime-common/runtime-benchmarks", +# "pallet-bridge-grandpa/runtime-benchmarks", +# "pallet-bridge-messages/runtime-benchmarks", +# "pallet-fee-market/runtime-benchmarks", # polkadot "pallet-xcm/runtime-benchmarks", "pallet-xcm-benchmarks", From d61f13ca4ac3f20b905eeeaa72f13a580c3cf2c9 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 11:10:16 +0800 Subject: [PATCH 14/59] Companion for Cumulus#993 --- Cargo.lock | 2341 ++++++++++++++++++++++---------------------- src/service/mod.rs | 10 +- 2 files changed, 1196 insertions(+), 1155 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3bc27783..fba7bc9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -273,7 +273,6 @@ dependencies = [ "async-global-executor", "async-io", "async-lock", - "async-process", "crossbeam-utils", "futures-channel", "futures-core", @@ -401,6 +400,12 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc19a4937b4fbd3fe3379793130e42060d10627a360f2127802b10b87e7baf74" +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base58" version = "0.2.0" @@ -413,6 +418,12 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64ct" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179" + [[package]] name = "beef" version = "0.5.1" @@ -425,14 +436,15 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "beefy-primitives", "fnv", "futures 0.3.21", + "hex", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-chain-spec", "sc-client-api", "sc-keystore", @@ -454,7 +466,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -464,8 +476,8 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-rpc", "sc-utils", "serde", @@ -477,15 +489,15 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-application-crypto", "sp-core", @@ -568,6 +580,15 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "blake2" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "blake2-rfc" version = "0.2.18" @@ -615,6 +636,20 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "blake3" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +dependencies = [ + "arrayref", + "arrayvec 0.7.2", + "cc", + "cfg-if 1.0.0", + "constant_time_eq", + "digest 0.10.3", +] + [[package]] name = "block-buffer" version = "0.7.3" @@ -684,48 +719,15 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bp-darwinia-core" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bp-header-chain" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "finality-grandpa", - "frame-support", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", -] - [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "finality-grandpa", "frame-support", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-finality-grandpa", @@ -736,119 +738,42 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-support", - "parity-scale-codec", - "scale-info", - "sp-std", -] - -[[package]] -name = "bp-message-dispatch" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-runtime", "frame-support", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-std", ] [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-std", -] - -[[package]] -name = "bp-messages" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" -dependencies = [ - "bitvec 0.20.4", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bitvec 1.0.0", + "bp-runtime", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-std", ] -[[package]] -name = "bp-pangolin" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-darwinia-core", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-support", - "sp-api", - "sp-runtime", - "sp-std", - "sp-version", -] - -[[package]] -name = "bp-pangolin-parachain" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-darwinia-core", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-support", - "sp-api", - "sp-runtime", - "sp-std", - "sp-version", -] - -[[package]] -name = "bp-polkadot-core" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-core", - "sp-runtime", - "sp-std", - "sp-version", -] - [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-messages", + "bp-runtime", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-core", "sp-runtime", @@ -859,13 +784,13 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-messages", + "bp-polkadot-core", + "bp-runtime", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "smallvec", "sp-api", "sp-runtime", @@ -876,31 +801,13 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", -] - -[[package]] -name = "bp-runtime" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" -dependencies = [ - "frame-support", - "hash-db", - "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -912,27 +819,12 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-header-chain", "ed25519-dalek", "finality-grandpa", - "parity-scale-codec", - "sp-application-crypto", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bp-test-utils" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" -dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "ed25519-dalek", - "finality-grandpa", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -942,13 +834,13 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-messages", + "bp-polkadot-core", "bp-rococo", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "parity-scale-codec", + "bp-runtime", + "parity-scale-codec 3.1.2", "sp-api", "sp-runtime", "sp-std", @@ -957,46 +849,19 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "ed25519-dalek", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", "frame-support", - "frame-system", "hash-db", - "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "pallet-bridge-dispatch", + "pallet-bridge-grandpa", + "pallet-bridge-messages", "pallet-transaction-payment", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", - "sp-version", -] - -[[package]] -name = "bridge-runtime-common" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" -dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "frame-support", - "hash-db", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "pallet-transaction-payment", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-state-machine", @@ -1068,6 +933,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "cache-padded" version = "1.2.0" @@ -1258,15 +1134,6 @@ dependencies = [ "os_str_bytes", ] -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - [[package]] name = "concurrent-queue" version = "1.2.2" @@ -1276,6 +1143,12 @@ dependencies = [ "cache-padded", ] +[[package]] +name = "const-oid" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1357,7 +1230,6 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", - "pallet-fee-market-rpc-runtime-api", "pallet-multisig", "pallet-proxy", "pallet-session", @@ -1370,9 +1242,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "polkadot-parachain", - "scale-info", + "scale-info 1.0.0", "smallvec", "sp-api", "sp-block-builder", @@ -1540,6 +1412,18 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-bigint" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" +dependencies = [ + "generic-array 0.14.5", + "rand_core 0.6.3", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.3" @@ -1612,25 +1496,26 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "clap", "sc-cli", "sc-service", + "url 2.2.2", ] [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", - "parity-scale-codec", - "parking_lot 0.10.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -1646,13 +1531,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-consensus", "sc-consensus-aura", @@ -1675,13 +1560,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-relay-chain-interface", "dyn-clone", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sc-client-api", "sc-consensus", @@ -1696,7 +1581,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1720,14 +1605,14 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-relay-chain-interface", "derive_more", "futures 0.3.21", "futures-timer", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-parachain", @@ -1745,13 +1630,13 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -1769,14 +1654,15 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ + "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-pov-recovery", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-overseer", "polkadot-primitives", @@ -1798,14 +1684,14 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-executive", "frame-support", "frame-system", "pallet-aura", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-application-crypto", "sp-consensus-aura", @@ -1816,14 +1702,14 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -1834,7 +1720,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -1845,9 +1731,9 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info", + "scale-info 2.1.1", "serde", "sp-core", "sp-externalities", @@ -1864,7 +1750,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -1875,13 +1761,13 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-io", "sp-runtime", @@ -1892,15 +1778,15 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand_chacha 0.3.1", - "scale-info", + "scale-info 2.1.1", "sp-runtime", "sp-std", "xcm", @@ -1910,10 +1796,10 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -1926,15 +1812,15 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-test-relay-sproof-builder", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", - "scale-info", + "scale-info 2.1.1", "sp-api", "sp-core", "sp-inherents", @@ -1949,9 +1835,11 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", + "futures 0.3.21", + "parity-scale-codec 3.1.2", "sp-inherents", "sp-std", "sp-timestamp", @@ -1960,11 +1848,11 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -1977,59 +1865,34 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-primitives-core", "derive_more", "futures 0.3.21", + "jsonrpsee-core 0.9.0", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-overseer", - "sc-client-api", - "sc-service", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-state-machine", - "thiserror", -] - -[[package]] -name = "cumulus-relay-chain-local" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" -dependencies = [ - "async-trait", - "cumulus-primitives-core", - "cumulus-relay-chain-interface", - "futures 0.3.21", - "futures-timer", - "parking_lot 0.12.0", - "polkadot-client", "polkadot-service", "sc-client-api", - "sc-consensus-babe", - "sc-network", "sc-service", - "sc-telemetry", - "sc-tracing", "sp-api", "sp-blockchain", - "sp-consensus", "sp-core", "sp-runtime", "sp-state-machine", - "tracing", + "thiserror", ] [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sp-runtime", "sp-state-machine", @@ -2079,7 +1942,6 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-interface", - "cumulus-relay-chain-local", "darwinia-parachain-runtime", "dc-primitives", "dc-rpc", @@ -2088,10 +1950,9 @@ dependencies = [ "futures 0.3.21", "jsonrpc-core", "log", - "pallet-fee-market-rpc-runtime-api", "pallet-transaction-payment-rpc", "pangolin-parachain-runtime", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "polkadot-cli", "polkadot-parachain", "polkadot-primitives", @@ -2155,7 +2016,6 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", - "pallet-fee-market-rpc-runtime-api", "pallet-multisig", "pallet-proxy", "pallet-session", @@ -2168,9 +2028,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "polkadot-parachain", - "scale-info", + "scale-info 1.0.0", "smallvec", "sp-api", "sp-block-builder", @@ -2219,15 +2079,11 @@ dependencies = [ name = "dc-common-runtime" version = "5.2.0-rc1" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", "dc-primitives", "frame-support", "frame-system", "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", "pallet-collator-selection", - "pallet-fee-market", "pallet-transaction-payment", "smallvec", "sp-runtime", @@ -2248,7 +2104,6 @@ version = "5.2.0-rc1" dependencies = [ "dc-primitives", "jsonrpc-core", - "pallet-fee-market-rpc", "pallet-transaction-payment-rpc", "sc-client-api", "sc-rpc", @@ -2259,6 +2114,15 @@ dependencies = [ "substrate-frame-rpc-system", ] +[[package]] +name = "der" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +dependencies = [ + "const-oid", +] + [[package]] name = "derivative" version = "2.2.0" @@ -2309,6 +2173,7 @@ checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ "block-buffer 0.10.2", "crypto-common", + "subtle", ] [[package]] @@ -2401,11 +2266,22 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" +[[package]] +name = "ecdsa" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +dependencies = [ + "der", + "elliptic-curve", + "signature", +] + [[package]] name = "ed25519" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cb2103c580a9f8732121f755eccb51312f7db26314664314c119298107064b" +checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" dependencies = [ "signature", ] @@ -2430,6 +2306,24 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "elliptic-curve" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +dependencies = [ + "base16ct", + "crypto-bigint", + "der", + "ff", + "generic-array 0.14.5", + "group", + "rand_core 0.6.3", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "enum-as-inner" version = "0.3.4" @@ -2528,6 +2422,30 @@ dependencies = [ "futures 0.3.21", ] +[[package]] +name = "expander" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a718c0675c555c5f976fff4ea9e2c150fa06cefa201cadef87cfbf9324075881" +dependencies = [ + "blake3 1.3.1", + "fs-err", + "proc-macro2", + "quote", +] + +[[package]] +name = "expander" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "309f21c39e8e38e4b6eda07e155bd7a4e5fc4d707cefd0402cc82a8b6bb65aaa" +dependencies = [ + "blake2 0.10.4", + "fs-err", + "proc-macro2", + "quote", +] + [[package]] name = "fake-simd" version = "0.1.2" @@ -2549,6 +2467,31 @@ dependencies = [ "instant", ] +[[package]] +name = "fatality" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad875162843b0d046276327afe0136e9ed3a23d5a754210fb6f1f33610d39ab" +dependencies = [ + "fatality-proc-macro", + "thiserror", +] + +[[package]] +name = "fatality-proc-macro" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd" +dependencies = [ + "expander 0.0.4", + "indexmap", + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", + "thiserror", +] + [[package]] name = "fdlimit" version = "0.2.1" @@ -2558,6 +2501,16 @@ dependencies = [ "libc", ] +[[package]] +name = "ff" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" +dependencies = [ + "rand_core 0.6.3", + "subtle", +] + [[package]] name = "file-per-thread-logger" version = "0.1.5" @@ -2570,18 +2523,18 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.14.4" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" +checksum = "d9def033d8505edf199f6a5d07aa7e6d2d6185b164293b77f0efd108f4f3e11d" dependencies = [ "either", "futures 0.3.21", "futures-timer", "log", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.11.2", - "scale-info", + "scale-info 2.1.1", ] [[package]] @@ -2624,9 +2577,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", ] [[package]] @@ -2642,15 +2595,15 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "linregress", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", - "scale-info", + "scale-info 2.1.1", "serde", "sp-api", "sp-application-crypto", @@ -2664,7 +2617,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "Inflector", "chrono", @@ -2672,31 +2625,45 @@ dependencies = [ "frame-benchmarking", "frame-support", "handlebars", + "hash-db", + "hex", + "itertools", + "kvdb", "linked-hash-map", "log", - "parity-scale-codec", + "memory-db", + "parity-scale-codec 3.1.2", + "rand 0.8.5", "sc-cli", + "sc-client-api", "sc-client-db", "sc-executor", "sc-service", "serde", "serde_json", + "serde_nanos", + "sp-api", + "sp-blockchain", "sp-core", + "sp-database", "sp-externalities", "sp-keystore", "sp-runtime", "sp-state-machine", + "sp-std", + "sp-storage", + "sp-trie", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-arithmetic", "sp-npos-elections", "sp-std", @@ -2705,12 +2672,12 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -2720,20 +2687,20 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ed5e5c346de62ca5c184b4325a6600d1eaca210666e4606fe4e449574978d0" +checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", ] [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "bitflags", "frame-metadata", @@ -2741,9 +2708,9 @@ dependencies = [ "impl-trait-for-tuples", "log", "once_cell", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", - "scale-info", + "scale-info 2.1.1", "serde", "smallvec", "sp-arithmetic", @@ -2762,7 +2729,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2774,7 +2741,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.3", @@ -2786,7 +2753,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro2", "quote", @@ -2796,12 +2763,12 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-io", @@ -2813,13 +2780,13 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -2828,16 +2795,16 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", ] [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "sp-api", @@ -2873,6 +2840,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + [[package]] name = "fuchsia-zircon" version = "0.3.3" @@ -3125,6 +3098,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "group" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +dependencies = [ + "ff", + "rand_core 0.6.3", + "subtle", +] + [[package]] name = "h2" version = "0.3.13" @@ -3417,11 +3401,11 @@ dependencies = [ [[package]] name = "impl-codec" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", ] [[package]] @@ -3709,7 +3693,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05fd8cd6c6b1bbd06881d2cf88f1fc83cc36c98f2219090f839115fb4a956cb9" dependencies = [ - "jsonrpsee-core", + "jsonrpsee-core 0.8.0", "jsonrpsee-proc-macros", "jsonrpsee-types 0.8.0", "jsonrpsee-ws-client 0.8.0", @@ -3723,7 +3707,7 @@ checksum = "3303cdf246e6ab76e2866fb3d9acb6c76a068b1b28bd923a1b7a8122257ad7b5" dependencies = [ "futures 0.3.21", "http", - "jsonrpsee-core", + "jsonrpsee-core 0.8.0", "jsonrpsee-types 0.8.0", "pin-project 1.0.10", "rustls-native-certs 0.6.2", @@ -3759,6 +3743,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22abc3274b265dcefe2e26c4beecf9fda4fffa48cf94930443a6c73678f020d5" +dependencies = [ + "anyhow", + "arrayvec 0.7.2", + "async-trait", + "beef", + "futures-channel", + "hyper", + "jsonrpsee-types 0.9.0", + "serde", + "serde_json", + "soketto", + "thiserror", +] + [[package]] name = "jsonrpsee-proc-macros" version = "0.8.0" @@ -3804,6 +3807,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f4c45d2e2aa1db4c7d7d7dbaabc10a5b5258d99cd9d42fbfd5260b76f80c324" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "jsonrpsee-utils" version = "0.4.1" @@ -3846,10 +3863,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5" dependencies = [ "jsonrpsee-client-transport", - "jsonrpsee-core", + "jsonrpsee-core 0.8.0", "jsonrpsee-types 0.8.0", ] +[[package]] +name = "k256" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" +dependencies = [ + "cfg-if 1.0.0", + "ecdsa", + "elliptic-curve", + "sec1", +] + [[package]] name = "keccak" version = "0.1.0" @@ -3868,11 +3897,11 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -3922,12 +3951,12 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "smallvec", @@ -3956,8 +3985,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "polkadot-primitives", @@ -3977,9 +4006,9 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a3f58dc069ec0e205a27f5b45920722a46faed802a0541538241af6228f512" +checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86" dependencies = [ "parity-util-mem", "smallvec", @@ -3987,20 +4016,20 @@ dependencies = [ [[package]] name = "kvdb-memorydb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5" +checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "kvdb-rocksdb" -version = "0.14.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1b6ea8f2536f504b645ad78419c8246550e19d2c3419a167080ce08edee35a" +checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1" dependencies = [ "fs-swap", "kvdb", @@ -4008,7 +4037,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rocksdb", "smallvec", @@ -4364,7 +4393,7 @@ dependencies = [ "pin-project 1.0.10", "rand 0.7.3", "salsa20", - "sha3", + "sha3 0.9.1", ] [[package]] @@ -4533,14 +4562,17 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "6.20.3" +version = "0.6.1+6.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d" +checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" dependencies = [ "bindgen", + "bzip2-sys", "cc", "glob", "libc", + "libz-sys", + "tikv-jemalloc-sys", ] [[package]] @@ -4633,15 +4665,6 @@ version = "0.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a261afc61b7a5e323933b402ca6a1765183687c614789b1e4db7762ed4230bca" -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - [[package]] name = "lock_api" version = "0.4.7" @@ -4789,12 +4812,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d505169b746dacf02f7d14d8c80b34edfd8212159c63d23c977739a0d960c626" +checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" dependencies = [ "hash-db", - "hashbrown 0.11.2", + "hashbrown 0.12.1", "parity-util-mem", ] @@ -4827,8 +4850,8 @@ dependencies = [ [[package]] name = "metered-channel" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "derive_more", "futures 0.3.21", @@ -4961,12 +4984,12 @@ checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab" dependencies = [ "blake2b_simd", "blake2s_simd", - "blake3", + "blake3 0.3.8", "digest 0.9.0", "generic-array 0.14.5", "multihash-derive", "sha2 0.9.9", - "sha3", + "sha3 0.9.1", "unsigned-varint 0.5.1", ] @@ -5265,13 +5288,13 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "pallet-timestamp", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-consensus-aura", "sp-runtime", @@ -5281,13 +5304,13 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-authority-discovery", "sp-runtime", @@ -5297,13 +5320,13 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-authorship", "sp-runtime", "sp-std", @@ -5312,7 +5335,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", @@ -5321,8 +5344,8 @@ dependencies = [ "pallet-authorship", "pallet-session", "pallet-timestamp", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", @@ -5336,7 +5359,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5344,8 +5367,8 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5356,14 +5379,14 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-std", ] @@ -5371,14 +5394,14 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "beefy-primitives", "frame-support", "frame-system", "pallet-session", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-runtime", "sp-std", @@ -5387,21 +5410,21 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "beefy-merkle-tree", "beefy-primitives", "frame-support", "frame-system", "hex", - "libsecp256k1", + "k256", "log", "pallet-beefy", "pallet-mmr", "pallet-mmr-primitives", "pallet-session", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-io", @@ -5412,15 +5435,15 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "pallet-treasury", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5430,32 +5453,15 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-message-dispatch", + "bp-runtime", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-bridge-dispatch" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" -dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -5464,19 +5470,18 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-header-chain", + "bp-runtime", + "bp-test-utils", "finality-grandpa", - "frame-benchmarking", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-finality-grandpa", "sp-runtime", @@ -5484,65 +5489,21 @@ dependencies = [ "sp-trie", ] -[[package]] -name = "pallet-bridge-grandpa" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" -dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-test-utils 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "finality-grandpa", - "frame-support", - "frame-system", - "log", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", - "sp-trie", -] - -[[package]] -name = "pallet-bridge-messages" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bitvec 0.20.4", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", - "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bitvec 1.0.0", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-runtime", @@ -5552,7 +5513,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5560,9 +5521,9 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand 0.8.5", - "scale-info", + "scale-info 2.1.1", "serde", "sp-runtime", "sp-staking", @@ -5572,14 +5533,14 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5589,13 +5550,13 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-io", "sp-runtime", @@ -5605,16 +5566,16 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand 0.7.3", - "scale-info", + "scale-info 2.1.1", "sp-arithmetic", "sp-core", "sp-io", @@ -5622,20 +5583,20 @@ dependencies = [ "sp-runtime", "sp-std", "static_assertions", - "strum", + "strum 0.23.0", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-npos-elections", @@ -5643,65 +5604,16 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-fee-market" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bitvec 1.0.0", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-benchmarking", - "frame-support", - "frame-system", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "pallet-timestamp", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-fee-market-rpc" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "pallet-fee-market-rpc-runtime-api", - "parity-scale-codec", - "sp-api", - "sp-blockchain", - "sp-runtime", -] - -[[package]] -name = "pallet-fee-market-rpc-runtime-api" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "parity-scale-codec", - "serde", - "sp-api", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-arithmetic", "sp-runtime", "sp-std", @@ -5710,7 +5622,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", @@ -5718,8 +5630,8 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-core", "sp-finality-grandpa", @@ -5733,14 +5645,14 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "enumflags2", "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -5749,15 +5661,15 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "pallet-authorship", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-core", "sp-io", @@ -5769,13 +5681,13 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-keyring", @@ -5786,14 +5698,14 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5803,15 +5715,15 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", "frame-support", "frame-system", "pallet-mmr-primitives", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5821,12 +5733,12 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "serde", "sp-api", "sp-core", @@ -5837,13 +5749,13 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "pallet-mmr-primitives", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "serde", "sp-api", "sp-blockchain", @@ -5854,13 +5766,13 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -5869,12 +5781,12 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -5883,14 +5795,14 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "log", "pallet-balances", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-runtime", "sp-staking", @@ -5900,7 +5812,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5913,8 +5825,8 @@ dependencies = [ "pallet-offences", "pallet-session", "pallet-staking", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-staking", "sp-std", @@ -5923,13 +5835,13 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5939,13 +5851,13 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -5954,12 +5866,12 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -5968,14 +5880,14 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -5984,15 +5896,15 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "log", "pallet-timestamp", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -6005,7 +5917,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", @@ -6021,13 +5933,13 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand_chacha 0.2.2", - "scale-info", + "scale-info 2.1.1", "sp-runtime", "sp-std", ] @@ -6035,7 +5947,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6044,9 +5956,9 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand_chacha 0.2.2", - "scale-info", + "scale-info 2.1.1", "serde", "sp-application-crypto", "sp-io", @@ -6058,7 +5970,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -6069,7 +5981,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", "sp-arithmetic", @@ -6078,12 +5990,12 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -6092,14 +6004,14 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-inherents", "sp-io", "sp-runtime", @@ -6110,15 +6022,15 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "pallet-treasury", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-io", @@ -6129,12 +6041,12 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "smallvec", "sp-core", @@ -6146,13 +6058,13 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-blockchain", "sp-core", @@ -6163,10 +6075,10 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-runtime", ] @@ -6174,15 +6086,15 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "impl-trait-for-tuples", "pallet-balances", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-runtime", "sp-std", @@ -6191,13 +6103,13 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -6207,28 +6119,28 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-std", ] [[package]] name = "pallet-xcm" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-runtime", @@ -6239,15 +6151,15 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-std", "xcm", @@ -6259,13 +6171,6 @@ name = "pangolin-parachain-runtime" version = "5.2.0-rc1" dependencies = [ "array-bytes", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-pangolin", - "bp-pangolin-parachain", - "bp-polkadot-core 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -6285,12 +6190,7 @@ dependencies = [ "pallet-aura", "pallet-authorship", "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", "pallet-collator-selection", - "pallet-fee-market", - "pallet-fee-market-rpc-runtime-api", "pallet-multisig", "pallet-proxy", "pallet-session", @@ -6303,9 +6203,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "polkadot-parachain", - "scale-info", + "scale-info 1.0.0", "smallvec", "sp-api", "sp-block-builder", @@ -6327,13 +6227,13 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", ] @@ -6366,7 +6266,21 @@ dependencies = [ "bitvec 0.20.4", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive", + "parity-scale-codec-derive 2.3.1", + "serde", +] + +[[package]] +name = "parity-scale-codec" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" +dependencies = [ + "arrayvec 0.7.2", + "bitvec 1.0.0", + "byte-slice-cast", + "impl-trait-for-tuples", + "parity-scale-codec-derive 3.1.2", "serde", ] @@ -6382,6 +6296,18 @@ dependencies = [ "syn", ] +[[package]] +name = "parity-scale-codec-derive" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "parity-send-wrapper" version = "0.1.0" @@ -6404,15 +6330,15 @@ dependencies = [ [[package]] name = "parity-util-mem" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4cb4e169446179cbc6b8b6320cc9fca49bd2e94e8db25f25f200a8ea774770" +checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.11.2", + "hashbrown 0.12.1", "impl-trait-for-tuples", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "primitive-types", "smallvec", "winapi 0.3.9", @@ -6464,19 +6390,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - -[[package]] -name = "parking_lot" -version = "0.10.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.2", -] +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" [[package]] name = "parking_lot" @@ -6485,7 +6401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.7", + "lock_api", "parking_lot_core 0.8.5", ] @@ -6495,24 +6411,10 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ - "lock_api 0.4.7", + "lock_api", "parking_lot_core 0.9.3", ] -[[package]] -name = "parking_lot_core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "smallvec", - "winapi 0.3.9", -] - [[package]] name = "parking_lot_core" version = "0.8.5" @@ -6522,7 +6424,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "smallvec", "winapi 0.3.9", ] @@ -6535,7 +6437,7 @@ checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "smallvec", "windows-sys", ] @@ -6693,6 +6595,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" +dependencies = [ + "der", + "spki", + "zeroize", +] + [[package]] name = "pkg-config" version = "0.3.25" @@ -6707,8 +6620,8 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "polkadot-approval-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -6721,8 +6634,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -6734,13 +6647,14 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "derive_more", + "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -6756,12 +6670,13 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ + "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -6776,8 +6691,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "clap", "frame-benchmarking-cli", @@ -6799,8 +6714,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6830,11 +6745,11 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "always-assert", - "derive_more", + "fatality", "futures 0.3.21", "futures-timer", "polkadot-node-network-protocol", @@ -6851,12 +6766,12 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", - "scale-info", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -6864,13 +6779,14 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "derive_more", + "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -6886,10 +6802,10 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", @@ -6900,8 +6816,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "futures-timer", @@ -6920,13 +6836,13 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -6939,11 +6855,11 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -6957,17 +6873,17 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "derive_more", "futures 0.3.21", "futures-timer", "kvdb", "lru 0.7.5", "merlin", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -6985,14 +6901,14 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7005,10 +6921,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7023,8 +6939,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -7038,12 +6954,12 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7056,8 +6972,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -7071,13 +6987,13 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7088,13 +7004,14 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ + "fatality", "futures 0.3.21", "kvdb", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7106,8 +7023,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", "futures 0.3.21", @@ -7123,10 +7040,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -7140,8 +7057,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "always-assert", "assert_matches", @@ -7149,7 +7066,7 @@ dependencies = [ "async-std", "futures 0.3.21", "futures-timer", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "pin-project 1.0.10", "polkadot-core-primitives", "polkadot-node-subsystem-util", @@ -7170,8 +7087,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "polkadot-node-primitives", @@ -7186,8 +7103,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "memory-lru", @@ -7204,15 +7121,15 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-std", "lazy_static", "log", "mick-jaeger", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-primitives", "sc-network", @@ -7222,15 +7139,15 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bs58", "futures 0.3.21", "futures-timer", "log", "metered-channel", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sc-cli", "sc-service", @@ -7241,30 +7158,30 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", - "derive_more", + "fatality", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", "sc-authority-discovery", "sc-network", - "strum", + "strum 0.24.0", "thiserror", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bounded-vec", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "schnorrkel", @@ -7281,8 +7198,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7291,8 +7208,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "derive_more", "futures 0.3.21", @@ -7310,16 +7227,21 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", "derive_more", + "fatality", "futures 0.3.21", "itertools", + "kvdb", "lru 0.7.5", "metered-channel", - "parity-scale-codec", + "parity-db", + "parity-scale-codec 3.1.2", + "parity-util-mem", + "parking_lot 0.11.2", "pin-project 1.0.10", "polkadot-node-jaeger", "polkadot-node-metrics", @@ -7338,14 +7260,14 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "futures-timer", "lru 0.7.5", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7359,8 +7281,8 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", "futures 0.3.21", @@ -7376,9 +7298,10 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ + "expander 0.0.5", "proc-macro-crate 1.1.3", "proc-macro2", "quote", @@ -7387,15 +7310,15 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "derive_more", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "polkadot-core-primitives", - "scale-info", + "scale-info 2.1.1", "serde", "sp-core", "sp-runtime", @@ -7404,8 +7327,8 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "env_logger", "kusama-runtime", @@ -7419,17 +7342,17 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-system", "hex-literal", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", - "scale-info", + "scale-info 2.1.1", "serde", "sp-api", "sp-application-crypto", @@ -7449,8 +7372,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7480,11 +7403,11 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -7530,13 +7453,13 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-constants", "polkadot-runtime-parachains", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "smallvec", @@ -7564,11 +7487,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7588,11 +7511,11 @@ dependencies = [ "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-parachains", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "slot-range-helper", @@ -7611,8 +7534,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "polkadot-primitives", @@ -7623,11 +7546,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bs58", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sp-std", "sp-tracing", @@ -7635,11 +7558,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bitflags", - "bitvec 0.20.4", + "bitvec 1.0.0", "derive_more", "frame-benchmarking", "frame-support", @@ -7653,13 +7576,13 @@ dependencies = [ "pallet-staking", "pallet-timestamp", "pallet-vesting", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-metrics", "rand 0.8.5", "rand_chacha 0.3.1", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "sp-api", "sp-core", @@ -7677,8 +7600,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", "beefy-gadget", @@ -7695,6 +7618,7 @@ dependencies = [ "pallet-mmr-primitives", "pallet-staking", "pallet-transaction-payment-rpc-runtime-api", + "parity-db", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", @@ -7778,14 +7702,14 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "arrayvec 0.5.2", - "derive_more", + "fatality", "futures 0.3.21", "indexmap", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7799,10 +7723,10 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sp-core", ] @@ -7851,14 +7775,14 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "primitive-types" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" +checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", "impl-codec", "impl-serde", - "scale-info", + "scale-info 2.1.1", "uint", ] @@ -7907,11 +7831,11 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.38" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa" +checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -8155,12 +8079,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.13" @@ -8177,7 +8095,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom 0.2.6", - "redox_syscall 0.2.13", + "redox_syscall", "thiserror", ] @@ -8266,12 +8184,12 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "env_logger", "jsonrpsee 0.8.0", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "serde", "serde_json", "sp-core", @@ -8322,9 +8240,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7" +checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" dependencies = [ "libc", "librocksdb-sys", @@ -8332,15 +8250,15 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-messages", "bp-rococo", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-runtime", "bp-wococo", - "bridge-runtime-common 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bridge-runtime-common", "frame-benchmarking", "frame-executive", "frame-support", @@ -8354,9 +8272,9 @@ dependencies = [ "pallet-balances", "pallet-beefy", "pallet-beefy-mmr", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "pallet-bridge-dispatch", + "pallet-bridge-grandpa", + "pallet-bridge-messages", "pallet-collective", "pallet-grandpa", "pallet-im-online", @@ -8375,13 +8293,13 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rococo-runtime-constants", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "smallvec", @@ -8407,8 +8325,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "polkadot-primitives", @@ -8579,7 +8497,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", "sp-core", @@ -8590,7 +8508,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", @@ -8598,7 +8516,7 @@ dependencies = [ "ip_network", "libp2p", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "prost", "prost-build", "rand 0.7.3", @@ -8617,12 +8535,12 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", @@ -8640,9 +8558,9 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sp-api", "sp-block-builder", @@ -8656,11 +8574,11 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.3", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-chain-spec-derive", "sc-network", "sc-telemetry", @@ -8673,7 +8591,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -8684,7 +8602,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "chrono", "clap", @@ -8694,7 +8612,7 @@ dependencies = [ "libp2p", "log", "names", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand 0.7.3", "regex", "rpassword", @@ -8722,14 +8640,14 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "fnv", "futures 0.3.21", "hash-db", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -8750,7 +8668,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "hash-db", "kvdb", @@ -8759,8 +8677,8 @@ dependencies = [ "linked-hash-map", "log", "parity-db", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-client-api", "sc-state-db", "sp-arithmetic", @@ -8775,14 +8693,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "libp2p", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sc-utils", "serde", @@ -8799,12 +8717,12 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -8828,7 +8746,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "fork-tree", @@ -8838,8 +8756,8 @@ dependencies = [ "num-bigint", "num-rational 0.2.4", "num-traits", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "rand 0.7.3", "retain_mut", "sc-client-api", @@ -8871,7 +8789,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -8895,10 +8813,10 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "fork-tree", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-consensus", "sp-blockchain", @@ -8908,13 +8826,13 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-consensus", "sc-telemetry", @@ -8933,7 +8851,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "sc-client-api", "sp-authorship", @@ -8944,14 +8862,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "lazy_static", - "libsecp256k1", - "log", "lru 0.6.6", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -8966,16 +8882,17 @@ dependencies = [ "sp-trie", "sp-version", "sp-wasm-interface", + "tracing", "wasmi", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-allocator", "sp-core", "sp-maybe-compressed-blob", @@ -8989,10 +8906,10 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-allocator", "sc-executor-common", "scoped-tls", @@ -9005,12 +8922,12 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "cfg-if 1.0.0", "libc", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-wasm 0.42.2", "sc-allocator", "sc-executor-common", @@ -9023,17 +8940,19 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ + "ahash", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", "futures 0.3.21", "futures-timer", + "hex", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "rand 0.8.5", "sc-block-builder", "sc-chain-spec", @@ -9061,7 +8980,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "finality-grandpa", "futures 0.3.21", @@ -9070,7 +8989,7 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-finality-grandpa", "sc-rpc", @@ -9085,7 +9004,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "ansi_term", "futures 0.3.21", @@ -9102,11 +9021,11 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "hex", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "serde_json", "sp-application-crypto", "sp-core", @@ -9117,9 +9036,8 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "async-std", "async-trait", "asynchronous-codec 0.5.0", "bitflags", @@ -9137,8 +9055,8 @@ dependencies = [ "linked_hash_set", "log", "lru 0.7.5", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "prost", "prost-build", @@ -9167,8 +9085,9 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ + "ahash", "futures 0.3.21", "futures-timer", "libp2p", @@ -9183,7 +9102,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "bytes 1.1.0", "fnv", @@ -9194,8 +9113,8 @@ dependencies = [ "hyper-rustls", "num_cpus", "once_cell", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "rand 0.7.3", "sc-client-api", "sc-network", @@ -9211,7 +9130,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "libp2p", @@ -9224,7 +9143,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9233,15 +9152,15 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -9264,7 +9183,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -9272,8 +9191,8 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-chain-spec", "sc-transaction-pool-api", "serde", @@ -9289,7 +9208,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -9306,7 +9225,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "directories", @@ -9317,9 +9236,9 @@ dependencies = [ "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "rand 0.7.3", "sc-block-builder", @@ -9370,13 +9289,13 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sp-core", ] @@ -9384,18 +9303,17 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", "sc-consensus-epochs", "sc-finality-grandpa", - "sc-rpc-api", "serde", "serde_json", "sp-blockchain", @@ -9406,13 +9324,13 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "chrono", "futures 0.3.21", "libp2p", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "rand 0.7.3", "serde", @@ -9424,7 +9342,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "ansi_term", "atty", @@ -9433,7 +9351,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rustc-hash", "sc-client-api", @@ -9455,7 +9373,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -9466,15 +9384,15 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "futures-timer", "linked-hash-map", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "retain_mut", "sc-client-api", "sc-transaction-pool-api", @@ -9493,7 +9411,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "log", @@ -9506,12 +9424,13 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "futures-timer", "lazy_static", - "parking_lot 0.11.2", + "log", + "parking_lot 0.12.0", "prometheus", ] @@ -9524,8 +9443,21 @@ dependencies = [ "bitvec 0.20.4", "cfg-if 1.0.0", "derive_more", - "parity-scale-codec", - "scale-info-derive", + "parity-scale-codec 2.3.1", + "scale-info-derive 1.0.0", +] + +[[package]] +name = "scale-info" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" +dependencies = [ + "bitvec 1.0.0", + "cfg-if 1.0.0", + "derive_more", + "parity-scale-codec 3.1.2", + "scale-info-derive 2.1.1", "serde", ] @@ -9541,6 +9473,18 @@ dependencies = [ "syn", ] +[[package]] +name = "scale-info-derive" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4260c630e8a8a33429d1688eff2f163f24c65a4e1b1578ef6b565061336e4b6f" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "schannel" version = "0.1.19" @@ -9601,6 +9545,37 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sec1" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +dependencies = [ + "der", + "generic-array 0.14.5", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "secp256k1" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" +dependencies = [ + "secp256k1-sys", +] + +[[package]] +name = "secp256k1-sys" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" +dependencies = [ + "cc", +] + [[package]] name = "secrecy" version = "0.8.0" @@ -9706,6 +9681,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_nanos" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e" +dependencies = [ + "serde", +] + [[package]] name = "sha-1" version = "0.8.2" @@ -9779,6 +9763,16 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha3" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" +dependencies = [ + "digest 0.10.3", + "keccak", +] + [[package]] name = "sharded-slab" version = "0.1.4" @@ -9796,9 +9790,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" +checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" dependencies = [ "libc", "signal-hook-registry", @@ -9815,9 +9809,12 @@ dependencies = [ [[package]] name = "signature" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" +checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +dependencies = [ + "rand_core 0.6.3", +] [[package]] name = "simba" @@ -9839,11 +9836,11 @@ checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "slot-range-helper" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "enumn", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", "sp-runtime", "sp-std", @@ -9877,7 +9874,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7" dependencies = [ "aes-gcm", - "blake2", + "blake2 0.9.2", "chacha20poly1305", "rand 0.8.5", "rand_core 0.6.3", @@ -9928,11 +9925,11 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "hash-db", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api-proc-macro", "sp-core", "sp-runtime", @@ -9945,9 +9942,9 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "blake2-rfc", + "blake2 0.10.4", "proc-macro-crate 1.1.3", "proc-macro2", "quote", @@ -9956,11 +9953,11 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-io", @@ -9969,13 +9966,13 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-debug-derive", "sp-std", @@ -9985,10 +9982,10 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-application-crypto", "sp-runtime", @@ -9998,10 +9995,10 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-inherents", "sp-runtime", "sp-std", @@ -10010,9 +10007,9 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-inherents", "sp-runtime", @@ -10022,13 +10019,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "log", "lru 0.7.5", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sp-api", "sp-consensus", "sp-database", @@ -10040,13 +10037,13 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-core", "sp-inherents", "sp-runtime", @@ -10059,11 +10056,11 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-application-crypto", "sp-consensus", @@ -10077,12 +10074,12 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "merlin", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-api", "sp-application-crypto", @@ -10100,21 +10097,23 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-arithmetic", "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "schnorrkel", "sp-core", "sp-runtime", @@ -10123,8 +10122,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "base58", "bitflags", @@ -10142,17 +10141,17 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "primitive-types", "rand 0.7.3", "regex", - "scale-info", + "scale-info 2.1.1", "schnorrkel", + "secp256k1", "secrecy", "serde", - "sha2 0.10.2", "sp-core-hashing", "sp-debug-derive", "sp-externalities", @@ -10163,8 +10162,6 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", - "tiny-keccak", - "twox-hash", "wasmi", "zeroize", ] @@ -10172,20 +10169,21 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "blake2-rfc", + "blake2 0.10.4", "byteorder", + "digest 0.10.3", "sha2 0.10.2", + "sha3 0.10.1", "sp-std", - "tiny-keccak", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro2", "quote", @@ -10196,16 +10194,16 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "kvdb", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro2", "quote", @@ -10214,11 +10212,11 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-std", "sp-storage", ] @@ -10226,12 +10224,12 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "finality-grandpa", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-api", "sp-application-crypto", @@ -10244,11 +10242,11 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-core", "sp-runtime", "sp-std", @@ -10257,15 +10255,16 @@ dependencies = [ [[package]] name = "sp-io" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "hash-db", "libsecp256k1", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", + "secp256k1", "sp-core", "sp-externalities", "sp-keystore", @@ -10281,25 +10280,25 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "lazy_static", "sp-core", "sp-runtime", - "strum", + "strum 0.23.0", ] [[package]] name = "sp-keystore" -version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "merlin", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "schnorrkel", "serde", "sp-core", @@ -10310,7 +10309,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "thiserror", "zstd", @@ -10319,10 +10318,10 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-arithmetic", "sp-core", @@ -10334,7 +10333,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -10345,7 +10344,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "sp-api", "sp-core", @@ -10355,7 +10354,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "backtrace", "lazy_static", @@ -10364,8 +10363,8 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "rustc-hash", "serde", @@ -10374,18 +10373,18 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "paste", "rand 0.7.3", - "scale-info", + "scale-info 2.1.1", "serde", "sp-application-crypto", "sp-arithmetic", @@ -10396,11 +10395,11 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "primitive-types", "sp-externalities", "sp-runtime-interface-proc-macro", @@ -10413,8 +10412,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "Inflector", "proc-macro-crate 1.1.3", @@ -10426,7 +10425,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "serde", "serde_json", @@ -10435,10 +10434,10 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-core", "sp-runtime", @@ -10449,24 +10448,24 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-std", ] [[package]] name = "sp-state-machine" -version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "hash-db", "log", "num-traits", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "rand 0.7.3", "smallvec", "sp-core", @@ -10483,15 +10482,15 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" [[package]] name = "sp-storage" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "ref-cast", "serde", "sp-debug-derive", @@ -10501,7 +10500,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", "sp-core", @@ -10514,12 +10513,12 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-inherents", "sp-runtime", @@ -10529,10 +10528,10 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-std", "tracing", "tracing-core", @@ -10542,7 +10541,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "sp-api", "sp-runtime", @@ -10551,12 +10550,12 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-inherents", "sp-runtime", @@ -10566,28 +10565,29 @@ dependencies = [ [[package]] name = "sp-trie" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "hash-db", "memory-db", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-std", + "thiserror", "trie-db", "trie-root", ] [[package]] name = "sp-version" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-wasm 0.42.2", - "scale-info", + "scale-info 2.1.1", "serde", "sp-core-hashing-proc-macro", "sp-runtime", @@ -10599,9 +10599,9 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "proc-macro2", "quote", "syn", @@ -10609,12 +10609,12 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-std", "wasmi", "wasmtime", @@ -10626,6 +10626,16 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spki" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "ss58-registry" version = "1.18.0" @@ -10703,7 +10713,16 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" dependencies = [ - "strum_macros", + "strum_macros 0.23.1", +] + +[[package]] +name = "strum" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8" +dependencies = [ + "strum_macros 0.24.0", ] [[package]] @@ -10719,6 +10738,19 @@ dependencies = [ "syn", ] +[[package]] +name = "strum_macros" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" +dependencies = [ + "heck 0.4.0", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + [[package]] name = "substrate-bip39" version = "0.4.4" @@ -10735,7 +10767,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "platforms", ] @@ -10743,7 +10775,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", @@ -10751,7 +10783,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", @@ -10765,9 +10797,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "async-std", "futures-util", "hyper", "log", @@ -10779,13 +10810,13 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", "sp-maybe-compressed-blob", - "strum", + "strum 0.23.0", "tempfile", "toml", "walkdir", @@ -10800,13 +10831,13 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07e33e919ebcd69113d5be0e4d70c5707004ff45188910106854f38b960df4a" +checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -10842,7 +10873,7 @@ dependencies = [ "cfg-if 1.0.0", "fastrand", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "remove_dir_all", "winapi 0.3.9", ] @@ -10913,6 +10944,17 @@ dependencies = [ "threadpool", ] +[[package]] +name = "tikv-jemalloc-sys" +version = "0.4.3+5.2.1-patched.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49" +dependencies = [ + "cc", + "fs_extra", + "libc", +] + [[package]] name = "time" version = "0.1.44" @@ -10943,15 +10985,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -10979,6 +11012,7 @@ dependencies = [ "mio 0.8.3", "num_cpus", "once_cell", + "parking_lot 0.12.0", "pin-project-lite 0.2.9", "signal-hook-registry", "socket2 0.4.4", @@ -11235,12 +11269,12 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "clap", "jsonrpsee 0.4.1", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "remote-externalities", "sc-chain-spec", "sc-cli", @@ -11270,6 +11304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if 1.0.0", + "digest 0.10.3", "rand 0.8.5", "static_assertions", ] @@ -11313,6 +11348,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +[[package]] +name = "unicode-ident" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" + [[package]] name = "unicode-normalization" version = "0.1.19" @@ -11825,11 +11866,11 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -11877,13 +11918,13 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "pallet-xcm-benchmarks", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "smallvec", @@ -11911,8 +11952,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "polkadot-primitives", @@ -12071,29 +12112,29 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "derivative", "impl-trait-for-tuples", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "xcm-procedural", ] [[package]] name = "xcm-builder" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "frame-system", "log", "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info", + "scale-info 2.1.1", "sp-arithmetic", "sp-io", "sp-runtime", @@ -12104,14 +12145,14 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-benchmarking", "frame-support", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-arithmetic", "sp-core", "sp-io", @@ -12123,7 +12164,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "Inflector", "proc-macro2", diff --git a/src/service/mod.rs b/src/service/mod.rs index 702b1723..8c3a402b 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -65,7 +65,7 @@ use sc_service::{ use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sc_transaction_pool::FullPool; use sp_api::{ApiExt, HeaderT}; -use sp_consensus::{CacheKeyId, CanAuthorWithNativeVersion, SlotData}; +use sp_consensus::{CacheKeyId, CanAuthorWithNativeVersion}; use sp_consensus_aura::sr25519::{AuthorityId as AuraId, AuthorityPair as AuraPair}; use sp_keystore::SyncCryptoStorePtr; use sp_runtime::{generic::BlockId, traits::BlakeTwo256}; @@ -499,9 +499,9 @@ where let time = sp_timestamp::InherentDataProvider::from_system_time(); let slot = - sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *time, - slot_duration.slot_duration(), + slot_duration, ); Ok((time, slot)) @@ -595,9 +595,9 @@ where let time = sp_timestamp::InherentDataProvider::from_system_time(); let slot = - sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *time, - slot_duration.slot_duration(), + slot_duration, ); let parachain_inherent = parachain_inherent.ok_or_else(|| { From a060fa83f3bf84d68fefdb245a726506cf9c5ffe Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 11:19:03 +0800 Subject: [PATCH 15/59] Companion for Cumulus#1013 --- Cargo.toml | 2 +- runtime/crab-parachain/Cargo.toml | 4 ++-- runtime/darwinia-parachain/Cargo.toml | 4 ++-- runtime/pangolin-parachain/Cargo.toml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 261fa634..534f89f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ runtime-benchmarks = [ array-bytes = { version = "1.5" } async-trait = { version = "0.1" } clap = { version = "3.1", features = ["derive"] } -codec = { package = "parity-scale-codec", version = "2.3" } +codec = { package = "parity-scale-codec", version = "3.0.0" } futures = { version = "0.3" } jsonrpc-core = { version = "18.0" } log = { version = "0.4" } diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 8111e7a9..81f69c8f 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -13,8 +13,8 @@ version = "5.2.0-rc1" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index ccfe8d02..ce89601e 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -13,8 +13,8 @@ version = "5.2.0-rc1" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index fa2a3627..6c50ae71 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -13,8 +13,8 @@ version = "5.2.0-rc1" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } From 75fde072748f9bc9dd15a958b459bd8ddb44c5a5 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 11:58:27 +0800 Subject: [PATCH 16/59] Companion for Cumulus#963 --- Cargo.lock | 240 +++++++++++++++++++++++++++++++++------------ Cargo.toml | 21 ++-- src/command.rs | 6 +- src/service/mod.rs | 58 ++++++++--- 4 files changed, 241 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fba7bc9e..0304b13d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -379,6 +379,20 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom 0.2.6", + "instant", + "pin-project-lite 0.2.9", + "rand 0.8.5", + "tokio", +] + [[package]] name = "backtrace" version = "0.3.65" @@ -545,28 +559,16 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitvec" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" -dependencies = [ - "funty 1.1.0", - "radium 0.6.2", - "tap", - "wyz 0.2.0", -] - [[package]] name = "bitvec" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ - "funty 2.0.0", - "radium 0.7.0", + "funty", + "radium", "tap", - "wyz 0.5.0", + "wyz", ] [[package]] @@ -752,7 +754,7 @@ name = "bp-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "bp-runtime", "frame-support", "frame-system", @@ -1242,9 +1244,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 2.3.1", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info 1.0.0", + "scale-info 2.1.1", "smallvec", "sp-api", "sp-block-builder", @@ -1862,6 +1864,34 @@ dependencies = [ "xcm", ] +[[package]] +name = "cumulus-relay-chain-inprocess-interface" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "futures 0.3.21", + "futures-timer", + "parking_lot 0.12.0", + "polkadot-client", + "polkadot-service", + "sc-client-api", + "sc-consensus-babe", + "sc-network", + "sc-service", + "sc-telemetry", + "sc-tracing", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-state-machine", + "tracing", +] + [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" @@ -1886,6 +1916,32 @@ dependencies = [ "thiserror", ] +[[package]] +name = "cumulus-relay-chain-rpc-interface" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" +dependencies = [ + "async-trait", + "backoff", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "futures 0.3.21", + "futures-timer", + "jsonrpsee 0.9.0", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", + "polkadot-service", + "sc-client-api", + "sc-rpc-api", + "sp-api", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "tracing", + "url 2.2.2", +] + [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" @@ -1941,7 +1997,9 @@ dependencies = [ "cumulus-client-service", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", + "cumulus-relay-chain-rpc-interface", "darwinia-parachain-runtime", "dc-primitives", "dc-rpc", @@ -1952,7 +2010,7 @@ dependencies = [ "log", "pallet-transaction-payment-rpc", "pangolin-parachain-runtime", - "parity-scale-codec 2.3.1", + "parity-scale-codec 3.1.2", "polkadot-cli", "polkadot-parachain", "polkadot-primitives", @@ -2028,9 +2086,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 2.3.1", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info 1.0.0", + "scale-info 2.1.1", "smallvec", "sp-api", "sp-block-builder", @@ -2862,12 +2920,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] name = "funty" version = "2.0.0" @@ -3340,6 +3392,22 @@ dependencies = [ "webpki 0.21.4", ] +[[package]] +name = "hyper-rustls" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +dependencies = [ + "http", + "hyper", + "log", + "rustls 0.20.5", + "rustls-native-certs 0.6.2", + "tokio", + "tokio-rustls 0.23.4", + "webpki-roots 0.22.3", +] + [[package]] name = "idna" version = "0.1.5" @@ -3699,6 +3767,18 @@ dependencies = [ "jsonrpsee-ws-client 0.8.0", ] +[[package]] +name = "jsonrpsee" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d0b8cc1959f8c05256ace093b2317482da9127f1d9227564f47e7e6bf9bda8" +dependencies = [ + "jsonrpsee-core 0.9.0", + "jsonrpsee-http-client", + "jsonrpsee-types 0.9.0", + "jsonrpsee-ws-client 0.9.0", +] + [[package]] name = "jsonrpsee-client-transport" version = "0.8.0" @@ -3720,6 +3800,27 @@ dependencies = [ "webpki-roots 0.22.3", ] +[[package]] +name = "jsonrpsee-client-transport" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa370c2c717d798c3c0a315ae3f0a707a388c6963c11f9da7dbbe1d3f7392f5f" +dependencies = [ + "futures 0.3.21", + "http", + "jsonrpsee-core 0.9.0", + "jsonrpsee-types 0.9.0", + "pin-project 1.0.10", + "rustls-native-certs 0.6.2", + "soketto", + "thiserror", + "tokio", + "tokio-rustls 0.23.4", + "tokio-util 0.6.10", + "tracing", + "webpki-roots 0.22.3", +] + [[package]] name = "jsonrpsee-core" version = "0.8.0" @@ -3754,12 +3855,35 @@ dependencies = [ "async-trait", "beef", "futures-channel", + "futures-util", "hyper", "jsonrpsee-types 0.9.0", + "rustc-hash", "serde", "serde_json", "soketto", "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-http-client" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d31b837273d09dd80051eefa57d337769dff6c3266108c43a3544ac7ffed9d68" +dependencies = [ + "async-trait", + "hyper", + "hyper-rustls 0.23.0", + "jsonrpsee-core 0.9.0", + "jsonrpsee-types 0.9.0", + "rustc-hash", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", ] [[package]] @@ -3862,11 +3986,22 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5" dependencies = [ - "jsonrpsee-client-transport", + "jsonrpsee-client-transport 0.8.0", "jsonrpsee-core 0.8.0", "jsonrpsee-types 0.8.0", ] +[[package]] +name = "jsonrpsee-ws-client" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b58983485b2b626c276f1eb367d62dae82132451b281072a7bfa536a33ddf3" +dependencies = [ + "jsonrpsee-client-transport 0.9.0", + "jsonrpsee-core 0.9.0", + "jsonrpsee-types 0.9.0", +] + [[package]] name = "k256" version = "0.10.4" @@ -3901,7 +4036,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -5494,7 +5629,7 @@ name = "pallet-bridge-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "bp-message-dispatch", "bp-messages", "bp-runtime", @@ -6203,9 +6338,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 2.3.1", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info 1.0.0", + "scale-info 2.1.1", "smallvec", "sp-api", "sp-block-builder", @@ -6263,11 +6398,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" dependencies = [ "arrayvec 0.7.2", - "bitvec 0.20.4", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive 2.3.1", - "serde", ] [[package]] @@ -6277,7 +6410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" dependencies = [ "arrayvec 0.7.2", - "bitvec 1.0.0", + "bitvec", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive 3.1.2", @@ -6876,7 +7009,7 @@ name = "polkadot-node-core-approval-voting" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "derive_more", "futures 0.3.21", "futures-timer", @@ -6904,7 +7037,7 @@ name = "polkadot-node-core-av-store" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "futures-timer", "kvdb", @@ -6924,7 +7057,7 @@ name = "polkadot-node-core-backing" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7043,7 +7176,7 @@ name = "polkadot-node-core-provisioner" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -7345,7 +7478,7 @@ name = "polkadot-primitives" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "frame-system", "hex-literal", "parity-scale-codec 3.1.2", @@ -7407,7 +7540,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -7491,7 +7624,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7562,7 +7695,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bitflags", - "bitvec 1.0.0", + "bitvec", "derive_more", "frame-benchmarking", "frame-support", @@ -7782,7 +7915,7 @@ dependencies = [ "fixed-hash", "impl-codec", "impl-serde", - "scale-info 2.1.1", + "scale-info 1.0.0", "uint", ] @@ -7946,12 +8079,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" - [[package]] name = "radium" version = "0.7.0" @@ -9110,7 +9237,7 @@ dependencies = [ "futures-timer", "hex", "hyper", - "hyper-rustls", + "hyper-rustls 0.22.1", "num_cpus", "once_cell", "parity-scale-codec 3.1.2", @@ -9440,7 +9567,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" dependencies = [ - "bitvec 0.20.4", "cfg-if 1.0.0", "derive_more", "parity-scale-codec 2.3.1", @@ -9453,7 +9579,7 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" dependencies = [ - "bitvec 1.0.0", + "bitvec", "cfg-if 1.0.0", "derive_more", "parity-scale-codec 3.1.2", @@ -11870,7 +11996,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -12084,12 +12210,6 @@ dependencies = [ "winapi-build", ] -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "wyz" version = "0.5.0" diff --git a/Cargo.toml b/Cargo.toml index 534f89f4..ccbfbdc5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,16 +89,17 @@ substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrat try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } # cumulus -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-network #pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } diff --git a/src/command.rs b/src/command.rs index dfb473c6..a43e5d2c 100644 --- a/src/command.rs +++ b/src/command.rs @@ -241,6 +241,7 @@ pub fn run() -> Result<()> { .create_runner(&cli.run.normalize())? .run_node_until_exit(|config| async move { let chain_spec = &config.chain_spec; + let collator_options = cli.run.collator_options(); set_default_ss58_version(chain_spec); @@ -283,6 +284,7 @@ pub fn run() -> Result<()> { service::start_node::( config, polkadot_config, + collator_options, id, ) .await @@ -292,7 +294,7 @@ pub fn run() -> Result<()> { service::start_node::< PangolinParachainRuntimeApi, PangolinParachainRuntimeExecutor, - >(config, polkadot_config, id) + >(config, polkadot_config, collator_options, id) .await .map(|r| r.0) .map_err(Into::into) @@ -300,7 +302,7 @@ pub fn run() -> Result<()> { service::start_node::< DarwiniaParachainRuntimeApi, DarwiniaParachainRuntimeExecutor, - >(config, polkadot_config, id) + >(config, polkadot_config, collator_options, id) .await .map(|r| r.0) .map_err(Into::into) diff --git a/src/service/mod.rs b/src/service/mod.rs index 8c3a402b..22d3f373 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -31,6 +31,7 @@ use std::{error::Error, sync::Arc, time::Duration}; // --- crates.io --- use futures::lock::Mutex; // --- paritytech --- +use cumulus_client_cli::CollatorOptions; use cumulus_client_consensus_aura::{ AuraConsensus, BuildAuraConsensusParams, BuildVerifierParams, SlotProportion, }; @@ -49,7 +50,10 @@ use cumulus_primitives_core::{ ParaId, }; use cumulus_primitives_parachain_inherent::ParachainInherentData; -use cumulus_relay_chain_interface::RelayChainInterface; +use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; +use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult}; +use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface; +use polkadot_service::CollatorPair; use sc_basic_authorship::ProposerFactory; use sc_client_api::{ExecutorProvider, StateBackendFor}; use sc_consensus::{ @@ -304,6 +308,31 @@ where Ok(params) } +async fn build_relay_chain_interface( + polkadot_config: Configuration, + telemetry_worker_handle: Option, + task_manager: &mut TaskManager, + collator_options: CollatorOptions, +) -> RelayChainResult<( + Arc<(dyn RelayChainInterface + 'static)>, + Option, +)> { + match collator_options.relay_chain_rpc_url { + Some(relay_chain_url) => Ok(( + Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>, + None, + )), + None => { + let relay_chain_local = build_inprocess_relay_chain( + polkadot_config, + telemetry_worker_handle, + task_manager, + )?; + Ok((relay_chain_local.0, Some(relay_chain_local.1))) + } + } +} + /// Start a node with the given parachain `Configuration` and relay chain `Configuration`. /// /// This is the actual implementation that is abstract over the executor and the runtime api. @@ -311,6 +340,7 @@ where async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, + collator_options: CollatorOptions, id: ParaId, _rpc_ext_builder: RB, build_import_queue: BIQ, @@ -357,16 +387,17 @@ where let client = params.client.clone(); let backend = params.backend.clone(); let mut task_manager = params.task_manager; - let (relay_chain_interface, collator_key) = - cumulus_relay_chain_local::build_relay_chain_interface( - polkadot_config, - telemetry_worker_handle, - &mut task_manager, - ) - .map_err(|e| match e { - polkadot_service::Error::Sub(x) => x, - s => format!("{}", s).into(), - })?; + let (relay_chain_interface, collator_key) = build_relay_chain_interface( + polkadot_config, + telemetry_worker_handle, + &mut task_manager, + collator_options.clone(), + ) + .await + .map_err(|e| match e { + RelayChainError::ServiceError(polkadot_service::Error::Sub(x)) => x, + s => s.to_string().into(), + })?; let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id); let force_authoring = parachain_config.force_authoring; let validator = parachain_config.role.is_authority(); @@ -444,7 +475,7 @@ where spawner, parachain_consensus, import_queue, - collator_key, + collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, }; @@ -458,6 +489,7 @@ where relay_chain_interface, relay_chain_slot_duration, import_queue, + collator_options, }; start_full_node(params)?; @@ -537,6 +569,7 @@ where pub async fn start_node( parachain_config: Configuration, polkadot_config: Configuration, + collator_options: CollatorOptions, id: ParaId, ) -> Result<(TaskManager, Arc>)> where @@ -550,6 +583,7 @@ where start_node_impl::( parachain_config, polkadot_config, + collator_options, id, |_| Ok(Default::default()), build_import_queue, From 0f9d7a773d5a06a0812b3275b329fd2a416dd2b5 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 13:23:07 +0800 Subject: [PATCH 17/59] Companion for Cumulus#1058 --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ccbfbdc5..76d68008 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,14 +61,14 @@ frame-benchmarking-cli = { optional = true, git = "https://github.com/pa pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", features = ["wasmtime"] } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", features = ["wasmtime"] } sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", features = ["wasmtime"] } sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } From 9a7663552e0124cae86f31aebfe8217061785398 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 13:58:24 +0800 Subject: [PATCH 18/59] Companion for Cumulus#1069 --- src/service/mod.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/service/mod.rs b/src/service/mod.rs index 22d3f373..2df24ad5 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -310,6 +310,7 @@ where async fn build_relay_chain_interface( polkadot_config: Configuration, + parachain_config: &Configuration, telemetry_worker_handle: Option, task_manager: &mut TaskManager, collator_options: CollatorOptions, @@ -322,14 +323,12 @@ async fn build_relay_chain_interface( Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>, None, )), - None => { - let relay_chain_local = build_inprocess_relay_chain( - polkadot_config, - telemetry_worker_handle, - task_manager, - )?; - Ok((relay_chain_local.0, Some(relay_chain_local.1))) - } + None => build_inprocess_relay_chain( + polkadot_config, + parachain_config, + telemetry_worker_handle, + task_manager, + ), } } @@ -389,6 +388,7 @@ where let mut task_manager = params.task_manager; let (relay_chain_interface, collator_key) = build_relay_chain_interface( polkadot_config, + ¶chain_config, telemetry_worker_handle, &mut task_manager, collator_options.clone(), From 1d20ec480f23794b4fdb459eb9a2e5703cf69bd4 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 14:15:48 +0800 Subject: [PATCH 19/59] Companion for Cumulus#982 --- Cargo.lock | 1 + runtime/crab-parachain/Cargo.toml | 2 ++ runtime/crab-parachain/src/lib.rs | 1 + runtime/crab-parachain/src/pallets/xcmp_queue.rs | 2 ++ runtime/darwinia-parachain/Cargo.toml | 2 ++ runtime/darwinia-parachain/src/lib.rs | 1 + runtime/darwinia-parachain/src/pallets/xcmp_queue.rs | 1 + runtime/pangolin-parachain/Cargo.toml | 2 ++ runtime/pangolin-parachain/src/lib.rs | 1 + runtime/pangolin-parachain/src/pallets/xcmp_queue.rs | 2 ++ 10 files changed, 15 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 0304b13d..8e10883c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1783,6 +1783,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", + "frame-benchmarking", "frame-support", "frame-system", "log", diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 81f69c8f..9dc1d63e 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -133,6 +133,8 @@ std = [ runtime-benchmarks = [ # crates.io "array-bytes", + # cumulus + "cumulus-pallet-xcmp-queue/runtime-benchmarks", # polkadot "pallet-xcm/runtime-benchmarks", "pallet-xcm-benchmarks", diff --git a/runtime/crab-parachain/src/lib.rs b/runtime/crab-parachain/src/lib.rs index bae3aef6..2bac9a05 100644 --- a/runtime/crab-parachain/src/lib.rs +++ b/runtime/crab-parachain/src/lib.rs @@ -59,6 +59,7 @@ mod benches { [pallet_utility, Utility] [pallet_multisig, Multisig] [pallet_proxy, Proxy] + [cumulus_pallet_xcmp_queue, XcmpQueue] ); } diff --git a/runtime/crab-parachain/src/pallets/xcmp_queue.rs b/runtime/crab-parachain/src/pallets/xcmp_queue.rs index 8193cca2..2f7d0be3 100644 --- a/runtime/crab-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/crab-parachain/src/pallets/xcmp_queue.rs @@ -13,4 +13,6 @@ impl Config for Runtime { type ExecuteOverweightOrigin = EnsureRoot; type ControllerOrigin = EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; + // TODO: Update weight + type WeightInfo = (); } diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index ce89601e..4b3427ab 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -126,6 +126,8 @@ std = [ runtime-benchmarks = [ # crates.io "array-bytes", + # cumulus + "cumulus-pallet-xcmp-queue/runtime-benchmarks", # polkadot "pallet-xcm/runtime-benchmarks", "pallet-xcm-benchmarks", diff --git a/runtime/darwinia-parachain/src/lib.rs b/runtime/darwinia-parachain/src/lib.rs index b7764c51..67bc27d8 100644 --- a/runtime/darwinia-parachain/src/lib.rs +++ b/runtime/darwinia-parachain/src/lib.rs @@ -56,6 +56,7 @@ mod benches { [pallet_utility, Utility] [pallet_multisig, Multisig] [pallet_proxy, Proxy] + [cumulus_pallet_xcmp_queue, XcmpQueue] ); } diff --git a/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs b/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs index 8193cca2..ac622d57 100644 --- a/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs @@ -13,4 +13,5 @@ impl Config for Runtime { type ExecuteOverweightOrigin = EnsureRoot; type ControllerOrigin = EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; + type WeightInfo = (); } diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 6c50ae71..3c335abb 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -157,6 +157,8 @@ alpha = [] runtime-benchmarks = [ # crates.io "array-bytes", + # cumulus + "cumulus-pallet-xcmp-queue/runtime-benchmarks", # darwinia-bridges-substrate # "bridge-runtime-common/runtime-benchmarks", # "pallet-bridge-grandpa/runtime-benchmarks", diff --git a/runtime/pangolin-parachain/src/lib.rs b/runtime/pangolin-parachain/src/lib.rs index f7e305af..34bee63f 100644 --- a/runtime/pangolin-parachain/src/lib.rs +++ b/runtime/pangolin-parachain/src/lib.rs @@ -63,6 +63,7 @@ mod benches { // TODO: https://github.com/darwinia-network/darwinia-parachain/issues/66 // [pallet_bridge_messages, MessagesBench::] [pallet_fee_market, FeeMarket] + [cumulus_pallet_xcmp_queue, XcmpQueue] ); } diff --git a/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs b/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs index 8193cca2..2f7d0be3 100644 --- a/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs @@ -13,4 +13,6 @@ impl Config for Runtime { type ExecuteOverweightOrigin = EnsureRoot; type ControllerOrigin = EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; + // TODO: Update weight + type WeightInfo = (); } From 07ba0594ea0d067d390fe92deee863f1f305c39f Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 14:27:43 +0800 Subject: [PATCH 20/59] Companion for Cumulus#1055 --- runtime/crab-parachain/src/pallets/polkadot_xcm.rs | 9 ++++----- runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs | 9 ++++----- runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs | 8 +++----- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs index ee0e6fdf..8b5d0c0f 100644 --- a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs @@ -1,12 +1,10 @@ // --- paritytech --- use cumulus_pallet_xcm::Origin as CumulusOrigin; use cumulus_primitives_utility::ParentAsUmp; -use frame_support::{ - traits::Everything, - weights::{IdentityFee, Weight}, -}; +use frame_support::{traits::Everything, weights::Weight}; use pallet_xcm::{Config, CurrentXcmVersion, XcmPassthrough}; use polkadot_parachain::primitives::Sibling; +use polkadot_runtime_common::impls::ToAuthor; use xcm::latest::prelude::*; use xcm_builder::*; use xcm_executor::{Config as XcmCExecutorConfig, XcmExecutor}; @@ -122,7 +120,8 @@ impl XcmCExecutorConfig for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = UsingComponents, KsmLocation, AccountId, Balances, ()>; + type Trader = + UsingComponents>; type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; diff --git a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs index 5cf4e272..cb13b4da 100644 --- a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs @@ -1,12 +1,10 @@ // --- paritytech --- use cumulus_pallet_xcm::Origin as CumulusOrigin; use cumulus_primitives_utility::ParentAsUmp; -use frame_support::{ - traits::Everything, - weights::{IdentityFee, Weight}, -}; +use frame_support::{traits::Everything, weights::Weight}; use pallet_xcm::{Config, CurrentXcmVersion, XcmPassthrough}; use polkadot_parachain::primitives::Sibling; +use polkadot_runtime_common::impls::ToAuthor; use xcm::latest::prelude::*; use xcm_builder::*; use xcm_executor::{Config as XcmCExecutorConfig, XcmExecutor}; @@ -122,7 +120,8 @@ impl XcmCExecutorConfig for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = UsingComponents, DotLocation, AccountId, Balances, ()>; + type Trader = + UsingComponents>; type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; diff --git a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs index e2dee2e7..9c64825e 100644 --- a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs @@ -1,12 +1,10 @@ // --- paritytech --- use cumulus_pallet_xcm::Origin as CumulusOrigin; use cumulus_primitives_utility::ParentAsUmp; -use frame_support::{ - traits::{Everything, PalletInfoAccess}, - weights::{IdentityFee, Weight}, -}; +use frame_support::{traits::Everything, weights::Weight}; use pallet_xcm::{Config, CurrentXcmVersion, XcmPassthrough}; use polkadot_parachain::primitives::Sibling; +use polkadot_runtime_common::impls::ToAuthor; use xcm::latest::prelude::*; use xcm_builder::*; use xcm_executor::{Config as XcmCExecutorConfig, XcmExecutor}; @@ -126,7 +124,7 @@ impl XcmCExecutorConfig for XcmConfig { type Barrier = Barrier; type Weigher = FixedWeightBounds; type Trader = - UsingComponents, AnchoringSelfReserve, AccountId, Balances, ()>; + UsingComponents>; type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; From f772a454c0c4693cc53a2bb49b8bf5da499e9cfa Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 14:38:39 +0800 Subject: [PATCH 21/59] Companion for paritytech/cumulus#1071 --- src/command.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/command.rs b/src/command.rs index a43e5d2c..f2a9a48b 100644 --- a/src/command.rs +++ b/src/command.rs @@ -257,7 +257,7 @@ pub fn run() -> Result<()> { ); let id = ParaId::from(para_id); let parachain_account = - AccountIdConversion::::into_account(&id); + AccountIdConversion::::into_account(&id); let state_version = RelayChainCli::native_runtime_version(&config.chain_spec).state_version(); let block: Block = generate_genesis_block(&config.chain_spec, state_version) From adba408bc68e2ae3cd93697fcb207810e1e6963c Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 15:33:32 +0800 Subject: [PATCH 22/59] Revert "Companion for paritytech/cumulus#1071" This reverts commit f772a454c0c4693cc53a2bb49b8bf5da499e9cfa. --- src/command.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/command.rs b/src/command.rs index f2a9a48b..a43e5d2c 100644 --- a/src/command.rs +++ b/src/command.rs @@ -257,7 +257,7 @@ pub fn run() -> Result<()> { ); let id = ParaId::from(para_id); let parachain_account = - AccountIdConversion::::into_account(&id); + AccountIdConversion::::into_account(&id); let state_version = RelayChainCli::native_runtime_version(&config.chain_spec).state_version(); let block: Block = generate_genesis_block(&config.chain_spec, state_version) From 0550eada10f11a325e6e891e7687a4fc5583c639 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 15:46:53 +0800 Subject: [PATCH 23/59] Revert "Disable darwinia-bridges-substrate" This reverts commit 87157a5001eb5588a2ad21ec808ad4eb2fd0d6cd. --- Cargo.toml | 2 +- rpc/Cargo.toml | 2 +- runtime/common/Cargo.toml | 16 ++++---- runtime/crab-parachain/Cargo.toml | 4 +- runtime/darwinia-parachain/Cargo.toml | 4 +- runtime/pangolin-parachain/Cargo.toml | 56 +++++++++++++-------------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 76d68008..d79729ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,7 +102,7 @@ cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-network -#pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index eb6e3440..483001cd 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -14,7 +14,7 @@ version = "5.2.0-rc1" jsonrpc-core = { version = "18.0" } # darwinia-network dc-primitives = { path = "../primitives" } -#pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # paritytech pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 562b8a4b..93108c7f 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -15,10 +15,10 @@ smallvec = { version = "1.8" } # cumulus pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-bridges-substrate -#bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # darwinia-collator dc-primitives = { default-features = false, path = "../../primitives" } # substrate @@ -36,10 +36,10 @@ std = [ # cumulus "pallet-collator-selection/std", # darwinia-bridges-substrate -# "bp-messages/std", -# "bridge-runtime-common/std", -# "pallet-bridge-dispatch/std", -# "pallet-fee-market/std", + "bp-messages/std", + "bridge-runtime-common/std", + "pallet-bridge-dispatch/std", + "pallet-fee-market/std", # darwinia-collator "dc-primitives/std", # substrate diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 9dc1d63e..3385ee88 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -30,7 +30,7 @@ parachain-info = { default-features = false, git = "https://git # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -93,7 +93,7 @@ std = [ # darwinia "dc-common-runtime/std", "dc-primitives/std", -# "pallet-fee-market-rpc-runtime-api/std", + "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 4b3427ab..1a20cfa5 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -30,7 +30,7 @@ parachain-info = { default-features = false, git = "https://git # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -89,7 +89,7 @@ std = [ "parachain-info/std", "dc-common-runtime/std", "dc-primitives/std", -# "pallet-fee-market-rpc-runtime-api/std", + "pallet-fee-market-rpc-runtime-api/std", "pallet-xcm/std", "polkadot-parachain/std", "xcm/std", diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 3c335abb..327a68e6 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -31,18 +31,18 @@ parachain-info = { default-features = false, git = "https://git dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # darwinia-bridges-substrate -#bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -105,18 +105,18 @@ std = [ "dc-common-runtime/std", "dc-primitives/std", # darwinia-bridges-substrate -# "bp-pangolin/std", -# "bp-message-dispatch/std", -# "bp-messages/std", -# "bp-runtime/std", -# "bp-polkadot-core/std", -# "bp-pangolin-parachain/std", -# "bridge-runtime-common/std", -# "pallet-bridge-dispatch/std", -# "pallet-bridge-grandpa/std", -# "pallet-bridge-messages/std", -# "pallet-fee-market/std", -# "pallet-fee-market-rpc-runtime-api/std", + "bp-pangolin/std", + "bp-message-dispatch/std", + "bp-messages/std", + "bp-runtime/std", + "bp-polkadot-core/std", + "bp-pangolin-parachain/std", + "bridge-runtime-common/std", + "pallet-bridge-dispatch/std", + "pallet-bridge-grandpa/std", + "pallet-bridge-messages/std", + "pallet-fee-market/std", + "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", @@ -160,10 +160,10 @@ runtime-benchmarks = [ # cumulus "cumulus-pallet-xcmp-queue/runtime-benchmarks", # darwinia-bridges-substrate -# "bridge-runtime-common/runtime-benchmarks", -# "pallet-bridge-grandpa/runtime-benchmarks", -# "pallet-bridge-messages/runtime-benchmarks", -# "pallet-fee-market/runtime-benchmarks", + "bridge-runtime-common/runtime-benchmarks", + "pallet-bridge-grandpa/runtime-benchmarks", + "pallet-bridge-messages/runtime-benchmarks", + "pallet-fee-market/runtime-benchmarks", # polkadot "pallet-xcm/runtime-benchmarks", "pallet-xcm-benchmarks", From db3f532b4582f96d379caa8e2c84813b636e9e30 Mon Sep 17 00:00:00 2001 From: AurevoirXavier Date: Wed, 18 May 2022 13:47:18 +0800 Subject: [PATCH 24/59] Remove `FeeMarket` RPC (#71) --- Cargo.lock | 447 ++++++++++++++++++++++---- Cargo.toml | 7 +- rpc/Cargo.toml | 3 +- rpc/src/lib.rs | 4 - runtime/crab-parachain/Cargo.toml | 6 +- runtime/crab-parachain/src/lib.rs | 9 - runtime/darwinia-parachain/Cargo.toml | 6 +- runtime/darwinia-parachain/src/lib.rs | 9 - runtime/pangolin-parachain/Cargo.toml | 24 +- runtime/pangolin-parachain/src/lib.rs | 16 - src/service/api.rs | 2 - 11 files changed, 397 insertions(+), 136 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8e10883c..9b569fb3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -559,16 +559,28 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitvec" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +dependencies = [ + "funty 1.1.0", + "radium 0.6.2", + "tap", + "wyz 0.2.0", +] + [[package]] name = "bitvec" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ - "funty", - "radium", + "funty 2.0.0", + "radium 0.7.0", "tap", - "wyz", + "wyz 0.5.0", ] [[package]] @@ -721,12 +733,45 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bp-darwinia-core" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "frame-system", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-header-chain" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "finality-grandpa 0.14.4", + "frame-support", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "serde", + "sp-core", + "sp-finality-grandpa", + "sp-runtime", + "sp-std", +] + [[package]] name = "bp-header-chain" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "finality-grandpa", + "finality-grandpa 0.15.0", "frame-support", "parity-scale-codec 3.1.2", "scale-info 2.1.1", @@ -737,25 +782,54 @@ dependencies = [ "sp-std", ] +[[package]] +name = "bp-message-dispatch" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-std", +] + [[package]] name = "bp-message-dispatch" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-runtime", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "parity-scale-codec 3.1.2", "scale-info 2.1.1", "sp-std", ] +[[package]] +name = "bp-messages" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bitvec 0.20.4", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "serde", + "sp-core", + "sp-std", +] + [[package]] name = "bp-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", - "bp-runtime", + "bitvec 1.0.0", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", "impl-trait-for-tuples", @@ -765,13 +839,61 @@ dependencies = [ "sp-std", ] +[[package]] +name = "bp-pangolin" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-darwinia-core", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", + "sp-version", +] + +[[package]] +name = "bp-pangolin-parachain" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-darwinia-core", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", + "sp-version", +] + +[[package]] +name = "bp-polkadot-core" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "frame-system", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-api", + "sp-core", + "sp-runtime", + "sp-std", + "sp-version", +] + [[package]] name = "bp-polkadot-core" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-messages", - "bp-runtime", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", "parity-scale-codec 3.1.2", @@ -788,9 +910,9 @@ name = "bp-rococo" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-messages", - "bp-polkadot-core", - "bp-runtime", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "parity-scale-codec 3.1.2", "smallvec", @@ -800,6 +922,24 @@ dependencies = [ "sp-version", ] +[[package]] +name = "bp-runtime" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "frame-support", + "hash-db", + "num-traits", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", +] + [[package]] name = "bp-runtime" version = "0.1.0" @@ -818,14 +958,29 @@ dependencies = [ "sp-trie", ] +[[package]] +name = "bp-test-utils" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "ed25519-dalek", + "finality-grandpa 0.14.4", + "parity-scale-codec 2.3.1", + "sp-application-crypto", + "sp-finality-grandpa", + "sp-runtime", + "sp-std", +] + [[package]] name = "bp-test-utils" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-header-chain", + "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "ed25519-dalek", - "finality-grandpa", + "finality-grandpa 0.15.0", "parity-scale-codec 3.1.2", "sp-application-crypto", "sp-finality-grandpa", @@ -838,29 +993,56 @@ name = "bp-wococo" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-messages", - "bp-polkadot-core", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-rococo", - "bp-runtime", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "parity-scale-codec 3.1.2", "sp-api", "sp-runtime", "sp-std", ] +[[package]] +name = "bridge-runtime-common" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "ed25519-dalek", + "frame-support", + "frame-system", + "hash-db", + "pallet-balances", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-transaction-payment", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", + "sp-version", +] + [[package]] name = "bridge-runtime-common" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-message-dispatch", - "bp-messages", - "bp-runtime", + "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "hash-db", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "pallet-transaction-payment", "parity-scale-codec 3.1.2", "scale-info 2.1.1", @@ -2138,11 +2320,15 @@ dependencies = [ name = "dc-common-runtime" version = "5.2.0-rc1" dependencies = [ + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "dc-primitives", "frame-support", "frame-system", "pallet-balances", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-collator-selection", + "pallet-fee-market", "pallet-transaction-payment", "smallvec", "sp-runtime", @@ -2283,7 +2469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" dependencies = [ "byteorder", - "quick-error 1.2.3", + "quick-error", ] [[package]] @@ -2580,6 +2766,22 @@ dependencies = [ "log", ] +[[package]] +name = "finality-grandpa" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" +dependencies = [ + "either", + "futures 0.3.21", + "futures-timer", + "log", + "num-traits", + "parity-scale-codec 2.3.1", + "parking_lot 0.11.2", + "scale-info 1.0.0", +] + [[package]] name = "finality-grandpa" version = "0.15.0" @@ -2921,6 +3123,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + [[package]] name = "funty" version = "2.0.0" @@ -3183,16 +3391,16 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d6a30320f094710245150395bc763ad23128d6a1ebbad7594dc4164b62c56b" +checksum = "d113a9853e5accd30f43003560b5563ffbb007e3f325e8b103fa0d0029c6e6df" dependencies = [ "log", "pest", "pest_derive", - "quick-error 2.0.1", "serde", "serde_json", + "thiserror", ] [[package]] @@ -4037,7 +4245,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -4193,9 +4401,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.125" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libloading" @@ -5586,13 +5794,30 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-bridge-dispatch" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "frame-system", + "log", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-core", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-message-dispatch", - "bp-runtime", + "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", "log", @@ -5603,15 +5828,38 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-bridge-grandpa" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "finality-grandpa 0.14.4", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "num-traits", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "serde", + "sp-finality-grandpa", + "sp-runtime", + "sp-std", + "sp-trie", +] + [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-header-chain", - "bp-runtime", - "bp-test-utils", - "finality-grandpa", + "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-test-utils 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "finality-grandpa 0.15.0", "frame-support", "frame-system", "log", @@ -5625,15 +5873,37 @@ dependencies = [ "sp-trie", ] +[[package]] +name = "pallet-bridge-messages" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bitvec 0.20.4", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "num-traits", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "serde", + "sp-core", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-bridge-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", - "bp-message-dispatch", - "bp-messages", - "bp-runtime", + "bitvec 1.0.0", + "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", "log", @@ -5740,6 +6010,27 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-fee-market" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bitvec 0.20.4", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-timestamp", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-gilt" version = "4.0.0-dev" @@ -6307,6 +6598,13 @@ name = "pangolin-parachain-runtime" version = "5.2.0-rc1" dependencies = [ "array-bytes", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-pangolin", + "bp-pangolin-parachain", + "bp-polkadot-core 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -6326,7 +6624,11 @@ dependencies = [ "pallet-aura", "pallet-authorship", "pallet-balances", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-collator-selection", + "pallet-fee-market", "pallet-multisig", "pallet-proxy", "pallet-session", @@ -6399,9 +6701,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" dependencies = [ "arrayvec 0.7.2", + "bitvec 0.20.4", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive 2.3.1", + "serde", ] [[package]] @@ -6411,7 +6715,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" dependencies = [ "arrayvec 0.7.2", - "bitvec", + "bitvec 1.0.0", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive 3.1.2", @@ -7010,7 +7314,7 @@ name = "polkadot-node-core-approval-voting" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "derive_more", "futures 0.3.21", "futures-timer", @@ -7038,7 +7342,7 @@ name = "polkadot-node-core-av-store" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "futures 0.3.21", "futures-timer", "kvdb", @@ -7058,7 +7362,7 @@ name = "polkadot-node-core-backing" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7177,7 +7481,7 @@ name = "polkadot-node-core-provisioner" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -7479,7 +7783,7 @@ name = "polkadot-primitives" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "frame-system", "hex-literal", "parity-scale-codec 3.1.2", @@ -7541,7 +7845,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -7625,7 +7929,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7696,7 +8000,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bitflags", - "bitvec", + "bitvec 1.0.0", "derive_more", "frame-benchmarking", "frame-support", @@ -7916,7 +8220,7 @@ dependencies = [ "fixed-hash", "impl-codec", "impl-serde", - "scale-info 1.0.0", + "scale-info 2.1.1", "uint", ] @@ -8054,12 +8358,6 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - [[package]] name = "quicksink" version = "0.1.2" @@ -8080,6 +8378,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" + [[package]] name = "radium" version = "0.7.0" @@ -8342,7 +8646,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ "hostname", - "quick-error 1.2.3", + "quick-error", ] [[package]] @@ -8382,11 +8686,11 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bp-messages", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-rococo", - "bp-runtime", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-wococo", - "bridge-runtime-common", + "bridge-runtime-common 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-benchmarking", "frame-executive", "frame-support", @@ -8400,9 +8704,9 @@ dependencies = [ "pallet-balances", "pallet-beefy", "pallet-beefy-mmr", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "pallet-collective", "pallet-grandpa", "pallet-im-online", @@ -9073,7 +9377,7 @@ dependencies = [ "ahash", "async-trait", "dyn-clone", - "finality-grandpa", + "finality-grandpa 0.15.0", "fork-tree", "futures 0.3.21", "futures-timer", @@ -9110,7 +9414,7 @@ name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "finality-grandpa", + "finality-grandpa 0.15.0", "futures 0.3.21", "jsonrpc-core", "jsonrpc-core-client", @@ -9568,6 +9872,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" dependencies = [ + "bitvec 0.20.4", "cfg-if 1.0.0", "derive_more", "parity-scale-codec 2.3.1", @@ -9580,7 +9885,7 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" dependencies = [ - "bitvec", + "bitvec 1.0.0", "cfg-if 1.0.0", "derive_more", "parity-scale-codec 3.1.2", @@ -10353,7 +10658,7 @@ name = "sp-finality-grandpa" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "finality-grandpa", + "finality-grandpa 0.15.0", "log", "parity-scale-codec 3.1.2", "scale-info 2.1.1", @@ -11997,7 +12302,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -12211,6 +12516,12 @@ dependencies = [ "winapi-build", ] +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" + [[package]] name = "wyz" version = "0.5.0" diff --git a/Cargo.toml b/Cargo.toml index d79729ff..24e1fd22 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ runtime-benchmarks = [ # crates.io array-bytes = { version = "1.5" } async-trait = { version = "0.1" } -clap = { version = "3.1", features = ["derive"] } +clap = { version = "3.1", features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0" } futures = { version = "0.3" } jsonrpc-core = { version = "18.0" } @@ -97,13 +97,10 @@ cumulus-client-network = { git = "https://github.com/paritytech cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -# darwinia-network -pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } - # polkadot polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 483001cd..08761a15 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -13,8 +13,7 @@ version = "5.2.0-rc1" # crates.io jsonrpc-core = { version = "18.0" } # darwinia-network -dc-primitives = { path = "../primitives" } -pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +dc-primitives = { path = "../primitives" } # paritytech pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index a99b86b8..43cdab1a 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -56,15 +56,12 @@ where C::Api: substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + sp_block_builder::BlockBuilder - + pallet_fee_market_rpc::FeeMarketRuntimeApi, P: 'static + Send + Sync + sc_transaction_pool_api::TransactionPool, { // --- paritytech --- use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; use substrate_frame_rpc_system::{FullSystem, SystemApi}; - // --- darwinia-network --- - use pallet_fee_market_rpc::*; let mut io = IoHandler::default(); let FullDeps { @@ -81,7 +78,6 @@ where io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new( client.clone(), ))); - io.extend_with(FeeMarketApi::to_delegate(FeeMarket::new(client.clone()))); io } diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 3385ee88..1905ec6c 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -28,9 +28,8 @@ cumulus-primitives-utility = { default-features = false, git = "https://git pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia -dc-common-runtime = { default-features = false, path = "../common" } -dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +dc-common-runtime = { default-features = false, path = "../common" } +dc-primitives = { default-features = false, path = "../../primitives" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -93,7 +92,6 @@ std = [ # darwinia "dc-common-runtime/std", "dc-primitives/std", - "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", diff --git a/runtime/crab-parachain/src/lib.rs b/runtime/crab-parachain/src/lib.rs index 2bac9a05..0089ea30 100644 --- a/runtime/crab-parachain/src/lib.rs +++ b/runtime/crab-parachain/src/lib.rs @@ -277,15 +277,6 @@ sp_api::impl_runtime_apis! { } } - impl pallet_fee_market_rpc_runtime_api::FeeMarketApi for Runtime { - fn market_fee() -> Option> { - Default::default() - } - fn in_process_orders() -> pallet_fee_market_rpc_runtime_api::InProcessOrders { - Default::default() - } - } - #[cfg(feature = "runtime-benchmarks")] impl frame_benchmarking::Benchmark for Runtime { fn benchmark_metadata(extra: bool) -> ( diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 1a20cfa5..c1b83582 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -28,9 +28,8 @@ cumulus-primitives-utility = { default-features = false, git = "https://git pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia -dc-common-runtime = { default-features = false, path = "../common" } -dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +dc-common-runtime = { default-features = false, path = "../common" } +dc-primitives = { default-features = false, path = "../../primitives" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -89,7 +88,6 @@ std = [ "parachain-info/std", "dc-common-runtime/std", "dc-primitives/std", - "pallet-fee-market-rpc-runtime-api/std", "pallet-xcm/std", "polkadot-parachain/std", "xcm/std", diff --git a/runtime/darwinia-parachain/src/lib.rs b/runtime/darwinia-parachain/src/lib.rs index 67bc27d8..8cfc2aeb 100644 --- a/runtime/darwinia-parachain/src/lib.rs +++ b/runtime/darwinia-parachain/src/lib.rs @@ -271,15 +271,6 @@ sp_api::impl_runtime_apis! { } } - impl pallet_fee_market_rpc_runtime_api::FeeMarketApi for Runtime { - fn market_fee() -> Option> { - Default::default() - } - fn in_process_orders() -> pallet_fee_market_rpc_runtime_api::InProcessOrders { - Default::default() - } - } - #[cfg(feature = "runtime-benchmarks")] impl frame_benchmarking::Benchmark for Runtime { fn benchmark_metadata(extra: bool) -> ( diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 327a68e6..24abe72a 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -31,18 +31,17 @@ parachain-info = { default-features = false, git = "https://git dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # darwinia-bridges-substrate -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -116,7 +115,6 @@ std = [ "pallet-bridge-grandpa/std", "pallet-bridge-messages/std", "pallet-fee-market/std", - "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", diff --git a/runtime/pangolin-parachain/src/lib.rs b/runtime/pangolin-parachain/src/lib.rs index 34bee63f..f78638e0 100644 --- a/runtime/pangolin-parachain/src/lib.rs +++ b/runtime/pangolin-parachain/src/lib.rs @@ -291,22 +291,6 @@ sp_api::impl_runtime_apis! { } } - impl pallet_fee_market_rpc_runtime_api::FeeMarketApi for Runtime { - fn market_fee() -> Option> { - if let Some(fee) = FeeMarket::market_fee() { - return Some(pallet_fee_market_rpc_runtime_api::Fee { - amount: fee, - }); - } - None - } - fn in_process_orders() -> pallet_fee_market_rpc_runtime_api::InProcessOrders { - return pallet_fee_market_rpc_runtime_api::InProcessOrders { - orders: FeeMarket::in_process_orders(), - } - } - } - impl bp_pangolin::PangolinFinalityApi for Runtime { fn best_finalized() -> (bp_pangolin::BlockNumber, bp_pangolin::Hash) { let header = BridgePangolinGrandpa::best_finalized(); diff --git a/src/service/api.rs b/src/service/api.rs index 3b48c7e5..0542c990 100644 --- a/src/service/api.rs +++ b/src/service/api.rs @@ -13,7 +13,6 @@ pub trait RuntimeApiCollection: + sp_transaction_pool::runtime_api::TaggedTransactionQueue + substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi - + pallet_fee_market_rpc_runtime_api::FeeMarketApi { } impl RuntimeApiCollection for Api where @@ -27,6 +26,5 @@ impl RuntimeApiCollection for Api where + sp_transaction_pool::runtime_api::TaggedTransactionQueue + substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi - + pallet_fee_market_rpc_runtime_api::FeeMarketApi { } From 7ec740f34ce3605c0fd4d1921f038a2f2bf41622 Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Wed, 18 May 2022 14:11:23 +0800 Subject: [PATCH 25/59] Format --- Cargo.toml | 2 +- runtime/crab-parachain/Cargo.toml | 4 ++-- runtime/darwinia-parachain/Cargo.toml | 4 ++-- runtime/pangolin-parachain/Cargo.toml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 24e1fd22..4bf1ca21 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ runtime-benchmarks = [ array-bytes = { version = "1.5" } async-trait = { version = "0.1" } clap = { version = "3.1", features = ["derive"] } -codec = { package = "parity-scale-codec", version = "3.0.0" } +codec = { package = "parity-scale-codec", version = "3.0" } futures = { version = "0.3" } jsonrpc-core = { version = "18.0" } log = { version = "0.4" } diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 1905ec6c..766ed6c0 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -13,8 +13,8 @@ version = "5.2.0-rc1" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index c1b83582..1e850b90 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -13,8 +13,8 @@ version = "5.2.0-rc1" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 24abe72a..b61d9651 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -13,8 +13,8 @@ version = "5.2.0-rc1" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } From a4a5e26d76552142c71c963f563f0128f23bcd0c Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Wed, 18 May 2022 15:23:52 +0800 Subject: [PATCH 26/59] Bump Deps --- Cargo.lock | 86 +++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9b569fb3..532196da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -736,14 +736,14 @@ dependencies = [ [[package]] name = "bp-darwinia-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -752,13 +752,13 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "finality-grandpa 0.14.4", "frame-support", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-finality-grandpa", @@ -785,12 +785,12 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-std", ] @@ -809,15 +809,15 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-std", @@ -842,7 +842,7 @@ dependencies = [ [[package]] name = "bp-pangolin" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-darwinia-core", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -857,7 +857,7 @@ dependencies = [ [[package]] name = "bp-pangolin-parachain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-darwinia-core", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -872,14 +872,14 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-core", "sp-runtime", @@ -925,13 +925,13 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -961,12 +961,12 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "ed25519-dalek", "finality-grandpa 0.14.4", - "parity-scale-codec 2.3.1", + "parity-scale-codec 3.1.2", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -1006,7 +1006,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -1020,8 +1020,8 @@ dependencies = [ "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-transaction-payment", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-state-machine", @@ -1270,9 +1270,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21" +checksum = "bf6b561dcf059c85bbe388e0a7b0a1469acb3934cc0cfa148613a830629e3049" dependencies = [ "glob", "libc", @@ -5797,15 +5797,15 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -5831,7 +5831,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -5842,8 +5842,8 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-finality-grandpa", "sp-runtime", @@ -5876,9 +5876,9 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -5887,8 +5887,8 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-runtime", @@ -6013,9 +6013,9 @@ dependencies = [ [[package]] name = "pallet-fee-market" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-benchmarking", @@ -6024,7 +6024,7 @@ dependencies = [ "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-timestamp", "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -9919,12 +9919,12 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "winapi 0.3.9", + "windows-sys", ] [[package]] From 3cd0df1765b9bf3b7bc3ff7a7562a49ef3f37e7c Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 16 May 2022 18:05:54 +0800 Subject: [PATCH 27/59] Anchor polkadot-v0.9.18 --- Cargo.toml | 98 +++++++++++----------- primitives/Cargo.toml | 4 +- rpc/Cargo.toml | 18 ++-- runtime/common/Cargo.toml | 22 ++--- runtime/crab-parachain/Cargo.toml | 96 ++++++++++----------- runtime/darwinia-parachain/Cargo.toml | 94 ++++++++++----------- runtime/pangolin-parachain/Cargo.toml | 116 +++++++++++++------------- 7 files changed, 224 insertions(+), 224 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 34d5c663..e77278c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,63 +56,63 @@ dc-rpc = { path = "rpc" } pangolin-parachain-runtime = { path = "runtime/pangolin-parachain" } # substrate -frame-benchmarking = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-benchmarking-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-benchmarking-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } # cumulus -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-network -pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [workspace] members = [ diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index e125365c..1fed3522 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -11,8 +11,8 @@ version = "5.2.0-rc1" [dependencies] # substrate -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 9f90232d..483001cd 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -14,13 +14,13 @@ version = "5.2.0-rc1" jsonrpc-core = { version = "18.0" } # darwinia-network dc-primitives = { path = "../primitives" } -pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # paritytech -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 166a4bcc..93108c7f 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -13,21 +13,21 @@ version = "5.2.0-rc1" # crates.io smallvec = { version = "1.8" } # cumulus -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-bridges-substrate -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # darwinia-collator dc-primitives = { default-features = false, path = "../../primitives" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index aa6dd17b..2eaaae0d 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -17,61 +17,61 @@ codec = { package = "parity-scale-codec", version = "2.3", default-feature scale-info = { version = "1.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 28d0f901..825db5c7 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -17,60 +17,60 @@ codec = { package = "parity-scale-codec", version = "2.3", default-feature scale-info = { version = "1.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 63176f03..01b5a3ab 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -17,72 +17,72 @@ codec = { package = "parity-scale-codec", version = "2.3", default-feature scale-info = { version = "1.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # darwinia-bridges-substrate -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.17" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] From a16f0444806f6ce1495384dbfd89d29b079dfa34 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 16 May 2022 18:22:52 +0800 Subject: [PATCH 28/59] Disable darwinia-bridges-substrate --- Cargo.toml | 2 +- rpc/Cargo.toml | 2 +- runtime/common/Cargo.toml | 16 ++++---- runtime/crab-parachain/Cargo.toml | 4 +- runtime/darwinia-parachain/Cargo.toml | 4 +- runtime/pangolin-parachain/Cargo.toml | 56 +++++++++++++-------------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e77278c2..261fa634 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,7 +101,7 @@ cumulus-relay-chain-interface = { git = "https://github.com/paritytech/c cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-network -pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 483001cd..eb6e3440 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -14,7 +14,7 @@ version = "5.2.0-rc1" jsonrpc-core = { version = "18.0" } # darwinia-network dc-primitives = { path = "../primitives" } -pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # paritytech pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 93108c7f..562b8a4b 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -15,10 +15,10 @@ smallvec = { version = "1.8" } # cumulus pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-bridges-substrate -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # darwinia-collator dc-primitives = { default-features = false, path = "../../primitives" } # substrate @@ -36,10 +36,10 @@ std = [ # cumulus "pallet-collator-selection/std", # darwinia-bridges-substrate - "bp-messages/std", - "bridge-runtime-common/std", - "pallet-bridge-dispatch/std", - "pallet-fee-market/std", +# "bp-messages/std", +# "bridge-runtime-common/std", +# "pallet-bridge-dispatch/std", +# "pallet-fee-market/std", # darwinia-collator "dc-primitives/std", # substrate diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 2eaaae0d..8111e7a9 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -30,7 +30,7 @@ parachain-info = { default-features = false, git = "https://git # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -93,7 +93,7 @@ std = [ # darwinia "dc-common-runtime/std", "dc-primitives/std", - "pallet-fee-market-rpc-runtime-api/std", +# "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 825db5c7..ccfe8d02 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -30,7 +30,7 @@ parachain-info = { default-features = false, git = "https://git # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -89,7 +89,7 @@ std = [ "parachain-info/std", "dc-common-runtime/std", "dc-primitives/std", - "pallet-fee-market-rpc-runtime-api/std", +# "pallet-fee-market-rpc-runtime-api/std", "pallet-xcm/std", "polkadot-parachain/std", "xcm/std", diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 01b5a3ab..fa2a3627 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -31,18 +31,18 @@ parachain-info = { default-features = false, git = "https://git dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # darwinia-bridges-substrate -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -105,18 +105,18 @@ std = [ "dc-common-runtime/std", "dc-primitives/std", # darwinia-bridges-substrate - "bp-pangolin/std", - "bp-message-dispatch/std", - "bp-messages/std", - "bp-runtime/std", - "bp-polkadot-core/std", - "bp-pangolin-parachain/std", - "bridge-runtime-common/std", - "pallet-bridge-dispatch/std", - "pallet-bridge-grandpa/std", - "pallet-bridge-messages/std", - "pallet-fee-market/std", - "pallet-fee-market-rpc-runtime-api/std", +# "bp-pangolin/std", +# "bp-message-dispatch/std", +# "bp-messages/std", +# "bp-runtime/std", +# "bp-polkadot-core/std", +# "bp-pangolin-parachain/std", +# "bridge-runtime-common/std", +# "pallet-bridge-dispatch/std", +# "pallet-bridge-grandpa/std", +# "pallet-bridge-messages/std", +# "pallet-fee-market/std", +# "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", @@ -158,10 +158,10 @@ runtime-benchmarks = [ # crates.io "array-bytes", # darwinia-bridges-substrate - "bridge-runtime-common/runtime-benchmarks", - "pallet-bridge-grandpa/runtime-benchmarks", - "pallet-bridge-messages/runtime-benchmarks", - "pallet-fee-market/runtime-benchmarks", +# "bridge-runtime-common/runtime-benchmarks", +# "pallet-bridge-grandpa/runtime-benchmarks", +# "pallet-bridge-messages/runtime-benchmarks", +# "pallet-fee-market/runtime-benchmarks", # polkadot "pallet-xcm/runtime-benchmarks", "pallet-xcm-benchmarks", From eb6c721ed5040588915586a3b5b8e3a6065ba7c1 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 11:10:16 +0800 Subject: [PATCH 29/59] Companion for Cumulus#993 --- Cargo.lock | 2341 ++++++++++++++++++++++---------------------- src/service/mod.rs | 10 +- 2 files changed, 1196 insertions(+), 1155 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3bc27783..fba7bc9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -273,7 +273,6 @@ dependencies = [ "async-global-executor", "async-io", "async-lock", - "async-process", "crossbeam-utils", "futures-channel", "futures-core", @@ -401,6 +400,12 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc19a4937b4fbd3fe3379793130e42060d10627a360f2127802b10b87e7baf74" +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base58" version = "0.2.0" @@ -413,6 +418,12 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64ct" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179" + [[package]] name = "beef" version = "0.5.1" @@ -425,14 +436,15 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "beefy-primitives", "fnv", "futures 0.3.21", + "hex", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-chain-spec", "sc-client-api", "sc-keystore", @@ -454,7 +466,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -464,8 +476,8 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-rpc", "sc-utils", "serde", @@ -477,15 +489,15 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-application-crypto", "sp-core", @@ -568,6 +580,15 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "blake2" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "blake2-rfc" version = "0.2.18" @@ -615,6 +636,20 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "blake3" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +dependencies = [ + "arrayref", + "arrayvec 0.7.2", + "cc", + "cfg-if 1.0.0", + "constant_time_eq", + "digest 0.10.3", +] + [[package]] name = "block-buffer" version = "0.7.3" @@ -684,48 +719,15 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bp-darwinia-core" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bp-header-chain" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "finality-grandpa", - "frame-support", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", -] - [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "finality-grandpa", "frame-support", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-finality-grandpa", @@ -736,119 +738,42 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-support", - "parity-scale-codec", - "scale-info", - "sp-std", -] - -[[package]] -name = "bp-message-dispatch" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-runtime", "frame-support", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-std", ] [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-std", -] - -[[package]] -name = "bp-messages" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" -dependencies = [ - "bitvec 0.20.4", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bitvec 1.0.0", + "bp-runtime", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-std", ] -[[package]] -name = "bp-pangolin" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-darwinia-core", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-support", - "sp-api", - "sp-runtime", - "sp-std", - "sp-version", -] - -[[package]] -name = "bp-pangolin-parachain" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-darwinia-core", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-support", - "sp-api", - "sp-runtime", - "sp-std", - "sp-version", -] - -[[package]] -name = "bp-polkadot-core" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-core", - "sp-runtime", - "sp-std", - "sp-version", -] - [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-messages", + "bp-runtime", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-core", "sp-runtime", @@ -859,13 +784,13 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-messages", + "bp-polkadot-core", + "bp-runtime", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "smallvec", "sp-api", "sp-runtime", @@ -876,31 +801,13 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", -] - -[[package]] -name = "bp-runtime" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" -dependencies = [ - "frame-support", - "hash-db", - "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -912,27 +819,12 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-header-chain", "ed25519-dalek", "finality-grandpa", - "parity-scale-codec", - "sp-application-crypto", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bp-test-utils" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" -dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "ed25519-dalek", - "finality-grandpa", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -942,13 +834,13 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-messages", + "bp-polkadot-core", "bp-rococo", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "parity-scale-codec", + "bp-runtime", + "parity-scale-codec 3.1.2", "sp-api", "sp-runtime", "sp-std", @@ -957,46 +849,19 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "ed25519-dalek", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", "frame-support", - "frame-system", "hash-db", - "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "pallet-bridge-dispatch", + "pallet-bridge-grandpa", + "pallet-bridge-messages", "pallet-transaction-payment", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", - "sp-version", -] - -[[package]] -name = "bridge-runtime-common" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" -dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "frame-support", - "hash-db", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "pallet-transaction-payment", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-state-machine", @@ -1068,6 +933,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "cache-padded" version = "1.2.0" @@ -1258,15 +1134,6 @@ dependencies = [ "os_str_bytes", ] -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - [[package]] name = "concurrent-queue" version = "1.2.2" @@ -1276,6 +1143,12 @@ dependencies = [ "cache-padded", ] +[[package]] +name = "const-oid" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1357,7 +1230,6 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", - "pallet-fee-market-rpc-runtime-api", "pallet-multisig", "pallet-proxy", "pallet-session", @@ -1370,9 +1242,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "polkadot-parachain", - "scale-info", + "scale-info 1.0.0", "smallvec", "sp-api", "sp-block-builder", @@ -1540,6 +1412,18 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-bigint" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" +dependencies = [ + "generic-array 0.14.5", + "rand_core 0.6.3", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.3" @@ -1612,25 +1496,26 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "clap", "sc-cli", "sc-service", + "url 2.2.2", ] [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", - "parity-scale-codec", - "parking_lot 0.10.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -1646,13 +1531,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-consensus", "sc-consensus-aura", @@ -1675,13 +1560,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-relay-chain-interface", "dyn-clone", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sc-client-api", "sc-consensus", @@ -1696,7 +1581,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1720,14 +1605,14 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-relay-chain-interface", "derive_more", "futures 0.3.21", "futures-timer", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-parachain", @@ -1745,13 +1630,13 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -1769,14 +1654,15 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ + "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-pov-recovery", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-overseer", "polkadot-primitives", @@ -1798,14 +1684,14 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-executive", "frame-support", "frame-system", "pallet-aura", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-application-crypto", "sp-consensus-aura", @@ -1816,14 +1702,14 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -1834,7 +1720,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -1845,9 +1731,9 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info", + "scale-info 2.1.1", "serde", "sp-core", "sp-externalities", @@ -1864,7 +1750,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -1875,13 +1761,13 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-io", "sp-runtime", @@ -1892,15 +1778,15 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand_chacha 0.3.1", - "scale-info", + "scale-info 2.1.1", "sp-runtime", "sp-std", "xcm", @@ -1910,10 +1796,10 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -1926,15 +1812,15 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-test-relay-sproof-builder", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", - "scale-info", + "scale-info 2.1.1", "sp-api", "sp-core", "sp-inherents", @@ -1949,9 +1835,11 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", + "futures 0.3.21", + "parity-scale-codec 3.1.2", "sp-inherents", "sp-std", "sp-timestamp", @@ -1960,11 +1848,11 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -1977,59 +1865,34 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-primitives-core", "derive_more", "futures 0.3.21", + "jsonrpsee-core 0.9.0", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-overseer", - "sc-client-api", - "sc-service", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-state-machine", - "thiserror", -] - -[[package]] -name = "cumulus-relay-chain-local" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" -dependencies = [ - "async-trait", - "cumulus-primitives-core", - "cumulus-relay-chain-interface", - "futures 0.3.21", - "futures-timer", - "parking_lot 0.12.0", - "polkadot-client", "polkadot-service", "sc-client-api", - "sc-consensus-babe", - "sc-network", "sc-service", - "sc-telemetry", - "sc-tracing", "sp-api", "sp-blockchain", - "sp-consensus", "sp-core", "sp-runtime", "sp-state-machine", - "tracing", + "thiserror", ] [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sp-runtime", "sp-state-machine", @@ -2079,7 +1942,6 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-interface", - "cumulus-relay-chain-local", "darwinia-parachain-runtime", "dc-primitives", "dc-rpc", @@ -2088,10 +1950,9 @@ dependencies = [ "futures 0.3.21", "jsonrpc-core", "log", - "pallet-fee-market-rpc-runtime-api", "pallet-transaction-payment-rpc", "pangolin-parachain-runtime", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "polkadot-cli", "polkadot-parachain", "polkadot-primitives", @@ -2155,7 +2016,6 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", - "pallet-fee-market-rpc-runtime-api", "pallet-multisig", "pallet-proxy", "pallet-session", @@ -2168,9 +2028,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "polkadot-parachain", - "scale-info", + "scale-info 1.0.0", "smallvec", "sp-api", "sp-block-builder", @@ -2219,15 +2079,11 @@ dependencies = [ name = "dc-common-runtime" version = "5.2.0-rc1" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", "dc-primitives", "frame-support", "frame-system", "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", "pallet-collator-selection", - "pallet-fee-market", "pallet-transaction-payment", "smallvec", "sp-runtime", @@ -2248,7 +2104,6 @@ version = "5.2.0-rc1" dependencies = [ "dc-primitives", "jsonrpc-core", - "pallet-fee-market-rpc", "pallet-transaction-payment-rpc", "sc-client-api", "sc-rpc", @@ -2259,6 +2114,15 @@ dependencies = [ "substrate-frame-rpc-system", ] +[[package]] +name = "der" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +dependencies = [ + "const-oid", +] + [[package]] name = "derivative" version = "2.2.0" @@ -2309,6 +2173,7 @@ checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ "block-buffer 0.10.2", "crypto-common", + "subtle", ] [[package]] @@ -2401,11 +2266,22 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" +[[package]] +name = "ecdsa" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +dependencies = [ + "der", + "elliptic-curve", + "signature", +] + [[package]] name = "ed25519" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cb2103c580a9f8732121f755eccb51312f7db26314664314c119298107064b" +checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" dependencies = [ "signature", ] @@ -2430,6 +2306,24 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "elliptic-curve" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +dependencies = [ + "base16ct", + "crypto-bigint", + "der", + "ff", + "generic-array 0.14.5", + "group", + "rand_core 0.6.3", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "enum-as-inner" version = "0.3.4" @@ -2528,6 +2422,30 @@ dependencies = [ "futures 0.3.21", ] +[[package]] +name = "expander" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a718c0675c555c5f976fff4ea9e2c150fa06cefa201cadef87cfbf9324075881" +dependencies = [ + "blake3 1.3.1", + "fs-err", + "proc-macro2", + "quote", +] + +[[package]] +name = "expander" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "309f21c39e8e38e4b6eda07e155bd7a4e5fc4d707cefd0402cc82a8b6bb65aaa" +dependencies = [ + "blake2 0.10.4", + "fs-err", + "proc-macro2", + "quote", +] + [[package]] name = "fake-simd" version = "0.1.2" @@ -2549,6 +2467,31 @@ dependencies = [ "instant", ] +[[package]] +name = "fatality" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad875162843b0d046276327afe0136e9ed3a23d5a754210fb6f1f33610d39ab" +dependencies = [ + "fatality-proc-macro", + "thiserror", +] + +[[package]] +name = "fatality-proc-macro" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd" +dependencies = [ + "expander 0.0.4", + "indexmap", + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", + "thiserror", +] + [[package]] name = "fdlimit" version = "0.2.1" @@ -2558,6 +2501,16 @@ dependencies = [ "libc", ] +[[package]] +name = "ff" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" +dependencies = [ + "rand_core 0.6.3", + "subtle", +] + [[package]] name = "file-per-thread-logger" version = "0.1.5" @@ -2570,18 +2523,18 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.14.4" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" +checksum = "d9def033d8505edf199f6a5d07aa7e6d2d6185b164293b77f0efd108f4f3e11d" dependencies = [ "either", "futures 0.3.21", "futures-timer", "log", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.11.2", - "scale-info", + "scale-info 2.1.1", ] [[package]] @@ -2624,9 +2577,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", ] [[package]] @@ -2642,15 +2595,15 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "linregress", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", - "scale-info", + "scale-info 2.1.1", "serde", "sp-api", "sp-application-crypto", @@ -2664,7 +2617,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "Inflector", "chrono", @@ -2672,31 +2625,45 @@ dependencies = [ "frame-benchmarking", "frame-support", "handlebars", + "hash-db", + "hex", + "itertools", + "kvdb", "linked-hash-map", "log", - "parity-scale-codec", + "memory-db", + "parity-scale-codec 3.1.2", + "rand 0.8.5", "sc-cli", + "sc-client-api", "sc-client-db", "sc-executor", "sc-service", "serde", "serde_json", + "serde_nanos", + "sp-api", + "sp-blockchain", "sp-core", + "sp-database", "sp-externalities", "sp-keystore", "sp-runtime", "sp-state-machine", + "sp-std", + "sp-storage", + "sp-trie", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-arithmetic", "sp-npos-elections", "sp-std", @@ -2705,12 +2672,12 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -2720,20 +2687,20 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ed5e5c346de62ca5c184b4325a6600d1eaca210666e4606fe4e449574978d0" +checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", ] [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "bitflags", "frame-metadata", @@ -2741,9 +2708,9 @@ dependencies = [ "impl-trait-for-tuples", "log", "once_cell", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", - "scale-info", + "scale-info 2.1.1", "serde", "smallvec", "sp-arithmetic", @@ -2762,7 +2729,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2774,7 +2741,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.3", @@ -2786,7 +2753,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro2", "quote", @@ -2796,12 +2763,12 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-io", @@ -2813,13 +2780,13 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -2828,16 +2795,16 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", ] [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "sp-api", @@ -2873,6 +2840,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + [[package]] name = "fuchsia-zircon" version = "0.3.3" @@ -3125,6 +3098,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "group" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +dependencies = [ + "ff", + "rand_core 0.6.3", + "subtle", +] + [[package]] name = "h2" version = "0.3.13" @@ -3417,11 +3401,11 @@ dependencies = [ [[package]] name = "impl-codec" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", ] [[package]] @@ -3709,7 +3693,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05fd8cd6c6b1bbd06881d2cf88f1fc83cc36c98f2219090f839115fb4a956cb9" dependencies = [ - "jsonrpsee-core", + "jsonrpsee-core 0.8.0", "jsonrpsee-proc-macros", "jsonrpsee-types 0.8.0", "jsonrpsee-ws-client 0.8.0", @@ -3723,7 +3707,7 @@ checksum = "3303cdf246e6ab76e2866fb3d9acb6c76a068b1b28bd923a1b7a8122257ad7b5" dependencies = [ "futures 0.3.21", "http", - "jsonrpsee-core", + "jsonrpsee-core 0.8.0", "jsonrpsee-types 0.8.0", "pin-project 1.0.10", "rustls-native-certs 0.6.2", @@ -3759,6 +3743,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22abc3274b265dcefe2e26c4beecf9fda4fffa48cf94930443a6c73678f020d5" +dependencies = [ + "anyhow", + "arrayvec 0.7.2", + "async-trait", + "beef", + "futures-channel", + "hyper", + "jsonrpsee-types 0.9.0", + "serde", + "serde_json", + "soketto", + "thiserror", +] + [[package]] name = "jsonrpsee-proc-macros" version = "0.8.0" @@ -3804,6 +3807,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f4c45d2e2aa1db4c7d7d7dbaabc10a5b5258d99cd9d42fbfd5260b76f80c324" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "jsonrpsee-utils" version = "0.4.1" @@ -3846,10 +3863,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5" dependencies = [ "jsonrpsee-client-transport", - "jsonrpsee-core", + "jsonrpsee-core 0.8.0", "jsonrpsee-types 0.8.0", ] +[[package]] +name = "k256" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" +dependencies = [ + "cfg-if 1.0.0", + "ecdsa", + "elliptic-curve", + "sec1", +] + [[package]] name = "keccak" version = "0.1.0" @@ -3868,11 +3897,11 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -3922,12 +3951,12 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "smallvec", @@ -3956,8 +3985,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "polkadot-primitives", @@ -3977,9 +4006,9 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a3f58dc069ec0e205a27f5b45920722a46faed802a0541538241af6228f512" +checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86" dependencies = [ "parity-util-mem", "smallvec", @@ -3987,20 +4016,20 @@ dependencies = [ [[package]] name = "kvdb-memorydb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5" +checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "kvdb-rocksdb" -version = "0.14.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1b6ea8f2536f504b645ad78419c8246550e19d2c3419a167080ce08edee35a" +checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1" dependencies = [ "fs-swap", "kvdb", @@ -4008,7 +4037,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rocksdb", "smallvec", @@ -4364,7 +4393,7 @@ dependencies = [ "pin-project 1.0.10", "rand 0.7.3", "salsa20", - "sha3", + "sha3 0.9.1", ] [[package]] @@ -4533,14 +4562,17 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "6.20.3" +version = "0.6.1+6.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d" +checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" dependencies = [ "bindgen", + "bzip2-sys", "cc", "glob", "libc", + "libz-sys", + "tikv-jemalloc-sys", ] [[package]] @@ -4633,15 +4665,6 @@ version = "0.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a261afc61b7a5e323933b402ca6a1765183687c614789b1e4db7762ed4230bca" -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - [[package]] name = "lock_api" version = "0.4.7" @@ -4789,12 +4812,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d505169b746dacf02f7d14d8c80b34edfd8212159c63d23c977739a0d960c626" +checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" dependencies = [ "hash-db", - "hashbrown 0.11.2", + "hashbrown 0.12.1", "parity-util-mem", ] @@ -4827,8 +4850,8 @@ dependencies = [ [[package]] name = "metered-channel" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "derive_more", "futures 0.3.21", @@ -4961,12 +4984,12 @@ checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab" dependencies = [ "blake2b_simd", "blake2s_simd", - "blake3", + "blake3 0.3.8", "digest 0.9.0", "generic-array 0.14.5", "multihash-derive", "sha2 0.9.9", - "sha3", + "sha3 0.9.1", "unsigned-varint 0.5.1", ] @@ -5265,13 +5288,13 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "pallet-timestamp", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-consensus-aura", "sp-runtime", @@ -5281,13 +5304,13 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-authority-discovery", "sp-runtime", @@ -5297,13 +5320,13 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-authorship", "sp-runtime", "sp-std", @@ -5312,7 +5335,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", @@ -5321,8 +5344,8 @@ dependencies = [ "pallet-authorship", "pallet-session", "pallet-timestamp", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", @@ -5336,7 +5359,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5344,8 +5367,8 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5356,14 +5379,14 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-std", ] @@ -5371,14 +5394,14 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "beefy-primitives", "frame-support", "frame-system", "pallet-session", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-runtime", "sp-std", @@ -5387,21 +5410,21 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "beefy-merkle-tree", "beefy-primitives", "frame-support", "frame-system", "hex", - "libsecp256k1", + "k256", "log", "pallet-beefy", "pallet-mmr", "pallet-mmr-primitives", "pallet-session", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-io", @@ -5412,15 +5435,15 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "pallet-treasury", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5430,32 +5453,15 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-message-dispatch", + "bp-runtime", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-bridge-dispatch" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" -dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -5464,19 +5470,18 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", + "bp-header-chain", + "bp-runtime", + "bp-test-utils", "finality-grandpa", - "frame-benchmarking", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-finality-grandpa", "sp-runtime", @@ -5484,65 +5489,21 @@ dependencies = [ "sp-trie", ] -[[package]] -name = "pallet-bridge-grandpa" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" -dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-test-utils 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "finality-grandpa", - "frame-support", - "frame-system", - "log", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", - "sp-trie", -] - -[[package]] -name = "pallet-bridge-messages" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bitvec 0.20.4", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", - "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bitvec 1.0.0", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-runtime", @@ -5552,7 +5513,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5560,9 +5521,9 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand 0.8.5", - "scale-info", + "scale-info 2.1.1", "serde", "sp-runtime", "sp-staking", @@ -5572,14 +5533,14 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5589,13 +5550,13 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-io", "sp-runtime", @@ -5605,16 +5566,16 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand 0.7.3", - "scale-info", + "scale-info 2.1.1", "sp-arithmetic", "sp-core", "sp-io", @@ -5622,20 +5583,20 @@ dependencies = [ "sp-runtime", "sp-std", "static_assertions", - "strum", + "strum 0.23.0", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-npos-elections", @@ -5643,65 +5604,16 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-fee-market" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bitvec 1.0.0", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "frame-benchmarking", - "frame-support", - "frame-system", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "pallet-timestamp", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-fee-market-rpc" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "pallet-fee-market-rpc-runtime-api", - "parity-scale-codec", - "sp-api", - "sp-blockchain", - "sp-runtime", -] - -[[package]] -name = "pallet-fee-market-rpc-runtime-api" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17#3f46f0ad5fe443bc31112334ef1d22d3d331a897" -dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "parity-scale-codec", - "serde", - "sp-api", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-arithmetic", "sp-runtime", "sp-std", @@ -5710,7 +5622,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", @@ -5718,8 +5630,8 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-core", "sp-finality-grandpa", @@ -5733,14 +5645,14 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "enumflags2", "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -5749,15 +5661,15 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "pallet-authorship", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-core", "sp-io", @@ -5769,13 +5681,13 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-keyring", @@ -5786,14 +5698,14 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5803,15 +5715,15 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", "frame-support", "frame-system", "pallet-mmr-primitives", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5821,12 +5733,12 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "serde", "sp-api", "sp-core", @@ -5837,13 +5749,13 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "pallet-mmr-primitives", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "serde", "sp-api", "sp-blockchain", @@ -5854,13 +5766,13 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -5869,12 +5781,12 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -5883,14 +5795,14 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "log", "pallet-balances", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-runtime", "sp-staking", @@ -5900,7 +5812,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5913,8 +5825,8 @@ dependencies = [ "pallet-offences", "pallet-session", "pallet-staking", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-staking", "sp-std", @@ -5923,13 +5835,13 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5939,13 +5851,13 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -5954,12 +5866,12 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -5968,14 +5880,14 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -5984,15 +5896,15 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "log", "pallet-timestamp", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -6005,7 +5917,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", @@ -6021,13 +5933,13 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand_chacha 0.2.2", - "scale-info", + "scale-info 2.1.1", "sp-runtime", "sp-std", ] @@ -6035,7 +5947,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6044,9 +5956,9 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand_chacha 0.2.2", - "scale-info", + "scale-info 2.1.1", "serde", "sp-application-crypto", "sp-io", @@ -6058,7 +5970,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -6069,7 +5981,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", "sp-arithmetic", @@ -6078,12 +5990,12 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -6092,14 +6004,14 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-inherents", "sp-io", "sp-runtime", @@ -6110,15 +6022,15 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "pallet-treasury", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-io", @@ -6129,12 +6041,12 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "smallvec", "sp-core", @@ -6146,13 +6058,13 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-blockchain", "sp-core", @@ -6163,10 +6075,10 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-runtime", ] @@ -6174,15 +6086,15 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "impl-trait-for-tuples", "pallet-balances", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-runtime", "sp-std", @@ -6191,13 +6103,13 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -6207,28 +6119,28 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-std", ] [[package]] name = "pallet-xcm" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-runtime", @@ -6239,15 +6151,15 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-std", "xcm", @@ -6259,13 +6171,6 @@ name = "pangolin-parachain-runtime" version = "5.2.0-rc1" dependencies = [ "array-bytes", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-pangolin", - "bp-pangolin-parachain", - "bp-polkadot-core 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -6285,12 +6190,7 @@ dependencies = [ "pallet-aura", "pallet-authorship", "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.17)", "pallet-collator-selection", - "pallet-fee-market", - "pallet-fee-market-rpc-runtime-api", "pallet-multisig", "pallet-proxy", "pallet-session", @@ -6303,9 +6203,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "polkadot-parachain", - "scale-info", + "scale-info 1.0.0", "smallvec", "sp-api", "sp-block-builder", @@ -6327,13 +6227,13 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", ] @@ -6366,7 +6266,21 @@ dependencies = [ "bitvec 0.20.4", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive", + "parity-scale-codec-derive 2.3.1", + "serde", +] + +[[package]] +name = "parity-scale-codec" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" +dependencies = [ + "arrayvec 0.7.2", + "bitvec 1.0.0", + "byte-slice-cast", + "impl-trait-for-tuples", + "parity-scale-codec-derive 3.1.2", "serde", ] @@ -6382,6 +6296,18 @@ dependencies = [ "syn", ] +[[package]] +name = "parity-scale-codec-derive" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "parity-send-wrapper" version = "0.1.0" @@ -6404,15 +6330,15 @@ dependencies = [ [[package]] name = "parity-util-mem" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4cb4e169446179cbc6b8b6320cc9fca49bd2e94e8db25f25f200a8ea774770" +checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.11.2", + "hashbrown 0.12.1", "impl-trait-for-tuples", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "primitive-types", "smallvec", "winapi 0.3.9", @@ -6464,19 +6390,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - -[[package]] -name = "parking_lot" -version = "0.10.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.2", -] +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" [[package]] name = "parking_lot" @@ -6485,7 +6401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.7", + "lock_api", "parking_lot_core 0.8.5", ] @@ -6495,24 +6411,10 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ - "lock_api 0.4.7", + "lock_api", "parking_lot_core 0.9.3", ] -[[package]] -name = "parking_lot_core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "smallvec", - "winapi 0.3.9", -] - [[package]] name = "parking_lot_core" version = "0.8.5" @@ -6522,7 +6424,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "smallvec", "winapi 0.3.9", ] @@ -6535,7 +6437,7 @@ checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "smallvec", "windows-sys", ] @@ -6693,6 +6595,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" +dependencies = [ + "der", + "spki", + "zeroize", +] + [[package]] name = "pkg-config" version = "0.3.25" @@ -6707,8 +6620,8 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "polkadot-approval-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -6721,8 +6634,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -6734,13 +6647,14 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "derive_more", + "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -6756,12 +6670,13 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ + "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -6776,8 +6691,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "clap", "frame-benchmarking-cli", @@ -6799,8 +6714,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6830,11 +6745,11 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "always-assert", - "derive_more", + "fatality", "futures 0.3.21", "futures-timer", "polkadot-node-network-protocol", @@ -6851,12 +6766,12 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", - "scale-info", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -6864,13 +6779,14 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "derive_more", + "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -6886,10 +6802,10 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", @@ -6900,8 +6816,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "futures-timer", @@ -6920,13 +6836,13 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -6939,11 +6855,11 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -6957,17 +6873,17 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "derive_more", "futures 0.3.21", "futures-timer", "kvdb", "lru 0.7.5", "merlin", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -6985,14 +6901,14 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7005,10 +6921,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7023,8 +6939,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -7038,12 +6954,12 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7056,8 +6972,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -7071,13 +6987,13 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7088,13 +7004,14 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ + "fatality", "futures 0.3.21", "kvdb", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7106,8 +7023,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", "futures 0.3.21", @@ -7123,10 +7040,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -7140,8 +7057,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "always-assert", "assert_matches", @@ -7149,7 +7066,7 @@ dependencies = [ "async-std", "futures 0.3.21", "futures-timer", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "pin-project 1.0.10", "polkadot-core-primitives", "polkadot-node-subsystem-util", @@ -7170,8 +7087,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "polkadot-node-primitives", @@ -7186,8 +7103,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "memory-lru", @@ -7204,15 +7121,15 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-std", "lazy_static", "log", "mick-jaeger", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-primitives", "sc-network", @@ -7222,15 +7139,15 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bs58", "futures 0.3.21", "futures-timer", "log", "metered-channel", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sc-cli", "sc-service", @@ -7241,30 +7158,30 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", - "derive_more", + "fatality", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", "sc-authority-discovery", "sc-network", - "strum", + "strum 0.24.0", "thiserror", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bounded-vec", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "schnorrkel", @@ -7281,8 +7198,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7291,8 +7208,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "derive_more", "futures 0.3.21", @@ -7310,16 +7227,21 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", "derive_more", + "fatality", "futures 0.3.21", "itertools", + "kvdb", "lru 0.7.5", "metered-channel", - "parity-scale-codec", + "parity-db", + "parity-scale-codec 3.1.2", + "parity-util-mem", + "parking_lot 0.11.2", "pin-project 1.0.10", "polkadot-node-jaeger", "polkadot-node-metrics", @@ -7338,14 +7260,14 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", "futures-timer", "lru 0.7.5", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7359,8 +7281,8 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", "futures 0.3.21", @@ -7376,9 +7298,10 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ + "expander 0.0.5", "proc-macro-crate 1.1.3", "proc-macro2", "quote", @@ -7387,15 +7310,15 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "derive_more", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "polkadot-core-primitives", - "scale-info", + "scale-info 2.1.1", "serde", "sp-core", "sp-runtime", @@ -7404,8 +7327,8 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "env_logger", "kusama-runtime", @@ -7419,17 +7342,17 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-system", "hex-literal", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", - "scale-info", + "scale-info 2.1.1", "serde", "sp-api", "sp-application-crypto", @@ -7449,8 +7372,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7480,11 +7403,11 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -7530,13 +7453,13 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-constants", "polkadot-runtime-parachains", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "smallvec", @@ -7564,11 +7487,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7588,11 +7511,11 @@ dependencies = [ "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-parachains", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "slot-range-helper", @@ -7611,8 +7534,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "polkadot-primitives", @@ -7623,11 +7546,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bs58", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sp-std", "sp-tracing", @@ -7635,11 +7558,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bitflags", - "bitvec 0.20.4", + "bitvec 1.0.0", "derive_more", "frame-benchmarking", "frame-support", @@ -7653,13 +7576,13 @@ dependencies = [ "pallet-staking", "pallet-timestamp", "pallet-vesting", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-metrics", "rand 0.8.5", "rand_chacha 0.3.1", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "sp-api", "sp-core", @@ -7677,8 +7600,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "async-trait", "beefy-gadget", @@ -7695,6 +7618,7 @@ dependencies = [ "pallet-mmr-primitives", "pallet-staking", "pallet-transaction-payment-rpc-runtime-api", + "parity-db", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", @@ -7778,14 +7702,14 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "arrayvec 0.5.2", - "derive_more", + "fatality", "futures 0.3.21", "indexmap", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7799,10 +7723,10 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sp-core", ] @@ -7851,14 +7775,14 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "primitive-types" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" +checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", "impl-codec", "impl-serde", - "scale-info", + "scale-info 2.1.1", "uint", ] @@ -7907,11 +7831,11 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.38" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa" +checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -8155,12 +8079,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.13" @@ -8177,7 +8095,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom 0.2.6", - "redox_syscall 0.2.13", + "redox_syscall", "thiserror", ] @@ -8266,12 +8184,12 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "env_logger", "jsonrpsee 0.8.0", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "serde", "serde_json", "sp-core", @@ -8322,9 +8240,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7" +checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" dependencies = [ "libc", "librocksdb-sys", @@ -8332,15 +8250,15 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-messages", "bp-rococo", - "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bp-runtime", "bp-wococo", - "bridge-runtime-common 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "bridge-runtime-common", "frame-benchmarking", "frame-executive", "frame-support", @@ -8354,9 +8272,9 @@ dependencies = [ "pallet-balances", "pallet-beefy", "pallet-beefy-mmr", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "pallet-bridge-dispatch", + "pallet-bridge-grandpa", + "pallet-bridge-messages", "pallet-collective", "pallet-grandpa", "pallet-im-online", @@ -8375,13 +8293,13 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rococo-runtime-constants", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "smallvec", @@ -8407,8 +8325,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "polkadot-primitives", @@ -8579,7 +8497,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", "sp-core", @@ -8590,7 +8508,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", @@ -8598,7 +8516,7 @@ dependencies = [ "ip_network", "libp2p", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "prost", "prost-build", "rand 0.7.3", @@ -8617,12 +8535,12 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", @@ -8640,9 +8558,9 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sp-api", "sp-block-builder", @@ -8656,11 +8574,11 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.3", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-chain-spec-derive", "sc-network", "sc-telemetry", @@ -8673,7 +8591,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -8684,7 +8602,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "chrono", "clap", @@ -8694,7 +8612,7 @@ dependencies = [ "libp2p", "log", "names", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand 0.7.3", "regex", "rpassword", @@ -8722,14 +8640,14 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "fnv", "futures 0.3.21", "hash-db", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -8750,7 +8668,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "hash-db", "kvdb", @@ -8759,8 +8677,8 @@ dependencies = [ "linked-hash-map", "log", "parity-db", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-client-api", "sc-state-db", "sp-arithmetic", @@ -8775,14 +8693,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "libp2p", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sc-utils", "serde", @@ -8799,12 +8717,12 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -8828,7 +8746,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "fork-tree", @@ -8838,8 +8756,8 @@ dependencies = [ "num-bigint", "num-rational 0.2.4", "num-traits", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "rand 0.7.3", "retain_mut", "sc-client-api", @@ -8871,7 +8789,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -8895,10 +8813,10 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "fork-tree", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-consensus", "sp-blockchain", @@ -8908,13 +8826,13 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-consensus", "sc-telemetry", @@ -8933,7 +8851,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "sc-client-api", "sp-authorship", @@ -8944,14 +8862,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "lazy_static", - "libsecp256k1", - "log", "lru 0.6.6", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -8966,16 +8882,17 @@ dependencies = [ "sp-trie", "sp-version", "sp-wasm-interface", + "tracing", "wasmi", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-allocator", "sp-core", "sp-maybe-compressed-blob", @@ -8989,10 +8906,10 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-allocator", "sc-executor-common", "scoped-tls", @@ -9005,12 +8922,12 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "cfg-if 1.0.0", "libc", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-wasm 0.42.2", "sc-allocator", "sc-executor-common", @@ -9023,17 +8940,19 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ + "ahash", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", "futures 0.3.21", "futures-timer", + "hex", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "rand 0.8.5", "sc-block-builder", "sc-chain-spec", @@ -9061,7 +8980,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "finality-grandpa", "futures 0.3.21", @@ -9070,7 +8989,7 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-finality-grandpa", "sc-rpc", @@ -9085,7 +9004,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "ansi_term", "futures 0.3.21", @@ -9102,11 +9021,11 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "hex", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "serde_json", "sp-application-crypto", "sp-core", @@ -9117,9 +9036,8 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "async-std", "async-trait", "asynchronous-codec 0.5.0", "bitflags", @@ -9137,8 +9055,8 @@ dependencies = [ "linked_hash_set", "log", "lru 0.7.5", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "prost", "prost-build", @@ -9167,8 +9085,9 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ + "ahash", "futures 0.3.21", "futures-timer", "libp2p", @@ -9183,7 +9102,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "bytes 1.1.0", "fnv", @@ -9194,8 +9113,8 @@ dependencies = [ "hyper-rustls", "num_cpus", "once_cell", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "rand 0.7.3", "sc-client-api", "sc-network", @@ -9211,7 +9130,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "libp2p", @@ -9224,7 +9143,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9233,15 +9152,15 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -9264,7 +9183,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -9272,8 +9191,8 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-chain-spec", "sc-transaction-pool-api", "serde", @@ -9289,7 +9208,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -9306,7 +9225,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "directories", @@ -9317,9 +9236,9 @@ dependencies = [ "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "rand 0.7.3", "sc-block-builder", @@ -9370,13 +9289,13 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sp-core", ] @@ -9384,18 +9303,17 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", "sc-consensus-epochs", "sc-finality-grandpa", - "sc-rpc-api", "serde", "serde_json", "sp-blockchain", @@ -9406,13 +9324,13 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "chrono", "futures 0.3.21", "libp2p", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "rand 0.7.3", "serde", @@ -9424,7 +9342,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "ansi_term", "atty", @@ -9433,7 +9351,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rustc-hash", "sc-client-api", @@ -9455,7 +9373,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -9466,15 +9384,15 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "futures-timer", "linked-hash-map", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "retain_mut", "sc-client-api", "sc-transaction-pool-api", @@ -9493,7 +9411,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "log", @@ -9506,12 +9424,13 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "futures-timer", "lazy_static", - "parking_lot 0.11.2", + "log", + "parking_lot 0.12.0", "prometheus", ] @@ -9524,8 +9443,21 @@ dependencies = [ "bitvec 0.20.4", "cfg-if 1.0.0", "derive_more", - "parity-scale-codec", - "scale-info-derive", + "parity-scale-codec 2.3.1", + "scale-info-derive 1.0.0", +] + +[[package]] +name = "scale-info" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" +dependencies = [ + "bitvec 1.0.0", + "cfg-if 1.0.0", + "derive_more", + "parity-scale-codec 3.1.2", + "scale-info-derive 2.1.1", "serde", ] @@ -9541,6 +9473,18 @@ dependencies = [ "syn", ] +[[package]] +name = "scale-info-derive" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4260c630e8a8a33429d1688eff2f163f24c65a4e1b1578ef6b565061336e4b6f" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "schannel" version = "0.1.19" @@ -9601,6 +9545,37 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sec1" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +dependencies = [ + "der", + "generic-array 0.14.5", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "secp256k1" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" +dependencies = [ + "secp256k1-sys", +] + +[[package]] +name = "secp256k1-sys" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" +dependencies = [ + "cc", +] + [[package]] name = "secrecy" version = "0.8.0" @@ -9706,6 +9681,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_nanos" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e" +dependencies = [ + "serde", +] + [[package]] name = "sha-1" version = "0.8.2" @@ -9779,6 +9763,16 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha3" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" +dependencies = [ + "digest 0.10.3", + "keccak", +] + [[package]] name = "sharded-slab" version = "0.1.4" @@ -9796,9 +9790,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" +checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" dependencies = [ "libc", "signal-hook-registry", @@ -9815,9 +9809,12 @@ dependencies = [ [[package]] name = "signature" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" +checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +dependencies = [ + "rand_core 0.6.3", +] [[package]] name = "simba" @@ -9839,11 +9836,11 @@ checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "slot-range-helper" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "enumn", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", "sp-runtime", "sp-std", @@ -9877,7 +9874,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7" dependencies = [ "aes-gcm", - "blake2", + "blake2 0.9.2", "chacha20poly1305", "rand 0.8.5", "rand_core 0.6.3", @@ -9928,11 +9925,11 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "hash-db", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api-proc-macro", "sp-core", "sp-runtime", @@ -9945,9 +9942,9 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "blake2-rfc", + "blake2 0.10.4", "proc-macro-crate 1.1.3", "proc-macro2", "quote", @@ -9956,11 +9953,11 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-io", @@ -9969,13 +9966,13 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-debug-derive", "sp-std", @@ -9985,10 +9982,10 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-application-crypto", "sp-runtime", @@ -9998,10 +9995,10 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-inherents", "sp-runtime", "sp-std", @@ -10010,9 +10007,9 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-inherents", "sp-runtime", @@ -10022,13 +10019,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "log", "lru 0.7.5", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sp-api", "sp-consensus", "sp-database", @@ -10040,13 +10037,13 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-core", "sp-inherents", "sp-runtime", @@ -10059,11 +10056,11 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-application-crypto", "sp-consensus", @@ -10077,12 +10074,12 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "merlin", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-api", "sp-application-crypto", @@ -10100,21 +10097,23 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-arithmetic", "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "schnorrkel", "sp-core", "sp-runtime", @@ -10123,8 +10122,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "base58", "bitflags", @@ -10142,17 +10141,17 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "primitive-types", "rand 0.7.3", "regex", - "scale-info", + "scale-info 2.1.1", "schnorrkel", + "secp256k1", "secrecy", "serde", - "sha2 0.10.2", "sp-core-hashing", "sp-debug-derive", "sp-externalities", @@ -10163,8 +10162,6 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", - "tiny-keccak", - "twox-hash", "wasmi", "zeroize", ] @@ -10172,20 +10169,21 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "blake2-rfc", + "blake2 0.10.4", "byteorder", + "digest 0.10.3", "sha2 0.10.2", + "sha3 0.10.1", "sp-std", - "tiny-keccak", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro2", "quote", @@ -10196,16 +10194,16 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "kvdb", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro2", "quote", @@ -10214,11 +10212,11 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-std", "sp-storage", ] @@ -10226,12 +10224,12 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "finality-grandpa", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-api", "sp-application-crypto", @@ -10244,11 +10242,11 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-core", "sp-runtime", "sp-std", @@ -10257,15 +10255,16 @@ dependencies = [ [[package]] name = "sp-io" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "hash-db", "libsecp256k1", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", + "secp256k1", "sp-core", "sp-externalities", "sp-keystore", @@ -10281,25 +10280,25 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "lazy_static", "sp-core", "sp-runtime", - "strum", + "strum 0.23.0", ] [[package]] name = "sp-keystore" -version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "merlin", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "schnorrkel", "serde", "sp-core", @@ -10310,7 +10309,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "thiserror", "zstd", @@ -10319,10 +10318,10 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-arithmetic", "sp-core", @@ -10334,7 +10333,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -10345,7 +10344,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "sp-api", "sp-core", @@ -10355,7 +10354,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "backtrace", "lazy_static", @@ -10364,8 +10363,8 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "rustc-hash", "serde", @@ -10374,18 +10373,18 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "paste", "rand 0.7.3", - "scale-info", + "scale-info 2.1.1", "serde", "sp-application-crypto", "sp-arithmetic", @@ -10396,11 +10395,11 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "primitive-types", "sp-externalities", "sp-runtime-interface-proc-macro", @@ -10413,8 +10412,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "Inflector", "proc-macro-crate 1.1.3", @@ -10426,7 +10425,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "serde", "serde_json", @@ -10435,10 +10434,10 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-core", "sp-runtime", @@ -10449,24 +10448,24 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-std", ] [[package]] name = "sp-state-machine" -version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "hash-db", "log", "num-traits", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "rand 0.7.3", "smallvec", "sp-core", @@ -10483,15 +10482,15 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" [[package]] name = "sp-storage" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "ref-cast", "serde", "sp-debug-derive", @@ -10501,7 +10500,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", "sp-core", @@ -10514,12 +10513,12 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-inherents", "sp-runtime", @@ -10529,10 +10528,10 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-std", "tracing", "tracing-core", @@ -10542,7 +10541,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "sp-api", "sp-runtime", @@ -10551,12 +10550,12 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-inherents", "sp-runtime", @@ -10566,28 +10565,29 @@ dependencies = [ [[package]] name = "sp-trie" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "hash-db", "memory-db", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-std", + "thiserror", "trie-db", "trie-root", ] [[package]] name = "sp-version" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-wasm 0.42.2", - "scale-info", + "scale-info 2.1.1", "serde", "sp-core-hashing-proc-macro", "sp-runtime", @@ -10599,9 +10599,9 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "proc-macro2", "quote", "syn", @@ -10609,12 +10609,12 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-std", "wasmi", "wasmtime", @@ -10626,6 +10626,16 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spki" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "ss58-registry" version = "1.18.0" @@ -10703,7 +10713,16 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" dependencies = [ - "strum_macros", + "strum_macros 0.23.1", +] + +[[package]] +name = "strum" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8" +dependencies = [ + "strum_macros 0.24.0", ] [[package]] @@ -10719,6 +10738,19 @@ dependencies = [ "syn", ] +[[package]] +name = "strum_macros" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" +dependencies = [ + "heck 0.4.0", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + [[package]] name = "substrate-bip39" version = "0.4.4" @@ -10735,7 +10767,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "platforms", ] @@ -10743,7 +10775,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", @@ -10751,7 +10783,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", @@ -10765,9 +10797,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "async-std", "futures-util", "hyper", "log", @@ -10779,13 +10810,13 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", "sp-maybe-compressed-blob", - "strum", + "strum 0.23.0", "tempfile", "toml", "walkdir", @@ -10800,13 +10831,13 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07e33e919ebcd69113d5be0e4d70c5707004ff45188910106854f38b960df4a" +checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -10842,7 +10873,7 @@ dependencies = [ "cfg-if 1.0.0", "fastrand", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "remove_dir_all", "winapi 0.3.9", ] @@ -10913,6 +10944,17 @@ dependencies = [ "threadpool", ] +[[package]] +name = "tikv-jemalloc-sys" +version = "0.4.3+5.2.1-patched.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49" +dependencies = [ + "cc", + "fs_extra", + "libc", +] + [[package]] name = "time" version = "0.1.44" @@ -10943,15 +10985,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -10979,6 +11012,7 @@ dependencies = [ "mio 0.8.3", "num_cpus", "once_cell", + "parking_lot 0.12.0", "pin-project-lite 0.2.9", "signal-hook-registry", "socket2 0.4.4", @@ -11235,12 +11269,12 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "clap", "jsonrpsee 0.4.1", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "remote-externalities", "sc-chain-spec", "sc-cli", @@ -11270,6 +11304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if 1.0.0", + "digest 0.10.3", "rand 0.8.5", "static_assertions", ] @@ -11313,6 +11348,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +[[package]] +name = "unicode-ident" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" + [[package]] name = "unicode-normalization" version = "0.1.19" @@ -11825,11 +11866,11 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -11877,13 +11918,13 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "pallet-xcm-benchmarks", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "smallvec", @@ -11911,8 +11952,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "polkadot-primitives", @@ -12071,29 +12112,29 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "derivative", "impl-trait-for-tuples", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "xcm-procedural", ] [[package]] name = "xcm-builder" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-support", "frame-system", "log", "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info", + "scale-info 2.1.1", "sp-arithmetic", "sp-io", "sp-runtime", @@ -12104,14 +12145,14 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "frame-benchmarking", "frame-support", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-arithmetic", "sp-core", "sp-io", @@ -12123,7 +12164,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "Inflector", "proc-macro2", diff --git a/src/service/mod.rs b/src/service/mod.rs index 702b1723..8c3a402b 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -65,7 +65,7 @@ use sc_service::{ use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sc_transaction_pool::FullPool; use sp_api::{ApiExt, HeaderT}; -use sp_consensus::{CacheKeyId, CanAuthorWithNativeVersion, SlotData}; +use sp_consensus::{CacheKeyId, CanAuthorWithNativeVersion}; use sp_consensus_aura::sr25519::{AuthorityId as AuraId, AuthorityPair as AuraPair}; use sp_keystore::SyncCryptoStorePtr; use sp_runtime::{generic::BlockId, traits::BlakeTwo256}; @@ -499,9 +499,9 @@ where let time = sp_timestamp::InherentDataProvider::from_system_time(); let slot = - sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *time, - slot_duration.slot_duration(), + slot_duration, ); Ok((time, slot)) @@ -595,9 +595,9 @@ where let time = sp_timestamp::InherentDataProvider::from_system_time(); let slot = - sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *time, - slot_duration.slot_duration(), + slot_duration, ); let parachain_inherent = parachain_inherent.ok_or_else(|| { From 8ae7dbdd726d108c16426f7da99a7b1514488528 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 11:19:03 +0800 Subject: [PATCH 30/59] Companion for Cumulus#1013 --- Cargo.toml | 2 +- runtime/crab-parachain/Cargo.toml | 4 ++-- runtime/darwinia-parachain/Cargo.toml | 4 ++-- runtime/pangolin-parachain/Cargo.toml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 261fa634..534f89f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ runtime-benchmarks = [ array-bytes = { version = "1.5" } async-trait = { version = "0.1" } clap = { version = "3.1", features = ["derive"] } -codec = { package = "parity-scale-codec", version = "2.3" } +codec = { package = "parity-scale-codec", version = "3.0.0" } futures = { version = "0.3" } jsonrpc-core = { version = "18.0" } log = { version = "0.4" } diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 8111e7a9..81f69c8f 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -13,8 +13,8 @@ version = "5.2.0-rc1" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index ccfe8d02..ce89601e 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -13,8 +13,8 @@ version = "5.2.0-rc1" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index fa2a3627..6c50ae71 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -13,8 +13,8 @@ version = "5.2.0-rc1" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } From 2713cb80f1011f0b8c30de764a42495c14dbd0a0 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 11:58:27 +0800 Subject: [PATCH 31/59] Companion for Cumulus#963 --- Cargo.lock | 240 +++++++++++++++++++++++++++++++++------------ Cargo.toml | 21 ++-- src/command.rs | 6 +- src/service/mod.rs | 58 ++++++++--- 4 files changed, 241 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fba7bc9e..0304b13d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -379,6 +379,20 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom 0.2.6", + "instant", + "pin-project-lite 0.2.9", + "rand 0.8.5", + "tokio", +] + [[package]] name = "backtrace" version = "0.3.65" @@ -545,28 +559,16 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitvec" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" -dependencies = [ - "funty 1.1.0", - "radium 0.6.2", - "tap", - "wyz 0.2.0", -] - [[package]] name = "bitvec" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ - "funty 2.0.0", - "radium 0.7.0", + "funty", + "radium", "tap", - "wyz 0.5.0", + "wyz", ] [[package]] @@ -752,7 +754,7 @@ name = "bp-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "bp-runtime", "frame-support", "frame-system", @@ -1242,9 +1244,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 2.3.1", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info 1.0.0", + "scale-info 2.1.1", "smallvec", "sp-api", "sp-block-builder", @@ -1862,6 +1864,34 @@ dependencies = [ "xcm", ] +[[package]] +name = "cumulus-relay-chain-inprocess-interface" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "futures 0.3.21", + "futures-timer", + "parking_lot 0.12.0", + "polkadot-client", + "polkadot-service", + "sc-client-api", + "sc-consensus-babe", + "sc-network", + "sc-service", + "sc-telemetry", + "sc-tracing", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-state-machine", + "tracing", +] + [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" @@ -1886,6 +1916,32 @@ dependencies = [ "thiserror", ] +[[package]] +name = "cumulus-relay-chain-rpc-interface" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" +dependencies = [ + "async-trait", + "backoff", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "futures 0.3.21", + "futures-timer", + "jsonrpsee 0.9.0", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", + "polkadot-service", + "sc-client-api", + "sc-rpc-api", + "sp-api", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "tracing", + "url 2.2.2", +] + [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" @@ -1941,7 +1997,9 @@ dependencies = [ "cumulus-client-service", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", + "cumulus-relay-chain-rpc-interface", "darwinia-parachain-runtime", "dc-primitives", "dc-rpc", @@ -1952,7 +2010,7 @@ dependencies = [ "log", "pallet-transaction-payment-rpc", "pangolin-parachain-runtime", - "parity-scale-codec 2.3.1", + "parity-scale-codec 3.1.2", "polkadot-cli", "polkadot-parachain", "polkadot-primitives", @@ -2028,9 +2086,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 2.3.1", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info 1.0.0", + "scale-info 2.1.1", "smallvec", "sp-api", "sp-block-builder", @@ -2862,12 +2920,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] name = "funty" version = "2.0.0" @@ -3340,6 +3392,22 @@ dependencies = [ "webpki 0.21.4", ] +[[package]] +name = "hyper-rustls" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +dependencies = [ + "http", + "hyper", + "log", + "rustls 0.20.5", + "rustls-native-certs 0.6.2", + "tokio", + "tokio-rustls 0.23.4", + "webpki-roots 0.22.3", +] + [[package]] name = "idna" version = "0.1.5" @@ -3699,6 +3767,18 @@ dependencies = [ "jsonrpsee-ws-client 0.8.0", ] +[[package]] +name = "jsonrpsee" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d0b8cc1959f8c05256ace093b2317482da9127f1d9227564f47e7e6bf9bda8" +dependencies = [ + "jsonrpsee-core 0.9.0", + "jsonrpsee-http-client", + "jsonrpsee-types 0.9.0", + "jsonrpsee-ws-client 0.9.0", +] + [[package]] name = "jsonrpsee-client-transport" version = "0.8.0" @@ -3720,6 +3800,27 @@ dependencies = [ "webpki-roots 0.22.3", ] +[[package]] +name = "jsonrpsee-client-transport" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa370c2c717d798c3c0a315ae3f0a707a388c6963c11f9da7dbbe1d3f7392f5f" +dependencies = [ + "futures 0.3.21", + "http", + "jsonrpsee-core 0.9.0", + "jsonrpsee-types 0.9.0", + "pin-project 1.0.10", + "rustls-native-certs 0.6.2", + "soketto", + "thiserror", + "tokio", + "tokio-rustls 0.23.4", + "tokio-util 0.6.10", + "tracing", + "webpki-roots 0.22.3", +] + [[package]] name = "jsonrpsee-core" version = "0.8.0" @@ -3754,12 +3855,35 @@ dependencies = [ "async-trait", "beef", "futures-channel", + "futures-util", "hyper", "jsonrpsee-types 0.9.0", + "rustc-hash", "serde", "serde_json", "soketto", "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-http-client" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d31b837273d09dd80051eefa57d337769dff6c3266108c43a3544ac7ffed9d68" +dependencies = [ + "async-trait", + "hyper", + "hyper-rustls 0.23.0", + "jsonrpsee-core 0.9.0", + "jsonrpsee-types 0.9.0", + "rustc-hash", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", ] [[package]] @@ -3862,11 +3986,22 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5" dependencies = [ - "jsonrpsee-client-transport", + "jsonrpsee-client-transport 0.8.0", "jsonrpsee-core 0.8.0", "jsonrpsee-types 0.8.0", ] +[[package]] +name = "jsonrpsee-ws-client" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b58983485b2b626c276f1eb367d62dae82132451b281072a7bfa536a33ddf3" +dependencies = [ + "jsonrpsee-client-transport 0.9.0", + "jsonrpsee-core 0.9.0", + "jsonrpsee-types 0.9.0", +] + [[package]] name = "k256" version = "0.10.4" @@ -3901,7 +4036,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -5494,7 +5629,7 @@ name = "pallet-bridge-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "bp-message-dispatch", "bp-messages", "bp-runtime", @@ -6203,9 +6338,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 2.3.1", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info 1.0.0", + "scale-info 2.1.1", "smallvec", "sp-api", "sp-block-builder", @@ -6263,11 +6398,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" dependencies = [ "arrayvec 0.7.2", - "bitvec 0.20.4", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive 2.3.1", - "serde", ] [[package]] @@ -6277,7 +6410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" dependencies = [ "arrayvec 0.7.2", - "bitvec 1.0.0", + "bitvec", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive 3.1.2", @@ -6876,7 +7009,7 @@ name = "polkadot-node-core-approval-voting" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "derive_more", "futures 0.3.21", "futures-timer", @@ -6904,7 +7037,7 @@ name = "polkadot-node-core-av-store" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "futures-timer", "kvdb", @@ -6924,7 +7057,7 @@ name = "polkadot-node-core-backing" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7043,7 +7176,7 @@ name = "polkadot-node-core-provisioner" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -7345,7 +7478,7 @@ name = "polkadot-primitives" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "frame-system", "hex-literal", "parity-scale-codec 3.1.2", @@ -7407,7 +7540,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -7491,7 +7624,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7562,7 +7695,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bitflags", - "bitvec 1.0.0", + "bitvec", "derive_more", "frame-benchmarking", "frame-support", @@ -7782,7 +7915,7 @@ dependencies = [ "fixed-hash", "impl-codec", "impl-serde", - "scale-info 2.1.1", + "scale-info 1.0.0", "uint", ] @@ -7946,12 +8079,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" - [[package]] name = "radium" version = "0.7.0" @@ -9110,7 +9237,7 @@ dependencies = [ "futures-timer", "hex", "hyper", - "hyper-rustls", + "hyper-rustls 0.22.1", "num_cpus", "once_cell", "parity-scale-codec 3.1.2", @@ -9440,7 +9567,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" dependencies = [ - "bitvec 0.20.4", "cfg-if 1.0.0", "derive_more", "parity-scale-codec 2.3.1", @@ -9453,7 +9579,7 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" dependencies = [ - "bitvec 1.0.0", + "bitvec", "cfg-if 1.0.0", "derive_more", "parity-scale-codec 3.1.2", @@ -11870,7 +11996,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -12084,12 +12210,6 @@ dependencies = [ "winapi-build", ] -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "wyz" version = "0.5.0" diff --git a/Cargo.toml b/Cargo.toml index 534f89f4..ccbfbdc5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,16 +89,17 @@ substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrat try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } # cumulus -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-network #pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } diff --git a/src/command.rs b/src/command.rs index dfb473c6..a43e5d2c 100644 --- a/src/command.rs +++ b/src/command.rs @@ -241,6 +241,7 @@ pub fn run() -> Result<()> { .create_runner(&cli.run.normalize())? .run_node_until_exit(|config| async move { let chain_spec = &config.chain_spec; + let collator_options = cli.run.collator_options(); set_default_ss58_version(chain_spec); @@ -283,6 +284,7 @@ pub fn run() -> Result<()> { service::start_node::( config, polkadot_config, + collator_options, id, ) .await @@ -292,7 +294,7 @@ pub fn run() -> Result<()> { service::start_node::< PangolinParachainRuntimeApi, PangolinParachainRuntimeExecutor, - >(config, polkadot_config, id) + >(config, polkadot_config, collator_options, id) .await .map(|r| r.0) .map_err(Into::into) @@ -300,7 +302,7 @@ pub fn run() -> Result<()> { service::start_node::< DarwiniaParachainRuntimeApi, DarwiniaParachainRuntimeExecutor, - >(config, polkadot_config, id) + >(config, polkadot_config, collator_options, id) .await .map(|r| r.0) .map_err(Into::into) diff --git a/src/service/mod.rs b/src/service/mod.rs index 8c3a402b..22d3f373 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -31,6 +31,7 @@ use std::{error::Error, sync::Arc, time::Duration}; // --- crates.io --- use futures::lock::Mutex; // --- paritytech --- +use cumulus_client_cli::CollatorOptions; use cumulus_client_consensus_aura::{ AuraConsensus, BuildAuraConsensusParams, BuildVerifierParams, SlotProportion, }; @@ -49,7 +50,10 @@ use cumulus_primitives_core::{ ParaId, }; use cumulus_primitives_parachain_inherent::ParachainInherentData; -use cumulus_relay_chain_interface::RelayChainInterface; +use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; +use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult}; +use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface; +use polkadot_service::CollatorPair; use sc_basic_authorship::ProposerFactory; use sc_client_api::{ExecutorProvider, StateBackendFor}; use sc_consensus::{ @@ -304,6 +308,31 @@ where Ok(params) } +async fn build_relay_chain_interface( + polkadot_config: Configuration, + telemetry_worker_handle: Option, + task_manager: &mut TaskManager, + collator_options: CollatorOptions, +) -> RelayChainResult<( + Arc<(dyn RelayChainInterface + 'static)>, + Option, +)> { + match collator_options.relay_chain_rpc_url { + Some(relay_chain_url) => Ok(( + Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>, + None, + )), + None => { + let relay_chain_local = build_inprocess_relay_chain( + polkadot_config, + telemetry_worker_handle, + task_manager, + )?; + Ok((relay_chain_local.0, Some(relay_chain_local.1))) + } + } +} + /// Start a node with the given parachain `Configuration` and relay chain `Configuration`. /// /// This is the actual implementation that is abstract over the executor and the runtime api. @@ -311,6 +340,7 @@ where async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, + collator_options: CollatorOptions, id: ParaId, _rpc_ext_builder: RB, build_import_queue: BIQ, @@ -357,16 +387,17 @@ where let client = params.client.clone(); let backend = params.backend.clone(); let mut task_manager = params.task_manager; - let (relay_chain_interface, collator_key) = - cumulus_relay_chain_local::build_relay_chain_interface( - polkadot_config, - telemetry_worker_handle, - &mut task_manager, - ) - .map_err(|e| match e { - polkadot_service::Error::Sub(x) => x, - s => format!("{}", s).into(), - })?; + let (relay_chain_interface, collator_key) = build_relay_chain_interface( + polkadot_config, + telemetry_worker_handle, + &mut task_manager, + collator_options.clone(), + ) + .await + .map_err(|e| match e { + RelayChainError::ServiceError(polkadot_service::Error::Sub(x)) => x, + s => s.to_string().into(), + })?; let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id); let force_authoring = parachain_config.force_authoring; let validator = parachain_config.role.is_authority(); @@ -444,7 +475,7 @@ where spawner, parachain_consensus, import_queue, - collator_key, + collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, }; @@ -458,6 +489,7 @@ where relay_chain_interface, relay_chain_slot_duration, import_queue, + collator_options, }; start_full_node(params)?; @@ -537,6 +569,7 @@ where pub async fn start_node( parachain_config: Configuration, polkadot_config: Configuration, + collator_options: CollatorOptions, id: ParaId, ) -> Result<(TaskManager, Arc>)> where @@ -550,6 +583,7 @@ where start_node_impl::( parachain_config, polkadot_config, + collator_options, id, |_| Ok(Default::default()), build_import_queue, From 3414364dd39e85885737e2d77816cfbe974d5b72 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 13:23:07 +0800 Subject: [PATCH 32/59] Companion for Cumulus#1058 --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ccbfbdc5..76d68008 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,14 +61,14 @@ frame-benchmarking-cli = { optional = true, git = "https://github.com/pa pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", features = ["wasmtime"] } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", features = ["wasmtime"] } sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", features = ["wasmtime"] } sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } From 1d1fc2a1cee215f04ce31d8a79d46cdec2beab9f Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 13:58:24 +0800 Subject: [PATCH 33/59] Companion for Cumulus#1069 --- src/service/mod.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/service/mod.rs b/src/service/mod.rs index 22d3f373..2df24ad5 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -310,6 +310,7 @@ where async fn build_relay_chain_interface( polkadot_config: Configuration, + parachain_config: &Configuration, telemetry_worker_handle: Option, task_manager: &mut TaskManager, collator_options: CollatorOptions, @@ -322,14 +323,12 @@ async fn build_relay_chain_interface( Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>, None, )), - None => { - let relay_chain_local = build_inprocess_relay_chain( - polkadot_config, - telemetry_worker_handle, - task_manager, - )?; - Ok((relay_chain_local.0, Some(relay_chain_local.1))) - } + None => build_inprocess_relay_chain( + polkadot_config, + parachain_config, + telemetry_worker_handle, + task_manager, + ), } } @@ -389,6 +388,7 @@ where let mut task_manager = params.task_manager; let (relay_chain_interface, collator_key) = build_relay_chain_interface( polkadot_config, + ¶chain_config, telemetry_worker_handle, &mut task_manager, collator_options.clone(), From acf811a2dafd57d42730b4748a76e30fb0f3c8f3 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 14:15:48 +0800 Subject: [PATCH 34/59] Companion for Cumulus#982 --- Cargo.lock | 1 + runtime/crab-parachain/Cargo.toml | 2 ++ runtime/crab-parachain/src/lib.rs | 1 + runtime/crab-parachain/src/pallets/xcmp_queue.rs | 2 ++ runtime/darwinia-parachain/Cargo.toml | 2 ++ runtime/darwinia-parachain/src/lib.rs | 1 + runtime/darwinia-parachain/src/pallets/xcmp_queue.rs | 1 + runtime/pangolin-parachain/Cargo.toml | 2 ++ runtime/pangolin-parachain/src/lib.rs | 1 + runtime/pangolin-parachain/src/pallets/xcmp_queue.rs | 2 ++ 10 files changed, 15 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 0304b13d..8e10883c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1783,6 +1783,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", + "frame-benchmarking", "frame-support", "frame-system", "log", diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 81f69c8f..9dc1d63e 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -133,6 +133,8 @@ std = [ runtime-benchmarks = [ # crates.io "array-bytes", + # cumulus + "cumulus-pallet-xcmp-queue/runtime-benchmarks", # polkadot "pallet-xcm/runtime-benchmarks", "pallet-xcm-benchmarks", diff --git a/runtime/crab-parachain/src/lib.rs b/runtime/crab-parachain/src/lib.rs index bae3aef6..2bac9a05 100644 --- a/runtime/crab-parachain/src/lib.rs +++ b/runtime/crab-parachain/src/lib.rs @@ -59,6 +59,7 @@ mod benches { [pallet_utility, Utility] [pallet_multisig, Multisig] [pallet_proxy, Proxy] + [cumulus_pallet_xcmp_queue, XcmpQueue] ); } diff --git a/runtime/crab-parachain/src/pallets/xcmp_queue.rs b/runtime/crab-parachain/src/pallets/xcmp_queue.rs index 8193cca2..2f7d0be3 100644 --- a/runtime/crab-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/crab-parachain/src/pallets/xcmp_queue.rs @@ -13,4 +13,6 @@ impl Config for Runtime { type ExecuteOverweightOrigin = EnsureRoot; type ControllerOrigin = EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; + // TODO: Update weight + type WeightInfo = (); } diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index ce89601e..4b3427ab 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -126,6 +126,8 @@ std = [ runtime-benchmarks = [ # crates.io "array-bytes", + # cumulus + "cumulus-pallet-xcmp-queue/runtime-benchmarks", # polkadot "pallet-xcm/runtime-benchmarks", "pallet-xcm-benchmarks", diff --git a/runtime/darwinia-parachain/src/lib.rs b/runtime/darwinia-parachain/src/lib.rs index b7764c51..67bc27d8 100644 --- a/runtime/darwinia-parachain/src/lib.rs +++ b/runtime/darwinia-parachain/src/lib.rs @@ -56,6 +56,7 @@ mod benches { [pallet_utility, Utility] [pallet_multisig, Multisig] [pallet_proxy, Proxy] + [cumulus_pallet_xcmp_queue, XcmpQueue] ); } diff --git a/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs b/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs index 8193cca2..ac622d57 100644 --- a/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs @@ -13,4 +13,5 @@ impl Config for Runtime { type ExecuteOverweightOrigin = EnsureRoot; type ControllerOrigin = EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; + type WeightInfo = (); } diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 6c50ae71..3c335abb 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -157,6 +157,8 @@ alpha = [] runtime-benchmarks = [ # crates.io "array-bytes", + # cumulus + "cumulus-pallet-xcmp-queue/runtime-benchmarks", # darwinia-bridges-substrate # "bridge-runtime-common/runtime-benchmarks", # "pallet-bridge-grandpa/runtime-benchmarks", diff --git a/runtime/pangolin-parachain/src/lib.rs b/runtime/pangolin-parachain/src/lib.rs index f7e305af..34bee63f 100644 --- a/runtime/pangolin-parachain/src/lib.rs +++ b/runtime/pangolin-parachain/src/lib.rs @@ -63,6 +63,7 @@ mod benches { // TODO: https://github.com/darwinia-network/darwinia-parachain/issues/66 // [pallet_bridge_messages, MessagesBench::] [pallet_fee_market, FeeMarket] + [cumulus_pallet_xcmp_queue, XcmpQueue] ); } diff --git a/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs b/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs index 8193cca2..2f7d0be3 100644 --- a/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs @@ -13,4 +13,6 @@ impl Config for Runtime { type ExecuteOverweightOrigin = EnsureRoot; type ControllerOrigin = EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; + // TODO: Update weight + type WeightInfo = (); } From d4e12c432635e4808d2ed9a89cb55331271f526c Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 14:27:43 +0800 Subject: [PATCH 35/59] Companion for Cumulus#1055 --- runtime/crab-parachain/src/pallets/polkadot_xcm.rs | 9 ++++----- runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs | 9 ++++----- runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs | 8 +++----- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs index ee0e6fdf..8b5d0c0f 100644 --- a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs @@ -1,12 +1,10 @@ // --- paritytech --- use cumulus_pallet_xcm::Origin as CumulusOrigin; use cumulus_primitives_utility::ParentAsUmp; -use frame_support::{ - traits::Everything, - weights::{IdentityFee, Weight}, -}; +use frame_support::{traits::Everything, weights::Weight}; use pallet_xcm::{Config, CurrentXcmVersion, XcmPassthrough}; use polkadot_parachain::primitives::Sibling; +use polkadot_runtime_common::impls::ToAuthor; use xcm::latest::prelude::*; use xcm_builder::*; use xcm_executor::{Config as XcmCExecutorConfig, XcmExecutor}; @@ -122,7 +120,8 @@ impl XcmCExecutorConfig for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = UsingComponents, KsmLocation, AccountId, Balances, ()>; + type Trader = + UsingComponents>; type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; diff --git a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs index 5cf4e272..cb13b4da 100644 --- a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs @@ -1,12 +1,10 @@ // --- paritytech --- use cumulus_pallet_xcm::Origin as CumulusOrigin; use cumulus_primitives_utility::ParentAsUmp; -use frame_support::{ - traits::Everything, - weights::{IdentityFee, Weight}, -}; +use frame_support::{traits::Everything, weights::Weight}; use pallet_xcm::{Config, CurrentXcmVersion, XcmPassthrough}; use polkadot_parachain::primitives::Sibling; +use polkadot_runtime_common::impls::ToAuthor; use xcm::latest::prelude::*; use xcm_builder::*; use xcm_executor::{Config as XcmCExecutorConfig, XcmExecutor}; @@ -122,7 +120,8 @@ impl XcmCExecutorConfig for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = UsingComponents, DotLocation, AccountId, Balances, ()>; + type Trader = + UsingComponents>; type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; diff --git a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs index e2dee2e7..9c64825e 100644 --- a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs @@ -1,12 +1,10 @@ // --- paritytech --- use cumulus_pallet_xcm::Origin as CumulusOrigin; use cumulus_primitives_utility::ParentAsUmp; -use frame_support::{ - traits::{Everything, PalletInfoAccess}, - weights::{IdentityFee, Weight}, -}; +use frame_support::{traits::Everything, weights::Weight}; use pallet_xcm::{Config, CurrentXcmVersion, XcmPassthrough}; use polkadot_parachain::primitives::Sibling; +use polkadot_runtime_common::impls::ToAuthor; use xcm::latest::prelude::*; use xcm_builder::*; use xcm_executor::{Config as XcmCExecutorConfig, XcmExecutor}; @@ -126,7 +124,7 @@ impl XcmCExecutorConfig for XcmConfig { type Barrier = Barrier; type Weigher = FixedWeightBounds; type Trader = - UsingComponents, AnchoringSelfReserve, AccountId, Balances, ()>; + UsingComponents>; type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; From 425a927048fe3d6c5bd5a7b9d80ee1565718cbe3 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 14:38:39 +0800 Subject: [PATCH 36/59] Companion for paritytech/cumulus#1071 --- src/command.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/command.rs b/src/command.rs index a43e5d2c..f2a9a48b 100644 --- a/src/command.rs +++ b/src/command.rs @@ -257,7 +257,7 @@ pub fn run() -> Result<()> { ); let id = ParaId::from(para_id); let parachain_account = - AccountIdConversion::::into_account(&id); + AccountIdConversion::::into_account(&id); let state_version = RelayChainCli::native_runtime_version(&config.chain_spec).state_version(); let block: Block = generate_genesis_block(&config.chain_spec, state_version) From 5a4eb6d2a14e10ee5fcea3c4778cea2c3451b4aa Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 15:33:32 +0800 Subject: [PATCH 37/59] Revert "Companion for paritytech/cumulus#1071" This reverts commit f772a454c0c4693cc53a2bb49b8bf5da499e9cfa. --- src/command.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/command.rs b/src/command.rs index f2a9a48b..a43e5d2c 100644 --- a/src/command.rs +++ b/src/command.rs @@ -257,7 +257,7 @@ pub fn run() -> Result<()> { ); let id = ParaId::from(para_id); let parachain_account = - AccountIdConversion::::into_account(&id); + AccountIdConversion::::into_account(&id); let state_version = RelayChainCli::native_runtime_version(&config.chain_spec).state_version(); let block: Block = generate_genesis_block(&config.chain_spec, state_version) From 8c876b77b0a85862337934be8c066171eeff6a90 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 17 May 2022 15:46:53 +0800 Subject: [PATCH 38/59] Revert "Disable darwinia-bridges-substrate" This reverts commit 87157a5001eb5588a2ad21ec808ad4eb2fd0d6cd. --- Cargo.toml | 2 +- rpc/Cargo.toml | 2 +- runtime/common/Cargo.toml | 16 ++++---- runtime/crab-parachain/Cargo.toml | 4 +- runtime/darwinia-parachain/Cargo.toml | 4 +- runtime/pangolin-parachain/Cargo.toml | 56 +++++++++++++-------------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 76d68008..d79729ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,7 +102,7 @@ cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-network -#pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index eb6e3440..483001cd 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -14,7 +14,7 @@ version = "5.2.0-rc1" jsonrpc-core = { version = "18.0" } # darwinia-network dc-primitives = { path = "../primitives" } -#pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # paritytech pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 562b8a4b..93108c7f 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -15,10 +15,10 @@ smallvec = { version = "1.8" } # cumulus pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia-bridges-substrate -#bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # darwinia-collator dc-primitives = { default-features = false, path = "../../primitives" } # substrate @@ -36,10 +36,10 @@ std = [ # cumulus "pallet-collator-selection/std", # darwinia-bridges-substrate -# "bp-messages/std", -# "bridge-runtime-common/std", -# "pallet-bridge-dispatch/std", -# "pallet-fee-market/std", + "bp-messages/std", + "bridge-runtime-common/std", + "pallet-bridge-dispatch/std", + "pallet-fee-market/std", # darwinia-collator "dc-primitives/std", # substrate diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 9dc1d63e..3385ee88 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -30,7 +30,7 @@ parachain-info = { default-features = false, git = "https://git # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -93,7 +93,7 @@ std = [ # darwinia "dc-common-runtime/std", "dc-primitives/std", -# "pallet-fee-market-rpc-runtime-api/std", + "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 4b3427ab..1a20cfa5 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -30,7 +30,7 @@ parachain-info = { default-features = false, git = "https://git # darwinia dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } -#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -89,7 +89,7 @@ std = [ "parachain-info/std", "dc-common-runtime/std", "dc-primitives/std", -# "pallet-fee-market-rpc-runtime-api/std", + "pallet-fee-market-rpc-runtime-api/std", "pallet-xcm/std", "polkadot-parachain/std", "xcm/std", diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 3c335abb..327a68e6 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -31,18 +31,18 @@ parachain-info = { default-features = false, git = "https://git dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # darwinia-bridges-substrate -#bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -#pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -105,18 +105,18 @@ std = [ "dc-common-runtime/std", "dc-primitives/std", # darwinia-bridges-substrate -# "bp-pangolin/std", -# "bp-message-dispatch/std", -# "bp-messages/std", -# "bp-runtime/std", -# "bp-polkadot-core/std", -# "bp-pangolin-parachain/std", -# "bridge-runtime-common/std", -# "pallet-bridge-dispatch/std", -# "pallet-bridge-grandpa/std", -# "pallet-bridge-messages/std", -# "pallet-fee-market/std", -# "pallet-fee-market-rpc-runtime-api/std", + "bp-pangolin/std", + "bp-message-dispatch/std", + "bp-messages/std", + "bp-runtime/std", + "bp-polkadot-core/std", + "bp-pangolin-parachain/std", + "bridge-runtime-common/std", + "pallet-bridge-dispatch/std", + "pallet-bridge-grandpa/std", + "pallet-bridge-messages/std", + "pallet-fee-market/std", + "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", @@ -160,10 +160,10 @@ runtime-benchmarks = [ # cumulus "cumulus-pallet-xcmp-queue/runtime-benchmarks", # darwinia-bridges-substrate -# "bridge-runtime-common/runtime-benchmarks", -# "pallet-bridge-grandpa/runtime-benchmarks", -# "pallet-bridge-messages/runtime-benchmarks", -# "pallet-fee-market/runtime-benchmarks", + "bridge-runtime-common/runtime-benchmarks", + "pallet-bridge-grandpa/runtime-benchmarks", + "pallet-bridge-messages/runtime-benchmarks", + "pallet-fee-market/runtime-benchmarks", # polkadot "pallet-xcm/runtime-benchmarks", "pallet-xcm-benchmarks", From 30598fdbdfd87be2441cd8bcd0446df82323a937 Mon Sep 17 00:00:00 2001 From: AurevoirXavier Date: Wed, 18 May 2022 13:47:18 +0800 Subject: [PATCH 39/59] Remove `FeeMarket` RPC (#71) --- Cargo.lock | 447 ++++++++++++++++++++++---- Cargo.toml | 7 +- rpc/Cargo.toml | 3 +- rpc/src/lib.rs | 4 - runtime/crab-parachain/Cargo.toml | 6 +- runtime/crab-parachain/src/lib.rs | 9 - runtime/darwinia-parachain/Cargo.toml | 6 +- runtime/darwinia-parachain/src/lib.rs | 9 - runtime/pangolin-parachain/Cargo.toml | 24 +- runtime/pangolin-parachain/src/lib.rs | 16 - src/service/api.rs | 2 - 11 files changed, 397 insertions(+), 136 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8e10883c..9b569fb3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -559,16 +559,28 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitvec" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +dependencies = [ + "funty 1.1.0", + "radium 0.6.2", + "tap", + "wyz 0.2.0", +] + [[package]] name = "bitvec" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ - "funty", - "radium", + "funty 2.0.0", + "radium 0.7.0", "tap", - "wyz", + "wyz 0.5.0", ] [[package]] @@ -721,12 +733,45 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bp-darwinia-core" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "frame-system", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-header-chain" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "finality-grandpa 0.14.4", + "frame-support", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "serde", + "sp-core", + "sp-finality-grandpa", + "sp-runtime", + "sp-std", +] + [[package]] name = "bp-header-chain" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "finality-grandpa", + "finality-grandpa 0.15.0", "frame-support", "parity-scale-codec 3.1.2", "scale-info 2.1.1", @@ -737,25 +782,54 @@ dependencies = [ "sp-std", ] +[[package]] +name = "bp-message-dispatch" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-std", +] + [[package]] name = "bp-message-dispatch" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-runtime", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "parity-scale-codec 3.1.2", "scale-info 2.1.1", "sp-std", ] +[[package]] +name = "bp-messages" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bitvec 0.20.4", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "serde", + "sp-core", + "sp-std", +] + [[package]] name = "bp-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", - "bp-runtime", + "bitvec 1.0.0", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", "impl-trait-for-tuples", @@ -765,13 +839,61 @@ dependencies = [ "sp-std", ] +[[package]] +name = "bp-pangolin" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-darwinia-core", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", + "sp-version", +] + +[[package]] +name = "bp-pangolin-parachain" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-darwinia-core", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", + "sp-version", +] + +[[package]] +name = "bp-polkadot-core" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "frame-system", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-api", + "sp-core", + "sp-runtime", + "sp-std", + "sp-version", +] + [[package]] name = "bp-polkadot-core" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-messages", - "bp-runtime", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", "parity-scale-codec 3.1.2", @@ -788,9 +910,9 @@ name = "bp-rococo" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-messages", - "bp-polkadot-core", - "bp-runtime", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "parity-scale-codec 3.1.2", "smallvec", @@ -800,6 +922,24 @@ dependencies = [ "sp-version", ] +[[package]] +name = "bp-runtime" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "frame-support", + "hash-db", + "num-traits", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", +] + [[package]] name = "bp-runtime" version = "0.1.0" @@ -818,14 +958,29 @@ dependencies = [ "sp-trie", ] +[[package]] +name = "bp-test-utils" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "ed25519-dalek", + "finality-grandpa 0.14.4", + "parity-scale-codec 2.3.1", + "sp-application-crypto", + "sp-finality-grandpa", + "sp-runtime", + "sp-std", +] + [[package]] name = "bp-test-utils" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-header-chain", + "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "ed25519-dalek", - "finality-grandpa", + "finality-grandpa 0.15.0", "parity-scale-codec 3.1.2", "sp-application-crypto", "sp-finality-grandpa", @@ -838,29 +993,56 @@ name = "bp-wococo" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-messages", - "bp-polkadot-core", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-rococo", - "bp-runtime", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "parity-scale-codec 3.1.2", "sp-api", "sp-runtime", "sp-std", ] +[[package]] +name = "bridge-runtime-common" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "ed25519-dalek", + "frame-support", + "frame-system", + "hash-db", + "pallet-balances", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-transaction-payment", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", + "sp-version", +] + [[package]] name = "bridge-runtime-common" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-message-dispatch", - "bp-messages", - "bp-runtime", + "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "hash-db", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "pallet-transaction-payment", "parity-scale-codec 3.1.2", "scale-info 2.1.1", @@ -2138,11 +2320,15 @@ dependencies = [ name = "dc-common-runtime" version = "5.2.0-rc1" dependencies = [ + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "dc-primitives", "frame-support", "frame-system", "pallet-balances", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-collator-selection", + "pallet-fee-market", "pallet-transaction-payment", "smallvec", "sp-runtime", @@ -2283,7 +2469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" dependencies = [ "byteorder", - "quick-error 1.2.3", + "quick-error", ] [[package]] @@ -2580,6 +2766,22 @@ dependencies = [ "log", ] +[[package]] +name = "finality-grandpa" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" +dependencies = [ + "either", + "futures 0.3.21", + "futures-timer", + "log", + "num-traits", + "parity-scale-codec 2.3.1", + "parking_lot 0.11.2", + "scale-info 1.0.0", +] + [[package]] name = "finality-grandpa" version = "0.15.0" @@ -2921,6 +3123,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + [[package]] name = "funty" version = "2.0.0" @@ -3183,16 +3391,16 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d6a30320f094710245150395bc763ad23128d6a1ebbad7594dc4164b62c56b" +checksum = "d113a9853e5accd30f43003560b5563ffbb007e3f325e8b103fa0d0029c6e6df" dependencies = [ "log", "pest", "pest_derive", - "quick-error 2.0.1", "serde", "serde_json", + "thiserror", ] [[package]] @@ -4037,7 +4245,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -4193,9 +4401,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.125" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libloading" @@ -5586,13 +5794,30 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-bridge-dispatch" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "frame-system", + "log", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-core", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-message-dispatch", - "bp-runtime", + "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", "log", @@ -5603,15 +5828,38 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-bridge-grandpa" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "finality-grandpa 0.14.4", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "num-traits", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "serde", + "sp-finality-grandpa", + "sp-runtime", + "sp-std", + "sp-trie", +] + [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bp-header-chain", - "bp-runtime", - "bp-test-utils", - "finality-grandpa", + "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-test-utils 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "finality-grandpa 0.15.0", "frame-support", "frame-system", "log", @@ -5625,15 +5873,37 @@ dependencies = [ "sp-trie", ] +[[package]] +name = "pallet-bridge-messages" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bitvec 0.20.4", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "num-traits", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "serde", + "sp-core", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-bridge-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", - "bp-message-dispatch", - "bp-messages", - "bp-runtime", + "bitvec 1.0.0", + "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", "log", @@ -5740,6 +6010,27 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-fee-market" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +dependencies = [ + "bitvec 0.20.4", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-timestamp", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-gilt" version = "4.0.0-dev" @@ -6307,6 +6598,13 @@ name = "pangolin-parachain-runtime" version = "5.2.0-rc1" dependencies = [ "array-bytes", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-pangolin", + "bp-pangolin-parachain", + "bp-polkadot-core 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -6326,7 +6624,11 @@ dependencies = [ "pallet-aura", "pallet-authorship", "pallet-balances", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-collator-selection", + "pallet-fee-market", "pallet-multisig", "pallet-proxy", "pallet-session", @@ -6399,9 +6701,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" dependencies = [ "arrayvec 0.7.2", + "bitvec 0.20.4", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive 2.3.1", + "serde", ] [[package]] @@ -6411,7 +6715,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" dependencies = [ "arrayvec 0.7.2", - "bitvec", + "bitvec 1.0.0", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive 3.1.2", @@ -7010,7 +7314,7 @@ name = "polkadot-node-core-approval-voting" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "derive_more", "futures 0.3.21", "futures-timer", @@ -7038,7 +7342,7 @@ name = "polkadot-node-core-av-store" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "futures 0.3.21", "futures-timer", "kvdb", @@ -7058,7 +7362,7 @@ name = "polkadot-node-core-backing" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7177,7 +7481,7 @@ name = "polkadot-node-core-provisioner" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -7479,7 +7783,7 @@ name = "polkadot-primitives" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "frame-system", "hex-literal", "parity-scale-codec 3.1.2", @@ -7541,7 +7845,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -7625,7 +7929,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7696,7 +8000,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bitflags", - "bitvec", + "bitvec 1.0.0", "derive_more", "frame-benchmarking", "frame-support", @@ -7916,7 +8220,7 @@ dependencies = [ "fixed-hash", "impl-codec", "impl-serde", - "scale-info 1.0.0", + "scale-info 2.1.1", "uint", ] @@ -8054,12 +8358,6 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - [[package]] name = "quicksink" version = "0.1.2" @@ -8080,6 +8378,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" + [[package]] name = "radium" version = "0.7.0" @@ -8342,7 +8646,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ "hostname", - "quick-error 1.2.3", + "quick-error", ] [[package]] @@ -8382,11 +8686,11 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bp-messages", + "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-rococo", - "bp-runtime", + "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-wococo", - "bridge-runtime-common", + "bridge-runtime-common 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-benchmarking", "frame-executive", "frame-support", @@ -8400,9 +8704,9 @@ dependencies = [ "pallet-balances", "pallet-beefy", "pallet-beefy-mmr", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "pallet-collective", "pallet-grandpa", "pallet-im-online", @@ -9073,7 +9377,7 @@ dependencies = [ "ahash", "async-trait", "dyn-clone", - "finality-grandpa", + "finality-grandpa 0.15.0", "fork-tree", "futures 0.3.21", "futures-timer", @@ -9110,7 +9414,7 @@ name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "finality-grandpa", + "finality-grandpa 0.15.0", "futures 0.3.21", "jsonrpc-core", "jsonrpc-core-client", @@ -9568,6 +9872,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" dependencies = [ + "bitvec 0.20.4", "cfg-if 1.0.0", "derive_more", "parity-scale-codec 2.3.1", @@ -9580,7 +9885,7 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" dependencies = [ - "bitvec", + "bitvec 1.0.0", "cfg-if 1.0.0", "derive_more", "parity-scale-codec 3.1.2", @@ -10353,7 +10658,7 @@ name = "sp-finality-grandpa" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "finality-grandpa", + "finality-grandpa 0.15.0", "log", "parity-scale-codec 3.1.2", "scale-info 2.1.1", @@ -11997,7 +12302,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -12211,6 +12516,12 @@ dependencies = [ "winapi-build", ] +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" + [[package]] name = "wyz" version = "0.5.0" diff --git a/Cargo.toml b/Cargo.toml index d79729ff..24e1fd22 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ runtime-benchmarks = [ # crates.io array-bytes = { version = "1.5" } async-trait = { version = "0.1" } -clap = { version = "3.1", features = ["derive"] } +clap = { version = "3.1", features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0" } futures = { version = "0.3" } jsonrpc-core = { version = "18.0" } @@ -97,13 +97,10 @@ cumulus-client-network = { git = "https://github.com/paritytech cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -# darwinia-network -pallet-fee-market-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } - # polkadot polkadot-cli = { features = ["rococo-native"], git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 483001cd..08761a15 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -13,8 +13,7 @@ version = "5.2.0-rc1" # crates.io jsonrpc-core = { version = "18.0" } # darwinia-network -dc-primitives = { path = "../primitives" } -pallet-fee-market-rpc = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +dc-primitives = { path = "../primitives" } # paritytech pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index a99b86b8..43cdab1a 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -56,15 +56,12 @@ where C::Api: substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + sp_block_builder::BlockBuilder - + pallet_fee_market_rpc::FeeMarketRuntimeApi, P: 'static + Send + Sync + sc_transaction_pool_api::TransactionPool, { // --- paritytech --- use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; use substrate_frame_rpc_system::{FullSystem, SystemApi}; - // --- darwinia-network --- - use pallet_fee_market_rpc::*; let mut io = IoHandler::default(); let FullDeps { @@ -81,7 +78,6 @@ where io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new( client.clone(), ))); - io.extend_with(FeeMarketApi::to_delegate(FeeMarket::new(client.clone()))); io } diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 3385ee88..1905ec6c 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -28,9 +28,8 @@ cumulus-primitives-utility = { default-features = false, git = "https://git pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia -dc-common-runtime = { default-features = false, path = "../common" } -dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +dc-common-runtime = { default-features = false, path = "../common" } +dc-primitives = { default-features = false, path = "../../primitives" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -93,7 +92,6 @@ std = [ # darwinia "dc-common-runtime/std", "dc-primitives/std", - "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", diff --git a/runtime/crab-parachain/src/lib.rs b/runtime/crab-parachain/src/lib.rs index 2bac9a05..0089ea30 100644 --- a/runtime/crab-parachain/src/lib.rs +++ b/runtime/crab-parachain/src/lib.rs @@ -277,15 +277,6 @@ sp_api::impl_runtime_apis! { } } - impl pallet_fee_market_rpc_runtime_api::FeeMarketApi for Runtime { - fn market_fee() -> Option> { - Default::default() - } - fn in_process_orders() -> pallet_fee_market_rpc_runtime_api::InProcessOrders { - Default::default() - } - } - #[cfg(feature = "runtime-benchmarks")] impl frame_benchmarking::Benchmark for Runtime { fn benchmark_metadata(extra: bool) -> ( diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 1a20cfa5..c1b83582 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -28,9 +28,8 @@ cumulus-primitives-utility = { default-features = false, git = "https://git pallet-collator-selection = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # darwinia -dc-common-runtime = { default-features = false, path = "../common" } -dc-primitives = { default-features = false, path = "../../primitives" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +dc-common-runtime = { default-features = false, path = "../common" } +dc-primitives = { default-features = false, path = "../../primitives" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -89,7 +88,6 @@ std = [ "parachain-info/std", "dc-common-runtime/std", "dc-primitives/std", - "pallet-fee-market-rpc-runtime-api/std", "pallet-xcm/std", "polkadot-parachain/std", "xcm/std", diff --git a/runtime/darwinia-parachain/src/lib.rs b/runtime/darwinia-parachain/src/lib.rs index 67bc27d8..8cfc2aeb 100644 --- a/runtime/darwinia-parachain/src/lib.rs +++ b/runtime/darwinia-parachain/src/lib.rs @@ -271,15 +271,6 @@ sp_api::impl_runtime_apis! { } } - impl pallet_fee_market_rpc_runtime_api::FeeMarketApi for Runtime { - fn market_fee() -> Option> { - Default::default() - } - fn in_process_orders() -> pallet_fee_market_rpc_runtime_api::InProcessOrders { - Default::default() - } - } - #[cfg(feature = "runtime-benchmarks")] impl frame_benchmarking::Benchmark for Runtime { fn benchmark_metadata(extra: bool) -> ( diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 327a68e6..24abe72a 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -31,18 +31,17 @@ parachain-info = { default-features = false, git = "https://git dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # darwinia-bridges-substrate -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } -pallet-fee-market-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-pangolin-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } @@ -116,7 +115,6 @@ std = [ "pallet-bridge-grandpa/std", "pallet-bridge-messages/std", "pallet-fee-market/std", - "pallet-fee-market-rpc-runtime-api/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", diff --git a/runtime/pangolin-parachain/src/lib.rs b/runtime/pangolin-parachain/src/lib.rs index 34bee63f..f78638e0 100644 --- a/runtime/pangolin-parachain/src/lib.rs +++ b/runtime/pangolin-parachain/src/lib.rs @@ -291,22 +291,6 @@ sp_api::impl_runtime_apis! { } } - impl pallet_fee_market_rpc_runtime_api::FeeMarketApi for Runtime { - fn market_fee() -> Option> { - if let Some(fee) = FeeMarket::market_fee() { - return Some(pallet_fee_market_rpc_runtime_api::Fee { - amount: fee, - }); - } - None - } - fn in_process_orders() -> pallet_fee_market_rpc_runtime_api::InProcessOrders { - return pallet_fee_market_rpc_runtime_api::InProcessOrders { - orders: FeeMarket::in_process_orders(), - } - } - } - impl bp_pangolin::PangolinFinalityApi for Runtime { fn best_finalized() -> (bp_pangolin::BlockNumber, bp_pangolin::Hash) { let header = BridgePangolinGrandpa::best_finalized(); diff --git a/src/service/api.rs b/src/service/api.rs index 3b48c7e5..0542c990 100644 --- a/src/service/api.rs +++ b/src/service/api.rs @@ -13,7 +13,6 @@ pub trait RuntimeApiCollection: + sp_transaction_pool::runtime_api::TaggedTransactionQueue + substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi - + pallet_fee_market_rpc_runtime_api::FeeMarketApi { } impl RuntimeApiCollection for Api where @@ -27,6 +26,5 @@ impl RuntimeApiCollection for Api where + sp_transaction_pool::runtime_api::TaggedTransactionQueue + substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi - + pallet_fee_market_rpc_runtime_api::FeeMarketApi { } From e5a1f2cb5d20a67e7253af94faa5c9b27041d1ed Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Wed, 18 May 2022 14:11:23 +0800 Subject: [PATCH 40/59] Format --- Cargo.toml | 2 +- runtime/crab-parachain/Cargo.toml | 4 ++-- runtime/darwinia-parachain/Cargo.toml | 4 ++-- runtime/pangolin-parachain/Cargo.toml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 24e1fd22..4bf1ca21 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ runtime-benchmarks = [ array-bytes = { version = "1.5" } async-trait = { version = "0.1" } clap = { version = "3.1", features = ["derive"] } -codec = { package = "parity-scale-codec", version = "3.0.0" } +codec = { package = "parity-scale-codec", version = "3.0" } futures = { version = "0.3" } jsonrpc-core = { version = "18.0" } log = { version = "0.4" } diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 1905ec6c..766ed6c0 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -13,8 +13,8 @@ version = "5.2.0-rc1" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index c1b83582..1e850b90 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -13,8 +13,8 @@ version = "5.2.0-rc1" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 24abe72a..b61d9651 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -13,8 +13,8 @@ version = "5.2.0-rc1" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } From 3a815bc8ed1e0d41e4673037c6b8c9e05d4de403 Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Wed, 18 May 2022 15:23:52 +0800 Subject: [PATCH 41/59] Bump Deps --- Cargo.lock | 86 +++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9b569fb3..532196da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -736,14 +736,14 @@ dependencies = [ [[package]] name = "bp-darwinia-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -752,13 +752,13 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "finality-grandpa 0.14.4", "frame-support", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-finality-grandpa", @@ -785,12 +785,12 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-std", ] @@ -809,15 +809,15 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-std", @@ -842,7 +842,7 @@ dependencies = [ [[package]] name = "bp-pangolin" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-darwinia-core", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -857,7 +857,7 @@ dependencies = [ [[package]] name = "bp-pangolin-parachain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-darwinia-core", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -872,14 +872,14 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-core", "sp-runtime", @@ -925,13 +925,13 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -961,12 +961,12 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "ed25519-dalek", "finality-grandpa 0.14.4", - "parity-scale-codec 2.3.1", + "parity-scale-codec 3.1.2", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -1006,7 +1006,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -1020,8 +1020,8 @@ dependencies = [ "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-transaction-payment", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-state-machine", @@ -1270,9 +1270,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21" +checksum = "bf6b561dcf059c85bbe388e0a7b0a1469acb3934cc0cfa148613a830629e3049" dependencies = [ "glob", "libc", @@ -5797,15 +5797,15 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -5831,7 +5831,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -5842,8 +5842,8 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-finality-grandpa", "sp-runtime", @@ -5876,9 +5876,9 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -5887,8 +5887,8 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-runtime", @@ -6013,9 +6013,9 @@ dependencies = [ [[package]] name = "pallet-fee-market" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#5cde446dd3bd992e58e6d25d137c25d61e27e82a" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-benchmarking", @@ -6024,7 +6024,7 @@ dependencies = [ "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-timestamp", "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -9919,12 +9919,12 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "winapi 0.3.9", + "windows-sys", ] [[package]] From 1ff72926bb9f8d24862cebf945fdf8ca09d8e8fa Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Wed, 18 May 2022 16:25:08 +0800 Subject: [PATCH 42/59] merge #72 --- runtime/pangolin-parachain/src/migrations.rs | 30 ++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 runtime/pangolin-parachain/src/migrations.rs diff --git a/runtime/pangolin-parachain/src/migrations.rs b/runtime/pangolin-parachain/src/migrations.rs new file mode 100644 index 00000000..c099a503 --- /dev/null +++ b/runtime/pangolin-parachain/src/migrations.rs @@ -0,0 +1,30 @@ +// --- paritytech --- +#[allow(unused)] +use frame_support::{migration, traits::OnRuntimeUpgrade, weights::Weight}; +// --- darwinia-network --- +#[allow(unused)] +use crate::*; + +pub struct CustomOnRuntimeUpgrade; +impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade { + #[cfg(feature = "try-runtime")] + fn pre_upgrade() -> Result<(), &'static str> { + Ok(()) + } + + #[cfg(feature = "try-runtime")] + fn post_upgrade() -> Result<(), &'static str> { + Ok(()) + } + + fn on_runtime_upgrade() -> Weight { + migrate() + } +} + +fn migrate() -> Weight { + migration::move_pallet(b"FeeMarket", b"PangolinFeeMarket"); + + // 0 + RuntimeBlockWeights::get().max_block +} From f5fccff670b0491fcb28f2cc914e7bdbd491ff71 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Wed, 18 May 2022 16:47:14 +0800 Subject: [PATCH 43/59] merge #72 --- rpc/src/lib.rs | 3 +- runtime/common/src/lib.rs | 15 ++++--- runtime/crab-parachain/src/migrations.rs | 6 ++- .../src/bridges_message/pangolin.rs | 4 +- runtime/pangolin-parachain/src/lib.rs | 6 ++- .../src/pallets/bridge_messages.rs | 43 +++++++------------ .../src/pallets/fee_market.rs | 35 +++++++-------- 7 files changed, 55 insertions(+), 57 deletions(-) diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index 43cdab1a..4483ef43 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -55,8 +55,7 @@ where + sp_blockchain::HeaderMetadata, C::Api: substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi - + sp_block_builder::BlockBuilder - + + sp_block_builder::BlockBuilder, P: 'static + Send + Sync + sc_transaction_pool_api::TransactionPool, { // --- paritytech --- diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index edaeeabd..2aef8ff3 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -130,18 +130,19 @@ where /// dispatch origin; /// - check that the sender has paid enough funds for both message delivery and dispatch. #[derive(RuntimeDebug)] -pub struct FromThisChainMessageVerifier(PhantomData<(B, R)>); -impl +pub struct FromThisChainMessageVerifier(PhantomData<(B, R, I)>); +impl LaneMessageVerifier< AccountIdOf>, FromThisChainMessagePayload, BalanceOf>, - > for FromThisChainMessageVerifier + > for FromThisChainMessageVerifier where B: MessageBridge, - R: pallet_fee_market::Config, + R: pallet_fee_market::Config, + I: 'static, AccountIdOf>: Clone + PartialEq, - pallet_fee_market::RingBalance: From>>, + pallet_fee_market::BalanceOf: From>>, { type Error = &'static str; @@ -173,8 +174,8 @@ where // Do the delivery_and_dispatch_fee. We assume that the delivery and dispatch fee always // greater than the fee market provided fee. - if let Some(market_fee) = pallet_fee_market::Pallet::::market_fee() { - let message_fee: pallet_fee_market::RingBalance = + if let Some(market_fee) = pallet_fee_market::Pallet::::market_fee() { + let message_fee: pallet_fee_market::BalanceOf = (*delivery_and_dispatch_fee).into(); // compare with actual fee paid diff --git a/runtime/crab-parachain/src/migrations.rs b/runtime/crab-parachain/src/migrations.rs index 437ec534..ece5346e 100644 --- a/runtime/crab-parachain/src/migrations.rs +++ b/runtime/crab-parachain/src/migrations.rs @@ -1,5 +1,9 @@ // --- paritytech --- -use frame_support::{traits::OnRuntimeUpgrade, weights::Weight}; +#[allow(unused)] +use frame_support::{migration, traits::OnRuntimeUpgrade, weights::Weight}; +// --- darwinia-network --- +#[allow(unused)] +use crate::*; pub struct CustomOnRuntimeUpgrade; impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade { diff --git a/runtime/pangolin-parachain/src/bridges_message/pangolin.rs b/runtime/pangolin-parachain/src/bridges_message/pangolin.rs index 64faf4da..a4a39e39 100644 --- a/runtime/pangolin-parachain/src/bridges_message/pangolin.rs +++ b/runtime/pangolin-parachain/src/bridges_message/pangolin.rs @@ -27,8 +27,8 @@ pub type ToPangolinMessagePayload = FromThisChainMessagePayload; /// Message verifier for PangolinParachain -> Pangolin messages. -pub type ToPangolinMessageVerifier = FromThisChainMessageVerifier; - +pub type ToPangolinMessageVerifier = + FromThisChainMessageVerifier; /// Encoded Pangolin Call as it comes from Pangolin. pub type FromPangolinEncodedCall = FromBridgedChainEncodedMessageCall; diff --git a/runtime/pangolin-parachain/src/lib.rs b/runtime/pangolin-parachain/src/lib.rs index f78638e0..a41de78d 100644 --- a/runtime/pangolin-parachain/src/lib.rs +++ b/runtime/pangolin-parachain/src/lib.rs @@ -44,6 +44,9 @@ pub mod wasm { } pub use wasm::*; +mod migrations; +use migrations::*; + #[cfg(feature = "runtime-benchmarks")] #[macro_use] extern crate frame_benchmarking; @@ -108,6 +111,7 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPalletsWithSystem, + CustomOnRuntimeUpgrade, >; type Ring = Balances; @@ -181,7 +185,7 @@ frame_support::construct_runtime! { BridgePangolinMessages: pallet_bridge_messages::::{Pallet, Call, Storage, Event} = 21, BridgePangolinDispatch: pallet_bridge_dispatch::::{Pallet, Event} = 22, - FeeMarket: pallet_fee_market::{Pallet, Call, Storage, Event} = 23, + PangolinFeeMarket: pallet_fee_market::::{Pallet, Call, Storage, Event} = 23, } } diff --git a/runtime/pangolin-parachain/src/pallets/bridge_messages.rs b/runtime/pangolin-parachain/src/pallets/bridge_messages.rs index fffbe306..295d567e 100644 --- a/runtime/pangolin-parachain/src/pallets/bridge_messages.rs +++ b/runtime/pangolin-parachain/src/pallets/bridge_messages.rs @@ -22,36 +22,25 @@ frame_support::parameter_types! { } impl Config for Runtime { + type AccountIdConverter = bp_pangolin_parachain::AccountIdConverter; + type BridgedChainId = BridgedChainId; type Event = Event; - type WeightInfo = WeightInfo; - type Parameter = bm_pangolin::PangolinParachainToPangolinParameter; - type MaxMessagesToPruneAtOnce = MaxMessagesToPruneAtOnce; - type MaxUnrewardedRelayerEntriesAtInboundLane = MaxUnrewardedRelayerEntriesAtInboundLane; - type MaxUnconfirmedMessagesAtInboundLane = MaxUnconfirmedMessagesAtInboundLane; - - type OutboundPayload = bm_pangolin::ToPangolinMessagePayload; - type OutboundMessageFee = Balance; - - type InboundPayload = bm_pangolin::FromPangolinMessagePayload; type InboundMessageFee = bp_pangolin::Balance; + type InboundPayload = bm_pangolin::FromPangolinMessagePayload; type InboundRelayer = bp_pangolin::AccountId; - - type AccountIdConverter = bp_pangolin_parachain::AccountIdConverter; - - type TargetHeaderChain = bm_pangolin::Pangolin; type LaneMessageVerifier = bm_pangolin::ToPangolinMessageVerifier; - type MessageDeliveryAndDispatchPayment = FeeMarketPayment< - Runtime, - WithPangolinMessages, - Ring, - GetDeliveryConfirmationTransactionFee, - RootAccountForPayments, - >; - - type OnMessageAccepted = FeeMarketMessageAcceptedHandler; - type OnDeliveryConfirmed = (FeeMarketMessageConfirmedHandler,); - - type SourceHeaderChain = bm_pangolin::Pangolin; + type MaxMessagesToPruneAtOnce = MaxMessagesToPruneAtOnce; + type MaxUnconfirmedMessagesAtInboundLane = MaxUnconfirmedMessagesAtInboundLane; + type MaxUnrewardedRelayerEntriesAtInboundLane = MaxUnrewardedRelayerEntriesAtInboundLane; + type MessageDeliveryAndDispatchPayment = + FeeMarketPayment; type MessageDispatch = bm_pangolin::FromPangolinMessageDispatch; - type BridgedChainId = BridgedChainId; + type OnDeliveryConfirmed = (FeeMarketMessageConfirmedHandler,); + type OnMessageAccepted = FeeMarketMessageAcceptedHandler; + type OutboundMessageFee = bp_pangolin_parachain::Balance; + type OutboundPayload = bm_pangolin::ToPangolinMessagePayload; + type Parameter = bm_pangolin::PangolinParachainToPangolinParameter; + type SourceHeaderChain = bm_pangolin::Pangolin; + type TargetHeaderChain = bm_pangolin::Pangolin; + type WeightInfo = WeightInfo; } diff --git a/runtime/pangolin-parachain/src/pallets/fee_market.rs b/runtime/pangolin-parachain/src/pallets/fee_market.rs index 43de2710..36540516 100644 --- a/runtime/pangolin-parachain/src/pallets/fee_market.rs +++ b/runtime/pangolin-parachain/src/pallets/fee_market.rs @@ -1,3 +1,5 @@ +pub use pallet_fee_market::Instance1 as WithPangolinFeeMarket; + // --- core --- use core::cmp; // --- substrate --- @@ -5,11 +7,15 @@ use frame_support::{traits::LockIdentifier, PalletId}; use sp_runtime::{traits::UniqueSaturatedInto, Permill}; // --- darwinia --- use crate::{weights::pallet_fee_market::WeightInfo, *}; -use pallet_fee_market::{Config, RingBalance, Slasher}; +use pallet_fee_market::{BalanceOf, Config, Slasher}; pub struct FeeMarketSlasher; -impl Slasher for FeeMarketSlasher { - fn slash(locked_collateral: RingBalance, timeout: T::BlockNumber) -> RingBalance { +impl Slasher for FeeMarketSlasher +where + T: Config, + I: 'static, +{ + fn slash(locked_collateral: BalanceOf, timeout: T::BlockNumber) -> BalanceOf { let slash_each_block = 2 * COIN; let slash_value = UniqueSaturatedInto::::unique_saturated_into(timeout) .saturating_mul(UniqueSaturatedInto::::unique_saturated_into( @@ -22,7 +28,6 @@ impl Slasher for FeeMarketSlasher { } frame_support::parameter_types! { - pub const FeeMarketPalletId: PalletId = PalletId(*b"da/feemk"); pub const TreasuryPalletId: PalletId = PalletId(*b"da/trsry"); pub const FeeMarketLockId: LockIdentifier = *b"da/feelf"; @@ -35,21 +40,17 @@ frame_support::parameter_types! { pub const ConfirmRelayersRewardRatio: Permill = Permill::from_percent(20); } -impl Config for Runtime { - type PalletId = FeeMarketPalletId; - type TreasuryPalletId = TreasuryPalletId; - type LockId = FeeMarketLockId; - - type MinimumRelayFee = MinimumRelayFee; - type CollateralPerOrder = CollateralPerOrder; - type Slot = Slot; - +impl Config for Runtime { type AssignedRelayersRewardRatio = AssignedRelayersRewardRatio; - type MessageRelayersRewardRatio = MessageRelayersRewardRatio; + type CollateralPerOrder = CollateralPerOrder; type ConfirmRelayersRewardRatio = ConfirmRelayersRewardRatio; - - type Slasher = FeeMarketSlasher; - type RingCurrency = Ring; + type Currency = Ring; type Event = Event; + type LockId = FeeMarketLockId; + type MessageRelayersRewardRatio = MessageRelayersRewardRatio; + type MinimumRelayFee = MinimumRelayFee; + type Slasher = FeeMarketSlasher; + type Slot = Slot; + type TreasuryPalletId = TreasuryPalletId; type WeightInfo = WeightInfo; } From 4caa04cc1973faa7109c637d330c6dddc3b12f11 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 23 May 2022 14:51:16 +0800 Subject: [PATCH 44/59] Companion for darwinia-bridges-substrate#1581f60cd5951a3fa4f9fd534798568c67bb7223 --- Cargo.lock | 938 ++++++++++++++++++-------------------- Cargo.toml | 12 + runtime/common/src/lib.rs | 29 +- 3 files changed, 476 insertions(+), 503 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 532196da..f99168f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -457,7 +457,7 @@ dependencies = [ "futures 0.3.21", "hex", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-chain-spec", "sc-client-api", @@ -490,7 +490,7 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-rpc", "sc-utils", @@ -510,8 +510,8 @@ name = "beefy-primitives" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-core", @@ -559,28 +559,16 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitvec" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" -dependencies = [ - "funty 1.1.0", - "radium 0.6.2", - "tap", - "wyz 0.2.0", -] - [[package]] name = "bitvec" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ - "funty 2.0.0", - "radium 0.7.0", + "funty", + "radium", "tap", - "wyz 0.5.0", + "wyz", ] [[package]] @@ -736,14 +724,13 @@ dependencies = [ [[package]] name = "bp-darwinia-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -752,13 +739,12 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "finality-grandpa 0.14.4", + "bp-runtime 0.1.0", + "finality-grandpa", "frame-support", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-finality-grandpa", @@ -771,10 +757,10 @@ name = "bp-header-chain" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "finality-grandpa 0.15.0", + "finality-grandpa", "frame-support", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-finality-grandpa", @@ -785,12 +771,11 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0", "frame-support", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-std", ] @@ -801,23 +786,22 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-std", ] [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec 1.0.0", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bitvec", + "bp-runtime 0.1.0", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-std", @@ -828,13 +812,13 @@ name = "bp-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-std", ] @@ -842,11 +826,10 @@ dependencies = [ [[package]] name = "bp-pangolin" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-darwinia-core", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "frame-support", "sp-api", "sp-runtime", @@ -857,11 +840,10 @@ dependencies = [ [[package]] name = "bp-pangolin-parachain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-darwinia-core", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "frame-support", "sp-api", "sp-runtime", @@ -872,14 +854,15 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "parity-util-mem", + "scale-info", + "serde", "sp-api", "sp-core", "sp-runtime", @@ -896,8 +879,8 @@ dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-core", "sp-runtime", @@ -914,7 +897,7 @@ dependencies = [ "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "smallvec", "sp-api", "sp-runtime", @@ -925,13 +908,12 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -948,8 +930,8 @@ dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -961,12 +943,11 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-header-chain 0.1.0", "ed25519-dalek", - "finality-grandpa 0.14.4", - "parity-scale-codec 3.1.2", + "finality-grandpa", + "parity-scale-codec", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -980,8 +961,8 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "ed25519-dalek", - "finality-grandpa 0.15.0", - "parity-scale-codec 3.1.2", + "finality-grandpa", + "parity-scale-codec", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -997,7 +978,7 @@ dependencies = [ "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-rococo", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-runtime", "sp-std", @@ -1006,22 +987,22 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-message-dispatch 0.1.0", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "ed25519-dalek", "frame-support", "frame-system", "hash-db", "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-dispatch 0.1.0", + "pallet-bridge-grandpa 0.1.0", + "pallet-bridge-messages 0.1.0", "pallet-transaction-payment", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", + "sp-api", "sp-core", "sp-runtime", "sp-state-machine", @@ -1044,8 +1025,8 @@ dependencies = [ "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "pallet-transaction-payment", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-state-machine", @@ -1426,9 +1407,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "smallvec", "sp-api", "sp-block-builder", @@ -1698,7 +1679,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -1721,7 +1702,7 @@ dependencies = [ "cumulus-client-consensus-common", "cumulus-primitives-core", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-consensus-aura", @@ -1750,7 +1731,7 @@ dependencies = [ "cumulus-relay-chain-interface", "dyn-clone", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sc-client-api", "sc-consensus", @@ -1796,7 +1777,7 @@ dependencies = [ "derive_more", "futures 0.3.21", "futures-timer", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-parachain", @@ -1820,7 +1801,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -1846,7 +1827,7 @@ dependencies = [ "cumulus-client-pov-recovery", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-overseer", "polkadot-primitives", @@ -1874,8 +1855,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-aura", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-application-crypto", "sp-consensus-aura", @@ -1892,8 +1873,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -1915,9 +1896,9 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "serde", "sp-core", "sp-externalities", @@ -1950,8 +1931,8 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -1969,9 +1950,9 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand_chacha 0.3.1", - "scale-info 2.1.1", + "scale-info", "sp-runtime", "sp-std", "xcm", @@ -1984,7 +1965,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2003,9 +1984,9 @@ dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-test-relay-sproof-builder", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", - "scale-info 2.1.1", + "scale-info", "sp-api", "sp-core", "sp-inherents", @@ -2024,7 +2005,7 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e9 dependencies = [ "cumulus-primitives-core", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-inherents", "sp-std", "sp-timestamp", @@ -2037,7 +2018,7 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e9 dependencies = [ "cumulus-primitives-core", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2085,7 +2066,7 @@ dependencies = [ "derive_more", "futures 0.3.21", "jsonrpsee-core 0.9.0", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-overseer", "polkadot-service", @@ -2111,7 +2092,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "jsonrpsee 0.9.0", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-service", "sc-client-api", @@ -2131,7 +2112,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sp-runtime", "sp-state-machine", @@ -2193,7 +2174,7 @@ dependencies = [ "log", "pallet-transaction-payment-rpc", "pangolin-parachain-runtime", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-cli", "polkadot-parachain", "polkadot-primitives", @@ -2269,9 +2250,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "smallvec", "sp-api", "sp-block-builder", @@ -2320,13 +2301,13 @@ dependencies = [ name = "dc-common-runtime" version = "5.2.0-rc1" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0", + "bridge-runtime-common 0.1.0", "dc-primitives", "frame-support", "frame-system", "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-dispatch 0.1.0", "pallet-collator-selection", "pallet-fee-market", "pallet-transaction-payment", @@ -2652,6 +2633,33 @@ dependencies = [ "libc", ] +[[package]] +name = "ethbloom" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef" +dependencies = [ + "crunchy", + "fixed-hash", + "impl-rlp", + "impl-serde", + "tiny-keccak", +] + +[[package]] +name = "ethereum-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6" +dependencies = [ + "ethbloom", + "fixed-hash", + "impl-rlp", + "impl-serde", + "primitive-types", + "uint", +] + [[package]] name = "event-listener" version = "2.5.2" @@ -2766,22 +2774,6 @@ dependencies = [ "log", ] -[[package]] -name = "finality-grandpa" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" -dependencies = [ - "either", - "futures 0.3.21", - "futures-timer", - "log", - "num-traits", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", - "scale-info 1.0.0", -] - [[package]] name = "finality-grandpa" version = "0.15.0" @@ -2793,9 +2785,9 @@ dependencies = [ "futures-timer", "log", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.11.2", - "scale-info 2.1.1", + "scale-info", ] [[package]] @@ -2840,7 +2832,7 @@ name = "fork-tree" version = "3.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", ] [[package]] @@ -2862,9 +2854,9 @@ dependencies = [ "frame-system", "linregress", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", - "scale-info 2.1.1", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -2893,7 +2885,7 @@ dependencies = [ "linked-hash-map", "log", "memory-db", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.8.5", "sc-cli", "sc-client-api", @@ -2923,8 +2915,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-npos-elections", "sp-std", @@ -2937,8 +2929,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -2953,8 +2945,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", ] @@ -2969,9 +2961,9 @@ dependencies = [ "impl-trait-for-tuples", "log", "once_cell", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", - "scale-info 2.1.1", + "scale-info", "serde", "smallvec", "sp-arithmetic", @@ -3028,8 +3020,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -3046,8 +3038,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -3058,7 +3050,7 @@ name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", ] @@ -3123,12 +3115,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] name = "funty" version = "2.0.0" @@ -3610,7 +3596,7 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.20.5", + "rustls 0.20.6", "rustls-native-certs 0.6.2", "tokio", "tokio-rustls 0.23.4", @@ -3682,7 +3668,16 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", +] + +[[package]] +name = "impl-rlp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" +dependencies = [ + "rlp", ] [[package]] @@ -4245,7 +4240,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -4295,12 +4290,12 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -5637,8 +5632,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-timestamp", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-consensus-aura", "sp-runtime", @@ -5653,8 +5648,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-authority-discovery", "sp-runtime", @@ -5669,8 +5664,8 @@ dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-authorship", "sp-runtime", "sp-std", @@ -5688,8 +5683,8 @@ dependencies = [ "pallet-authorship", "pallet-session", "pallet-timestamp", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", @@ -5711,8 +5706,8 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -5729,8 +5724,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -5744,8 +5739,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -5767,8 +5762,8 @@ dependencies = [ "pallet-mmr", "pallet-mmr-primitives", "pallet-session", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -5786,8 +5781,8 @@ dependencies = [ "frame-system", "log", "pallet-treasury", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -5797,15 +5792,14 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-message-dispatch 0.1.0", + "bp-runtime 0.1.0", "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -5821,8 +5815,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -5831,19 +5825,18 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "finality-grandpa 0.14.4", + "bp-header-chain 0.1.0", + "bp-runtime 0.1.0", + "bp-test-utils 0.1.0", + "finality-grandpa", "frame-benchmarking", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-finality-grandpa", "sp-runtime", @@ -5859,13 +5852,13 @@ dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-test-utils 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", - "finality-grandpa 0.15.0", + "finality-grandpa", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-finality-grandpa", "sp-runtime", @@ -5876,19 +5869,18 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec 1.0.0", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bitvec", + "bp-message-dispatch 0.1.0", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "frame-benchmarking", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -5900,7 +5892,7 @@ name = "pallet-bridge-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", @@ -5908,8 +5900,8 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -5927,9 +5919,9 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.8.5", - "scale-info 2.1.1", + "scale-info", "serde", "sp-runtime", "sp-staking", @@ -5945,8 +5937,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -5961,8 +5953,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -5979,9 +5971,9 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.7.3", - "scale-info 2.1.1", + "scale-info", "sp-arithmetic", "sp-core", "sp-io", @@ -6001,8 +5993,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-npos-elections", @@ -6013,18 +6005,17 @@ dependencies = [ [[package]] name = "pallet-fee-market" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec 1.0.0", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bitvec", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "frame-benchmarking", "frame-support", "frame-system", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-messages 0.1.0", "pallet-timestamp", - "parity-scale-codec 2.3.1", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6039,8 +6030,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-runtime", "sp-std", @@ -6057,8 +6048,8 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-core", "sp-finality-grandpa", @@ -6078,8 +6069,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6095,8 +6086,8 @@ dependencies = [ "frame-system", "log", "pallet-authorship", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-core", "sp-io", @@ -6113,8 +6104,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-keyring", @@ -6131,8 +6122,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6149,8 +6140,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-mmr-primitives", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6165,7 +6156,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "serde", "sp-api", "sp-core", @@ -6182,7 +6173,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "pallet-mmr-primitives", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "serde", "sp-api", "sp-blockchain", @@ -6198,8 +6189,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6212,8 +6203,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6228,8 +6219,8 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-staking", @@ -6252,8 +6243,8 @@ dependencies = [ "pallet-offences", "pallet-session", "pallet-staking", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-staking", "sp-std", @@ -6267,8 +6258,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6283,8 +6274,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6297,8 +6288,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6313,8 +6304,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6330,8 +6321,8 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-timestamp", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6364,9 +6355,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand_chacha 0.2.2", - "scale-info 2.1.1", + "scale-info", "sp-runtime", "sp-std", ] @@ -6383,9 +6374,9 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand_chacha 0.2.2", - "scale-info 2.1.1", + "scale-info", "serde", "sp-application-crypto", "sp-io", @@ -6421,8 +6412,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6437,8 +6428,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-inherents", "sp-io", "sp-runtime", @@ -6456,8 +6447,8 @@ dependencies = [ "frame-system", "log", "pallet-treasury", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -6472,8 +6463,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "smallvec", "sp-core", @@ -6491,7 +6482,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-blockchain", "sp-core", @@ -6505,7 +6496,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "pallet-transaction-payment", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-runtime", ] @@ -6520,8 +6511,8 @@ dependencies = [ "frame-system", "impl-trait-for-tuples", "pallet-balances", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -6535,8 +6526,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6552,8 +6543,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -6566,8 +6557,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -6585,8 +6576,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", "xcm", @@ -6598,13 +6589,13 @@ name = "pangolin-parachain-runtime" version = "5.2.0-rc1" dependencies = [ "array-bytes", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-message-dispatch 0.1.0", + "bp-messages 0.1.0", "bp-pangolin", "bp-pangolin-parachain", - "bp-polkadot-core 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-polkadot-core 0.1.0", + "bp-runtime 0.1.0", + "bridge-runtime-common 0.1.0", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -6624,9 +6615,9 @@ dependencies = [ "pallet-aura", "pallet-authorship", "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-dispatch 0.1.0", + "pallet-bridge-grandpa 0.1.0", + "pallet-bridge-messages 0.1.0", "pallet-collator-selection", "pallet-fee-market", "pallet-multisig", @@ -6641,9 +6632,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "smallvec", "sp-api", "sp-block-builder", @@ -6670,8 +6661,8 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", ] @@ -6694,20 +6685,6 @@ dependencies = [ "snap", ] -[[package]] -name = "parity-scale-codec" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" -dependencies = [ - "arrayvec 0.7.2", - "bitvec 0.20.4", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive 2.3.1", - "serde", -] - [[package]] name = "parity-scale-codec" version = "3.1.2" @@ -6715,25 +6692,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" dependencies = [ "arrayvec 0.7.2", - "bitvec 1.0.0", + "bitvec", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive 3.1.2", + "parity-scale-codec-derive", "serde", ] -[[package]] -name = "parity-scale-codec-derive" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" -dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "parity-scale-codec-derive" version = "3.1.2" @@ -6773,8 +6738,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if 1.0.0", + "ethereum-types", "hashbrown 0.12.1", "impl-trait-for-tuples", + "lru 0.7.5", "parity-util-mem-derive", "parking_lot 0.12.0", "primitive-types", @@ -7092,7 +7059,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7114,7 +7081,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7207,9 +7174,9 @@ name = "polkadot-core-primitives" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", - "scale-info 2.1.1", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -7224,7 +7191,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7243,7 +7210,7 @@ name = "polkadot-erasure-coding" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", @@ -7279,7 +7246,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-network-protocol", "polkadot-node-subsystem", @@ -7297,7 +7264,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7314,14 +7281,14 @@ name = "polkadot-node-core-approval-voting" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "derive_more", "futures 0.3.21", "futures-timer", "kvdb", "lru 0.7.5", "merlin", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7342,11 +7309,11 @@ name = "polkadot-node-core-av-store" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7362,7 +7329,7 @@ name = "polkadot-node-core-backing" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7397,7 +7364,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7431,7 +7398,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7449,7 +7416,7 @@ dependencies = [ "futures 0.3.21", "kvdb", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7481,7 +7448,7 @@ name = "polkadot-node-core-provisioner" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -7504,7 +7471,7 @@ dependencies = [ "async-std", "futures 0.3.21", "futures-timer", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "pin-project 1.0.10", "polkadot-core-primitives", "polkadot-node-subsystem-util", @@ -7566,7 +7533,7 @@ dependencies = [ "lazy_static", "log", "mick-jaeger", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-primitives", @@ -7585,7 +7552,7 @@ dependencies = [ "futures-timer", "log", "metered-channel", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sc-cli", "sc-service", @@ -7602,7 +7569,7 @@ dependencies = [ "async-trait", "fatality", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", @@ -7619,7 +7586,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "bounded-vec", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "schnorrkel", @@ -7677,7 +7644,7 @@ dependencies = [ "lru 0.7.5", "metered-channel", "parity-db", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.2", "pin-project 1.0.10", @@ -7753,10 +7720,10 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "derive_more", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", - "scale-info 2.1.1", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -7783,14 +7750,14 @@ name = "polkadot-primitives" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "frame-system", "hex-literal", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -7845,7 +7812,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -7891,13 +7858,13 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-constants", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -7929,7 +7896,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7949,11 +7916,11 @@ dependencies = [ "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "slot-range-helper", @@ -7988,7 +7955,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bs58", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sp-std", "sp-tracing", @@ -8000,7 +7967,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bitflags", - "bitvec 1.0.0", + "bitvec", "derive_more", "frame-benchmarking", "frame-support", @@ -8014,13 +7981,13 @@ dependencies = [ "pallet-staking", "pallet-timestamp", "pallet-vesting", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-metrics", "rand 0.8.5", "rand_chacha 0.3.1", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "sp-api", "sp-core", @@ -8147,7 +8114,7 @@ dependencies = [ "fatality", "futures 0.3.21", "indexmap", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8164,7 +8131,7 @@ name = "polkadot-statement-table" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sp-core", ] @@ -8219,8 +8186,9 @@ checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", "impl-codec", + "impl-rlp", "impl-serde", - "scale-info 2.1.1", + "scale-info", "uint", ] @@ -8378,12 +8346,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" - [[package]] name = "radium" version = "0.7.0" @@ -8621,7 +8583,7 @@ dependencies = [ "env_logger", "jsonrpsee 0.8.0", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "serde", "serde_json", "sp-core", @@ -8670,6 +8632,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "rlp" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" +dependencies = [ + "bytes 1.1.0", + "rustc-hex", +] + [[package]] name = "rocksdb" version = "0.18.0" @@ -8725,13 +8697,13 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rococo-runtime-constants", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -8842,9 +8814,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.5" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024a432ae760ab3bff924ad91ce1cfa52cb57ed16e1ef32d0d249cfee1a6c13" +checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ "log", "ring", @@ -8948,7 +8920,7 @@ dependencies = [ "ip_network", "libp2p", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "prost", "prost-build", "rand 0.7.3", @@ -8972,7 +8944,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", @@ -8992,7 +8964,7 @@ name = "sc-block-builder" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sp-api", "sp-block-builder", @@ -9010,7 +8982,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.3", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-chain-spec-derive", "sc-network", "sc-telemetry", @@ -9044,7 +9016,7 @@ dependencies = [ "libp2p", "log", "names", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.7.3", "regex", "rpassword", @@ -9078,7 +9050,7 @@ dependencies = [ "futures 0.3.21", "hash-db", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-executor", "sc-transaction-pool-api", @@ -9109,7 +9081,7 @@ dependencies = [ "linked-hash-map", "log", "parity-db", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-client-api", "sc-state-db", @@ -9154,7 +9126,7 @@ dependencies = [ "async-trait", "futures 0.3.21", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -9188,7 +9160,7 @@ dependencies = [ "num-bigint", "num-rational 0.2.4", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "rand 0.7.3", "retain_mut", @@ -9248,7 +9220,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "fork-tree", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sp-blockchain", @@ -9264,7 +9236,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-telemetry", @@ -9298,7 +9270,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "lazy_static", "lru 0.6.6", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-executor-common", "sc-executor-wasmi", @@ -9324,7 +9296,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-allocator", "sp-core", "sp-maybe-compressed-blob", @@ -9341,7 +9313,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-allocator", "sc-executor-common", "scoped-tls", @@ -9359,7 +9331,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-wasm 0.42.2", "sc-allocator", "sc-executor-common", @@ -9377,13 +9349,13 @@ dependencies = [ "ahash", "async-trait", "dyn-clone", - "finality-grandpa 0.15.0", + "finality-grandpa", "fork-tree", "futures 0.3.21", "futures-timer", "hex", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "rand 0.8.5", "sc-block-builder", @@ -9414,14 +9386,14 @@ name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "finality-grandpa 0.15.0", + "finality-grandpa", "futures 0.3.21", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-finality-grandpa", "sc-rpc", @@ -9487,7 +9459,7 @@ dependencies = [ "linked_hash_set", "log", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "pin-project 1.0.10", "prost", @@ -9545,7 +9517,7 @@ dependencies = [ "hyper-rustls 0.22.1", "num_cpus", "once_cell", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "rand 0.7.3", "sc-client-api", @@ -9591,7 +9563,7 @@ dependencies = [ "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-block-builder", "sc-chain-spec", @@ -9623,7 +9595,7 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-chain-spec", "sc-transaction-pool-api", @@ -9668,7 +9640,7 @@ dependencies = [ "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.12.0", "pin-project 1.0.10", @@ -9724,7 +9696,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", "parking_lot 0.12.0", @@ -9740,7 +9712,7 @@ dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", @@ -9822,7 +9794,7 @@ dependencies = [ "futures-timer", "linked-hash-map", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.12.0", "retain_mut", @@ -9866,45 +9838,20 @@ dependencies = [ "prometheus", ] -[[package]] -name = "scale-info" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" -dependencies = [ - "bitvec 0.20.4", - "cfg-if 1.0.0", - "derive_more", - "parity-scale-codec 2.3.1", - "scale-info-derive 1.0.0", -] - [[package]] name = "scale-info" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" dependencies = [ - "bitvec 1.0.0", + "bitvec", "cfg-if 1.0.0", "derive_more", - "parity-scale-codec 3.1.2", - "scale-info-derive 2.1.1", + "parity-scale-codec", + "scale-info-derive", "serde", ] -[[package]] -name = "scale-info-derive" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" -dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "scale-info-derive" version = "2.1.1" @@ -10272,7 +10219,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "enumn", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", "sp-runtime", "sp-std", @@ -10361,7 +10308,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "hash-db", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api-proc-macro", "sp-core", "sp-runtime", @@ -10388,8 +10335,8 @@ name = "sp-application-crypto" version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -10403,8 +10350,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-debug-derive", "sp-std", @@ -10416,8 +10363,8 @@ name = "sp-authority-discovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-runtime", @@ -10430,7 +10377,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-inherents", "sp-runtime", "sp-std", @@ -10441,7 +10388,7 @@ name = "sp-block-builder" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -10456,7 +10403,7 @@ dependencies = [ "futures 0.3.21", "log", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sp-api", "sp-consensus", @@ -10475,7 +10422,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-core", "sp-inherents", "sp-runtime", @@ -10491,8 +10438,8 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-consensus", @@ -10510,8 +10457,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "async-trait", "merlin", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -10531,8 +10478,8 @@ name = "sp-consensus-slots" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-arithmetic", "sp-runtime", @@ -10545,7 +10492,7 @@ name = "sp-consensus-vrf" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "schnorrkel", "sp-core", "sp-runtime", @@ -10573,13 +10520,13 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.12.0", "primitive-types", "rand 0.7.3", "regex", - "scale-info 2.1.1", + "scale-info", "schnorrkel", "secp256k1", "secrecy", @@ -10648,7 +10595,7 @@ version = "0.12.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-std", "sp-storage", ] @@ -10658,10 +10605,10 @@ name = "sp-finality-grandpa" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "finality-grandpa 0.15.0", + "finality-grandpa", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -10678,7 +10625,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "async-trait", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-core", "sp-runtime", "sp-std", @@ -10694,7 +10641,7 @@ dependencies = [ "hash-db", "libsecp256k1", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "secp256k1", "sp-core", @@ -10729,7 +10676,7 @@ dependencies = [ "async-trait", "futures 0.3.21", "merlin", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "schnorrkel", "serde", @@ -10752,8 +10699,8 @@ name = "sp-npos-elections" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-arithmetic", "sp-core", @@ -10812,11 +10759,11 @@ dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "paste", "rand 0.7.3", - "scale-info 2.1.1", + "scale-info", "serde", "sp-application-crypto", "sp-arithmetic", @@ -10831,7 +10778,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "primitive-types", "sp-externalities", "sp-runtime-interface-proc-macro", @@ -10868,8 +10815,8 @@ name = "sp-session" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-core", "sp-runtime", @@ -10882,8 +10829,8 @@ name = "sp-staking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -10896,7 +10843,7 @@ dependencies = [ "hash-db", "log", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "rand 0.7.3", "smallvec", @@ -10922,7 +10869,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "ref-cast", "serde", "sp-debug-derive", @@ -10950,7 +10897,7 @@ dependencies = [ "async-trait", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -10963,7 +10910,7 @@ name = "sp-tracing" version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-std", "tracing", "tracing-core", @@ -10986,8 +10933,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "async-trait", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-inherents", "sp-runtime", @@ -11002,8 +10949,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "hash-db", "memory-db", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-std", "thiserror", @@ -11017,9 +10964,9 @@ version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-wasm 0.42.2", - "scale-info 2.1.1", + "scale-info", "serde", "sp-core-hashing-proc-macro", "sp-runtime", @@ -11033,7 +10980,7 @@ name = "sp-version-proc-macro" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "proc-macro2", "quote", "syn", @@ -11046,7 +10993,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-std", "wasmi", "wasmtime", @@ -11215,7 +11162,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", @@ -11417,6 +11364,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -11480,7 +11436,7 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.5", + "rustls 0.20.6", "tokio", "webpki 0.22.0", ] @@ -11706,7 +11662,7 @@ dependencies = [ "clap", "jsonrpsee 0.4.1", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "remote-externalities", "sc-chain-spec", "sc-cli", @@ -12302,7 +12258,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -12350,13 +12306,13 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "pallet-xcm-benchmarks", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -12516,12 +12472,6 @@ dependencies = [ "winapi-build", ] -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "wyz" version = "0.5.0" @@ -12550,8 +12500,8 @@ dependencies = [ "derivative", "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "xcm-procedural", ] @@ -12564,9 +12514,9 @@ dependencies = [ "frame-system", "log", "pallet-transaction-payment", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "sp-arithmetic", "sp-io", "sp-runtime", @@ -12584,7 +12534,7 @@ dependencies = [ "frame-support", "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-arithmetic", "sp-core", "sp-io", diff --git a/Cargo.toml b/Cargo.toml index 4bf1ca21..2868fabc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,3 +118,15 @@ members = [ "rpc", "runtime/*", ] +[patch."https://github.com/darwinia-network/darwinia-bridges-substrate"] +bp-message-dispatch = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/message-dispatch" } +bp-messages = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/messages" } +bp-pangolin = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/chain-pangolin" } +bp-pangolin-parachain = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/chain-pangolin-parachain" } +bp-polkadot-core = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/polkadot-core" } +bp-runtime = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/runtime" } +bridge-runtime-common = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/bin/runtime-common" } +pallet-bridge-dispatch = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/modules/dispatch" } +pallet-bridge-grandpa = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/modules/grandpa" } +pallet-bridge-messages = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/modules/messages" } +pallet-fee-market = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/modules/fee-market" } diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 2aef8ff3..64f0f375 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -21,10 +21,7 @@ // --- core --- use core::marker::PhantomData; // --- paritytech --- -use bp_messages::{ - source_chain::{LaneMessageVerifier, Sender}, - LaneId, OutboundLaneData, -}; +use bp_messages::{source_chain::LaneMessageVerifier, LaneId, OutboundLaneData}; use bridge_runtime_common::messages::{source::*, *}; use frame_support::{ traits::{Currency, Imbalance, OnUnbalanced}, @@ -133,6 +130,7 @@ where pub struct FromThisChainMessageVerifier(PhantomData<(B, R, I)>); impl LaneMessageVerifier< + OriginOf>, AccountIdOf>, FromThisChainMessagePayload, BalanceOf>, @@ -147,15 +145,15 @@ where type Error = &'static str; fn verify_message( - submitter: &Sender>>, + submitter: &OriginOf>, delivery_and_dispatch_fee: &BalanceOf>, lane: &LaneId, lane_outbound_data: &OutboundLaneData, payload: &FromThisChainMessagePayload, ) -> Result<(), Self::Error> { // reject message if lane is blocked - if !ThisChain::::is_outbound_lane_enabled(lane) { - return Err(OUTBOUND_LANE_DISABLED); + if !ThisChain::::is_message_accepted(submitter, lane) { + return Err(MESSAGE_REJECTED_BY_OUTBOUND_LANE); } // reject message if there are too many pending messages at this lane @@ -169,8 +167,21 @@ where // Do the dispatch-specific check. We assume that the target chain uses // `Dispatch`, so we verify the message accordingly. - pallet_bridge_dispatch::verify_message_origin(submitter, payload) - .map_err(|_| BAD_ORIGIN)?; + let raw_origin_or_err: Result< + frame_system::RawOrigin>>, + OriginOf>, + > = submitter.clone().into(); + if let Ok(raw_origin) = raw_origin_or_err { + pallet_bridge_dispatch::verify_message_origin(&raw_origin, payload) + .map(drop) + .map_err(|_| BAD_ORIGIN)?; + } else { + // so what it means that we've failed to convert origin to the + // `frame_system::RawOrigin`? now it means that the custom pallet origin has + // been used to send the message. Do we need to verify it? The answer is no, + // because pallet may craft any origin (e.g. root) && we can't verify whether it + // is valid, or not. + }; // Do the delivery_and_dispatch_fee. We assume that the delivery and dispatch fee always // greater than the fee market provided fee. From f77c4a8c2aceb49c8e9b6b3ff66b5cab558aa945 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 23 May 2022 14:58:02 +0800 Subject: [PATCH 45/59] Revert "Companion for darwinia-bridges-substrate#1581f60cd5951a3fa4f9fd534798568c67bb7223" This reverts commit 4caa04cc1973faa7109c637d330c6dddc3b12f11. --- Cargo.lock | 938 ++++++++++++++++++++------------------ Cargo.toml | 12 - runtime/common/src/lib.rs | 29 +- 3 files changed, 503 insertions(+), 476 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f99168f8..532196da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -457,7 +457,7 @@ dependencies = [ "futures 0.3.21", "hex", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "sc-chain-spec", "sc-client-api", @@ -490,7 +490,7 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "sc-rpc", "sc-utils", @@ -510,8 +510,8 @@ name = "beefy-primitives" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-application-crypto", "sp-core", @@ -559,16 +559,28 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitvec" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +dependencies = [ + "funty 1.1.0", + "radium 0.6.2", + "tap", + "wyz 0.2.0", +] + [[package]] name = "bitvec" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ - "funty", - "radium", + "funty 2.0.0", + "radium 0.7.0", "tap", - "wyz", + "wyz 0.5.0", ] [[package]] @@ -724,13 +736,14 @@ dependencies = [ [[package]] name = "bp-darwinia-core" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-messages 0.1.0", - "bp-runtime 0.1.0", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 2.3.1", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -739,12 +752,13 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-runtime 0.1.0", - "finality-grandpa", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "finality-grandpa 0.14.4", "frame-support", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-finality-grandpa", @@ -757,10 +771,10 @@ name = "bp-header-chain" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "finality-grandpa", + "finality-grandpa 0.15.0", "frame-support", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-finality-grandpa", @@ -771,11 +785,12 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-runtime 0.1.0", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-std", ] @@ -786,22 +801,23 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-std", ] [[package]] name = "bp-messages" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec", - "bp-runtime 0.1.0", + "bitvec 1.0.0", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-std", @@ -812,13 +828,13 @@ name = "bp-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-std", ] @@ -826,10 +842,11 @@ dependencies = [ [[package]] name = "bp-pangolin" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-darwinia-core", - "bp-messages 0.1.0", - "bp-runtime 0.1.0", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "sp-api", "sp-runtime", @@ -840,10 +857,11 @@ dependencies = [ [[package]] name = "bp-pangolin-parachain" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-darwinia-core", - "bp-messages 0.1.0", - "bp-runtime 0.1.0", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "sp-api", "sp-runtime", @@ -854,15 +872,14 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-messages 0.1.0", - "bp-runtime 0.1.0", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", - "parity-scale-codec", - "parity-util-mem", - "scale-info", - "serde", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-core", "sp-runtime", @@ -879,8 +896,8 @@ dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-core", "sp-runtime", @@ -897,7 +914,7 @@ dependencies = [ "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "smallvec", "sp-api", "sp-runtime", @@ -908,12 +925,13 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -930,8 +948,8 @@ dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -943,11 +961,12 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-header-chain 0.1.0", + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "ed25519-dalek", - "finality-grandpa", - "parity-scale-codec", + "finality-grandpa 0.14.4", + "parity-scale-codec 3.1.2", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -961,8 +980,8 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "ed25519-dalek", - "finality-grandpa", - "parity-scale-codec", + "finality-grandpa 0.15.0", + "parity-scale-codec 3.1.2", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -978,7 +997,7 @@ dependencies = [ "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-rococo", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-runtime", "sp-std", @@ -987,22 +1006,22 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-message-dispatch 0.1.0", - "bp-messages 0.1.0", - "bp-runtime 0.1.0", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "ed25519-dalek", "frame-support", "frame-system", "hash-db", "pallet-balances", - "pallet-bridge-dispatch 0.1.0", - "pallet-bridge-grandpa 0.1.0", - "pallet-bridge-messages 0.1.0", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-transaction-payment", - "parity-scale-codec", - "scale-info", - "sp-api", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-state-machine", @@ -1025,8 +1044,8 @@ dependencies = [ "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "pallet-transaction-payment", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-state-machine", @@ -1407,9 +1426,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info", + "scale-info 2.1.1", "smallvec", "sp-api", "sp-block-builder", @@ -1679,7 +1698,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -1702,7 +1721,7 @@ dependencies = [ "cumulus-client-consensus-common", "cumulus-primitives-core", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-consensus", "sc-consensus-aura", @@ -1731,7 +1750,7 @@ dependencies = [ "cumulus-relay-chain-interface", "dyn-clone", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sc-client-api", "sc-consensus", @@ -1777,7 +1796,7 @@ dependencies = [ "derive_more", "futures 0.3.21", "futures-timer", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-parachain", @@ -1801,7 +1820,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -1827,7 +1846,7 @@ dependencies = [ "cumulus-client-pov-recovery", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-overseer", "polkadot-primitives", @@ -1855,8 +1874,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-aura", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-application-crypto", "sp-consensus-aura", @@ -1873,8 +1892,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -1896,9 +1915,9 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info", + "scale-info 2.1.1", "serde", "sp-core", "sp-externalities", @@ -1931,8 +1950,8 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-io", "sp-runtime", @@ -1950,9 +1969,9 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand_chacha 0.3.1", - "scale-info", + "scale-info 2.1.1", "sp-runtime", "sp-std", "xcm", @@ -1965,7 +1984,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -1984,9 +2003,9 @@ dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-test-relay-sproof-builder", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", - "scale-info", + "scale-info 2.1.1", "sp-api", "sp-core", "sp-inherents", @@ -2005,7 +2024,7 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e9 dependencies = [ "cumulus-primitives-core", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-inherents", "sp-std", "sp-timestamp", @@ -2018,7 +2037,7 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e9 dependencies = [ "cumulus-primitives-core", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2066,7 +2085,7 @@ dependencies = [ "derive_more", "futures 0.3.21", "jsonrpsee-core 0.9.0", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-overseer", "polkadot-service", @@ -2092,7 +2111,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "jsonrpsee 0.9.0", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-service", "sc-client-api", @@ -2112,7 +2131,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sp-runtime", "sp-state-machine", @@ -2174,7 +2193,7 @@ dependencies = [ "log", "pallet-transaction-payment-rpc", "pangolin-parachain-runtime", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-cli", "polkadot-parachain", "polkadot-primitives", @@ -2250,9 +2269,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info", + "scale-info 2.1.1", "smallvec", "sp-api", "sp-block-builder", @@ -2301,13 +2320,13 @@ dependencies = [ name = "dc-common-runtime" version = "5.2.0-rc1" dependencies = [ - "bp-messages 0.1.0", - "bridge-runtime-common 0.1.0", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "dc-primitives", "frame-support", "frame-system", "pallet-balances", - "pallet-bridge-dispatch 0.1.0", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-collator-selection", "pallet-fee-market", "pallet-transaction-payment", @@ -2633,33 +2652,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ethbloom" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef" -dependencies = [ - "crunchy", - "fixed-hash", - "impl-rlp", - "impl-serde", - "tiny-keccak", -] - -[[package]] -name = "ethereum-types" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6" -dependencies = [ - "ethbloom", - "fixed-hash", - "impl-rlp", - "impl-serde", - "primitive-types", - "uint", -] - [[package]] name = "event-listener" version = "2.5.2" @@ -2774,6 +2766,22 @@ dependencies = [ "log", ] +[[package]] +name = "finality-grandpa" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" +dependencies = [ + "either", + "futures 0.3.21", + "futures-timer", + "log", + "num-traits", + "parity-scale-codec 2.3.1", + "parking_lot 0.11.2", + "scale-info 1.0.0", +] + [[package]] name = "finality-grandpa" version = "0.15.0" @@ -2785,9 +2793,9 @@ dependencies = [ "futures-timer", "log", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.11.2", - "scale-info", + "scale-info 2.1.1", ] [[package]] @@ -2832,7 +2840,7 @@ name = "fork-tree" version = "3.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", ] [[package]] @@ -2854,9 +2862,9 @@ dependencies = [ "frame-system", "linregress", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", - "scale-info", + "scale-info 2.1.1", "serde", "sp-api", "sp-application-crypto", @@ -2885,7 +2893,7 @@ dependencies = [ "linked-hash-map", "log", "memory-db", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand 0.8.5", "sc-cli", "sc-client-api", @@ -2915,8 +2923,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-arithmetic", "sp-npos-elections", "sp-std", @@ -2929,8 +2937,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -2945,8 +2953,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", ] @@ -2961,9 +2969,9 @@ dependencies = [ "impl-trait-for-tuples", "log", "once_cell", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", - "scale-info", + "scale-info 2.1.1", "serde", "smallvec", "sp-arithmetic", @@ -3020,8 +3028,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-io", @@ -3038,8 +3046,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -3050,7 +3058,7 @@ name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", ] @@ -3115,6 +3123,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + [[package]] name = "funty" version = "2.0.0" @@ -3596,7 +3610,7 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.20.6", + "rustls 0.20.5", "rustls-native-certs 0.6.2", "tokio", "tokio-rustls 0.23.4", @@ -3668,16 +3682,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec", -] - -[[package]] -name = "impl-rlp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -dependencies = [ - "rlp", + "parity-scale-codec 3.1.2", ] [[package]] @@ -4240,7 +4245,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -4290,12 +4295,12 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "smallvec", @@ -5632,8 +5637,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-timestamp", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-consensus-aura", "sp-runtime", @@ -5648,8 +5653,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-authority-discovery", "sp-runtime", @@ -5664,8 +5669,8 @@ dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-authorship", "sp-runtime", "sp-std", @@ -5683,8 +5688,8 @@ dependencies = [ "pallet-authorship", "pallet-session", "pallet-timestamp", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", @@ -5706,8 +5711,8 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5724,8 +5729,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-std", ] @@ -5739,8 +5744,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-runtime", "sp-std", @@ -5762,8 +5767,8 @@ dependencies = [ "pallet-mmr", "pallet-mmr-primitives", "pallet-session", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-io", @@ -5781,8 +5786,8 @@ dependencies = [ "frame-system", "log", "pallet-treasury", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5792,14 +5797,15 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-message-dispatch 0.1.0", - "bp-runtime 0.1.0", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -5815,8 +5821,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -5825,18 +5831,19 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-header-chain 0.1.0", - "bp-runtime 0.1.0", - "bp-test-utils 0.1.0", - "finality-grandpa", + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "finality-grandpa 0.14.4", "frame-benchmarking", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-finality-grandpa", "sp-runtime", @@ -5852,13 +5859,13 @@ dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-test-utils 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", - "finality-grandpa", + "finality-grandpa 0.15.0", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-finality-grandpa", "sp-runtime", @@ -5869,18 +5876,19 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec", - "bp-message-dispatch 0.1.0", - "bp-messages 0.1.0", - "bp-runtime 0.1.0", + "bitvec 1.0.0", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-benchmarking", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-runtime", @@ -5892,7 +5900,7 @@ name = "pallet-bridge-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", @@ -5900,8 +5908,8 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-runtime", @@ -5919,9 +5927,9 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand 0.8.5", - "scale-info", + "scale-info 2.1.1", "serde", "sp-runtime", "sp-staking", @@ -5937,8 +5945,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -5953,8 +5961,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-io", "sp-runtime", @@ -5971,9 +5979,9 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand 0.7.3", - "scale-info", + "scale-info 2.1.1", "sp-arithmetic", "sp-core", "sp-io", @@ -5993,8 +6001,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-npos-elections", @@ -6005,17 +6013,18 @@ dependencies = [ [[package]] name = "pallet-fee-market" version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec", - "bp-messages 0.1.0", - "bp-runtime 0.1.0", + "bitvec 1.0.0", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-benchmarking", "frame-support", "frame-system", - "pallet-bridge-messages 0.1.0", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-timestamp", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 2.3.1", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -6030,8 +6039,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-arithmetic", "sp-runtime", "sp-std", @@ -6048,8 +6057,8 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-core", "sp-finality-grandpa", @@ -6069,8 +6078,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -6086,8 +6095,8 @@ dependencies = [ "frame-system", "log", "pallet-authorship", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-application-crypto", "sp-core", "sp-io", @@ -6104,8 +6113,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-keyring", @@ -6122,8 +6131,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -6140,8 +6149,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-mmr-primitives", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -6156,7 +6165,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "serde", "sp-api", "sp-core", @@ -6173,7 +6182,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "pallet-mmr-primitives", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "serde", "sp-api", "sp-blockchain", @@ -6189,8 +6198,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -6203,8 +6212,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -6219,8 +6228,8 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-runtime", "sp-staking", @@ -6243,8 +6252,8 @@ dependencies = [ "pallet-offences", "pallet-session", "pallet-staking", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-staking", "sp-std", @@ -6258,8 +6267,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -6274,8 +6283,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -6288,8 +6297,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -6304,8 +6313,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -6321,8 +6330,8 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-timestamp", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -6355,9 +6364,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand_chacha 0.2.2", - "scale-info", + "scale-info 2.1.1", "sp-runtime", "sp-std", ] @@ -6374,9 +6383,9 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand_chacha 0.2.2", - "scale-info", + "scale-info 2.1.1", "serde", "sp-application-crypto", "sp-io", @@ -6412,8 +6421,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-io", "sp-runtime", "sp-std", @@ -6428,8 +6437,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-inherents", "sp-io", "sp-runtime", @@ -6447,8 +6456,8 @@ dependencies = [ "frame-system", "log", "pallet-treasury", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-io", @@ -6463,8 +6472,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "smallvec", "sp-core", @@ -6482,7 +6491,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-blockchain", "sp-core", @@ -6496,7 +6505,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-runtime", ] @@ -6511,8 +6520,8 @@ dependencies = [ "frame-system", "impl-trait-for-tuples", "pallet-balances", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-runtime", "sp-std", @@ -6526,8 +6535,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-io", "sp-runtime", @@ -6543,8 +6552,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-std", ] @@ -6557,8 +6566,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-runtime", @@ -6576,8 +6585,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-std", "xcm", @@ -6589,13 +6598,13 @@ name = "pangolin-parachain-runtime" version = "5.2.0-rc1" dependencies = [ "array-bytes", - "bp-message-dispatch 0.1.0", - "bp-messages 0.1.0", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-pangolin", "bp-pangolin-parachain", - "bp-polkadot-core 0.1.0", - "bp-runtime 0.1.0", - "bridge-runtime-common 0.1.0", + "bp-polkadot-core 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -6615,9 +6624,9 @@ dependencies = [ "pallet-aura", "pallet-authorship", "pallet-balances", - "pallet-bridge-dispatch 0.1.0", - "pallet-bridge-grandpa 0.1.0", - "pallet-bridge-messages 0.1.0", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-collator-selection", "pallet-fee-market", "pallet-multisig", @@ -6632,9 +6641,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info", + "scale-info 2.1.1", "smallvec", "sp-api", "sp-block-builder", @@ -6661,8 +6670,8 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", ] @@ -6685,6 +6694,20 @@ dependencies = [ "snap", ] +[[package]] +name = "parity-scale-codec" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" +dependencies = [ + "arrayvec 0.7.2", + "bitvec 0.20.4", + "byte-slice-cast", + "impl-trait-for-tuples", + "parity-scale-codec-derive 2.3.1", + "serde", +] + [[package]] name = "parity-scale-codec" version = "3.1.2" @@ -6692,13 +6715,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" dependencies = [ "arrayvec 0.7.2", - "bitvec", + "bitvec 1.0.0", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive", + "parity-scale-codec-derive 3.1.2", "serde", ] +[[package]] +name = "parity-scale-codec-derive" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "parity-scale-codec-derive" version = "3.1.2" @@ -6738,10 +6773,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if 1.0.0", - "ethereum-types", "hashbrown 0.12.1", "impl-trait-for-tuples", - "lru 0.7.5", "parity-util-mem-derive", "parking_lot 0.12.0", "primitive-types", @@ -7059,7 +7092,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7081,7 +7114,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7174,9 +7207,9 @@ name = "polkadot-core-primitives" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", - "scale-info", + "scale-info 2.1.1", "sp-core", "sp-runtime", "sp-std", @@ -7191,7 +7224,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7210,7 +7243,7 @@ name = "polkadot-erasure-coding" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", @@ -7246,7 +7279,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-node-network-protocol", "polkadot-node-subsystem", @@ -7264,7 +7297,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7281,14 +7314,14 @@ name = "polkadot-node-core-approval-voting" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "derive_more", "futures 0.3.21", "futures-timer", "kvdb", "lru 0.7.5", "merlin", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7309,11 +7342,11 @@ name = "polkadot-node-core-av-store" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7329,7 +7362,7 @@ name = "polkadot-node-core-backing" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7364,7 +7397,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7398,7 +7431,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7416,7 +7449,7 @@ dependencies = [ "futures 0.3.21", "kvdb", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7448,7 +7481,7 @@ name = "polkadot-node-core-provisioner" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -7471,7 +7504,7 @@ dependencies = [ "async-std", "futures 0.3.21", "futures-timer", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "pin-project 1.0.10", "polkadot-core-primitives", "polkadot-node-subsystem-util", @@ -7533,7 +7566,7 @@ dependencies = [ "lazy_static", "log", "mick-jaeger", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-primitives", @@ -7552,7 +7585,7 @@ dependencies = [ "futures-timer", "log", "metered-channel", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sc-cli", "sc-service", @@ -7569,7 +7602,7 @@ dependencies = [ "async-trait", "fatality", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", @@ -7586,7 +7619,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "bounded-vec", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "schnorrkel", @@ -7644,7 +7677,7 @@ dependencies = [ "lru 0.7.5", "metered-channel", "parity-db", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "parking_lot 0.11.2", "pin-project 1.0.10", @@ -7720,10 +7753,10 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "derive_more", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "polkadot-core-primitives", - "scale-info", + "scale-info 2.1.1", "serde", "sp-core", "sp-runtime", @@ -7750,14 +7783,14 @@ name = "polkadot-primitives" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec", + "bitvec 1.0.0", "frame-system", "hex-literal", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", - "scale-info", + "scale-info 2.1.1", "serde", "sp-api", "sp-application-crypto", @@ -7812,7 +7845,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -7858,13 +7891,13 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-constants", "polkadot-runtime-parachains", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "smallvec", @@ -7896,7 +7929,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7916,11 +7949,11 @@ dependencies = [ "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-parachains", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "slot-range-helper", @@ -7955,7 +7988,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bs58", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sp-std", "sp-tracing", @@ -7967,7 +8000,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bitflags", - "bitvec", + "bitvec 1.0.0", "derive_more", "frame-benchmarking", "frame-support", @@ -7981,13 +8014,13 @@ dependencies = [ "pallet-staking", "pallet-timestamp", "pallet-vesting", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-metrics", "rand 0.8.5", "rand_chacha 0.3.1", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "sp-api", "sp-core", @@ -8114,7 +8147,7 @@ dependencies = [ "fatality", "futures 0.3.21", "indexmap", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8131,7 +8164,7 @@ name = "polkadot-statement-table" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sp-core", ] @@ -8186,9 +8219,8 @@ checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", "impl-codec", - "impl-rlp", "impl-serde", - "scale-info", + "scale-info 2.1.1", "uint", ] @@ -8346,6 +8378,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" + [[package]] name = "radium" version = "0.7.0" @@ -8583,7 +8621,7 @@ dependencies = [ "env_logger", "jsonrpsee 0.8.0", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "serde", "serde_json", "sp-core", @@ -8632,16 +8670,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rlp" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" -dependencies = [ - "bytes 1.1.0", - "rustc-hex", -] - [[package]] name = "rocksdb" version = "0.18.0" @@ -8697,13 +8725,13 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rococo-runtime-constants", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "smallvec", @@ -8814,9 +8842,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.6" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" +checksum = "a024a432ae760ab3bff924ad91ce1cfa52cb57ed16e1ef32d0d249cfee1a6c13" dependencies = [ "log", "ring", @@ -8920,7 +8948,7 @@ dependencies = [ "ip_network", "libp2p", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "prost", "prost-build", "rand 0.7.3", @@ -8944,7 +8972,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", @@ -8964,7 +8992,7 @@ name = "sc-block-builder" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sp-api", "sp-block-builder", @@ -8982,7 +9010,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.3", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-chain-spec-derive", "sc-network", "sc-telemetry", @@ -9016,7 +9044,7 @@ dependencies = [ "libp2p", "log", "names", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand 0.7.3", "regex", "rpassword", @@ -9050,7 +9078,7 @@ dependencies = [ "futures 0.3.21", "hash-db", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "sc-executor", "sc-transaction-pool-api", @@ -9081,7 +9109,7 @@ dependencies = [ "linked-hash-map", "log", "parity-db", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "sc-client-api", "sc-state-db", @@ -9126,7 +9154,7 @@ dependencies = [ "async-trait", "futures 0.3.21", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -9160,7 +9188,7 @@ dependencies = [ "num-bigint", "num-rational 0.2.4", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "rand 0.7.3", "retain_mut", @@ -9220,7 +9248,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "fork-tree", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-consensus", "sp-blockchain", @@ -9236,7 +9264,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-consensus", "sc-telemetry", @@ -9270,7 +9298,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "lazy_static", "lru 0.6.6", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "sc-executor-common", "sc-executor-wasmi", @@ -9296,7 +9324,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-allocator", "sp-core", "sp-maybe-compressed-blob", @@ -9313,7 +9341,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-allocator", "sc-executor-common", "scoped-tls", @@ -9331,7 +9359,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-wasm 0.42.2", "sc-allocator", "sc-executor-common", @@ -9349,13 +9377,13 @@ dependencies = [ "ahash", "async-trait", "dyn-clone", - "finality-grandpa", + "finality-grandpa 0.15.0", "fork-tree", "futures 0.3.21", "futures-timer", "hex", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "rand 0.8.5", "sc-block-builder", @@ -9386,14 +9414,14 @@ name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "finality-grandpa", + "finality-grandpa 0.15.0", "futures 0.3.21", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-finality-grandpa", "sc-rpc", @@ -9459,7 +9487,7 @@ dependencies = [ "linked_hash_set", "log", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "pin-project 1.0.10", "prost", @@ -9517,7 +9545,7 @@ dependencies = [ "hyper-rustls 0.22.1", "num_cpus", "once_cell", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "rand 0.7.3", "sc-client-api", @@ -9563,7 +9591,7 @@ dependencies = [ "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "sc-block-builder", "sc-chain-spec", @@ -9595,7 +9623,7 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "sc-chain-spec", "sc-transaction-pool-api", @@ -9640,7 +9668,7 @@ dependencies = [ "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "parking_lot 0.12.0", "pin-project 1.0.10", @@ -9696,7 +9724,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "parity-util-mem-derive", "parking_lot 0.12.0", @@ -9712,7 +9740,7 @@ dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", @@ -9794,7 +9822,7 @@ dependencies = [ "futures-timer", "linked-hash-map", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "parking_lot 0.12.0", "retain_mut", @@ -9838,20 +9866,45 @@ dependencies = [ "prometheus", ] +[[package]] +name = "scale-info" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" +dependencies = [ + "bitvec 0.20.4", + "cfg-if 1.0.0", + "derive_more", + "parity-scale-codec 2.3.1", + "scale-info-derive 1.0.0", +] + [[package]] name = "scale-info" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" dependencies = [ - "bitvec", + "bitvec 1.0.0", "cfg-if 1.0.0", "derive_more", - "parity-scale-codec", - "scale-info-derive", + "parity-scale-codec 3.1.2", + "scale-info-derive 2.1.1", "serde", ] +[[package]] +name = "scale-info-derive" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "scale-info-derive" version = "2.1.1" @@ -10219,7 +10272,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "enumn", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", "sp-runtime", "sp-std", @@ -10308,7 +10361,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "hash-db", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api-proc-macro", "sp-core", "sp-runtime", @@ -10335,8 +10388,8 @@ name = "sp-application-crypto" version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-core", "sp-io", @@ -10350,8 +10403,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-debug-derive", "sp-std", @@ -10363,8 +10416,8 @@ name = "sp-authority-discovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-application-crypto", "sp-runtime", @@ -10377,7 +10430,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-inherents", "sp-runtime", "sp-std", @@ -10388,7 +10441,7 @@ name = "sp-block-builder" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-inherents", "sp-runtime", @@ -10403,7 +10456,7 @@ dependencies = [ "futures 0.3.21", "log", "lru 0.7.5", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "sp-api", "sp-consensus", @@ -10422,7 +10475,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-core", "sp-inherents", "sp-runtime", @@ -10438,8 +10491,8 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-application-crypto", "sp-consensus", @@ -10457,8 +10510,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "async-trait", "merlin", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-api", "sp-application-crypto", @@ -10478,8 +10531,8 @@ name = "sp-consensus-slots" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-arithmetic", "sp-runtime", @@ -10492,7 +10545,7 @@ name = "sp-consensus-vrf" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "schnorrkel", "sp-core", "sp-runtime", @@ -10520,13 +10573,13 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "parking_lot 0.12.0", "primitive-types", "rand 0.7.3", "regex", - "scale-info", + "scale-info 2.1.1", "schnorrkel", "secp256k1", "secrecy", @@ -10595,7 +10648,7 @@ version = "0.12.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-std", "sp-storage", ] @@ -10605,10 +10658,10 @@ name = "sp-finality-grandpa" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "finality-grandpa", + "finality-grandpa 0.15.0", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-api", "sp-application-crypto", @@ -10625,7 +10678,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "async-trait", "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-core", "sp-runtime", "sp-std", @@ -10641,7 +10694,7 @@ dependencies = [ "hash-db", "libsecp256k1", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "secp256k1", "sp-core", @@ -10676,7 +10729,7 @@ dependencies = [ "async-trait", "futures 0.3.21", "merlin", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "schnorrkel", "serde", @@ -10699,8 +10752,8 @@ name = "sp-npos-elections" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "serde", "sp-arithmetic", "sp-core", @@ -10759,11 +10812,11 @@ dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "paste", "rand 0.7.3", - "scale-info", + "scale-info 2.1.1", "serde", "sp-application-crypto", "sp-arithmetic", @@ -10778,7 +10831,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "primitive-types", "sp-externalities", "sp-runtime-interface-proc-macro", @@ -10815,8 +10868,8 @@ name = "sp-session" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-api", "sp-core", "sp-runtime", @@ -10829,8 +10882,8 @@ name = "sp-staking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-runtime", "sp-std", ] @@ -10843,7 +10896,7 @@ dependencies = [ "hash-db", "log", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "rand 0.7.3", "smallvec", @@ -10869,7 +10922,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "ref-cast", "serde", "sp-debug-derive", @@ -10897,7 +10950,7 @@ dependencies = [ "async-trait", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-inherents", "sp-runtime", @@ -10910,7 +10963,7 @@ name = "sp-tracing" version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-std", "tracing", "tracing-core", @@ -10933,8 +10986,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "async-trait", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-inherents", "sp-runtime", @@ -10949,8 +11002,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "hash-db", "memory-db", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "sp-core", "sp-std", "thiserror", @@ -10964,9 +11017,9 @@ version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-wasm 0.42.2", - "scale-info", + "scale-info 2.1.1", "serde", "sp-core-hashing-proc-macro", "sp-runtime", @@ -10980,7 +11033,7 @@ name = "sp-version-proc-macro" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "proc-macro2", "quote", "syn", @@ -10993,7 +11046,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-std", "wasmi", "wasmtime", @@ -11162,7 +11215,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", @@ -11364,15 +11417,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -11436,7 +11480,7 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.6", + "rustls 0.20.5", "tokio", "webpki 0.22.0", ] @@ -11662,7 +11706,7 @@ dependencies = [ "clap", "jsonrpsee 0.4.1", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "remote-externalities", "sc-chain-spec", "sc-cli", @@ -12258,7 +12302,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -12306,13 +12350,13 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "pallet-xcm-benchmarks", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info", + "scale-info 2.1.1", "serde", "serde_derive", "smallvec", @@ -12472,6 +12516,12 @@ dependencies = [ "winapi-build", ] +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" + [[package]] name = "wyz" version = "0.5.0" @@ -12500,8 +12550,8 @@ dependencies = [ "derivative", "impl-trait-for-tuples", "log", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 3.1.2", + "scale-info 2.1.1", "xcm-procedural", ] @@ -12514,9 +12564,9 @@ dependencies = [ "frame-system", "log", "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info", + "scale-info 2.1.1", "sp-arithmetic", "sp-io", "sp-runtime", @@ -12534,7 +12584,7 @@ dependencies = [ "frame-support", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-arithmetic", "sp-core", "sp-io", diff --git a/Cargo.toml b/Cargo.toml index 2868fabc..4bf1ca21 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,15 +118,3 @@ members = [ "rpc", "runtime/*", ] -[patch."https://github.com/darwinia-network/darwinia-bridges-substrate"] -bp-message-dispatch = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/message-dispatch" } -bp-messages = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/messages" } -bp-pangolin = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/chain-pangolin" } -bp-pangolin-parachain = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/chain-pangolin-parachain" } -bp-polkadot-core = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/polkadot-core" } -bp-runtime = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/runtime" } -bridge-runtime-common = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/bin/runtime-common" } -pallet-bridge-dispatch = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/modules/dispatch" } -pallet-bridge-grandpa = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/modules/grandpa" } -pallet-bridge-messages = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/modules/messages" } -pallet-fee-market = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/modules/fee-market" } diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 64f0f375..2aef8ff3 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -21,7 +21,10 @@ // --- core --- use core::marker::PhantomData; // --- paritytech --- -use bp_messages::{source_chain::LaneMessageVerifier, LaneId, OutboundLaneData}; +use bp_messages::{ + source_chain::{LaneMessageVerifier, Sender}, + LaneId, OutboundLaneData, +}; use bridge_runtime_common::messages::{source::*, *}; use frame_support::{ traits::{Currency, Imbalance, OnUnbalanced}, @@ -130,7 +133,6 @@ where pub struct FromThisChainMessageVerifier(PhantomData<(B, R, I)>); impl LaneMessageVerifier< - OriginOf>, AccountIdOf>, FromThisChainMessagePayload, BalanceOf>, @@ -145,15 +147,15 @@ where type Error = &'static str; fn verify_message( - submitter: &OriginOf>, + submitter: &Sender>>, delivery_and_dispatch_fee: &BalanceOf>, lane: &LaneId, lane_outbound_data: &OutboundLaneData, payload: &FromThisChainMessagePayload, ) -> Result<(), Self::Error> { // reject message if lane is blocked - if !ThisChain::::is_message_accepted(submitter, lane) { - return Err(MESSAGE_REJECTED_BY_OUTBOUND_LANE); + if !ThisChain::::is_outbound_lane_enabled(lane) { + return Err(OUTBOUND_LANE_DISABLED); } // reject message if there are too many pending messages at this lane @@ -167,21 +169,8 @@ where // Do the dispatch-specific check. We assume that the target chain uses // `Dispatch`, so we verify the message accordingly. - let raw_origin_or_err: Result< - frame_system::RawOrigin>>, - OriginOf>, - > = submitter.clone().into(); - if let Ok(raw_origin) = raw_origin_or_err { - pallet_bridge_dispatch::verify_message_origin(&raw_origin, payload) - .map(drop) - .map_err(|_| BAD_ORIGIN)?; - } else { - // so what it means that we've failed to convert origin to the - // `frame_system::RawOrigin`? now it means that the custom pallet origin has - // been used to send the message. Do we need to verify it? The answer is no, - // because pallet may craft any origin (e.g. root) && we can't verify whether it - // is valid, or not. - }; + pallet_bridge_dispatch::verify_message_origin(submitter, payload) + .map_err(|_| BAD_ORIGIN)?; // Do the delivery_and_dispatch_fee. We assume that the delivery and dispatch fee always // greater than the fee market provided fee. From 95b0ff1232153a373c6ee88fdfff91cba1269412 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Tue, 24 May 2022 16:35:00 +0800 Subject: [PATCH 46/59] Fix compile --- Cargo.lock | 867 +++++++++--------- runtime/crab-parachain/Cargo.toml | 13 +- .../src/pallets/polkadot_xcm.rs | 3 +- runtime/darwinia-parachain/Cargo.toml | 13 +- .../src/pallets/polkadot_xcm.rs | 3 +- runtime/pangolin-parachain/Cargo.toml | 13 +- .../src/bridges_message/pangolin.rs | 1 + .../src/pallets/polkadot_xcm.rs | 8 +- 8 files changed, 447 insertions(+), 474 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 532196da..b112caa3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -457,7 +457,7 @@ dependencies = [ "futures 0.3.21", "hex", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-chain-spec", "sc-client-api", @@ -490,7 +490,7 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-rpc", "sc-utils", @@ -510,8 +510,8 @@ name = "beefy-primitives" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-core", @@ -559,28 +559,16 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitvec" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" -dependencies = [ - "funty 1.1.0", - "radium 0.6.2", - "tap", - "wyz 0.2.0", -] - [[package]] name = "bitvec" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ - "funty 2.0.0", - "radium 0.7.0", + "funty", + "radium", "tap", - "wyz 0.5.0", + "wyz", ] [[package]] @@ -736,14 +724,14 @@ dependencies = [ [[package]] name = "bp-darwinia-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -752,13 +740,13 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "finality-grandpa 0.14.4", + "finality-grandpa", "frame-support", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-finality-grandpa", @@ -771,10 +759,10 @@ name = "bp-header-chain" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "finality-grandpa 0.15.0", + "finality-grandpa", "frame-support", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-finality-grandpa", @@ -785,12 +773,12 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-std", ] @@ -801,23 +789,23 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-std", ] [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ - "bitvec 1.0.0", + "bitvec", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-std", @@ -828,13 +816,13 @@ name = "bp-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-std", ] @@ -842,7 +830,7 @@ dependencies = [ [[package]] name = "bp-pangolin" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ "bp-darwinia-core", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -857,7 +845,7 @@ dependencies = [ [[package]] name = "bp-pangolin-parachain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ "bp-darwinia-core", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -872,14 +860,16 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "parity-util-mem", + "scale-info", + "serde", "sp-api", "sp-core", "sp-runtime", @@ -896,8 +886,8 @@ dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-core", "sp-runtime", @@ -914,7 +904,7 @@ dependencies = [ "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "smallvec", "sp-api", "sp-runtime", @@ -925,13 +915,13 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -948,8 +938,8 @@ dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -961,12 +951,12 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "ed25519-dalek", - "finality-grandpa 0.14.4", - "parity-scale-codec 3.1.2", + "finality-grandpa", + "parity-scale-codec", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -980,8 +970,8 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "ed25519-dalek", - "finality-grandpa 0.15.0", - "parity-scale-codec 3.1.2", + "finality-grandpa", + "parity-scale-codec", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -997,7 +987,7 @@ dependencies = [ "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-rococo", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-runtime", "sp-std", @@ -1006,7 +996,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -1020,8 +1010,9 @@ dependencies = [ "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-transaction-payment", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", + "sp-api", "sp-core", "sp-runtime", "sp-state-machine", @@ -1044,8 +1035,8 @@ dependencies = [ "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "pallet-transaction-payment", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-state-machine", @@ -1426,9 +1417,10 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "polkadot-runtime-common", + "scale-info", "smallvec", "sp-api", "sp-block-builder", @@ -1698,7 +1690,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -1721,7 +1713,7 @@ dependencies = [ "cumulus-client-consensus-common", "cumulus-primitives-core", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-consensus-aura", @@ -1750,7 +1742,7 @@ dependencies = [ "cumulus-relay-chain-interface", "dyn-clone", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sc-client-api", "sc-consensus", @@ -1796,7 +1788,7 @@ dependencies = [ "derive_more", "futures 0.3.21", "futures-timer", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-parachain", @@ -1820,7 +1812,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -1846,7 +1838,7 @@ dependencies = [ "cumulus-client-pov-recovery", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-overseer", "polkadot-primitives", @@ -1874,8 +1866,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-aura", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-application-crypto", "sp-consensus-aura", @@ -1892,8 +1884,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -1915,9 +1907,9 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "serde", "sp-core", "sp-externalities", @@ -1950,8 +1942,8 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -1969,9 +1961,9 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand_chacha 0.3.1", - "scale-info 2.1.1", + "scale-info", "sp-runtime", "sp-std", "xcm", @@ -1984,7 +1976,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2003,9 +1995,9 @@ dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-test-relay-sproof-builder", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", - "scale-info 2.1.1", + "scale-info", "sp-api", "sp-core", "sp-inherents", @@ -2024,7 +2016,7 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e9 dependencies = [ "cumulus-primitives-core", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-inherents", "sp-std", "sp-timestamp", @@ -2037,7 +2029,7 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e9 dependencies = [ "cumulus-primitives-core", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2085,7 +2077,7 @@ dependencies = [ "derive_more", "futures 0.3.21", "jsonrpsee-core 0.9.0", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-overseer", "polkadot-service", @@ -2111,7 +2103,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "jsonrpsee 0.9.0", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-service", "sc-client-api", @@ -2131,7 +2123,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sp-runtime", "sp-state-machine", @@ -2193,7 +2185,7 @@ dependencies = [ "log", "pallet-transaction-payment-rpc", "pangolin-parachain-runtime", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-cli", "polkadot-parachain", "polkadot-primitives", @@ -2269,9 +2261,10 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "polkadot-runtime-common", + "scale-info", "smallvec", "sp-api", "sp-block-builder", @@ -2652,6 +2645,33 @@ dependencies = [ "libc", ] +[[package]] +name = "ethbloom" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef" +dependencies = [ + "crunchy", + "fixed-hash", + "impl-rlp", + "impl-serde", + "tiny-keccak", +] + +[[package]] +name = "ethereum-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6" +dependencies = [ + "ethbloom", + "fixed-hash", + "impl-rlp", + "impl-serde", + "primitive-types", + "uint", +] + [[package]] name = "event-listener" version = "2.5.2" @@ -2766,22 +2786,6 @@ dependencies = [ "log", ] -[[package]] -name = "finality-grandpa" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" -dependencies = [ - "either", - "futures 0.3.21", - "futures-timer", - "log", - "num-traits", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", - "scale-info 1.0.0", -] - [[package]] name = "finality-grandpa" version = "0.15.0" @@ -2793,9 +2797,9 @@ dependencies = [ "futures-timer", "log", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.11.2", - "scale-info 2.1.1", + "scale-info", ] [[package]] @@ -2840,7 +2844,7 @@ name = "fork-tree" version = "3.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", ] [[package]] @@ -2862,9 +2866,9 @@ dependencies = [ "frame-system", "linregress", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", - "scale-info 2.1.1", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -2893,7 +2897,7 @@ dependencies = [ "linked-hash-map", "log", "memory-db", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.8.5", "sc-cli", "sc-client-api", @@ -2923,8 +2927,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-npos-elections", "sp-std", @@ -2937,8 +2941,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -2953,8 +2957,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", ] @@ -2969,9 +2973,9 @@ dependencies = [ "impl-trait-for-tuples", "log", "once_cell", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", - "scale-info 2.1.1", + "scale-info", "serde", "smallvec", "sp-arithmetic", @@ -3028,8 +3032,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -3046,8 +3050,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -3058,7 +3062,7 @@ name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", ] @@ -3123,12 +3127,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] name = "funty" version = "2.0.0" @@ -3682,7 +3680,16 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", +] + +[[package]] +name = "impl-rlp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" +dependencies = [ + "rlp", ] [[package]] @@ -4245,7 +4252,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -4295,12 +4302,12 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -5637,8 +5644,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-timestamp", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-consensus-aura", "sp-runtime", @@ -5653,8 +5660,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-authority-discovery", "sp-runtime", @@ -5669,8 +5676,8 @@ dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-authorship", "sp-runtime", "sp-std", @@ -5688,8 +5695,8 @@ dependencies = [ "pallet-authorship", "pallet-session", "pallet-timestamp", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", @@ -5711,8 +5718,8 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -5729,8 +5736,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -5744,8 +5751,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -5767,8 +5774,8 @@ dependencies = [ "pallet-mmr", "pallet-mmr-primitives", "pallet-session", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -5786,8 +5793,8 @@ dependencies = [ "frame-system", "log", "pallet-treasury", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -5797,15 +5804,15 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -5821,8 +5828,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -5831,19 +5838,19 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "finality-grandpa 0.14.4", + "finality-grandpa", "frame-benchmarking", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-finality-grandpa", "sp-runtime", @@ -5859,13 +5866,13 @@ dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-test-utils 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", - "finality-grandpa 0.15.0", + "finality-grandpa", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-finality-grandpa", "sp-runtime", @@ -5876,9 +5883,9 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ - "bitvec 1.0.0", + "bitvec", "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -5887,8 +5894,8 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -5900,7 +5907,7 @@ name = "pallet-bridge-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", @@ -5908,8 +5915,8 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -5927,9 +5934,9 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.8.5", - "scale-info 2.1.1", + "scale-info", "serde", "sp-runtime", "sp-staking", @@ -5945,8 +5952,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -5961,8 +5968,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -5979,9 +5986,9 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.7.3", - "scale-info 2.1.1", + "scale-info", "sp-arithmetic", "sp-core", "sp-io", @@ -6001,8 +6008,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-npos-elections", @@ -6013,9 +6020,9 @@ dependencies = [ [[package]] name = "pallet-fee-market" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" dependencies = [ - "bitvec 1.0.0", + "bitvec", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-benchmarking", @@ -6023,8 +6030,8 @@ dependencies = [ "frame-system", "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-timestamp", - "parity-scale-codec 2.3.1", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6039,8 +6046,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-runtime", "sp-std", @@ -6057,8 +6064,8 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-core", "sp-finality-grandpa", @@ -6078,8 +6085,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6095,8 +6102,8 @@ dependencies = [ "frame-system", "log", "pallet-authorship", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-core", "sp-io", @@ -6113,8 +6120,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-keyring", @@ -6131,8 +6138,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6149,8 +6156,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-mmr-primitives", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6165,7 +6172,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "serde", "sp-api", "sp-core", @@ -6182,7 +6189,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "pallet-mmr-primitives", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "serde", "sp-api", "sp-blockchain", @@ -6198,8 +6205,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6212,8 +6219,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6228,8 +6235,8 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-staking", @@ -6252,8 +6259,8 @@ dependencies = [ "pallet-offences", "pallet-session", "pallet-staking", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-staking", "sp-std", @@ -6267,8 +6274,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6283,8 +6290,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6297,8 +6304,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6313,8 +6320,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6330,8 +6337,8 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-timestamp", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6364,9 +6371,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand_chacha 0.2.2", - "scale-info 2.1.1", + "scale-info", "sp-runtime", "sp-std", ] @@ -6383,9 +6390,9 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand_chacha 0.2.2", - "scale-info 2.1.1", + "scale-info", "serde", "sp-application-crypto", "sp-io", @@ -6421,8 +6428,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6437,8 +6444,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-inherents", "sp-io", "sp-runtime", @@ -6456,8 +6463,8 @@ dependencies = [ "frame-system", "log", "pallet-treasury", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -6472,8 +6479,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "smallvec", "sp-core", @@ -6491,7 +6498,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-blockchain", "sp-core", @@ -6505,7 +6512,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "pallet-transaction-payment", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-runtime", ] @@ -6520,8 +6527,8 @@ dependencies = [ "frame-system", "impl-trait-for-tuples", "pallet-balances", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -6535,8 +6542,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6552,8 +6559,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -6566,8 +6573,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -6585,8 +6592,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", "xcm", @@ -6641,9 +6648,10 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "polkadot-runtime-common", + "scale-info", "smallvec", "sp-api", "sp-block-builder", @@ -6670,8 +6678,8 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", ] @@ -6694,20 +6702,6 @@ dependencies = [ "snap", ] -[[package]] -name = "parity-scale-codec" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" -dependencies = [ - "arrayvec 0.7.2", - "bitvec 0.20.4", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive 2.3.1", - "serde", -] - [[package]] name = "parity-scale-codec" version = "3.1.2" @@ -6715,25 +6709,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" dependencies = [ "arrayvec 0.7.2", - "bitvec 1.0.0", + "bitvec", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive 3.1.2", + "parity-scale-codec-derive", "serde", ] -[[package]] -name = "parity-scale-codec-derive" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" -dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "parity-scale-codec-derive" version = "3.1.2" @@ -6773,8 +6755,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if 1.0.0", + "ethereum-types", "hashbrown 0.12.1", "impl-trait-for-tuples", + "lru 0.7.5", "parity-util-mem-derive", "parking_lot 0.12.0", "primitive-types", @@ -7092,7 +7076,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7114,7 +7098,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7207,9 +7191,9 @@ name = "polkadot-core-primitives" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", - "scale-info 2.1.1", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -7224,7 +7208,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7243,7 +7227,7 @@ name = "polkadot-erasure-coding" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", @@ -7279,7 +7263,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-network-protocol", "polkadot-node-subsystem", @@ -7297,7 +7281,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7314,14 +7298,14 @@ name = "polkadot-node-core-approval-voting" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "derive_more", "futures 0.3.21", "futures-timer", "kvdb", "lru 0.7.5", "merlin", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7342,11 +7326,11 @@ name = "polkadot-node-core-av-store" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7362,7 +7346,7 @@ name = "polkadot-node-core-backing" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7397,7 +7381,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7431,7 +7415,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7449,7 +7433,7 @@ dependencies = [ "futures 0.3.21", "kvdb", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7481,7 +7465,7 @@ name = "polkadot-node-core-provisioner" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -7504,7 +7488,7 @@ dependencies = [ "async-std", "futures 0.3.21", "futures-timer", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "pin-project 1.0.10", "polkadot-core-primitives", "polkadot-node-subsystem-util", @@ -7566,7 +7550,7 @@ dependencies = [ "lazy_static", "log", "mick-jaeger", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-primitives", @@ -7585,7 +7569,7 @@ dependencies = [ "futures-timer", "log", "metered-channel", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sc-cli", "sc-service", @@ -7602,7 +7586,7 @@ dependencies = [ "async-trait", "fatality", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", @@ -7619,7 +7603,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "bounded-vec", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "schnorrkel", @@ -7677,7 +7661,7 @@ dependencies = [ "lru 0.7.5", "metered-channel", "parity-db", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.2", "pin-project 1.0.10", @@ -7753,10 +7737,10 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "derive_more", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", - "scale-info 2.1.1", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -7783,14 +7767,14 @@ name = "polkadot-primitives" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "frame-system", "hex-literal", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -7845,7 +7829,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -7891,13 +7875,13 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-constants", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -7929,7 +7913,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7949,11 +7933,11 @@ dependencies = [ "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "slot-range-helper", @@ -7988,7 +7972,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bs58", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sp-std", "sp-tracing", @@ -8000,7 +7984,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bitflags", - "bitvec 1.0.0", + "bitvec", "derive_more", "frame-benchmarking", "frame-support", @@ -8014,13 +7998,13 @@ dependencies = [ "pallet-staking", "pallet-timestamp", "pallet-vesting", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-metrics", "rand 0.8.5", "rand_chacha 0.3.1", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "sp-api", "sp-core", @@ -8147,7 +8131,7 @@ dependencies = [ "fatality", "futures 0.3.21", "indexmap", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8164,7 +8148,7 @@ name = "polkadot-statement-table" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sp-core", ] @@ -8219,8 +8203,9 @@ checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", "impl-codec", + "impl-rlp", "impl-serde", - "scale-info 2.1.1", + "scale-info", "uint", ] @@ -8378,12 +8363,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" - [[package]] name = "radium" version = "0.7.0" @@ -8621,7 +8600,7 @@ dependencies = [ "env_logger", "jsonrpsee 0.8.0", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "serde", "serde_json", "sp-core", @@ -8670,6 +8649,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "rlp" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" +dependencies = [ + "bytes 1.1.0", + "rustc-hex", +] + [[package]] name = "rocksdb" version = "0.18.0" @@ -8725,13 +8714,13 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rococo-runtime-constants", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -8948,7 +8937,7 @@ dependencies = [ "ip_network", "libp2p", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "prost", "prost-build", "rand 0.7.3", @@ -8972,7 +8961,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", @@ -8992,7 +8981,7 @@ name = "sc-block-builder" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sp-api", "sp-block-builder", @@ -9010,7 +8999,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.3", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-chain-spec-derive", "sc-network", "sc-telemetry", @@ -9044,7 +9033,7 @@ dependencies = [ "libp2p", "log", "names", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.7.3", "regex", "rpassword", @@ -9078,7 +9067,7 @@ dependencies = [ "futures 0.3.21", "hash-db", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-executor", "sc-transaction-pool-api", @@ -9109,7 +9098,7 @@ dependencies = [ "linked-hash-map", "log", "parity-db", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-client-api", "sc-state-db", @@ -9154,7 +9143,7 @@ dependencies = [ "async-trait", "futures 0.3.21", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -9188,7 +9177,7 @@ dependencies = [ "num-bigint", "num-rational 0.2.4", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "rand 0.7.3", "retain_mut", @@ -9248,7 +9237,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "fork-tree", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sp-blockchain", @@ -9264,7 +9253,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-telemetry", @@ -9298,7 +9287,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "lazy_static", "lru 0.6.6", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-executor-common", "sc-executor-wasmi", @@ -9324,7 +9313,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-allocator", "sp-core", "sp-maybe-compressed-blob", @@ -9341,7 +9330,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-allocator", "sc-executor-common", "scoped-tls", @@ -9359,7 +9348,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-wasm 0.42.2", "sc-allocator", "sc-executor-common", @@ -9377,13 +9366,13 @@ dependencies = [ "ahash", "async-trait", "dyn-clone", - "finality-grandpa 0.15.0", + "finality-grandpa", "fork-tree", "futures 0.3.21", "futures-timer", "hex", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "rand 0.8.5", "sc-block-builder", @@ -9414,14 +9403,14 @@ name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "finality-grandpa 0.15.0", + "finality-grandpa", "futures 0.3.21", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-finality-grandpa", "sc-rpc", @@ -9487,7 +9476,7 @@ dependencies = [ "linked_hash_set", "log", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "pin-project 1.0.10", "prost", @@ -9545,7 +9534,7 @@ dependencies = [ "hyper-rustls 0.22.1", "num_cpus", "once_cell", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "rand 0.7.3", "sc-client-api", @@ -9591,7 +9580,7 @@ dependencies = [ "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-block-builder", "sc-chain-spec", @@ -9623,7 +9612,7 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-chain-spec", "sc-transaction-pool-api", @@ -9668,7 +9657,7 @@ dependencies = [ "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.12.0", "pin-project 1.0.10", @@ -9724,7 +9713,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", "parking_lot 0.12.0", @@ -9740,7 +9729,7 @@ dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", @@ -9822,7 +9811,7 @@ dependencies = [ "futures-timer", "linked-hash-map", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.12.0", "retain_mut", @@ -9866,45 +9855,20 @@ dependencies = [ "prometheus", ] -[[package]] -name = "scale-info" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" -dependencies = [ - "bitvec 0.20.4", - "cfg-if 1.0.0", - "derive_more", - "parity-scale-codec 2.3.1", - "scale-info-derive 1.0.0", -] - [[package]] name = "scale-info" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" dependencies = [ - "bitvec 1.0.0", + "bitvec", "cfg-if 1.0.0", "derive_more", - "parity-scale-codec 3.1.2", - "scale-info-derive 2.1.1", + "parity-scale-codec", + "scale-info-derive", "serde", ] -[[package]] -name = "scale-info-derive" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" -dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "scale-info-derive" version = "2.1.1" @@ -10272,7 +10236,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "enumn", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", "sp-runtime", "sp-std", @@ -10361,7 +10325,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "hash-db", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api-proc-macro", "sp-core", "sp-runtime", @@ -10388,8 +10352,8 @@ name = "sp-application-crypto" version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -10403,8 +10367,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-debug-derive", "sp-std", @@ -10416,8 +10380,8 @@ name = "sp-authority-discovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-runtime", @@ -10430,7 +10394,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-inherents", "sp-runtime", "sp-std", @@ -10441,7 +10405,7 @@ name = "sp-block-builder" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -10456,7 +10420,7 @@ dependencies = [ "futures 0.3.21", "log", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sp-api", "sp-consensus", @@ -10475,7 +10439,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-core", "sp-inherents", "sp-runtime", @@ -10491,8 +10455,8 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-consensus", @@ -10510,8 +10474,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "async-trait", "merlin", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -10531,8 +10495,8 @@ name = "sp-consensus-slots" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-arithmetic", "sp-runtime", @@ -10545,7 +10509,7 @@ name = "sp-consensus-vrf" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "schnorrkel", "sp-core", "sp-runtime", @@ -10573,13 +10537,13 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.12.0", "primitive-types", "rand 0.7.3", "regex", - "scale-info 2.1.1", + "scale-info", "schnorrkel", "secp256k1", "secrecy", @@ -10648,7 +10612,7 @@ version = "0.12.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-std", "sp-storage", ] @@ -10658,10 +10622,10 @@ name = "sp-finality-grandpa" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "finality-grandpa 0.15.0", + "finality-grandpa", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -10678,7 +10642,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "async-trait", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-core", "sp-runtime", "sp-std", @@ -10694,7 +10658,7 @@ dependencies = [ "hash-db", "libsecp256k1", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "secp256k1", "sp-core", @@ -10729,7 +10693,7 @@ dependencies = [ "async-trait", "futures 0.3.21", "merlin", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "schnorrkel", "serde", @@ -10752,8 +10716,8 @@ name = "sp-npos-elections" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-arithmetic", "sp-core", @@ -10812,11 +10776,11 @@ dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "paste", "rand 0.7.3", - "scale-info 2.1.1", + "scale-info", "serde", "sp-application-crypto", "sp-arithmetic", @@ -10831,7 +10795,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "primitive-types", "sp-externalities", "sp-runtime-interface-proc-macro", @@ -10868,8 +10832,8 @@ name = "sp-session" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-core", "sp-runtime", @@ -10882,8 +10846,8 @@ name = "sp-staking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -10896,7 +10860,7 @@ dependencies = [ "hash-db", "log", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "rand 0.7.3", "smallvec", @@ -10922,7 +10886,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "ref-cast", "serde", "sp-debug-derive", @@ -10950,7 +10914,7 @@ dependencies = [ "async-trait", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -10963,7 +10927,7 @@ name = "sp-tracing" version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-std", "tracing", "tracing-core", @@ -10986,8 +10950,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "async-trait", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-inherents", "sp-runtime", @@ -11002,8 +10966,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "hash-db", "memory-db", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-std", "thiserror", @@ -11017,9 +10981,9 @@ version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-wasm 0.42.2", - "scale-info 2.1.1", + "scale-info", "serde", "sp-core-hashing-proc-macro", "sp-runtime", @@ -11033,7 +10997,7 @@ name = "sp-version-proc-macro" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "proc-macro2", "quote", "syn", @@ -11046,7 +11010,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-std", "wasmi", "wasmtime", @@ -11215,7 +11179,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", @@ -11417,6 +11381,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -11706,7 +11679,7 @@ dependencies = [ "clap", "jsonrpsee 0.4.1", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "remote-externalities", "sc-chain-spec", "sc-cli", @@ -12302,7 +12275,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -12350,13 +12323,13 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "pallet-xcm-benchmarks", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -12516,12 +12489,6 @@ dependencies = [ "winapi-build", ] -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "wyz" version = "0.5.0" @@ -12550,8 +12517,8 @@ dependencies = [ "derivative", "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "xcm-procedural", ] @@ -12564,9 +12531,9 @@ dependencies = [ "frame-system", "log", "pallet-transaction-payment", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "sp-arithmetic", "sp-io", "sp-runtime", @@ -12584,7 +12551,7 @@ dependencies = [ "frame-support", "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-arithmetic", "sp-core", "sp-io", diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 766ed6c0..051a70fa 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -31,12 +31,13 @@ parachain-info = { default-features = false, git = "https://git dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs index 8b5d0c0f..2acd854b 100644 --- a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs @@ -120,8 +120,7 @@ impl XcmCExecutorConfig for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = - UsingComponents>; + type Trader = UsingComponents>; type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 1e850b90..919cb2dd 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -31,12 +31,13 @@ parachain-info = { default-features = false, git = "https://git dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs index cb13b4da..fecf0d9e 100644 --- a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs @@ -120,8 +120,7 @@ impl XcmCExecutorConfig for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = - UsingComponents>; + type Trader = UsingComponents>; type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index b61d9651..3d932849 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -43,12 +43,13 @@ pallet-bridge-grandpa = { default-features = false, git = "https://github.com/d pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/runtime/pangolin-parachain/src/bridges_message/pangolin.rs b/runtime/pangolin-parachain/src/bridges_message/pangolin.rs index a4a39e39..536a0029 100644 --- a/runtime/pangolin-parachain/src/bridges_message/pangolin.rs +++ b/runtime/pangolin-parachain/src/bridges_message/pangolin.rs @@ -77,6 +77,7 @@ impl MessageBridge for WithPangolinMessageBridge { fn bridged_balance_to_this_balance( bridged_balance: BalanceOf, + _bridged_to_this_conversion_rate: Option, ) -> BalanceOf { >::try_from( PangolinToPangolinParachainConversionRate::get().saturating_mul_int(bridged_balance), diff --git a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs index 9c64825e..cf2337ee 100644 --- a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs @@ -1,7 +1,10 @@ // --- paritytech --- use cumulus_pallet_xcm::Origin as CumulusOrigin; use cumulus_primitives_utility::ParentAsUmp; -use frame_support::{traits::Everything, weights::Weight}; +use frame_support::{ + traits::{Everything, PalletInfoAccess}, + weights::Weight, +}; use pallet_xcm::{Config, CurrentXcmVersion, XcmPassthrough}; use polkadot_parachain::primitives::Sibling; use polkadot_runtime_common::impls::ToAuthor; @@ -86,6 +89,7 @@ pub type XcmOriginToTransactDispatchOrigin = ( ); frame_support::parameter_types! { + pub const RococoLocation: MultiLocation = MultiLocation::parent(); pub const RelayNetwork: NetworkId = NetworkId::Kusama; pub const MaxInstructions: u32 = 100; pub AnchoringSelfReserve: MultiLocation = MultiLocation::new( @@ -124,7 +128,7 @@ impl XcmCExecutorConfig for XcmConfig { type Barrier = Barrier; type Weigher = FixedWeightBounds; type Trader = - UsingComponents>; + UsingComponents>; type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; From 2571863c8e9d4b69f5abb5134b6d6c804dd79971 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Wed, 25 May 2022 13:36:02 +0800 Subject: [PATCH 47/59] Fix compile --- runtime/pangolin-parachain/src/lib.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/runtime/pangolin-parachain/src/lib.rs b/runtime/pangolin-parachain/src/lib.rs index a41de78d..a4fefca8 100644 --- a/runtime/pangolin-parachain/src/lib.rs +++ b/runtime/pangolin-parachain/src/lib.rs @@ -65,7 +65,7 @@ mod benches { [pallet_bridge_grandpa, BridgePangolinGrandpa] // TODO: https://github.com/darwinia-network/darwinia-parachain/issues/66 // [pallet_bridge_messages, MessagesBench::] - [pallet_fee_market, FeeMarket] + [pallet_fee_market, PangolinFeeMarket] [cumulus_pallet_xcmp_queue, XcmpQueue] ); } @@ -388,6 +388,7 @@ sp_api::impl_runtime_apis! { } }; use bp_runtime::{messages::DispatchFeePayment}; + use pallet_fee_market::Instance1; impl frame_system_benchmarking::Config for Runtime {} impl MessagesConfig for Runtime { @@ -408,26 +409,26 @@ sp_api::impl_runtime_apis! { use frame_support::traits::Currency; // prepare fee_market - let collateral = ::CollateralPerOrder::get(); + let collateral = >::CollateralPerOrder::get(); let caller1: ::AccountId = frame_benchmarking::account("source", 1, 0u32); let caller2: ::AccountId = frame_benchmarking::account("source", 2, 0u32); let caller3: ::AccountId = frame_benchmarking::account("source", 3, 0u32); - ::RingCurrency::make_free_balance_be(&caller1, collateral.saturating_mul(10u32.into())); - ::RingCurrency::make_free_balance_be(&caller2, collateral.saturating_mul(10u32.into())); - ::RingCurrency::make_free_balance_be(&caller3, collateral.saturating_mul(10u32.into())); + >::Currency::make_free_balance_be(&caller1, collateral.saturating_mul(10u32.into())); + >::Currency::make_free_balance_be(&caller2, collateral.saturating_mul(10u32.into())); + >::Currency::make_free_balance_be(&caller3, collateral.saturating_mul(10u32.into())); - assert_ok!(pallet_fee_market::Pallet::::enroll_and_lock_collateral( + assert_ok!(pallet_fee_market::Pallet::::enroll_and_lock_collateral( frame_system::RawOrigin::Signed(caller1).into(), collateral, None )); - assert_ok!(pallet_fee_market::Pallet::::enroll_and_lock_collateral( + assert_ok!(pallet_fee_market::Pallet::::enroll_and_lock_collateral( frame_system::RawOrigin::Signed(caller2).into(), collateral, None )); - assert_ok!(pallet_fee_market::Pallet::::enroll_and_lock_collateral( + assert_ok!(pallet_fee_market::Pallet::::enroll_and_lock_collateral( frame_system::RawOrigin::Signed(caller3).into(), collateral, None @@ -452,7 +453,7 @@ sp_api::impl_runtime_apis! { dispatch_fee_payment: DispatchFeePayment::AtSourceChain, }; - (message, ::MinimumRelayFee::get()) + (message, >::MinimumRelayFee::get()) } fn prepare_message_proof( From 1acede783655d3d94f0ff02cc51e3d3f03076377 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Wed, 18 May 2022 15:57:27 +0800 Subject: [PATCH 48/59] Format --- .rustfmt.toml | 38 +++-- rpc/src/lib.rs | 16 +- runtime/common/src/lib.rs | 11 +- runtime/crab-parachain/build.rs | 6 +- runtime/crab-parachain/src/lib.rs | 5 +- .../crab-parachain/src/pallets/authorship.rs | 4 +- .../crab-parachain/src/pallets/balances.rs | 4 +- .../src/pallets/collator_selection.rs | 12 +- .../crab-parachain/src/pallets/dmp_queue.rs | 2 +- .../crab-parachain/src/pallets/multisig.rs | 2 +- .../src/pallets/parachain_system.rs | 8 +- .../src/pallets/polkadot_xcm.rs | 39 ++--- runtime/crab-parachain/src/pallets/proxy.rs | 14 +- runtime/crab-parachain/src/pallets/session.rs | 12 +- runtime/crab-parachain/src/pallets/sudo.rs | 2 +- runtime/crab-parachain/src/pallets/system.rs | 32 ++-- .../crab-parachain/src/pallets/timestamp.rs | 2 +- .../src/pallets/transaction_payment.rs | 4 +- runtime/crab-parachain/src/pallets/utility.rs | 2 +- .../crab-parachain/src/pallets/xcmp_queue.rs | 8 +- runtime/darwinia-parachain/build.rs | 6 +- runtime/darwinia-parachain/src/lib.rs | 5 +- .../src/pallets/authorship.rs | 4 +- .../src/pallets/balances.rs | 4 +- .../src/pallets/collator_selection.rs | 12 +- .../src/pallets/dmp_queue.rs | 2 +- .../src/pallets/multisig.rs | 2 +- .../src/pallets/parachain_system.rs | 8 +- .../src/pallets/polkadot_xcm.rs | 39 ++--- .../darwinia-parachain/src/pallets/proxy.rs | 14 +- .../darwinia-parachain/src/pallets/session.rs | 12 +- .../darwinia-parachain/src/pallets/sudo.rs | 2 +- .../darwinia-parachain/src/pallets/system.rs | 32 ++-- .../src/pallets/timestamp.rs | 2 +- .../src/pallets/transaction_payment.rs | 4 +- .../darwinia-parachain/src/pallets/utility.rs | 2 +- .../src/pallets/xcmp_queue.rs | 8 +- runtime/pangolin-parachain/build.rs | 6 +- .../src/bridges_message/pangolin.rs | 29 ++-- runtime/pangolin-parachain/src/lib.rs | 5 +- .../src/pallets/authorship.rs | 4 +- .../src/pallets/balances.rs | 4 +- .../src/pallets/bridge_dispatch.rs | 4 +- .../src/pallets/bridge_grandpa.rs | 2 +- .../src/pallets/collator_selection.rs | 12 +- .../src/pallets/dmp_queue.rs | 2 +- .../src/pallets/fee_market.rs | 4 +- .../src/pallets/multisig.rs | 2 +- .../src/pallets/parachain_system.rs | 8 +- .../src/pallets/polkadot_xcm.rs | 41 ++--- .../pangolin-parachain/src/pallets/proxy.rs | 14 +- .../pangolin-parachain/src/pallets/session.rs | 12 +- .../pangolin-parachain/src/pallets/sudo.rs | 2 +- .../pangolin-parachain/src/pallets/system.rs | 32 ++-- .../src/pallets/timestamp.rs | 2 +- .../src/pallets/transaction_payment.rs | 4 +- .../pangolin-parachain/src/pallets/utility.rs | 2 +- .../src/pallets/xcmp_queue.rs | 8 +- src/chain_spec/crab_parachain.rs | 37 ++--- src/chain_spec/darwinia_parachain.rs | 42 ++--- src/chain_spec/pangolin_parachain.rs | 51 ++---- src/cli.rs | 11 +- src/command.rs | 145 ++++++++---------- src/service/mod.rs | 64 +++----- tests/deploy.rs | 17 +- 65 files changed, 412 insertions(+), 535 deletions(-) diff --git a/.rustfmt.toml b/.rustfmt.toml index 557a6c19..8f17dfe5 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -1,9 +1,29 @@ -edition = "2021" -hard_tabs = true -imports_granularity = "Crate" -max_width = 100 -newline_style = "Unix" -reorder_imports = true -reorder_modules = true -tab_spaces = 4 -use_field_init_shorthand = true +# Basic +edition = "2021" +hard_tabs = true +max_width = 100 +tab_spaces = 4 + +# Imports +imports_granularity = "Crate" +reorder_imports = true + +# Format comments +comment_width = 100 +wrap_comments = true + +# Misc +match_arm_blocks = false +match_block_trailing_comma = true +newline_style = "Unix" +reorder_impl_items = true +reorder_modules = true +use_field_init_shorthand = true +use_small_heuristics = "Max" + +# Wait for stablization +# format_code_in_doc_comments = true + +# Could give it a try +# group_imports = "StdExternalCrate" +# inline_attribute_width = 100 diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index 4483ef43..13ee50a9 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -63,20 +63,10 @@ where use substrate_frame_rpc_system::{FullSystem, SystemApi}; let mut io = IoHandler::default(); - let FullDeps { - client, - pool, - deny_unsafe, - } = deps; + let FullDeps { client, pool, deny_unsafe } = deps; - io.extend_with(SystemApi::to_delegate(FullSystem::new( - client.clone(), - pool, - deny_unsafe, - ))); - io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new( - client.clone(), - ))); + io.extend_with(SystemApi::to_delegate(FullSystem::new(client.clone(), pool, deny_unsafe))); + io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new(client.clone()))); io } diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 2aef8ff3..640e9717 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -68,8 +68,10 @@ frame_support::parameter_types! { pub struct WeightToFee; impl WeightToFeePolynomial for WeightToFee { type Balance = Balance; + fn polynomial() -> WeightToFeeCoefficients { - // in `Pangolin Parachain`, extrinsic base weight (smallest non-zero weight) is mapped to 100 MILLI: + // in `Pangolin Parachain`, extrinsic base weight (smallest non-zero weight) is mapped to + // 100 MILLI: let p = 100 * MILLI_COIN; let q = Balance::from(ExtrinsicBaseWeight::get()); @@ -124,10 +126,9 @@ where /// Following checks are made: /// /// - message is rejected if its lane is currently blocked; -/// - message is rejected if there are too many pending (undelivered) messages at the outbound -/// lane; -/// - check that the sender has rights to dispatch the call on target chain using provided -/// dispatch origin; +/// - message is rejected if there are too many pending (undelivered) messages at the outbound lane; +/// - check that the sender has rights to dispatch the call on target chain using provided dispatch +/// origin; /// - check that the sender has paid enough funds for both message delivery and dispatch. #[derive(RuntimeDebug)] pub struct FromThisChainMessageVerifier(PhantomData<(B, R, I)>); diff --git a/runtime/crab-parachain/build.rs b/runtime/crab-parachain/build.rs index 2fc25b87..9e4d064f 100644 --- a/runtime/crab-parachain/build.rs +++ b/runtime/crab-parachain/build.rs @@ -20,9 +20,5 @@ use substrate_wasm_builder::WasmBuilder; fn main() { - WasmBuilder::new() - .with_current_project() - .export_heap_base() - .import_memory() - .build() + WasmBuilder::new().with_current_project().export_heap_base().import_memory().build() } diff --git a/runtime/crab-parachain/src/lib.rs b/runtime/crab-parachain/src/lib.rs index 0089ea30..26e2e478 100644 --- a/runtime/crab-parachain/src/lib.rs +++ b/runtime/crab-parachain/src/lib.rs @@ -127,10 +127,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { /// The version information used to identify this runtime when compiled natively. #[cfg(feature = "std")] pub fn native_version() -> NativeVersion { - NativeVersion { - runtime_version: VERSION, - can_author_with: Default::default(), - } + NativeVersion { runtime_version: VERSION, can_author_with: Default::default() } } frame_support::construct_runtime! { diff --git a/runtime/crab-parachain/src/pallets/authorship.rs b/runtime/crab-parachain/src/pallets/authorship.rs index 887b69c8..488a5ef9 100644 --- a/runtime/crab-parachain/src/pallets/authorship.rs +++ b/runtime/crab-parachain/src/pallets/authorship.rs @@ -9,8 +9,8 @@ frame_support::parameter_types! { } impl Config for Runtime { + type EventHandler = (CollatorSelection,); + type FilterUncle = (); type FindAuthor = FindAccountFromAuthorIndex; type UncleGenerations = UncleGenerations; - type FilterUncle = (); - type EventHandler = (CollatorSelection,); } diff --git a/runtime/crab-parachain/src/pallets/balances.rs b/runtime/crab-parachain/src/pallets/balances.rs index aa05d360..b2b520ee 100644 --- a/runtime/crab-parachain/src/pallets/balances.rs +++ b/runtime/crab-parachain/src/pallets/balances.rs @@ -18,11 +18,11 @@ frame_support::parameter_types! { } impl Config for Runtime { + type AccountStore = System; type Balance = Balance; - type Event = Event; type DustRemoval = (); + type Event = Event; type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; diff --git a/runtime/crab-parachain/src/pallets/collator_selection.rs b/runtime/crab-parachain/src/pallets/collator_selection.rs index ccb76bb4..7bff77c3 100644 --- a/runtime/crab-parachain/src/pallets/collator_selection.rs +++ b/runtime/crab-parachain/src/pallets/collator_selection.rs @@ -20,15 +20,15 @@ pub type CollatorSelectionUpdateOrigin = EnsureOneOf, EnsureXcm>>; impl Config for Runtime { - type Event = Event; type Currency = Ring; - type UpdateOrigin = CollatorSelectionUpdateOrigin; - type PotId = PotId; - type MaxCandidates = MaxCandidates; - type MinCandidates = MinCandidates; - type MaxInvulnerables = MaxInvulnerables; + type Event = Event; // should be a multiple of session or things will get inconsistent type KickThreshold = Period; + type MaxCandidates = MaxCandidates; + type MaxInvulnerables = MaxInvulnerables; + type MinCandidates = MinCandidates; + type PotId = PotId; + type UpdateOrigin = CollatorSelectionUpdateOrigin; type ValidatorId = ::AccountId; type ValidatorIdOf = IdentityCollator; type ValidatorRegistration = Session; diff --git a/runtime/crab-parachain/src/pallets/dmp_queue.rs b/runtime/crab-parachain/src/pallets/dmp_queue.rs index 8118f54d..fa5490ba 100644 --- a/runtime/crab-parachain/src/pallets/dmp_queue.rs +++ b/runtime/crab-parachain/src/pallets/dmp_queue.rs @@ -7,6 +7,6 @@ use crate::*; impl Config for Runtime { type Event = Event; - type XcmExecutor = XcmExecutor; type ExecuteOverweightOrigin = EnsureRoot; + type XcmExecutor = XcmExecutor; } diff --git a/runtime/crab-parachain/src/pallets/multisig.rs b/runtime/crab-parachain/src/pallets/multisig.rs index e9b46e60..375ecbc7 100644 --- a/runtime/crab-parachain/src/pallets/multisig.rs +++ b/runtime/crab-parachain/src/pallets/multisig.rs @@ -12,11 +12,11 @@ frame_support::parameter_types! { } impl Config for Runtime { - type Event = Event; type Call = Call; type Currency = Ring; type DepositBase = DepositBase; type DepositFactor = DepositFactor; + type Event = Event; type MaxSignatories = MaxSignatories; type WeightInfo = WeightInfo; } diff --git a/runtime/crab-parachain/src/pallets/parachain_system.rs b/runtime/crab-parachain/src/pallets/parachain_system.rs index 8d843089..e2438681 100644 --- a/runtime/crab-parachain/src/pallets/parachain_system.rs +++ b/runtime/crab-parachain/src/pallets/parachain_system.rs @@ -11,12 +11,12 @@ frame_support::parameter_types! { } impl Config for Runtime { + type DmpMessageHandler = DmpQueue; type Event = Event; type OnSystemEvent = (); - type SelfParaId = ParachainInfoPallet; - type DmpMessageHandler = DmpQueue; - type ReservedDmpWeight = ReservedDmpWeight; type OutboundXcmpMessageSource = XcmpQueue; - type XcmpMessageHandler = XcmpQueue; + type ReservedDmpWeight = ReservedDmpWeight; type ReservedXcmpWeight = ReservedXcmpWeight; + type SelfParaId = ParachainInfoPallet; + type XcmpMessageHandler = XcmpQueue; } diff --git a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs index 2acd854b..0cd1fee9 100644 --- a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs @@ -110,37 +110,38 @@ frame_support::match_type! { pub struct XcmConfig; impl XcmCExecutorConfig for XcmConfig { - type Call = Call; - type XcmSender = XcmRouter; + type AssetClaims = PolkadotXcm; // How to withdraw and deposit an asset. type AssetTransactor = LocalAssetTransactor; - type OriginConverter = XcmOriginToTransactDispatchOrigin; + type AssetTrap = PolkadotXcm; + type Barrier = Barrier; + type Call = Call; type IsReserve = NativeAsset; - type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of KSM + type IsTeleporter = NativeAsset; + // <- should be enough to allow teleportation of KSM type LocationInverter = LocationInverter; - type Barrier = Barrier; - type Weigher = FixedWeightBounds; - type Trader = UsingComponents>; + type OriginConverter = XcmOriginToTransactDispatchOrigin; type ResponseHandler = PolkadotXcm; - type AssetTrap = PolkadotXcm; - type AssetClaims = PolkadotXcm; type SubscriptionService = PolkadotXcm; + type Trader = UsingComponents>; + type Weigher = FixedWeightBounds; + type XcmSender = XcmRouter; } impl Config for Runtime { - const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; - + type AdvertisedXcmVersion = CurrentXcmVersion; + type Call = Call; type Event = Event; - type SendXcmOrigin = EnsureXcmOrigin; - type XcmRouter = XcmRouter; type ExecuteXcmOrigin = EnsureXcmOrigin; + type LocationInverter = LocationInverter; + type Origin = Origin; + type SendXcmOrigin = EnsureXcmOrigin; + type Weigher = FixedWeightBounds; type XcmExecuteFilter = Everything; type XcmExecutor = XcmExecutor; - type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; - type LocationInverter = LocationInverter; - type Origin = Origin; - type Call = Call; - type AdvertisedXcmVersion = CurrentXcmVersion; + type XcmRouter = XcmRouter; + type XcmTeleportFilter = Everything; + + const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; } diff --git a/runtime/crab-parachain/src/pallets/proxy.rs b/runtime/crab-parachain/src/pallets/proxy.rs index 8a8ba63d..23deb741 100644 --- a/runtime/crab-parachain/src/pallets/proxy.rs +++ b/runtime/crab-parachain/src/pallets/proxy.rs @@ -78,16 +78,16 @@ frame_support::parameter_types! { } impl Config for Runtime { - type Event = Event; + type AnnouncementDepositBase = AnnouncementDepositBase; + type AnnouncementDepositFactor = AnnouncementDepositFactor; type Call = Call; + type CallHasher = BlakeTwo256; type Currency = Ring; - type ProxyType = ProxyType; + type Event = Event; + type MaxPending = MaxPending; + type MaxProxies = MaxProxies; type ProxyDepositBase = ProxyDepositBase; type ProxyDepositFactor = ProxyDepositFactor; - type MaxProxies = MaxProxies; - type MaxPending = MaxPending; - type CallHasher = BlakeTwo256; - type AnnouncementDepositBase = AnnouncementDepositBase; - type AnnouncementDepositFactor = AnnouncementDepositFactor; + type ProxyType = ProxyType; type WeightInfo = WeightInfo; } diff --git a/runtime/crab-parachain/src/pallets/session.rs b/runtime/crab-parachain/src/pallets/session.rs index 7c727cf5..7d93c1e8 100644 --- a/runtime/crab-parachain/src/pallets/session.rs +++ b/runtime/crab-parachain/src/pallets/session.rs @@ -18,14 +18,14 @@ frame_support::parameter_types! { impl Config for Runtime { type Event = Event; - type ValidatorId = ::AccountId; - // we don't have stash and controller, thus we don't need the convert as well. - type ValidatorIdOf = IdentityCollator; - type ShouldEndSession = PeriodicSessions; + type Keys = SessionKeys; type NextSessionRotation = PeriodicSessions; - type SessionManager = CollatorSelection; // Essentially just Aura, but lets be pedantic. type SessionHandler = ::KeyTypeIdProviders; - type Keys = SessionKeys; + type SessionManager = CollatorSelection; + type ShouldEndSession = PeriodicSessions; + type ValidatorId = ::AccountId; + // we don't have stash and controller, thus we don't need the convert as well. + type ValidatorIdOf = IdentityCollator; type WeightInfo = (); } diff --git a/runtime/crab-parachain/src/pallets/sudo.rs b/runtime/crab-parachain/src/pallets/sudo.rs index a819e943..a7a64a8d 100644 --- a/runtime/crab-parachain/src/pallets/sudo.rs +++ b/runtime/crab-parachain/src/pallets/sudo.rs @@ -4,6 +4,6 @@ use pallet_sudo::Config; use crate::*; impl Config for Runtime { - type Event = Event; type Call = Call; + type Event = Event; } diff --git a/runtime/crab-parachain/src/pallets/system.rs b/runtime/crab-parachain/src/pallets/system.rs index b95aba5f..e2aa5a0f 100644 --- a/runtime/crab-parachain/src/pallets/system.rs +++ b/runtime/crab-parachain/src/pallets/system.rs @@ -57,28 +57,28 @@ frame_support::parameter_types! { } impl Config for Runtime { + type AccountData = AccountData; + type AccountId = AccountId; type BaseCallFilter = Everything; - type BlockWeights = RuntimeBlockWeights; + type BlockHashCount = BlockHashCount; type BlockLength = RuntimeBlockLength; - type DbWeight = RocksDbWeight; - type Origin = Origin; - type Call = Call; - type Index = Nonce; type BlockNumber = BlockNumber; + type BlockWeights = RuntimeBlockWeights; + type Call = Call; + type DbWeight = RocksDbWeight; + type Event = Event; type Hash = Hash; type Hashing = BlakeTwo256; - type AccountId = AccountId; - type Lookup = AccountIdLookup; type Header = Header; - type Event = Event; - type BlockHashCount = BlockHashCount; - type Version = Version; - type PalletInfo = PalletInfo; - type AccountData = AccountData; - type OnNewAccount = (); + type Index = Nonce; + type Lookup = AccountIdLookup; + type MaxConsumers = ConstU32<16>; type OnKilledAccount = (); - type SystemWeightInfo = WeightInfo; - type SS58Prefix = SS58Prefix; + type OnNewAccount = (); type OnSetCode = ParachainSetCode; - type MaxConsumers = ConstU32<16>; + type Origin = Origin; + type PalletInfo = PalletInfo; + type SS58Prefix = SS58Prefix; + type SystemWeightInfo = WeightInfo; + type Version = Version; } diff --git a/runtime/crab-parachain/src/pallets/timestamp.rs b/runtime/crab-parachain/src/pallets/timestamp.rs index ca3a15d3..0576b528 100644 --- a/runtime/crab-parachain/src/pallets/timestamp.rs +++ b/runtime/crab-parachain/src/pallets/timestamp.rs @@ -8,9 +8,9 @@ frame_support::parameter_types! { } impl Config for Runtime { + type MinimumPeriod = MinimumPeriod; /// A timestamp: milliseconds since the unix epoch. type Moment = Moment; type OnTimestampSet = (); - type MinimumPeriod = MinimumPeriod; type WeightInfo = WeightInfo; } diff --git a/runtime/crab-parachain/src/pallets/transaction_payment.rs b/runtime/crab-parachain/src/pallets/transaction_payment.rs index 7f60aa23..498af6cb 100644 --- a/runtime/crab-parachain/src/pallets/transaction_payment.rs +++ b/runtime/crab-parachain/src/pallets/transaction_payment.rs @@ -12,9 +12,9 @@ frame_support::parameter_types! { } impl Config for Runtime { + type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OnChargeTransaction = CurrencyAdapter>; + type OperationalFeeMultiplier = OperationalFeeMultiplier; type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; - type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; - type OperationalFeeMultiplier = OperationalFeeMultiplier; } diff --git a/runtime/crab-parachain/src/pallets/utility.rs b/runtime/crab-parachain/src/pallets/utility.rs index 6cb4dc12..4b1d2407 100644 --- a/runtime/crab-parachain/src/pallets/utility.rs +++ b/runtime/crab-parachain/src/pallets/utility.rs @@ -4,8 +4,8 @@ use pallet_utility::Config; use crate::{weights::pallet_utility::WeightInfo, *}; impl Config for Runtime { - type Event = Event; type Call = Call; + type Event = Event; type PalletsOrigin = OriginCaller; type WeightInfo = WeightInfo; } diff --git a/runtime/crab-parachain/src/pallets/xcmp_queue.rs b/runtime/crab-parachain/src/pallets/xcmp_queue.rs index 2f7d0be3..19034a79 100644 --- a/runtime/crab-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/crab-parachain/src/pallets/xcmp_queue.rs @@ -6,13 +6,13 @@ use xcm_executor::XcmExecutor; use crate::*; impl Config for Runtime { - type Event = Event; - type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; - type VersionWrapper = PolkadotXcm; - type ExecuteOverweightOrigin = EnsureRoot; type ControllerOrigin = EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; + type Event = Event; + type ExecuteOverweightOrigin = EnsureRoot; + type VersionWrapper = PolkadotXcm; // TODO: Update weight type WeightInfo = (); + type XcmExecutor = XcmExecutor; } diff --git a/runtime/darwinia-parachain/build.rs b/runtime/darwinia-parachain/build.rs index 2fc25b87..9e4d064f 100644 --- a/runtime/darwinia-parachain/build.rs +++ b/runtime/darwinia-parachain/build.rs @@ -20,9 +20,5 @@ use substrate_wasm_builder::WasmBuilder; fn main() { - WasmBuilder::new() - .with_current_project() - .export_heap_base() - .import_memory() - .build() + WasmBuilder::new().with_current_project().export_heap_base().import_memory().build() } diff --git a/runtime/darwinia-parachain/src/lib.rs b/runtime/darwinia-parachain/src/lib.rs index 8cfc2aeb..93c32295 100644 --- a/runtime/darwinia-parachain/src/lib.rs +++ b/runtime/darwinia-parachain/src/lib.rs @@ -121,10 +121,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { /// The version information used to identify this runtime when compiled natively. #[cfg(feature = "std")] pub fn native_version() -> NativeVersion { - NativeVersion { - runtime_version: VERSION, - can_author_with: Default::default(), - } + NativeVersion { runtime_version: VERSION, can_author_with: Default::default() } } frame_support::construct_runtime! { diff --git a/runtime/darwinia-parachain/src/pallets/authorship.rs b/runtime/darwinia-parachain/src/pallets/authorship.rs index 887b69c8..488a5ef9 100644 --- a/runtime/darwinia-parachain/src/pallets/authorship.rs +++ b/runtime/darwinia-parachain/src/pallets/authorship.rs @@ -9,8 +9,8 @@ frame_support::parameter_types! { } impl Config for Runtime { + type EventHandler = (CollatorSelection,); + type FilterUncle = (); type FindAuthor = FindAccountFromAuthorIndex; type UncleGenerations = UncleGenerations; - type FilterUncle = (); - type EventHandler = (CollatorSelection,); } diff --git a/runtime/darwinia-parachain/src/pallets/balances.rs b/runtime/darwinia-parachain/src/pallets/balances.rs index 25ee4f62..13079a95 100644 --- a/runtime/darwinia-parachain/src/pallets/balances.rs +++ b/runtime/darwinia-parachain/src/pallets/balances.rs @@ -18,11 +18,11 @@ frame_support::parameter_types! { } impl Config for Runtime { + type AccountStore = System; type Balance = Balance; - type Event = Event; type DustRemoval = (); + type Event = Event; type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; diff --git a/runtime/darwinia-parachain/src/pallets/collator_selection.rs b/runtime/darwinia-parachain/src/pallets/collator_selection.rs index 90e0425d..a0e6ddbe 100644 --- a/runtime/darwinia-parachain/src/pallets/collator_selection.rs +++ b/runtime/darwinia-parachain/src/pallets/collator_selection.rs @@ -20,15 +20,15 @@ pub type CollatorSelectionUpdateOrigin = EnsureOneOf, EnsureXcm>>; impl Config for Runtime { - type Event = Event; type Currency = Ring; - type UpdateOrigin = CollatorSelectionUpdateOrigin; - type PotId = PotId; - type MaxCandidates = MaxCandidates; - type MinCandidates = MinCandidates; - type MaxInvulnerables = MaxInvulnerables; + type Event = Event; // should be a multiple of session or things will get inconsistent type KickThreshold = Period; + type MaxCandidates = MaxCandidates; + type MaxInvulnerables = MaxInvulnerables; + type MinCandidates = MinCandidates; + type PotId = PotId; + type UpdateOrigin = CollatorSelectionUpdateOrigin; type ValidatorId = ::AccountId; type ValidatorIdOf = IdentityCollator; type ValidatorRegistration = Session; diff --git a/runtime/darwinia-parachain/src/pallets/dmp_queue.rs b/runtime/darwinia-parachain/src/pallets/dmp_queue.rs index 8118f54d..fa5490ba 100644 --- a/runtime/darwinia-parachain/src/pallets/dmp_queue.rs +++ b/runtime/darwinia-parachain/src/pallets/dmp_queue.rs @@ -7,6 +7,6 @@ use crate::*; impl Config for Runtime { type Event = Event; - type XcmExecutor = XcmExecutor; type ExecuteOverweightOrigin = EnsureRoot; + type XcmExecutor = XcmExecutor; } diff --git a/runtime/darwinia-parachain/src/pallets/multisig.rs b/runtime/darwinia-parachain/src/pallets/multisig.rs index ddb016c7..e5f7524a 100644 --- a/runtime/darwinia-parachain/src/pallets/multisig.rs +++ b/runtime/darwinia-parachain/src/pallets/multisig.rs @@ -12,11 +12,11 @@ frame_support::parameter_types! { } impl Config for Runtime { - type Event = Event; type Call = Call; type Currency = Ring; type DepositBase = DepositBase; type DepositFactor = DepositFactor; + type Event = Event; type MaxSignatories = MaxSignatories; type WeightInfo = (); } diff --git a/runtime/darwinia-parachain/src/pallets/parachain_system.rs b/runtime/darwinia-parachain/src/pallets/parachain_system.rs index 8d843089..e2438681 100644 --- a/runtime/darwinia-parachain/src/pallets/parachain_system.rs +++ b/runtime/darwinia-parachain/src/pallets/parachain_system.rs @@ -11,12 +11,12 @@ frame_support::parameter_types! { } impl Config for Runtime { + type DmpMessageHandler = DmpQueue; type Event = Event; type OnSystemEvent = (); - type SelfParaId = ParachainInfoPallet; - type DmpMessageHandler = DmpQueue; - type ReservedDmpWeight = ReservedDmpWeight; type OutboundXcmpMessageSource = XcmpQueue; - type XcmpMessageHandler = XcmpQueue; + type ReservedDmpWeight = ReservedDmpWeight; type ReservedXcmpWeight = ReservedXcmpWeight; + type SelfParaId = ParachainInfoPallet; + type XcmpMessageHandler = XcmpQueue; } diff --git a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs index fecf0d9e..29d5604a 100644 --- a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs @@ -110,37 +110,38 @@ frame_support::match_type! { pub struct XcmConfig; impl XcmCExecutorConfig for XcmConfig { - type Call = Call; - type XcmSender = XcmRouter; + type AssetClaims = PolkadotXcm; // How to withdraw and deposit an asset. type AssetTransactor = LocalAssetTransactor; - type OriginConverter = XcmOriginToTransactDispatchOrigin; + type AssetTrap = PolkadotXcm; + type Barrier = Barrier; + type Call = Call; type IsReserve = NativeAsset; - type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of KSM + type IsTeleporter = NativeAsset; + // <- should be enough to allow teleportation of KSM type LocationInverter = LocationInverter; - type Barrier = Barrier; - type Weigher = FixedWeightBounds; - type Trader = UsingComponents>; + type OriginConverter = XcmOriginToTransactDispatchOrigin; type ResponseHandler = PolkadotXcm; - type AssetTrap = PolkadotXcm; - type AssetClaims = PolkadotXcm; type SubscriptionService = PolkadotXcm; + type Trader = UsingComponents>; + type Weigher = FixedWeightBounds; + type XcmSender = XcmRouter; } impl Config for Runtime { - const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; - + type AdvertisedXcmVersion = CurrentXcmVersion; + type Call = Call; type Event = Event; - type SendXcmOrigin = EnsureXcmOrigin; - type XcmRouter = XcmRouter; type ExecuteXcmOrigin = EnsureXcmOrigin; + type LocationInverter = LocationInverter; + type Origin = Origin; + type SendXcmOrigin = EnsureXcmOrigin; + type Weigher = FixedWeightBounds; type XcmExecuteFilter = Everything; type XcmExecutor = XcmExecutor; - type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; - type LocationInverter = LocationInverter; - type Origin = Origin; - type Call = Call; - type AdvertisedXcmVersion = CurrentXcmVersion; + type XcmRouter = XcmRouter; + type XcmTeleportFilter = Everything; + + const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; } diff --git a/runtime/darwinia-parachain/src/pallets/proxy.rs b/runtime/darwinia-parachain/src/pallets/proxy.rs index b6deb3db..49e9268c 100644 --- a/runtime/darwinia-parachain/src/pallets/proxy.rs +++ b/runtime/darwinia-parachain/src/pallets/proxy.rs @@ -78,16 +78,16 @@ frame_support::parameter_types! { } impl Config for Runtime { - type Event = Event; + type AnnouncementDepositBase = AnnouncementDepositBase; + type AnnouncementDepositFactor = AnnouncementDepositFactor; type Call = Call; + type CallHasher = BlakeTwo256; type Currency = Ring; - type ProxyType = ProxyType; + type Event = Event; + type MaxPending = MaxPending; + type MaxProxies = MaxProxies; type ProxyDepositBase = ProxyDepositBase; type ProxyDepositFactor = ProxyDepositFactor; - type MaxProxies = MaxProxies; - type MaxPending = MaxPending; - type CallHasher = BlakeTwo256; - type AnnouncementDepositBase = AnnouncementDepositBase; - type AnnouncementDepositFactor = AnnouncementDepositFactor; + type ProxyType = ProxyType; type WeightInfo = (); } diff --git a/runtime/darwinia-parachain/src/pallets/session.rs b/runtime/darwinia-parachain/src/pallets/session.rs index 7c727cf5..7d93c1e8 100644 --- a/runtime/darwinia-parachain/src/pallets/session.rs +++ b/runtime/darwinia-parachain/src/pallets/session.rs @@ -18,14 +18,14 @@ frame_support::parameter_types! { impl Config for Runtime { type Event = Event; - type ValidatorId = ::AccountId; - // we don't have stash and controller, thus we don't need the convert as well. - type ValidatorIdOf = IdentityCollator; - type ShouldEndSession = PeriodicSessions; + type Keys = SessionKeys; type NextSessionRotation = PeriodicSessions; - type SessionManager = CollatorSelection; // Essentially just Aura, but lets be pedantic. type SessionHandler = ::KeyTypeIdProviders; - type Keys = SessionKeys; + type SessionManager = CollatorSelection; + type ShouldEndSession = PeriodicSessions; + type ValidatorId = ::AccountId; + // we don't have stash and controller, thus we don't need the convert as well. + type ValidatorIdOf = IdentityCollator; type WeightInfo = (); } diff --git a/runtime/darwinia-parachain/src/pallets/sudo.rs b/runtime/darwinia-parachain/src/pallets/sudo.rs index a819e943..a7a64a8d 100644 --- a/runtime/darwinia-parachain/src/pallets/sudo.rs +++ b/runtime/darwinia-parachain/src/pallets/sudo.rs @@ -4,6 +4,6 @@ use pallet_sudo::Config; use crate::*; impl Config for Runtime { - type Event = Event; type Call = Call; + type Event = Event; } diff --git a/runtime/darwinia-parachain/src/pallets/system.rs b/runtime/darwinia-parachain/src/pallets/system.rs index d98ec6c0..ba382467 100644 --- a/runtime/darwinia-parachain/src/pallets/system.rs +++ b/runtime/darwinia-parachain/src/pallets/system.rs @@ -57,28 +57,28 @@ frame_support::parameter_types! { } impl Config for Runtime { + type AccountData = AccountData; + type AccountId = AccountId; type BaseCallFilter = Everything; - type BlockWeights = RuntimeBlockWeights; + type BlockHashCount = BlockHashCount; type BlockLength = RuntimeBlockLength; - type DbWeight = RocksDbWeight; - type Origin = Origin; - type Call = Call; - type Index = Nonce; type BlockNumber = BlockNumber; + type BlockWeights = RuntimeBlockWeights; + type Call = Call; + type DbWeight = RocksDbWeight; + type Event = Event; type Hash = Hash; type Hashing = BlakeTwo256; - type AccountId = AccountId; - type Lookup = AccountIdLookup; type Header = Header; - type Event = Event; - type BlockHashCount = BlockHashCount; - type Version = Version; - type PalletInfo = PalletInfo; - type AccountData = AccountData; - type OnNewAccount = (); + type Index = Nonce; + type Lookup = AccountIdLookup; + type MaxConsumers = ConstU32<16>; type OnKilledAccount = (); - type SystemWeightInfo = (); - type SS58Prefix = SS58Prefix; + type OnNewAccount = (); type OnSetCode = ParachainSetCode; - type MaxConsumers = ConstU32<16>; + type Origin = Origin; + type PalletInfo = PalletInfo; + type SS58Prefix = SS58Prefix; + type SystemWeightInfo = (); + type Version = Version; } diff --git a/runtime/darwinia-parachain/src/pallets/timestamp.rs b/runtime/darwinia-parachain/src/pallets/timestamp.rs index f64b6f2c..40d88eba 100644 --- a/runtime/darwinia-parachain/src/pallets/timestamp.rs +++ b/runtime/darwinia-parachain/src/pallets/timestamp.rs @@ -8,9 +8,9 @@ frame_support::parameter_types! { } impl Config for Runtime { + type MinimumPeriod = MinimumPeriod; /// A timestamp: milliseconds since the unix epoch. type Moment = Moment; type OnTimestampSet = (); - type MinimumPeriod = MinimumPeriod; type WeightInfo = (); } diff --git a/runtime/darwinia-parachain/src/pallets/transaction_payment.rs b/runtime/darwinia-parachain/src/pallets/transaction_payment.rs index 7f60aa23..498af6cb 100644 --- a/runtime/darwinia-parachain/src/pallets/transaction_payment.rs +++ b/runtime/darwinia-parachain/src/pallets/transaction_payment.rs @@ -12,9 +12,9 @@ frame_support::parameter_types! { } impl Config for Runtime { + type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OnChargeTransaction = CurrencyAdapter>; + type OperationalFeeMultiplier = OperationalFeeMultiplier; type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; - type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; - type OperationalFeeMultiplier = OperationalFeeMultiplier; } diff --git a/runtime/darwinia-parachain/src/pallets/utility.rs b/runtime/darwinia-parachain/src/pallets/utility.rs index f11c4545..808c1728 100644 --- a/runtime/darwinia-parachain/src/pallets/utility.rs +++ b/runtime/darwinia-parachain/src/pallets/utility.rs @@ -4,8 +4,8 @@ use pallet_utility::Config; use crate::*; impl Config for Runtime { - type Event = Event; type Call = Call; + type Event = Event; type PalletsOrigin = OriginCaller; type WeightInfo = (); } diff --git a/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs b/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs index ac622d57..c82e970c 100644 --- a/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/darwinia-parachain/src/pallets/xcmp_queue.rs @@ -6,12 +6,12 @@ use xcm_executor::XcmExecutor; use crate::*; impl Config for Runtime { - type Event = Event; - type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; - type VersionWrapper = PolkadotXcm; - type ExecuteOverweightOrigin = EnsureRoot; type ControllerOrigin = EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; + type Event = Event; + type ExecuteOverweightOrigin = EnsureRoot; + type VersionWrapper = PolkadotXcm; type WeightInfo = (); + type XcmExecutor = XcmExecutor; } diff --git a/runtime/pangolin-parachain/build.rs b/runtime/pangolin-parachain/build.rs index 0da0eb54..93908a8c 100644 --- a/runtime/pangolin-parachain/build.rs +++ b/runtime/pangolin-parachain/build.rs @@ -20,9 +20,5 @@ use substrate_wasm_builder::WasmBuilder; fn main() { - WasmBuilder::new() - .with_current_project() - .export_heap_base() - .import_memory() - .build() + WasmBuilder::new().with_current_project().export_heap_base().import_memory().build() } diff --git a/runtime/pangolin-parachain/src/bridges_message/pangolin.rs b/runtime/pangolin-parachain/src/bridges_message/pangolin.rs index 536a0029..d776143e 100644 --- a/runtime/pangolin-parachain/src/bridges_message/pangolin.rs +++ b/runtime/pangolin-parachain/src/bridges_message/pangolin.rs @@ -49,7 +49,8 @@ frame_support::parameter_types! { #[derive(Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, TypeInfo)] pub enum PangolinParachainToPangolinParameter { - /// The conversion formula we use is: `PangolinTokens = PangolinParachainTokens * conversion_rate`. + /// The conversion formula we use is: `PangolinTokens = PangolinParachainTokens * + /// conversion_rate`. PangolinToPangolinParachainConversionRate(FixedU128), } impl Parameter for PangolinParachainToPangolinParameter { @@ -66,14 +67,14 @@ impl Parameter for PangolinParachainToPangolinParameter { #[derive(Clone, Copy, RuntimeDebug)] pub struct WithPangolinMessageBridge; impl MessageBridge for WithPangolinMessageBridge { - type ThisChain = PangolinParachain; type BridgedChain = Pangolin; + type ThisChain = PangolinParachain; - const RELAYER_FEE_PERCENT: u32 = 10; - const THIS_CHAIN_ID: ChainId = PANGOLIN_PARACHAIN_CHAIN_ID; const BRIDGED_CHAIN_ID: ChainId = PANGOLIN_CHAIN_ID; const BRIDGED_MESSAGES_PALLET_NAME: &'static str = bp_pangolin_parachain::WITH_PANGOLIN_PARACHAIN_MESSAGES_PALLET_NAME; + const RELAYER_FEE_PERCENT: u32 = 10; + const THIS_CHAIN_ID: ChainId = PANGOLIN_PARACHAIN_CHAIN_ID; fn bridged_balance_to_this_balance( bridged_balance: BalanceOf, @@ -89,12 +90,12 @@ impl MessageBridge for WithPangolinMessageBridge { #[derive(Clone, Copy, RuntimeDebug)] pub struct PangolinParachain; impl ChainWithMessages for PangolinParachain { - type Hash = bp_pangolin_parachain::Hash; type AccountId = bp_pangolin_parachain::AccountId; - type Signer = bp_pangolin_parachain::AccountPublic; + type Balance = bp_pangolin_parachain::Balance; + type Hash = bp_pangolin_parachain::Hash; type Signature = bp_pangolin_parachain::Signature; + type Signer = bp_pangolin_parachain::AccountPublic; type Weight = Weight; - type Balance = bp_pangolin_parachain::Balance; } impl ThisChainWithMessages for PangolinParachain { type Call = Call; @@ -127,9 +128,7 @@ impl ThisChainWithMessages for PangolinParachain { fn transaction_payment(transaction: MessageTransaction) -> Balance { // in our testnets, both per-byte fee and weight-to-fee are 1:1 messages::transaction_payment( - RuntimeBlockWeights::get() - .get(DispatchClass::Normal) - .base_extrinsic, + RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic, 1, FixedU128::zero(), |weight| weight as _, @@ -141,12 +140,12 @@ impl ThisChainWithMessages for PangolinParachain { #[derive(Clone, Copy, RuntimeDebug)] pub struct Pangolin; impl ChainWithMessages for Pangolin { - type Hash = bp_pangolin::Hash; type AccountId = bp_pangolin::AccountId; - type Signer = bp_pangolin::AccountPublic; + type Balance = bp_pangolin::Balance; + type Hash = bp_pangolin::Hash; type Signature = bp_pangolin::Signature; + type Signer = bp_pangolin::AccountPublic; type Weight = Weight; - type Balance = bp_pangolin::Balance; } impl BridgedChainWithMessages for Pangolin { fn maximal_extrinsic_size() -> u32 { @@ -188,9 +187,7 @@ impl BridgedChainWithMessages for Pangolin { fn transaction_payment(transaction: MessageTransaction) -> Self::Balance { // in our testnets, both per-byte fee and weight-to-fee are 1:1 messages::transaction_payment( - bp_pangolin::RuntimeBlockWeights::get() - .get(DispatchClass::Normal) - .base_extrinsic, + bp_pangolin::RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic, 1, FixedU128::zero(), |weight| weight as _, diff --git a/runtime/pangolin-parachain/src/lib.rs b/runtime/pangolin-parachain/src/lib.rs index a4fefca8..9dae0520 100644 --- a/runtime/pangolin-parachain/src/lib.rs +++ b/runtime/pangolin-parachain/src/lib.rs @@ -546,8 +546,5 @@ cumulus_pallet_parachain_system::register_validate_block! { /// The version information used to identify this runtime when compiled natively. #[cfg(feature = "std")] pub fn native_version() -> NativeVersion { - NativeVersion { - runtime_version: VERSION, - can_author_with: Default::default(), - } + NativeVersion { runtime_version: VERSION, can_author_with: Default::default() } } diff --git a/runtime/pangolin-parachain/src/pallets/authorship.rs b/runtime/pangolin-parachain/src/pallets/authorship.rs index 887b69c8..488a5ef9 100644 --- a/runtime/pangolin-parachain/src/pallets/authorship.rs +++ b/runtime/pangolin-parachain/src/pallets/authorship.rs @@ -9,8 +9,8 @@ frame_support::parameter_types! { } impl Config for Runtime { + type EventHandler = (CollatorSelection,); + type FilterUncle = (); type FindAuthor = FindAccountFromAuthorIndex; type UncleGenerations = UncleGenerations; - type FilterUncle = (); - type EventHandler = (CollatorSelection,); } diff --git a/runtime/pangolin-parachain/src/pallets/balances.rs b/runtime/pangolin-parachain/src/pallets/balances.rs index aa05d360..b2b520ee 100644 --- a/runtime/pangolin-parachain/src/pallets/balances.rs +++ b/runtime/pangolin-parachain/src/pallets/balances.rs @@ -18,11 +18,11 @@ frame_support::parameter_types! { } impl Config for Runtime { + type AccountStore = System; type Balance = Balance; - type Event = Event; type DustRemoval = (); + type Event = Event; type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; diff --git a/runtime/pangolin-parachain/src/pallets/bridge_dispatch.rs b/runtime/pangolin-parachain/src/pallets/bridge_dispatch.rs index cb7e192f..f990c696 100644 --- a/runtime/pangolin-parachain/src/pallets/bridge_dispatch.rs +++ b/runtime/pangolin-parachain/src/pallets/bridge_dispatch.rs @@ -8,13 +8,13 @@ use bp_messages::{LaneId, MessageNonce}; use pallet_bridge_dispatch::Config; impl Config for Runtime { - type Event = Event; + type AccountIdConverter = bp_pangolin_parachain::AccountIdConverter; type BridgeMessageId = (LaneId, MessageNonce); type Call = Call; type CallFilter = Everything; type EncodedCall = bm_pangolin::FromPangolinEncodedCall; + type Event = Event; type SourceChainAccountId = bp_pangolin::AccountId; type TargetChainAccountPublic = AccountPublic; type TargetChainSignature = Signature; - type AccountIdConverter = bp_pangolin_parachain::AccountIdConverter; } diff --git a/runtime/pangolin-parachain/src/pallets/bridge_grandpa.rs b/runtime/pangolin-parachain/src/pallets/bridge_grandpa.rs index 815acb64..5c3f91d9 100644 --- a/runtime/pangolin-parachain/src/pallets/bridge_grandpa.rs +++ b/runtime/pangolin-parachain/src/pallets/bridge_grandpa.rs @@ -19,7 +19,7 @@ frame_support::parameter_types! { impl Config for Runtime { type BridgedChain = bp_pangolin::Pangolin; - type MaxRequests = MaxRequests; type HeadersToKeep = HeadersToKeep; + type MaxRequests = MaxRequests; type WeightInfo = WeightInfo; } diff --git a/runtime/pangolin-parachain/src/pallets/collator_selection.rs b/runtime/pangolin-parachain/src/pallets/collator_selection.rs index e3dad095..125c6efa 100644 --- a/runtime/pangolin-parachain/src/pallets/collator_selection.rs +++ b/runtime/pangolin-parachain/src/pallets/collator_selection.rs @@ -21,15 +21,15 @@ pub type CollatorSelectionUpdateOrigin = EnsureOneOf, EnsureXcm>>; impl Config for Runtime { - type Event = Event; type Currency = Ring; - type UpdateOrigin = CollatorSelectionUpdateOrigin; - type PotId = PotId; - type MaxCandidates = MaxCandidates; - type MinCandidates = MinCandidates; - type MaxInvulnerables = MaxInvulnerables; + type Event = Event; // should be a multiple of session or things will get inconsistent type KickThreshold = Period; + type MaxCandidates = MaxCandidates; + type MaxInvulnerables = MaxInvulnerables; + type MinCandidates = MinCandidates; + type PotId = PotId; + type UpdateOrigin = CollatorSelectionUpdateOrigin; type ValidatorId = ::AccountId; type ValidatorIdOf = IdentityCollator; type ValidatorRegistration = Session; diff --git a/runtime/pangolin-parachain/src/pallets/dmp_queue.rs b/runtime/pangolin-parachain/src/pallets/dmp_queue.rs index 8118f54d..fa5490ba 100644 --- a/runtime/pangolin-parachain/src/pallets/dmp_queue.rs +++ b/runtime/pangolin-parachain/src/pallets/dmp_queue.rs @@ -7,6 +7,6 @@ use crate::*; impl Config for Runtime { type Event = Event; - type XcmExecutor = XcmExecutor; type ExecuteOverweightOrigin = EnsureRoot; + type XcmExecutor = XcmExecutor; } diff --git a/runtime/pangolin-parachain/src/pallets/fee_market.rs b/runtime/pangolin-parachain/src/pallets/fee_market.rs index 36540516..229863c7 100644 --- a/runtime/pangolin-parachain/src/pallets/fee_market.rs +++ b/runtime/pangolin-parachain/src/pallets/fee_market.rs @@ -18,9 +18,7 @@ where fn slash(locked_collateral: BalanceOf, timeout: T::BlockNumber) -> BalanceOf { let slash_each_block = 2 * COIN; let slash_value = UniqueSaturatedInto::::unique_saturated_into(timeout) - .saturating_mul(UniqueSaturatedInto::::unique_saturated_into( - slash_each_block, - )) + .saturating_mul(UniqueSaturatedInto::::unique_saturated_into(slash_each_block)) .unique_saturated_into(); cmp::min(locked_collateral, slash_value) diff --git a/runtime/pangolin-parachain/src/pallets/multisig.rs b/runtime/pangolin-parachain/src/pallets/multisig.rs index 0005415d..00b8fce7 100644 --- a/runtime/pangolin-parachain/src/pallets/multisig.rs +++ b/runtime/pangolin-parachain/src/pallets/multisig.rs @@ -12,11 +12,11 @@ frame_support::parameter_types! { } impl Config for Runtime { - type Event = Event; type Call = Call; type Currency = Ring; type DepositBase = DepositBase; type DepositFactor = DepositFactor; + type Event = Event; type MaxSignatories = MaxSignatories; type WeightInfo = WeightInfo; } diff --git a/runtime/pangolin-parachain/src/pallets/parachain_system.rs b/runtime/pangolin-parachain/src/pallets/parachain_system.rs index 8d843089..e2438681 100644 --- a/runtime/pangolin-parachain/src/pallets/parachain_system.rs +++ b/runtime/pangolin-parachain/src/pallets/parachain_system.rs @@ -11,12 +11,12 @@ frame_support::parameter_types! { } impl Config for Runtime { + type DmpMessageHandler = DmpQueue; type Event = Event; type OnSystemEvent = (); - type SelfParaId = ParachainInfoPallet; - type DmpMessageHandler = DmpQueue; - type ReservedDmpWeight = ReservedDmpWeight; type OutboundXcmpMessageSource = XcmpQueue; - type XcmpMessageHandler = XcmpQueue; + type ReservedDmpWeight = ReservedDmpWeight; type ReservedXcmpWeight = ReservedXcmpWeight; + type SelfParaId = ParachainInfoPallet; + type XcmpMessageHandler = XcmpQueue; } diff --git a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs index cf2337ee..1dcb5146 100644 --- a/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs @@ -117,38 +117,39 @@ frame_support::match_type! { pub struct XcmConfig; impl XcmCExecutorConfig for XcmConfig { - type Call = Call; - type XcmSender = XcmRouter; + type AssetClaims = PolkadotXcm; // How to withdraw and deposit an asset. type AssetTransactor = LocalAssetTransactor; - type OriginConverter = XcmOriginToTransactDispatchOrigin; + type AssetTrap = PolkadotXcm; + type Barrier = Barrier; + type Call = Call; type IsReserve = NativeAsset; - type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of KSM + type IsTeleporter = NativeAsset; + // <- should be enough to allow teleportation of KSM type LocationInverter = LocationInverter; - type Barrier = Barrier; - type Weigher = FixedWeightBounds; - type Trader = - UsingComponents>; + type OriginConverter = XcmOriginToTransactDispatchOrigin; type ResponseHandler = PolkadotXcm; - type AssetTrap = PolkadotXcm; - type AssetClaims = PolkadotXcm; type SubscriptionService = PolkadotXcm; + type Trader = + UsingComponents>; + type Weigher = FixedWeightBounds; + type XcmSender = XcmRouter; } impl Config for Runtime { - const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; - + type AdvertisedXcmVersion = CurrentXcmVersion; + type Call = Call; type Event = Event; - type SendXcmOrigin = EnsureXcmOrigin; - type XcmRouter = XcmRouter; type ExecuteXcmOrigin = EnsureXcmOrigin; + type LocationInverter = LocationInverter; + type Origin = Origin; + type SendXcmOrigin = EnsureXcmOrigin; + type Weigher = FixedWeightBounds; type XcmExecuteFilter = Everything; type XcmExecutor = XcmExecutor; - type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; - type LocationInverter = LocationInverter; - type Origin = Origin; - type Call = Call; - type AdvertisedXcmVersion = CurrentXcmVersion; + type XcmRouter = XcmRouter; + type XcmTeleportFilter = Everything; + + const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; } diff --git a/runtime/pangolin-parachain/src/pallets/proxy.rs b/runtime/pangolin-parachain/src/pallets/proxy.rs index dc325258..7b404904 100644 --- a/runtime/pangolin-parachain/src/pallets/proxy.rs +++ b/runtime/pangolin-parachain/src/pallets/proxy.rs @@ -78,16 +78,16 @@ frame_support::parameter_types! { } impl Config for Runtime { - type Event = Event; + type AnnouncementDepositBase = AnnouncementDepositBase; + type AnnouncementDepositFactor = AnnouncementDepositFactor; type Call = Call; + type CallHasher = BlakeTwo256; type Currency = Ring; - type ProxyType = ProxyType; + type Event = Event; + type MaxPending = MaxPending; + type MaxProxies = MaxProxies; type ProxyDepositBase = ProxyDepositBase; type ProxyDepositFactor = ProxyDepositFactor; - type MaxProxies = MaxProxies; - type MaxPending = MaxPending; - type CallHasher = BlakeTwo256; - type AnnouncementDepositBase = AnnouncementDepositBase; - type AnnouncementDepositFactor = AnnouncementDepositFactor; + type ProxyType = ProxyType; type WeightInfo = WeightInfo; } diff --git a/runtime/pangolin-parachain/src/pallets/session.rs b/runtime/pangolin-parachain/src/pallets/session.rs index 7c727cf5..7d93c1e8 100644 --- a/runtime/pangolin-parachain/src/pallets/session.rs +++ b/runtime/pangolin-parachain/src/pallets/session.rs @@ -18,14 +18,14 @@ frame_support::parameter_types! { impl Config for Runtime { type Event = Event; - type ValidatorId = ::AccountId; - // we don't have stash and controller, thus we don't need the convert as well. - type ValidatorIdOf = IdentityCollator; - type ShouldEndSession = PeriodicSessions; + type Keys = SessionKeys; type NextSessionRotation = PeriodicSessions; - type SessionManager = CollatorSelection; // Essentially just Aura, but lets be pedantic. type SessionHandler = ::KeyTypeIdProviders; - type Keys = SessionKeys; + type SessionManager = CollatorSelection; + type ShouldEndSession = PeriodicSessions; + type ValidatorId = ::AccountId; + // we don't have stash and controller, thus we don't need the convert as well. + type ValidatorIdOf = IdentityCollator; type WeightInfo = (); } diff --git a/runtime/pangolin-parachain/src/pallets/sudo.rs b/runtime/pangolin-parachain/src/pallets/sudo.rs index a819e943..a7a64a8d 100644 --- a/runtime/pangolin-parachain/src/pallets/sudo.rs +++ b/runtime/pangolin-parachain/src/pallets/sudo.rs @@ -4,6 +4,6 @@ use pallet_sudo::Config; use crate::*; impl Config for Runtime { - type Event = Event; type Call = Call; + type Event = Event; } diff --git a/runtime/pangolin-parachain/src/pallets/system.rs b/runtime/pangolin-parachain/src/pallets/system.rs index b95aba5f..e2aa5a0f 100644 --- a/runtime/pangolin-parachain/src/pallets/system.rs +++ b/runtime/pangolin-parachain/src/pallets/system.rs @@ -57,28 +57,28 @@ frame_support::parameter_types! { } impl Config for Runtime { + type AccountData = AccountData; + type AccountId = AccountId; type BaseCallFilter = Everything; - type BlockWeights = RuntimeBlockWeights; + type BlockHashCount = BlockHashCount; type BlockLength = RuntimeBlockLength; - type DbWeight = RocksDbWeight; - type Origin = Origin; - type Call = Call; - type Index = Nonce; type BlockNumber = BlockNumber; + type BlockWeights = RuntimeBlockWeights; + type Call = Call; + type DbWeight = RocksDbWeight; + type Event = Event; type Hash = Hash; type Hashing = BlakeTwo256; - type AccountId = AccountId; - type Lookup = AccountIdLookup; type Header = Header; - type Event = Event; - type BlockHashCount = BlockHashCount; - type Version = Version; - type PalletInfo = PalletInfo; - type AccountData = AccountData; - type OnNewAccount = (); + type Index = Nonce; + type Lookup = AccountIdLookup; + type MaxConsumers = ConstU32<16>; type OnKilledAccount = (); - type SystemWeightInfo = WeightInfo; - type SS58Prefix = SS58Prefix; + type OnNewAccount = (); type OnSetCode = ParachainSetCode; - type MaxConsumers = ConstU32<16>; + type Origin = Origin; + type PalletInfo = PalletInfo; + type SS58Prefix = SS58Prefix; + type SystemWeightInfo = WeightInfo; + type Version = Version; } diff --git a/runtime/pangolin-parachain/src/pallets/timestamp.rs b/runtime/pangolin-parachain/src/pallets/timestamp.rs index ca3a15d3..0576b528 100644 --- a/runtime/pangolin-parachain/src/pallets/timestamp.rs +++ b/runtime/pangolin-parachain/src/pallets/timestamp.rs @@ -8,9 +8,9 @@ frame_support::parameter_types! { } impl Config for Runtime { + type MinimumPeriod = MinimumPeriod; /// A timestamp: milliseconds since the unix epoch. type Moment = Moment; type OnTimestampSet = (); - type MinimumPeriod = MinimumPeriod; type WeightInfo = WeightInfo; } diff --git a/runtime/pangolin-parachain/src/pallets/transaction_payment.rs b/runtime/pangolin-parachain/src/pallets/transaction_payment.rs index 7f60aa23..498af6cb 100644 --- a/runtime/pangolin-parachain/src/pallets/transaction_payment.rs +++ b/runtime/pangolin-parachain/src/pallets/transaction_payment.rs @@ -12,9 +12,9 @@ frame_support::parameter_types! { } impl Config for Runtime { + type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OnChargeTransaction = CurrencyAdapter>; + type OperationalFeeMultiplier = OperationalFeeMultiplier; type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; - type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; - type OperationalFeeMultiplier = OperationalFeeMultiplier; } diff --git a/runtime/pangolin-parachain/src/pallets/utility.rs b/runtime/pangolin-parachain/src/pallets/utility.rs index 6cb4dc12..4b1d2407 100644 --- a/runtime/pangolin-parachain/src/pallets/utility.rs +++ b/runtime/pangolin-parachain/src/pallets/utility.rs @@ -4,8 +4,8 @@ use pallet_utility::Config; use crate::{weights::pallet_utility::WeightInfo, *}; impl Config for Runtime { - type Event = Event; type Call = Call; + type Event = Event; type PalletsOrigin = OriginCaller; type WeightInfo = WeightInfo; } diff --git a/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs b/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs index 2f7d0be3..19034a79 100644 --- a/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs @@ -6,13 +6,13 @@ use xcm_executor::XcmExecutor; use crate::*; impl Config for Runtime { - type Event = Event; - type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; - type VersionWrapper = PolkadotXcm; - type ExecuteOverweightOrigin = EnsureRoot; type ControllerOrigin = EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; + type Event = Event; + type ExecuteOverweightOrigin = EnsureRoot; + type VersionWrapper = PolkadotXcm; // TODO: Update weight type WeightInfo = (); + type XcmExecutor = XcmExecutor; } diff --git a/src/chain_spec/crab_parachain.rs b/src/chain_spec/crab_parachain.rs index b0ac3992..9e1ec307 100644 --- a/src/chain_spec/crab_parachain.rs +++ b/src/chain_spec/crab_parachain.rs @@ -81,9 +81,7 @@ pub fn genesis_config() -> ChainSpec { .collect::>(); GenesisConfig { - system: SystemConfig { - code: wasm_binary_unwrap().into(), - }, + system: SystemConfig { code: wasm_binary_unwrap().into() }, balances: BalancesConfig { balances: vec![ // Root @@ -97,9 +95,7 @@ pub fn genesis_config() -> ChainSpec { ), ], }, - parachain_info: ParachainInfoConfig { - parachain_id: PARA_ID.into(), - }, + parachain_info: ParachainInfoConfig { parachain_id: PARA_ID.into() }, collator_selection: CollatorSelectionConfig { invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), candidacy_bond: 0, @@ -117,13 +113,11 @@ pub fn genesis_config() -> ChainSpec { }) .collect(), }, - // no need to pass anything to aura, in fact it will panic if we do. Session will take care - // of this. + // no need to pass anything to aura, in fact it will panic if we do. Session will take + // care of this. aura: Default::default(), aura_ext: Default::default(), - polkadot_xcm: PolkadotXcmConfig { - safe_xcm_version: Some(SAFE_XCM_VERSION), - }, + polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION) }, sudo: SudoConfig { key: Some(root) }, parachain_system: Default::default(), } @@ -142,10 +136,7 @@ pub fn genesis_config() -> ChainSpec { None, None, Some(properties()), - Extensions { - relay_chain: "kusama".into(), - para_id: PARA_ID, - }, + Extensions { relay_chain: "kusama".into(), para_id: PARA_ID }, ); } @@ -158,9 +149,7 @@ pub fn development_config() -> ChainSpec { )]; GenesisConfig { - system: SystemConfig { - code: wasm_binary_unwrap().into(), - }, + system: SystemConfig { code: wasm_binary_unwrap().into() }, balances: BalancesConfig { balances: invulnerables .iter() @@ -168,9 +157,7 @@ pub fn development_config() -> ChainSpec { .map(|(acc, _)| (acc, 100_000 * COIN)) .collect(), }, - parachain_info: ParachainInfoConfig { - parachain_id: PARA_ID.into(), - }, + parachain_info: ParachainInfoConfig { parachain_id: PARA_ID.into() }, collator_selection: CollatorSelectionConfig { invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), candidacy_bond: 0, @@ -188,13 +175,11 @@ pub fn development_config() -> ChainSpec { }) .collect(), }, - // no need to pass anything to aura, in fact it will panic if we do. Session will take care - // of this. + // no need to pass anything to aura, in fact it will panic if we do. Session will take + // care of this. aura: Default::default(), aura_ext: Default::default(), - polkadot_xcm: PolkadotXcmConfig { - safe_xcm_version: Some(SAFE_XCM_VERSION), - }, + polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION) }, sudo: SudoConfig { key: Some(root) }, parachain_system: Default::default(), } diff --git a/src/chain_spec/darwinia_parachain.rs b/src/chain_spec/darwinia_parachain.rs index d3638e75..95324e3a 100644 --- a/src/chain_spec/darwinia_parachain.rs +++ b/src/chain_spec/darwinia_parachain.rs @@ -79,9 +79,7 @@ pub fn genesis_config() -> ChainSpec { .collect::>(); GenesisConfig { - system: SystemConfig { - code: wasm_binary_unwrap().into(), - }, + system: SystemConfig { code: wasm_binary_unwrap().into() }, balances: BalancesConfig { balances: vec![ // Root @@ -95,9 +93,7 @@ pub fn genesis_config() -> ChainSpec { ), ], }, - parachain_info: ParachainInfoConfig { - parachain_id: PARA_ID.into(), - }, + parachain_info: ParachainInfoConfig { parachain_id: PARA_ID.into() }, collator_selection: CollatorSelectionConfig { invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), candidacy_bond: 0, @@ -115,13 +111,11 @@ pub fn genesis_config() -> ChainSpec { }) .collect(), }, - // no need to pass anything to aura, in fact it will panic if we do. Session will take care - // of this. + // no need to pass anything to aura, in fact it will panic if we do. Session will take + // care of this. aura: Default::default(), aura_ext: Default::default(), - polkadot_xcm: PolkadotXcmConfig { - safe_xcm_version: Some(SAFE_XCM_VERSION), - }, + polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION) }, sudo: SudoConfig { key: Some(root) }, parachain_system: Default::default(), } @@ -140,10 +134,7 @@ pub fn genesis_config() -> ChainSpec { None, None, Some(properties()), - Extensions { - relay_chain: "polkadot".into(), - para_id: PARA_ID, - }, + Extensions { relay_chain: "polkadot".into(), para_id: PARA_ID }, ); } @@ -156,9 +147,7 @@ pub fn development_config() -> ChainSpec { )]; GenesisConfig { - system: SystemConfig { - code: wasm_binary_unwrap().into(), - }, + system: SystemConfig { code: wasm_binary_unwrap().into() }, balances: BalancesConfig { balances: invulnerables .iter() @@ -166,9 +155,7 @@ pub fn development_config() -> ChainSpec { .map(|(acc, _)| (acc, 100_000 * COIN)) .collect(), }, - parachain_info: ParachainInfoConfig { - parachain_id: PARA_ID.into(), - }, + parachain_info: ParachainInfoConfig { parachain_id: PARA_ID.into() }, collator_selection: CollatorSelectionConfig { invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), candidacy_bond: 0, @@ -186,13 +173,11 @@ pub fn development_config() -> ChainSpec { }) .collect(), }, - // no need to pass anything to aura, in fact it will panic if we do. Session will take care - // of this. + // no need to pass anything to aura, in fact it will panic if we do. Session will take + // care of this. aura: Default::default(), aura_ext: Default::default(), - polkadot_xcm: PolkadotXcmConfig { - safe_xcm_version: Some(SAFE_XCM_VERSION), - }, + polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION) }, sudo: SudoConfig { key: Some(root) }, parachain_system: Default::default(), } @@ -208,9 +193,6 @@ pub fn development_config() -> ChainSpec { None, None, Some(properties()), - Extensions { - relay_chain: "rococo-local".into(), - para_id: PARA_ID, - }, + Extensions { relay_chain: "rococo-local".into(), para_id: PARA_ID }, ); } diff --git a/src/chain_spec/pangolin_parachain.rs b/src/chain_spec/pangolin_parachain.rs index 08170d18..d3d1de37 100644 --- a/src/chain_spec/pangolin_parachain.rs +++ b/src/chain_spec/pangolin_parachain.rs @@ -102,15 +102,9 @@ pub fn genesis_config() -> ChainSpec { .collect::>(); GenesisConfig { - system: SystemConfig { - code: wasm_binary_unwrap().into(), - }, - balances: BalancesConfig { - balances: vec![(root.clone(), 100_000 * COIN)], - }, - parachain_info: ParachainInfoConfig { - parachain_id: PARA_ID.into(), - }, + system: SystemConfig { code: wasm_binary_unwrap().into() }, + balances: BalancesConfig { balances: vec![(root.clone(), 100_000 * COIN)] }, + parachain_info: ParachainInfoConfig { parachain_id: PARA_ID.into() }, collator_selection: CollatorSelectionConfig { invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), candidacy_bond: 0, @@ -128,13 +122,11 @@ pub fn genesis_config() -> ChainSpec { }) .collect(), }, - // no need to pass anything to aura, in fact it will panic if we do. Session will take care - // of this. + // no need to pass anything to aura, in fact it will panic if we do. Session will take + // care of this. aura: Default::default(), aura_ext: Default::default(), - polkadot_xcm: PolkadotXcmConfig { - safe_xcm_version: Some(SAFE_XCM_VERSION), - }, + polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION) }, sudo: SudoConfig { key: Some(root) }, parachain_system: Default::default(), } @@ -145,10 +137,7 @@ pub fn genesis_config() -> ChainSpec { ID, ChainType::Live, genesis, - BOOT_NODES - .iter() - .filter_map(|s| FromStr::from_str(s).ok()) - .collect(), + BOOT_NODES.iter().filter_map(|s| FromStr::from_str(s).ok()).collect(), Some( TelemetryEndpoints::new(vec![(TELEMETRY_URL.to_string(), 0)]) .expect("Pangolin Parachain telemetry url is valid; qed"), @@ -156,10 +145,7 @@ pub fn genesis_config() -> ChainSpec { None, None, Some(properties()), - Extensions { - relay_chain: "rococo".into(), - para_id: PARA_ID, - }, + Extensions { relay_chain: "rococo".into(), para_id: PARA_ID }, ); } @@ -172,9 +158,7 @@ pub fn development_config() -> ChainSpec { )]; GenesisConfig { - system: SystemConfig { - code: wasm_binary_unwrap().into(), - }, + system: SystemConfig { code: wasm_binary_unwrap().into() }, balances: BalancesConfig { balances: invulnerables .iter() @@ -182,9 +166,7 @@ pub fn development_config() -> ChainSpec { .map(|(acc, _)| (acc, 100_000 * COIN)) .collect(), }, - parachain_info: ParachainInfoConfig { - parachain_id: PARA_ID.into(), - }, + parachain_info: ParachainInfoConfig { parachain_id: PARA_ID.into() }, collator_selection: CollatorSelectionConfig { invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), candidacy_bond: 0, @@ -202,13 +184,11 @@ pub fn development_config() -> ChainSpec { }) .collect(), }, - // no need to pass anything to aura, in fact it will panic if we do. Session will take care - // of this. + // no need to pass anything to aura, in fact it will panic if we do. Session will take + // care of this. aura: Default::default(), aura_ext: Default::default(), - polkadot_xcm: PolkadotXcmConfig { - safe_xcm_version: Some(SAFE_XCM_VERSION), - }, + polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION) }, sudo: SudoConfig { key: Some(root) }, parachain_system: Default::default(), } @@ -224,9 +204,6 @@ pub fn development_config() -> ChainSpec { None, None, Some(properties()), - Extensions { - relay_chain: "rococo-local".into(), - para_id: PARA_ID, - }, + Extensions { relay_chain: "rococo-local".into(), para_id: PARA_ID }, ); } diff --git a/src/cli.rs b/src/cli.rs index f8ef38d3..c2fc5a11 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -138,14 +138,7 @@ impl RelayChainCli { ) -> Self { let extension = chain_spec::Extensions::try_get(&*para_config.chain_spec); let chain_id = extension.map(|e| e.relay_chain.clone()); - let base_path = para_config - .base_path - .as_ref() - .map(|x| x.path().join("polkadot")); - Self { - base_path, - chain_id, - base: polkadot_cli::RunCmd::parse_from(relay_chain_args), - } + let base_path = para_config.base_path.as_ref().map(|x| x.path().join("polkadot")); + Self { base_path, chain_id, base: polkadot_cli::RunCmd::parse_from(relay_chain_args) } } } diff --git a/src/command.rs b/src/command.rs index a43e5d2c..efa5803c 100644 --- a/src/command.rs +++ b/src/command.rs @@ -149,7 +149,7 @@ fn load_spec(id: &str) -> std::result::Result, St } else { chain_spec } - } + }, }) } @@ -237,101 +237,92 @@ pub fn run() -> Result<()> { let cli = Cli::from_args(); match &cli.subcommand { - None => cli - .create_runner(&cli.run.normalize())? - .run_node_until_exit(|config| async move { - let chain_spec = &config.chain_spec; - let collator_options = cli.run.collator_options(); + None => cli.create_runner(&cli.run.normalize())?.run_node_until_exit(|config| async move { + let chain_spec = &config.chain_spec; + let collator_options = cli.run.collator_options(); - set_default_ss58_version(chain_spec); + set_default_ss58_version(chain_spec); - let para_id = Extensions::try_get(&*config.chain_spec) - .map(|e| e.para_id) - .ok_or_else(|| "Could not find parachain ID in chain-spec.")?; + let para_id = Extensions::try_get(&*config.chain_spec) + .map(|e| e.para_id) + .ok_or_else(|| "Could not find parachain ID in chain-spec.")?; + + let polkadot_cli = RelayChainCli::new( + &config, + [RelayChainCli::executable_name().to_string()] + .iter() + .chain(cli.relay_chain_args.iter()), + ); + let id = ParaId::from(para_id); + let parachain_account = + AccountIdConversion::::into_account(&id); + let state_version = + RelayChainCli::native_runtime_version(&config.chain_spec).state_version(); + let block: Block = generate_genesis_block(&config.chain_spec, state_version) + .map_err(|e| format!("{:?}", e))?; + let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode())); + let tokio_handle = config.tokio_handle.clone(); + let polkadot_config = + SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, tokio_handle) + .map_err(|err| format!("Relay chain argument error: {}", err))?; + + info!("Parachain id: {:?}", id); + info!("Parachain Account: {}", parachain_account); + info!("Parachain genesis state: {}", genesis_state); + info!("Is collating: {}", if config.role.is_authority() { "yes" } else { "no" }); - let polkadot_cli = RelayChainCli::new( - &config, - [RelayChainCli::executable_name().to_string()] - .iter() - .chain(cli.relay_chain_args.iter()), - ); - let id = ParaId::from(para_id); - let parachain_account = - AccountIdConversion::::into_account(&id); - let state_version = - RelayChainCli::native_runtime_version(&config.chain_spec).state_version(); - let block: Block = generate_genesis_block(&config.chain_spec, state_version) - .map_err(|e| format!("{:?}", e))?; - let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode())); - let tokio_handle = config.tokio_handle.clone(); - let polkadot_config = - SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, tokio_handle) - .map_err(|err| format!("Relay chain argument error: {}", err))?; - - info!("Parachain id: {:?}", id); - info!("Parachain Account: {}", parachain_account); - info!("Parachain genesis state: {}", genesis_state); - info!( - "Is collating: {}", - if config.role.is_authority() { - "yes" - } else { - "no" - } - ); - - if chain_spec.is_crab_parachain() { - service::start_node::( - config, - polkadot_config, - collator_options, - id, - ) - .await - .map(|r| r.0) - .map_err(Into::into) - } else if chain_spec.is_pangolin_parachain() { - service::start_node::< + if chain_spec.is_crab_parachain() { + service::start_node::( + config, + polkadot_config, + collator_options, + id, + ) + .await + .map(|r| r.0) + .map_err(Into::into) + } else if chain_spec.is_pangolin_parachain() { + service::start_node::< PangolinParachainRuntimeApi, PangolinParachainRuntimeExecutor, >(config, polkadot_config, collator_options, id) .await .map(|r| r.0) .map_err(Into::into) - } else { - service::start_node::< + } else { + service::start_node::< DarwiniaParachainRuntimeApi, DarwiniaParachainRuntimeExecutor, >(config, polkadot_config, collator_options, id) .await .map(|r| r.0) .map_err(Into::into) - } - }), + } + }), Some(Subcommand::BuildSpec(cmd)) => { let runner = cli.create_runner(cmd)?; runner.sync_run(|config| cmd.run(config.chain_spec, config.network)) - } + }, Some(Subcommand::CheckBlock(cmd)) => { construct_async_run!(|components, cli, cmd, config| { Ok(cmd.run(components.client, components.import_queue)) }) - } + }, Some(Subcommand::ExportBlocks(cmd)) => { construct_async_run!(|components, cli, cmd, config| { Ok(cmd.run(components.client, config.database)) }) - } + }, Some(Subcommand::ExportState(cmd)) => { construct_async_run!(|components, cli, cmd, config| { Ok(cmd.run(components.client, config.chain_spec)) }) - } + }, Some(Subcommand::ImportBlocks(cmd)) => { construct_async_run!(|components, cli, cmd, config| { Ok(cmd.run(components.client, components.import_queue)) }) - } + }, Some(Subcommand::PurgeChain(cmd)) => { let runner = cli.create_runner(cmd)?; @@ -352,7 +343,7 @@ pub fn run() -> Result<()> { cmd.run(config, polkadot_config) }) - } + }, Some(Subcommand::Revert(cmd)) => construct_async_run!(|components, cli, cmd, config| { Ok(cmd.run(components.client, components.backend)) }), @@ -379,7 +370,7 @@ pub fn run() -> Result<()> { } Ok(()) - } + }, Some(Subcommand::ExportGenesisWasm(params)) => { let mut builder = sc_cli::LoggerBuilder::new(""); builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); @@ -400,7 +391,7 @@ pub fn run() -> Result<()> { } Ok(()) - } + }, Some(Subcommand::Key(cmd)) => Ok(cmd.run(&cli)?), #[cfg(feature = "runtime-benchmarks")] Some(Subcommand::Benchmark(cmd)) => { @@ -416,7 +407,7 @@ pub fn run() -> Result<()> { } else { runner.sync_run(|config| cmd.run::(config)) } - } + }, #[cfg(feature = "try-runtime")] Some(Subcommand::TryRuntime(cmd)) => { let runner = cli.create_runner(cmd)?; @@ -433,15 +424,12 @@ pub fn run() -> Result<()> { sc_service::TaskManager::new(config.tokio_handle.clone(), registry) .map_err(|e| sc_cli::Error::from(sc_service::Error::Prometheus(e)))?; - Ok(( - cmd.run::(config), - task_manager, - )) + Ok((cmd.run::(config), task_manager)) }) } else { panic!("Try runtime not support chain: {}", chain_spec.id()); } - } + }, } } @@ -481,10 +469,7 @@ impl CliConfiguration for RelayChainCli { } fn base_path(&self) -> Result> { - Ok(self - .shared_params() - .base_path() - .or_else(|| self.base_path.clone().map(Into::into))) + Ok(self.shared_params().base_path().or_else(|| self.base_path.clone().map(Into::into))) } fn rpc_http(&self, default_listen_port: u16) -> Result> { @@ -504,9 +489,7 @@ impl CliConfiguration for RelayChainCli { default_listen_port: u16, chain_spec: &Box, ) -> Result> { - self.base - .base - .prometheus_config(default_listen_port, chain_spec) + self.base.base.prometheus_config(default_listen_port, chain_spec) } fn init( @@ -525,11 +508,7 @@ impl CliConfiguration for RelayChainCli { fn chain_id(&self, is_dev: bool) -> Result { let chain_id = self.base.base.chain_id(is_dev)?; - Ok(if chain_id.is_empty() { - self.chain_id.clone().unwrap_or_default() - } else { - chain_id - }) + Ok(if chain_id.is_empty() { self.chain_id.clone().unwrap_or_default() } else { chain_id }) } fn role(&self, is_dev: bool) -> Result { diff --git a/src/service/mod.rs b/src/service/mod.rs index 2df24ad5..5d5abcaf 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -83,7 +83,8 @@ type FullClient = TFullClient>; type StateBackend = StateBackendFor; -/// Can be called for a `Configuration` to check if it is a configuration for the `Crab Parachain` network. +/// Can be called for a `Configuration` to check if it is a configuration for the `Crab Parachain` +/// network. pub trait IdentifyVariant { /// Returns if this is a configuration for the `Crab Parachain` network. fn is_crab_parachain(&self) -> bool; @@ -118,7 +119,7 @@ impl BuildOnAccess { match self { Self::Uninitialized(f) => { *self = Self::Initialized((f.take().unwrap())()); - } + }, Self::Initialized(ref mut r) => return r, } } @@ -140,10 +141,7 @@ where &mut self, block_import: BlockImportParams, ) -> std::result::Result< - ( - BlockImportParams, - Option)>>, - ), + (BlockImportParams, Option)>>), String, > { let block_id = BlockId::hash(*block_import.header.parent_hash()); @@ -273,9 +271,7 @@ where let telemetry_worker_handle = telemetry.as_ref().map(|(worker, _)| worker.handle()); let telemetry = telemetry.map(|(worker, telemetry)| { - task_manager - .spawn_handle() - .spawn("telemetry", None, worker.run()); + task_manager.spawn_handle().spawn("telemetry", None, worker.run()); telemetry }); @@ -314,15 +310,10 @@ async fn build_relay_chain_interface( telemetry_worker_handle: Option, task_manager: &mut TaskManager, collator_options: CollatorOptions, -) -> RelayChainResult<( - Arc<(dyn RelayChainInterface + 'static)>, - Option, -)> { +) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option)> { match collator_options.relay_chain_rpc_url { - Some(relay_chain_url) => Ok(( - Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>, - None, - )), + Some(relay_chain_url) => + Ok((Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>, None)), None => build_inprocess_relay_chain( polkadot_config, parachain_config, @@ -421,11 +412,8 @@ where let transaction_pool = transaction_pool.clone(); Box::new(move |deny_unsafe, _| { - let deps = FullDeps { - client: client.clone(), - pool: transaction_pool.clone(), - deny_unsafe, - }; + let deps = + FullDeps { client: client.clone(), pool: transaction_pool.clone(), deny_unsafe }; Ok(dc_rpc::create_full(deps)) }) @@ -520,32 +508,28 @@ where let aura_verifier = move || { let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client2).unwrap(); - Box::new(cumulus_client_consensus_aura::build_verifier::< - AuraPair, - _, - _, - _, - >(BuildVerifierParams { - client: client2.clone(), - create_inherent_data_providers: move |_, _| async move { - let time = sp_timestamp::InherentDataProvider::from_system_time(); - - let slot = + Box::new(cumulus_client_consensus_aura::build_verifier::( + BuildVerifierParams { + client: client2.clone(), + create_inherent_data_providers: move |_, _| async move { + let time = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *time, slot_duration, ); - Ok((time, slot)) + Ok((time, slot)) + }, + can_author_with: CanAuthorWithNativeVersion::new(client2.executor().clone()), + telemetry, }, - can_author_with: CanAuthorWithNativeVersion::new(client2.executor().clone()), - telemetry, - })) as Box<_> + )) as Box<_> }; - let relay_chain_verifier = Box::new(RelayChainVerifier::new(client.clone(), |_, _| async { - Ok(()) - })) as Box<_>; + let relay_chain_verifier = + Box::new(RelayChainVerifier::new(client.clone(), |_, _| async { Ok(()) })) as Box<_>; let verifier = Verifier { client: client.clone(), diff --git a/tests/deploy.rs b/tests/deploy.rs index c345379b..88c29d8d 100755 --- a/tests/deploy.rs +++ b/tests/deploy.rs @@ -33,12 +33,7 @@ impl Deployer { return None; }; - Some(Self { - chain, - project_dir, - darwinia_exec, - polkadot_exec, - }) + Some(Self { chain, project_dir, darwinia_exec, polkadot_exec }) } fn get_chain() -> Option { @@ -59,10 +54,7 @@ impl Deployer { let script_path = env::current_exe().unwrap(); let project_dir = script_path.parent().unwrap().parent().unwrap().to_owned(); - println!( - "[CHECK] project directory: {}", - project_dir.to_string_lossy() - ); + println!("[CHECK] project directory: {}", project_dir.to_string_lossy()); project_dir } @@ -114,10 +106,7 @@ impl Deployer { return None; } - Some(( - get_darwinia_exec(project_dir)?, - get_polkadot_exec(project_dir)?, - )) + Some((get_darwinia_exec(project_dir)?, get_polkadot_exec(project_dir)?)) } fn deploy(self) {} From 2dfb8eed817f113b835370030e8da0fd4f992b06 Mon Sep 17 00:00:00 2001 From: AurevoirXavier Date: Wed, 18 May 2022 15:57:27 +0800 Subject: [PATCH 49/59] Disable pallet_fee_market benchmark --- runtime/pangolin-parachain/src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/pangolin-parachain/src/lib.rs b/runtime/pangolin-parachain/src/lib.rs index 9dae0520..48c1c77c 100644 --- a/runtime/pangolin-parachain/src/lib.rs +++ b/runtime/pangolin-parachain/src/lib.rs @@ -65,7 +65,8 @@ mod benches { [pallet_bridge_grandpa, BridgePangolinGrandpa] // TODO: https://github.com/darwinia-network/darwinia-parachain/issues/66 // [pallet_bridge_messages, MessagesBench::] - [pallet_fee_market, PangolinFeeMarket] + // FIXME: https://github.com/darwinia-network/darwinia-parachain/issues/81 + // [pallet_fee_market, PangolinFeeMarket] [cumulus_pallet_xcmp_queue, XcmpQueue] ); } From 7fb631e6b36d54f1880b6e5066622e592961de04 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Thu, 26 May 2022 12:14:12 +0800 Subject: [PATCH 50/59] Update weights for xcmp_queue --- .../crab-parachain/src/pallets/xcmp_queue.rs | 5 +- .../src/weights/cumulus_pallet_xcmp_queue.rs | 69 +++++++++++++++++++ runtime/crab-parachain/src/weights/mod.rs | 1 + .../src/pallets/xcmp_queue.rs | 5 +- .../src/weights/cumulus_pallet_xcmp_queue.rs | 69 +++++++++++++++++++ runtime/pangolin-parachain/src/weights/mod.rs | 1 + 6 files changed, 144 insertions(+), 6 deletions(-) create mode 100644 runtime/crab-parachain/src/weights/cumulus_pallet_xcmp_queue.rs create mode 100644 runtime/pangolin-parachain/src/weights/cumulus_pallet_xcmp_queue.rs diff --git a/runtime/crab-parachain/src/pallets/xcmp_queue.rs b/runtime/crab-parachain/src/pallets/xcmp_queue.rs index 19034a79..85c795f1 100644 --- a/runtime/crab-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/crab-parachain/src/pallets/xcmp_queue.rs @@ -3,7 +3,7 @@ use cumulus_pallet_xcmp_queue::Config; use frame_system::EnsureRoot; use xcm_executor::XcmExecutor; // --- darwinia-network --- -use crate::*; +use crate::{weights::cumulus_pallet_xcmp_queue::WeightInfo, *}; impl Config for Runtime { type ChannelInfo = ParachainSystem; @@ -12,7 +12,6 @@ impl Config for Runtime { type Event = Event; type ExecuteOverweightOrigin = EnsureRoot; type VersionWrapper = PolkadotXcm; - // TODO: Update weight - type WeightInfo = (); + type WeightInfo = WeightInfo; type XcmExecutor = XcmExecutor; } diff --git a/runtime/crab-parachain/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/crab-parachain/src/weights/cumulus_pallet_xcmp_queue.rs new file mode 100644 index 00000000..4421cc34 --- /dev/null +++ b/runtime/crab-parachain/src/weights/cumulus_pallet_xcmp_queue.rs @@ -0,0 +1,69 @@ +// This file is part of Darwinia. +// +// Copyright (C) 2018-2022 Darwinia Network +// SPDX-License-Identifier: GPL-3.0 +// +// Darwinia is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Darwinia is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Darwinia. If not, see . + +//! Autogenerated weights for `cumulus_pallet_xcmp_queue` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-05-26, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("crab-parachain-dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/release/darwinia-collator +// benchmark +// --header +// .maintain/lincense-header +// --execution +// wasm +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 +// --chain +// crab-parachain-dev +// --output +// runtime/crab-parachain/src/weights/ +// --extrinsic +// * +// --pallet +// cumulus_pallet_xcmp_queue + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for `cumulus_pallet_xcmp_queue`. +pub struct WeightInfo(PhantomData); +impl cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo { + // Storage: XcmpQueue QueueConfig (r:1 w:1) + fn set_config_with_u32() -> Weight { + (2_531_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + // Storage: XcmpQueue QueueConfig (r:1 w:1) + fn set_config_with_weight() -> Weight { + (2_509_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } +} diff --git a/runtime/crab-parachain/src/weights/mod.rs b/runtime/crab-parachain/src/weights/mod.rs index eb363969..d6edf096 100644 --- a/runtime/crab-parachain/src/weights/mod.rs +++ b/runtime/crab-parachain/src/weights/mod.rs @@ -1,3 +1,4 @@ +pub mod cumulus_pallet_xcmp_queue; pub mod frame_system; pub mod pallet_balances; pub mod pallet_collator_selection; diff --git a/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs b/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs index 19034a79..85c795f1 100644 --- a/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs +++ b/runtime/pangolin-parachain/src/pallets/xcmp_queue.rs @@ -3,7 +3,7 @@ use cumulus_pallet_xcmp_queue::Config; use frame_system::EnsureRoot; use xcm_executor::XcmExecutor; // --- darwinia-network --- -use crate::*; +use crate::{weights::cumulus_pallet_xcmp_queue::WeightInfo, *}; impl Config for Runtime { type ChannelInfo = ParachainSystem; @@ -12,7 +12,6 @@ impl Config for Runtime { type Event = Event; type ExecuteOverweightOrigin = EnsureRoot; type VersionWrapper = PolkadotXcm; - // TODO: Update weight - type WeightInfo = (); + type WeightInfo = WeightInfo; type XcmExecutor = XcmExecutor; } diff --git a/runtime/pangolin-parachain/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/pangolin-parachain/src/weights/cumulus_pallet_xcmp_queue.rs new file mode 100644 index 00000000..73a221ca --- /dev/null +++ b/runtime/pangolin-parachain/src/weights/cumulus_pallet_xcmp_queue.rs @@ -0,0 +1,69 @@ +// This file is part of Darwinia. +// +// Copyright (C) 2018-2022 Darwinia Network +// SPDX-License-Identifier: GPL-3.0 +// +// Darwinia is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Darwinia is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Darwinia. If not, see . + +//! Autogenerated weights for `cumulus_pallet_xcmp_queue` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-05-26, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-parachain-dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/release/darwinia-collator +// benchmark +// --chain +// pangolin-parachain-dev +// --execution +// wasm +// --wasm-execution +// compiled +// --pallet +// cumulus_pallet_xcmp_queue +// --extrinsic +// * +// --steps +// 50 +// --repeat +// 20 +// --heap-pages=4096 +// --header=./.maintain/lincense-header +// --output +// ./runtime/pangolin-parachain/src/weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for `cumulus_pallet_xcmp_queue`. +pub struct WeightInfo(PhantomData); +impl cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo { + // Storage: XcmpQueue QueueConfig (r:1 w:1) + fn set_config_with_u32() -> Weight { + (2_521_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + // Storage: XcmpQueue QueueConfig (r:1 w:1) + fn set_config_with_weight() -> Weight { + (2_534_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } +} diff --git a/runtime/pangolin-parachain/src/weights/mod.rs b/runtime/pangolin-parachain/src/weights/mod.rs index fc0a16db..09035aac 100644 --- a/runtime/pangolin-parachain/src/weights/mod.rs +++ b/runtime/pangolin-parachain/src/weights/mod.rs @@ -1,3 +1,4 @@ +pub mod cumulus_pallet_xcmp_queue; pub mod frame_system; pub mod pallet_balances; pub mod pallet_bridge_grandpa; From f32767a000ff5e40925c4ec42f924f596d116b0c Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Thu, 26 May 2022 21:48:40 +0800 Subject: [PATCH 51/59] Fix compile --- Cargo.lock | 180 +++++++++++------- runtime/crab-parachain/Cargo.toml | 26 +++ .../src/bridges_message/crab.rs | 4 +- .../src/pallets/polkadot_xcm.rs | 5 +- .../src/pallets/polkadot_xcm.rs | 2 +- 5 files changed, 144 insertions(+), 73 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b112caa3..eb76a826 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "array-bytes" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a14a3cc05445830e3f8aed09cc974007c2c9026729f77c09616c0bcbe78d973" +checksum = "b48bc78d3fa4a9a0925d5009f731cbf7e5613d2a4f1a937208f6dde89a287bab" [[package]] name = "arrayref" @@ -210,9 +210,9 @@ dependencies = [ [[package]] name = "async-io" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" +checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07" dependencies = [ "concurrent-queue", "futures-lite", @@ -721,10 +721,40 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bp-crab" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" +dependencies = [ + "bp-darwinia-core", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", + "sp-version", +] + +[[package]] +name = "bp-crab-parachain" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" +dependencies = [ + "bp-darwinia-core", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", + "sp-version", +] + [[package]] name = "bp-darwinia-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -740,7 +770,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "finality-grandpa", @@ -773,7 +803,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "frame-support", @@ -797,7 +827,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "bitvec", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -830,7 +860,7 @@ dependencies = [ [[package]] name = "bp-pangolin" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "bp-darwinia-core", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -845,7 +875,7 @@ dependencies = [ [[package]] name = "bp-pangolin-parachain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "bp-darwinia-core", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -860,7 +890,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -915,7 +945,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "frame-support", "hash-db", @@ -951,7 +981,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "ed25519-dalek", @@ -996,7 +1026,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -1127,9 +1157,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "camino" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fd178c5af4d59e83498ef15cf3f154e1a6f9d091270cb86283c65ef44e9ef0" +checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412" dependencies = [ "serde", ] @@ -1384,6 +1414,12 @@ name = "crab-parachain-runtime" version = "5.2.0-rc1" dependencies = [ "array-bytes", + "bp-crab", + "bp-crab-parachain", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -1404,7 +1440,11 @@ dependencies = [ "pallet-aura", "pallet-authorship", "pallet-balances", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "pallet-collator-selection", + "pallet-fee-market", "pallet-multisig", "pallet-proxy", "pallet-session", @@ -2158,7 +2198,7 @@ dependencies = [ [[package]] name = "darwinia-collator" -version = "5.2.0-rc1" +version = "5.2.0" dependencies = [ "array-bytes", "async-trait", @@ -2226,7 +2266,7 @@ dependencies = [ [[package]] name = "darwinia-parachain-runtime" -version = "5.2.0-rc1" +version = "5.2.0" dependencies = [ "array-bytes", "cumulus-pallet-aura-ext", @@ -2311,7 +2351,7 @@ dependencies = [ [[package]] name = "dc-common-runtime" -version = "5.2.0-rc1" +version = "5.2.0" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -2330,7 +2370,7 @@ dependencies = [ [[package]] name = "dc-primitives" -version = "5.2.0-rc1" +version = "5.2.0" dependencies = [ "sp-core", "sp-runtime", @@ -2338,7 +2378,7 @@ dependencies = [ [[package]] name = "dc-rpc" -version = "5.2.0-rc1" +version = "5.2.0" dependencies = [ "dc-primitives", "jsonrpc-core", @@ -3531,9 +3571,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes 1.1.0", "http", @@ -3608,7 +3648,7 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.20.5", + "rustls 0.20.6", "rustls-native-certs 0.6.2", "tokio", "tokio-rustls 0.23.4", @@ -4232,9 +4272,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] name = "kernel32-sys" @@ -4804,7 +4844,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "lru 0.7.5", + "lru 0.7.6", "rand 0.7.3", "smallvec", "unsigned-varint 0.7.1", @@ -5047,9 +5087,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889" +checksum = "8015d95cb7b2ddd3c0d32ca38283ceb1eea09b4713ee380bceb942d85a244228" dependencies = [ "hashbrown 0.11.2", ] @@ -5567,9 +5607,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" [[package]] name = "opaque-debug" @@ -5623,9 +5663,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d8d0b2f198229de29dca79676f2738ff952edf3fde542eb8bf94d8c21b435" +checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" [[package]] name = "owning_ref" @@ -5804,7 +5844,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -5838,7 +5878,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -5883,7 +5923,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "bitvec", "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -6020,7 +6060,7 @@ dependencies = [ [[package]] name = "pallet-fee-market" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#021f0752997eb03db6fab7787136e9d5779f4d9b" +source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#a21df01890ec2cce3dd63c02ca9e8a3411b7a3b4" dependencies = [ "bitvec", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -6602,7 +6642,7 @@ dependencies = [ [[package]] name = "pangolin-parachain-runtime" -version = "5.2.0-rc1" +version = "5.2.0" dependencies = [ "array-bytes", "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", @@ -6758,7 +6798,7 @@ dependencies = [ "ethereum-types", "hashbrown 0.12.1", "impl-trait-for-tuples", - "lru 0.7.5", + "lru 0.7.6", "parity-util-mem-derive", "parking_lot 0.12.0", "primitive-types", @@ -7075,7 +7115,7 @@ dependencies = [ "derive_more", "fatality", "futures 0.3.21", - "lru 0.7.5", + "lru 0.7.6", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7097,7 +7137,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "fatality", "futures 0.3.21", - "lru 0.7.5", + "lru 0.7.6", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7207,7 +7247,7 @@ dependencies = [ "derive_more", "fatality", "futures 0.3.21", - "lru 0.7.5", + "lru 0.7.6", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7303,7 +7343,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "kvdb", - "lru 0.7.5", + "lru 0.7.6", "merlin", "parity-scale-codec", "polkadot-node-jaeger", @@ -7432,7 +7472,7 @@ dependencies = [ "fatality", "futures 0.3.21", "kvdb", - "lru 0.7.5", + "lru 0.7.6", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7658,7 +7698,7 @@ dependencies = [ "futures 0.3.21", "itertools", "kvdb", - "lru 0.7.5", + "lru 0.7.6", "metered-channel", "parity-db", "parity-scale-codec", @@ -7687,7 +7727,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "futures 0.3.21", "futures-timer", - "lru 0.7.5", + "lru 0.7.6", "parity-util-mem", "parking_lot 0.12.0", "polkadot-node-metrics", @@ -8034,7 +8074,7 @@ dependencies = [ "kusama-runtime", "kvdb", "kvdb-rocksdb", - "lru 0.7.5", + "lru 0.7.6", "pallet-babe", "pallet-im-online", "pallet-mmr-primitives", @@ -8263,15 +8303,15 @@ dependencies = [ [[package]] name = "prometheus" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504" +checksum = "cface98dfa6d645ea4c789839f176e4b072265d085bfcc48eaa8d137f58d3c39" dependencies = [ "cfg-if 1.0.0", "fnv", "lazy_static", "memchr", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "thiserror", ] @@ -8556,9 +8596,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.5" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" dependencies = [ "aho-corasick", "memchr", @@ -8576,9 +8616,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" [[package]] name = "region" @@ -8630,9 +8670,9 @@ dependencies = [ [[package]] name = "retain_mut" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" +checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" [[package]] name = "ring" @@ -8831,9 +8871,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.5" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024a432ae760ab3bff924ad91ce1cfa52cb57ed16e1ef32d0d249cfee1a6c13" +checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ "log", "ring", @@ -9475,7 +9515,7 @@ dependencies = [ "linked-hash-map", "linked_hash_set", "log", - "lru 0.7.5", + "lru 0.7.6", "parity-scale-codec", "parking_lot 0.12.0", "pin-project 1.0.10", @@ -9513,7 +9553,7 @@ dependencies = [ "futures-timer", "libp2p", "log", - "lru 0.7.5", + "lru 0.7.6", "sc-network", "sp-runtime", "substrate-prometheus-endpoint", @@ -9857,9 +9897,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" +checksum = "c46be926081c9f4dd5dd9b6f1d3e3229f2360bc6502dd8836f84a93b7c75e99a" dependencies = [ "bitvec", "cfg-if 1.0.0", @@ -9871,9 +9911,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4260c630e8a8a33429d1688eff2f163f24c65a4e1b1578ef6b565061336e4b6f" +checksum = "50e334bb10a245e28e5fd755cabcafd96cfcd167c99ae63a46924ca8d8703a3c" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -10419,7 +10459,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "futures 0.3.21", "log", - "lru 0.7.5", + "lru 0.7.6", "parity-scale-codec", "parking_lot 0.12.0", "sp-api", @@ -11034,9 +11074,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.18.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb8b72a924ccfe7882d0e26144c114503760a4d1248bb5cd06c8ab2d55404cc" +checksum = "5e1e7c268f5610088463d23188fc9e764cda491784360e5e4ea3a8ce1e0e2ac9" dependencies = [ "Inflector", "num-format", @@ -11256,9 +11296,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fa7e55043acb85fca6b3c01485a2eeb6b69c5d21002e273c79e465f43b7ac1" +checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1" [[package]] name = "tempfile" @@ -11453,7 +11493,7 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.5", + "rustls 0.20.6", "tokio", "webpki 0.22.0", ] diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 051a70fa..9d9b1c05 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -69,6 +69,17 @@ sp-session = { default-features = false, git = " sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +# darwinia-bridges-substrate +bp-crab = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-crab-parachain = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } [build-dependencies] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } @@ -93,6 +104,17 @@ std = [ # darwinia "dc-common-runtime/std", "dc-primitives/std", + # darwinia-bridges-substrate + "bp-crab/std", + "bp-crab-parachain/std", + "bp-message-dispatch/std", + "bp-messages/std", + "bp-runtime/std", + "bridge-runtime-common/std", + "pallet-bridge-dispatch/std", + "pallet-bridge-grandpa/std", + "pallet-bridge-messages/std", + "pallet-fee-market/std", # polkadot "pallet-xcm/std", "polkadot-parachain/std", @@ -166,4 +188,8 @@ try-runtime = [ "pallet-timestamp/try-runtime", "pallet-transaction-payment/try-runtime", "pallet-utility/try-runtime", + # darwinia-bridges-substrate + "bridge-runtime-common/runtime-benchmarks", + "pallet-bridge-grandpa/runtime-benchmarks", + "pallet-bridge-messages/runtime-benchmarks", ] diff --git a/runtime/crab-parachain/src/bridges_message/crab.rs b/runtime/crab-parachain/src/bridges_message/crab.rs index 360e7e05..053160bc 100644 --- a/runtime/crab-parachain/src/bridges_message/crab.rs +++ b/runtime/crab-parachain/src/bridges_message/crab.rs @@ -30,7 +30,8 @@ pub type ToCrabMessagePayload = FromThisChainMessagePayload; /// Message verifier for CrabParachain -> Crab messages. -pub type ToCrabMessageVerifier = FromThisChainMessageVerifier; +pub type ToCrabMessageVerifier = + FromThisChainMessageVerifier; /// Encoded Crab Call as it comes from Crab. pub type FromCrabEncodedCall = FromBridgedChainEncodedMessageCall; @@ -78,6 +79,7 @@ impl MessageBridge for WithCrabMessageBridge { fn bridged_balance_to_this_balance( bridged_balance: BalanceOf, + _bridged_to_this_conversion_rate_override: Option, ) -> BalanceOf { >::try_from( CrabToCrabParachainConversionRate::get().saturating_mul_int(bridged_balance), diff --git a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs index 77a94378..261de94e 100644 --- a/runtime/crab-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/crab-parachain/src/pallets/polkadot_xcm.rs @@ -1,7 +1,10 @@ // --- paritytech --- use cumulus_pallet_xcm::Origin as CumulusOrigin; use cumulus_primitives_utility::ParentAsUmp; -use frame_support::{traits::Everything, weights::Weight}; +use frame_support::{ + traits::{Everything, PalletInfoAccess}, + weights::Weight, +}; use pallet_xcm::{Config, CurrentXcmVersion, XcmPassthrough}; use polkadot_parachain::primitives::Sibling; use polkadot_runtime_common::impls::ToAuthor; diff --git a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs index f4412486..eeb30dd0 100644 --- a/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs @@ -3,7 +3,7 @@ use cumulus_pallet_xcm::Origin as CumulusOrigin; use cumulus_primitives_utility::ParentAsUmp; use frame_support::{ traits::{Everything, PalletInfoAccess}, - weights::{IdentityFee, Weight}, + weights::Weight, }; use pallet_xcm::{Config, CurrentXcmVersion, XcmPassthrough}; use polkadot_parachain::primitives::Sibling; From bd4f434a0aeffa0cd364931478adff9714894a5e Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Thu, 26 May 2022 21:56:57 +0800 Subject: [PATCH 52/59] Enable fee_market benchmark. --- runtime/pangolin-parachain/src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/runtime/pangolin-parachain/src/lib.rs b/runtime/pangolin-parachain/src/lib.rs index e4f0394b..c6bf1098 100644 --- a/runtime/pangolin-parachain/src/lib.rs +++ b/runtime/pangolin-parachain/src/lib.rs @@ -65,8 +65,7 @@ mod benches { [pallet_bridge_grandpa, BridgePangolinGrandpa] // TODO: https://github.com/darwinia-network/darwinia-parachain/issues/66 // [pallet_bridge_messages, MessagesBench::] - // FIXME: https://github.com/darwinia-network/darwinia-parachain/issues/81 - // [pallet_fee_market, PangolinFeeMarket] + [pallet_fee_market, PangolinFeeMarket] [cumulus_pallet_xcmp_queue, XcmpQueue] ); } From 9312dab5f99bc81dca5ad5561169d8ff06ffc9a8 Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Fri, 27 May 2022 10:02:02 +0800 Subject: [PATCH 53/59] Recache --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7180fde..5051accb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ env: SCCACHE_LINK: https://github.com/mozilla/sccache/releases/download SCCACHE_VERSION: v0.2.15 SCCACHE_DIR: /home/runner/.cache/sccache - GITHUB_CACHE_VERSION: 0 + GITHUB_CACHE_VERSION: 1 jobs: basic-checks: From 934f9c90b6f09eb977a61766244ea6d57c6a179c Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Mon, 30 May 2022 08:46:58 +0800 Subject: [PATCH 54/59] Fix Features --- runtime/crab-parachain/Cargo.toml | 15 ++++++++------- runtime/darwinia-parachain/Cargo.toml | 15 ++++++++------- runtime/pangolin-parachain/Cargo.toml | 15 ++++++++------- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/runtime/crab-parachain/Cargo.toml b/runtime/crab-parachain/Cargo.toml index 9d9b1c05..7c8277f2 100644 --- a/runtime/crab-parachain/Cargo.toml +++ b/runtime/crab-parachain/Cargo.toml @@ -31,13 +31,13 @@ parachain-info = { default-features = false, git = "https://git dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } @@ -118,6 +118,7 @@ std = [ # polkadot "pallet-xcm/std", "polkadot-parachain/std", + "polkadot-runtime-common/std", "xcm/std", "xcm-builder/std", "xcm-executor/std", diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index da3e20ce..8a8e7773 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -31,13 +31,13 @@ parachain-info = { default-features = false, git = "https://git dc-common-runtime = { default-features = false, path = "../common" } dc-primitives = { default-features = false, path = "../../primitives" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } @@ -91,6 +91,7 @@ std = [ "dc-primitives/std", "pallet-xcm/std", "polkadot-parachain/std", + "polkadot-runtime-common/std", "xcm/std", "xcm-builder/std", "xcm-executor/std", diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index daf8e70d..7ec232ae 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -43,13 +43,13 @@ pallet-bridge-grandpa = { default-features = false, git = "https://github.com/d pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-bridges-substrate", branch = "polkadot-v0.9.18" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm-benchmarks = { optional = true, default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # substrate frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } @@ -119,6 +119,7 @@ std = [ # polkadot "pallet-xcm/std", "polkadot-parachain/std", + "polkadot-runtime-common/std", "xcm/std", "xcm-builder/std", "xcm-executor/std", From 002d15b1753ea17b0c54af0d8214591ad42b6af3 Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Mon, 30 May 2022 09:00:57 +0800 Subject: [PATCH 55/59] Rename --- src/service/mod.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/service/mod.rs b/src/service/mod.rs index 5d5abcaf..82390fcd 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -27,7 +27,7 @@ pub use darwinia_parachain_runtime::RuntimeApi as DarwiniaParachainRuntimeApi; pub use pangolin_parachain_runtime::RuntimeApi as PangolinParachainRuntimeApi; // --- std --- -use std::{error::Error, sync::Arc, time::Duration}; +use std::{error::Error, sync::Arc, timestamp::Duration}; // --- crates.io --- use futures::lock::Mutex; // --- paritytech --- @@ -512,15 +512,15 @@ where BuildVerifierParams { client: client2.clone(), create_inherent_data_providers: move |_, _| async move { - let time = sp_timestamp::InherentDataProvider::from_system_time(); + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( - *time, + *timestamp, slot_duration, ); - Ok((time, slot)) + Ok((timestamp, slot)) }, can_author_with: CanAuthorWithNativeVersion::new(client2.executor().clone()), telemetry, @@ -610,11 +610,11 @@ where id, ) .await; - let time = sp_timestamp::InherentDataProvider::from_system_time(); + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( - *time, + *timestamp, slot_duration, ); @@ -623,7 +623,7 @@ where "Failed to create parachain inherent", ) })?; - Ok((time, slot, parachain_inherent)) + Ok((timestamp, slot, parachain_inherent)) } }, block_import: client2.clone(), From 47408c1f99c1268a340238fc26678ec2fbcf3ce8 Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Mon, 30 May 2022 09:23:19 +0800 Subject: [PATCH 56/59] Part of paritytech/cumulus#963 --- src/cli.rs | 2 +- src/command.rs | 1 - src/service/mod.rs | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/cli.rs b/src/cli.rs index c2fc5a11..8f34adf9 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -115,7 +115,7 @@ pub struct Cli { pub run: cumulus_client_cli::RunCmd, /// Relay chain arguments - #[clap(raw = true)] + #[clap(raw = true, conflicts_with = "relay-chain-rpc-url")] pub relay_chain_args: Vec, } diff --git a/src/command.rs b/src/command.rs index efa5803c..60016570 100644 --- a/src/command.rs +++ b/src/command.rs @@ -246,7 +246,6 @@ pub fn run() -> Result<()> { let para_id = Extensions::try_get(&*config.chain_spec) .map(|e| e.para_id) .ok_or_else(|| "Could not find parachain ID in chain-spec.")?; - let polkadot_cli = RelayChainCli::new( &config, [RelayChainCli::executable_name().to_string()] diff --git a/src/service/mod.rs b/src/service/mod.rs index 82390fcd..79a0d0c5 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -450,9 +450,7 @@ where params.keystore_container.sync_keystore(), force_authoring, )?; - let spawner = task_manager.spawn_handle(); - let params = StartCollatorParams { para_id: id, block_status: client.clone(), From c24f61a736813daa3004123d7d41acee9a9104e1 Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Mon, 30 May 2022 09:24:30 +0800 Subject: [PATCH 57/59] Format --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5c4846ca..95e8386b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,14 +61,14 @@ frame-benchmarking-cli = { optional = true, git = "https://github.com/pa pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", features = ["wasmtime"] } +sc-cli = { features = ["wasmtime"], git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", features = ["wasmtime"] } +sc-executor = { features = ["wasmtime"], git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", features = ["wasmtime"] } +sc-service = { features = ["wasmtime"], git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } From fe1b2697807b73594ed4120f0ea1a50dd7098517 Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Mon, 30 May 2022 09:54:18 +0800 Subject: [PATCH 58/59] Companion of paritytech/cumulus#1054 --- Cargo.lock | 1 + Cargo.toml | 1 + src/command.rs | 60 ++++++++++++--------------- src/service/executors.rs | 6 +++ src/service/mod.rs | 90 ++++++++++++++-------------------------- 5 files changed, 66 insertions(+), 92 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb76a826..5a511225 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2250,6 +2250,7 @@ dependencies = [ "sp-consensus-aura", "sp-core", "sp-inherents", + "sp-io", "sp-keystore", "sp-offchain", "sp-runtime", diff --git a/Cargo.toml b/Cargo.toml index 95e8386b..a5eb5d26 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -78,6 +78,7 @@ sp-consensus = { git = "https://github.com/paritytech/substrat sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/src/command.rs b/src/command.rs index 60016570..08c7d4dc 100644 --- a/src/command.rs +++ b/src/command.rs @@ -193,11 +193,7 @@ pub fn run() -> Result<()> { if chain_spec.is_crab_parachain() { runner.async_run(|$config| { - let $components = new_partial::< - CrabParachainRuntimeApi, - CrabParachainRuntimeExecutor, - _ - >( + let $components = new_partial::( &$config, service::build_import_queue, )?; @@ -206,11 +202,7 @@ pub fn run() -> Result<()> { }) } else if chain_spec.is_pangolin_parachain() { runner.async_run(|$config| { - let $components = new_partial::< - PangolinParachainRuntimeApi, - PangolinParachainRuntimeExecutor, - _ - >( + let $components = new_partial::( &$config, service::build_import_queue, )?; @@ -219,11 +211,7 @@ pub fn run() -> Result<()> { }) } else { runner.async_run(|$config| { - let $components = new_partial::< - DarwiniaParachainRuntimeApi, - DarwiniaParachainRuntimeExecutor, - _ - >( + let $components = new_partial::( &$config, service::build_import_queue, )?; @@ -271,7 +259,7 @@ pub fn run() -> Result<()> { info!("Is collating: {}", if config.role.is_authority() { "yes" } else { "no" }); if chain_spec.is_crab_parachain() { - service::start_node::( + service::start_node::( config, polkadot_config, collator_options, @@ -281,21 +269,25 @@ pub fn run() -> Result<()> { .map(|r| r.0) .map_err(Into::into) } else if chain_spec.is_pangolin_parachain() { - service::start_node::< - PangolinParachainRuntimeApi, - PangolinParachainRuntimeExecutor, - >(config, polkadot_config, collator_options, id) - .await - .map(|r| r.0) - .map_err(Into::into) + service::start_node::( + config, + polkadot_config, + collator_options, + id, + ) + .await + .map(|r| r.0) + .map_err(Into::into) } else { - service::start_node::< - DarwiniaParachainRuntimeApi, - DarwiniaParachainRuntimeExecutor, - >(config, polkadot_config, collator_options, id) - .await - .map(|r| r.0) - .map_err(Into::into) + service::start_node::( + config, + polkadot_config, + collator_options, + id, + ) + .await + .map(|r| r.0) + .map_err(Into::into) } }), Some(Subcommand::BuildSpec(cmd)) => { @@ -400,11 +392,11 @@ pub fn run() -> Result<()> { set_default_ss58_version(chain_spec); if chain_spec.is_crab_parachain() { - runner.sync_run(|config| cmd.run::(config)) + runner.sync_run(|config| cmd.run::(config)) } else if chain_spec.is_pangolin_parachain() { - runner.sync_run(|config| cmd.run::(config)) + runner.sync_run(|config| cmd.run::(config)) } else { - runner.sync_run(|config| cmd.run::(config)) + runner.sync_run(|config| cmd.run::(config)) } }, #[cfg(feature = "try-runtime")] @@ -423,7 +415,7 @@ pub fn run() -> Result<()> { sc_service::TaskManager::new(config.tokio_handle.clone(), registry) .map_err(|e| sc_cli::Error::from(sc_service::Error::Prometheus(e)))?; - Ok((cmd.run::(config), task_manager)) + Ok((cmd.run::(config), task_manager)) }) } else { panic!("Try runtime not support chain: {}", chain_spec.id()); diff --git a/src/service/executors.rs b/src/service/executors.rs index ce185352..0456fdaf 100644 --- a/src/service/executors.rs +++ b/src/service/executors.rs @@ -18,6 +18,12 @@ // --- paritytech --- use sc_executor::{NativeExecutionDispatch, NativeVersion}; +use sp_io::SubstrateHostFunctions; + +#[cfg(not(feature = "runtime-benchmarks"))] +pub type HostFunctions = SubstrateHostFunctions; +#[cfg(feature = "runtime-benchmarks")] +pub type HostFunctions = (SubstrateHostFunctions, frame_benchmarking::benchmarking::HostFunctions); /// Darwinia native executor instance. pub struct DarwiniaParachainRuntimeExecutor; diff --git a/src/service/mod.rs b/src/service/mod.rs index 79a0d0c5..79260b6a 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -27,7 +27,7 @@ pub use darwinia_parachain_runtime::RuntimeApi as DarwiniaParachainRuntimeApi; pub use pangolin_parachain_runtime::RuntimeApi as PangolinParachainRuntimeApi; // --- std --- -use std::{error::Error, sync::Arc, timestamp::Duration}; +use std::{error::Error, sync::Arc, time::Duration}; // --- crates.io --- use futures::lock::Mutex; // --- paritytech --- @@ -55,12 +55,12 @@ use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayC use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface; use polkadot_service::CollatorPair; use sc_basic_authorship::ProposerFactory; -use sc_client_api::{ExecutorProvider, StateBackendFor}; +use sc_client_api::StateBackendFor; use sc_consensus::{ import_queue::{BasicQueue, Verifier as VerifierT}, BlockImportParams, DefaultImportQueue, }; -use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch}; +use sc_executor::WasmExecutor; use sc_network::NetworkService; use sc_service::{ error::Result, ChainSpec, Configuration, PartialComponents, Role, TFullBackend, TFullClient, @@ -69,7 +69,7 @@ use sc_service::{ use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sc_transaction_pool::FullPool; use sp_api::{ApiExt, HeaderT}; -use sp_consensus::{CacheKeyId, CanAuthorWithNativeVersion}; +use sp_consensus::{AlwaysCanAuthor, CacheKeyId}; use sp_consensus_aura::sr25519::{AuthorityId as AuraId, AuthorityPair as AuraPair}; use sp_keystore::SyncCryptoStorePtr; use sp_runtime::{generic::BlockId, traits::BlakeTwo256}; @@ -79,8 +79,7 @@ use dc_primitives::{OpaqueBlock as Block, *}; use dc_rpc::FullDeps; type FullBackend = TFullBackend; -type FullClient = - TFullClient>; +type FullClient = TFullClient>; type StateBackend = StateBackendFor; /// Can be called for a `Configuration` to check if it is a configuration for the `Crab Parachain` @@ -214,32 +213,28 @@ where /// /// Use this macro if you don't actually need the full service, but just the builder in order to /// be able to perform chain operations. -pub fn new_partial( +pub fn new_partial( config: &Configuration, build_import_queue: BIQ, ) -> Result< PartialComponents< - FullClient, + FullClient, FullBackend, (), - DefaultImportQueue>, - FullPool>, + DefaultImportQueue>, + FullPool>, (Option, Option), >, > where - RuntimeApi: 'static - + Send - + Sync - + sp_api::ConstructRuntimeApi>, + RuntimeApi: 'static + Send + Sync + sp_api::ConstructRuntimeApi>, RuntimeApi::RuntimeApi: RuntimeApiCollection, - Executor: 'static + NativeExecutionDispatch, BIQ: FnOnce( - Arc>, + Arc>, &Configuration, Option, &TaskManager, - ) -> Result>>, + ) -> Result>>, StateBackend: sp_api::StateBackend, { let telemetry = config @@ -252,14 +247,13 @@ where Ok((worker, telemetry)) }) .transpose()?; - - let executor = sc_executor::NativeElseWasmExecutor::::new( + let executor = sc_executor::WasmExecutor::::new( config.wasm_method, config.default_heap_pages, config.max_runtime_instances, + None, config.runtime_cache_size, ); - let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::( &config, @@ -267,14 +261,11 @@ where executor, )?; let client = Arc::new(client); - let telemetry_worker_handle = telemetry.as_ref().map(|(worker, _)| worker.handle()); - let telemetry = telemetry.map(|(worker, telemetry)| { task_manager.spawn_handle().spawn("telemetry", None, worker.run()); telemetry }); - let transaction_pool = sc_transaction_pool::BasicPool::new_full( config.transaction_pool.clone(), config.role.is_authority().into(), @@ -282,14 +273,12 @@ where task_manager.spawn_essential_handle(), client.clone(), ); - let import_queue = build_import_queue( client.clone(), config, telemetry.as_ref().map(|telemetry| telemetry.handle()), &task_manager, )?; - let params = PartialComponents { backend, client, @@ -327,7 +316,7 @@ async fn build_relay_chain_interface( /// /// This is the actual implementation that is abstract over the executor and the runtime api. #[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, @@ -335,32 +324,26 @@ async fn start_node_impl( _rpc_ext_builder: RB, build_import_queue: BIQ, build_consensus: BIC, -) -> sc_service::error::Result<(TaskManager, Arc>)> +) -> sc_service::error::Result<(TaskManager, Arc>)> where - RuntimeApi: 'static - + Send - + Sync - + sp_api::ConstructRuntimeApi>, + RuntimeApi: 'static + Send + Sync + sp_api::ConstructRuntimeApi>, RuntimeApi::RuntimeApi: RuntimeApiCollection, - Executor: 'static + NativeExecutionDispatch, RB: 'static + Send - + Fn( - Arc>, - ) -> Result>, + + Fn(Arc>) -> Result>, BIQ: FnOnce( - Arc>, + Arc>, &Configuration, Option, &TaskManager, - ) -> Result>>, + ) -> Result>>, BIC: FnOnce( - Arc>, + Arc>, Option<&Registry>, Option, &TaskManager, Arc, - Arc>>, + Arc>>, Arc>, SyncCryptoStorePtr, bool, @@ -372,7 +355,7 @@ where } let parachain_config = prepare_node_config(parachain_config); - let params = new_partial::(¶chain_config, build_import_queue)?; + let params = new_partial::(¶chain_config, build_import_queue)?; let (mut telemetry, telemetry_worker_handle) = params.other; let client = params.client.clone(); let backend = params.backend.clone(); @@ -487,19 +470,15 @@ where } /// Build the import queue for the darwinia-collator. -pub fn build_import_queue( - client: Arc>, +pub fn build_import_queue( + client: Arc>, config: &Configuration, telemetry: Option, task_manager: &TaskManager, -) -> Result>> +) -> Result>> where - RuntimeApi: 'static - + Send - + Sync - + sp_api::ConstructRuntimeApi>, + RuntimeApi: 'static + Send + Sync + sp_api::ConstructRuntimeApi>, RuntimeApi::RuntimeApi: RuntimeApiCollection, - Executor: 'static + NativeExecutionDispatch, { let client2 = client.clone(); @@ -520,7 +499,7 @@ where Ok((timestamp, slot)) }, - can_author_with: CanAuthorWithNativeVersion::new(client2.executor().clone()), + can_author_with: AlwaysCanAuthor, telemetry, }, )) as Box<_> @@ -548,21 +527,17 @@ where } /// Start a darwinia-collator node. -pub async fn start_node( +pub async fn start_node( parachain_config: Configuration, polkadot_config: Configuration, collator_options: CollatorOptions, id: ParaId, -) -> Result<(TaskManager, Arc>)> +) -> Result<(TaskManager, Arc>)> where - RuntimeApi: 'static - + Send - + Sync - + sp_api::ConstructRuntimeApi>, + RuntimeApi: 'static + Send + Sync + sp_api::ConstructRuntimeApi>, RuntimeApi::RuntimeApi: RuntimeApiCollection, - Executor: 'static + NativeExecutionDispatch, { - start_node_impl::( + start_node_impl::( parachain_config, polkadot_config, collator_options, @@ -638,7 +613,6 @@ where telemetry: telemetry2, }) }))); - let proposer_factory = ProposerFactory::with_proof_recording( task_manager.spawn_handle(), client.clone(), From fb4e2604324ee0092097514a0eff877ad82c9ae0 Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Mon, 30 May 2022 10:03:17 +0800 Subject: [PATCH 59/59] Companion of paritytech/cumulus#1087 --- Cargo.toml | 2 +- runtime/darwinia-parachain/Cargo.toml | 2 +- runtime/pangolin-parachain/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a5eb5d26..e386a3c0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ runtime-benchmarks = [ array-bytes = { version = "1.5" } async-trait = { version = "0.1" } clap = { version = "3.1", features = ["derive"] } -codec = { package = "parity-scale-codec", version = "3.0" } +codec = { package = "parity-scale-codec", version = "3.1" } futures = { version = "0.3" } jsonrpc-core = { version = "18.0" } log = { version = "0.4" } diff --git a/runtime/darwinia-parachain/Cargo.toml b/runtime/darwinia-parachain/Cargo.toml index 8a8e7773..ceadb4b9 100644 --- a/runtime/darwinia-parachain/Cargo.toml +++ b/runtime/darwinia-parachain/Cargo.toml @@ -13,7 +13,7 @@ version = "5.2.0" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.1", default-features = false, features = ["derive"] } scale-info = { version = "2.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus diff --git a/runtime/pangolin-parachain/Cargo.toml b/runtime/pangolin-parachain/Cargo.toml index 7ec232ae..020c0684 100644 --- a/runtime/pangolin-parachain/Cargo.toml +++ b/runtime/pangolin-parachain/Cargo.toml @@ -13,7 +13,7 @@ version = "5.2.0" [dependencies] # crates.io array-bytes = { version = "1.5", optional = true } -codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.1", default-features = false, features = ["derive"] } scale-info = { version = "2.0", default-features = false, features = ["derive"] } smallvec = { version = "1.8" } # cumulus