From b490d8def545bf2919585c1084bd272ef8df94a1 Mon Sep 17 00:00:00 2001 From: Guantong Date: Wed, 1 Mar 2023 17:42:46 +0800 Subject: [PATCH 01/18] Anchor v0.9.38 --- Cargo.toml | 449 ++++++++++++++++------------------------------------- 1 file changed, 131 insertions(+), 318 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bed125e8..8f3d7b15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,24 +28,24 @@ sha3 = { version = "0.9" } static_assertions = { version = "1.1" } # cumulus -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.37" } -cumulus-client-collator = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.37" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.37" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.37" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.37" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.37" } -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-pallet-session-benchmarking = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.37" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.37" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.38" } +cumulus-client-collator = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.38" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.38" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.38" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.38" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.38" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38" } +cumulus-pallet-session-benchmarking = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.38" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.38" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38" } # darwinia crab-runtime = { path = "runtime/crab" } @@ -69,311 +69,124 @@ pangolin-runtime = { path = "runtime/pangolin" } pangoro-runtime = { path = "runtime/pangoro" } # darwinia-messages-substrate -bp-darwinia-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.37" } -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.37" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.37" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.37" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.37" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.37" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.37" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.37" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.37" } -pallet-bridge-parachains = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.37" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.37" } +bp-darwinia-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +pallet-bridge-parachains = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } # frontier -fc-cli = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -fc-consensus = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -fc-db = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -fc-mapping-sync = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -fc-rpc = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -fc-rpc-core = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -fp-ethereum = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -fp-rpc = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -fp-self-contained = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -fp-storage = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -pallet-ethereum = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -pallet-evm = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -pallet-evm-precompile-blake2 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -pallet-evm-precompile-bn128 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -pallet-evm-precompile-dispatch = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -pallet-evm-precompile-modexp = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } -pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.37" } +fc-cli = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +fc-consensus = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +fc-db = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +fc-mapping-sync = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +fc-rpc = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +fc-rpc-core = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +fp-ethereum = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +fp-rpc = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +fp-self-contained = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +fp-storage = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +pallet-ethereum = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +pallet-evm = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +pallet-evm-precompile-blake2 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +pallet-evm-precompile-bn128 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +pallet-evm-precompile-dispatch = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +pallet-evm-precompile-modexp = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } +pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } # moonbeam -account = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.37" } -precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.37" } -xcm-primitives = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.37" } +account = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.38" } +precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.38" } +xcm-primitives = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.38" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" } +polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" } # substrate -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -frame-try-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-collective = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-democracy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-elections-phragmen = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-identity = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-membership = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-preimage = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-scheduler = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-tips = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-treasury = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-keyring = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } - -[patch."https://github.com/paritytech/substrate"] -beefy-gadget = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -beefy-gadget-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -beefy-merkle-tree = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -frame-benchmarking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -frame-benchmarking-cli = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -frame-election-provider-solution-type = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -frame-election-provider-support = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -frame-executive = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -frame-support = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -frame-support-procedural = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -frame-support-procedural-tools = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -frame-support-procedural-tools-derive = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -frame-system = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -frame-system-benchmarking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -frame-system-rpc-runtime-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -frame-try-runtime = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -mmr-gadget = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -mmr-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-assets = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-aura = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-authority-discovery = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-authorship = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-babe = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-bags-list = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-balances = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-beefy = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-beefy-mmr = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-bounties = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-child-bounties = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-collective = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-conviction-voting = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-democracy = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-election-provider-multi-phase = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-election-provider-support-benchmarking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-elections-phragmen = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-fast-unstake = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-grandpa = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-identity = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-im-online = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-indices = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-membership = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-mmr = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-nis = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-nomination-pools = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-nomination-pools-benchmarking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-nomination-pools-runtime-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-offences = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-offences-benchmarking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-preimage = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-proxy = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-ranked-collective = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-recovery = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-referenda = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-scheduler = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-session = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-session-benchmarking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-society = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-staking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-staking-reward-curve = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-staking-reward-fn = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-state-trie-migration = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-sudo = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-timestamp = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-tips = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-transaction-payment-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-treasury = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-utility = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-vesting = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -pallet-whitelist = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-allocator = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-authority-discovery = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-basic-authorship = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-block-builder = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-chain-spec = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-chain-spec-derive = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-cli = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-client-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-client-db = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-consensus = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-consensus-aura = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-consensus-babe-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-consensus-epochs = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-consensus-slots = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-executor = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-executor-common = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-executor-wasmi = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-executor-wasmtime = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-finality-grandpa = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-finality-grandpa-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-informant = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-keystore = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-network = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-network-common = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-network-gossip = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-offchain = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-peerset = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-proposer-metrics = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-rpc-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-rpc-server = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-service = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-state-db = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-sync-state-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-sysinfo = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-telemetry = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-tracing = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-tracing-proc-macro = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-transaction-pool = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-transaction-pool-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sc-utils = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-api-proc-macro = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-application-crypto = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-arithmetic = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-authority-discovery = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-beefy = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-block-builder = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-blockchain = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-consensus = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-consensus-aura = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-consensus-slots = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-consensus-vrf = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-core = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-database = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-debug-derive = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-externalities = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-finality-grandpa = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-inherents = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-io = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-keyring = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-keystore = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-maybe-compressed-blob = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-mmr-primitives = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-npos-elections = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-offchain = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-panic-handler = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-runtime = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-runtime-interface = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-runtime-interface-proc-macro = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-session = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-staking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-state-machine = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-std = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-storage = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-timestamp = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-tracing = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-transaction-storage-proof = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-trie = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-version = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-version-proc-macro = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-wasm-interface = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -sp-weights = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -substrate-build-script-utils = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -substrate-frame-rpc-system = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -substrate-prometheus-endpoint = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -substrate-rpc-client = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -substrate-state-trie-migration-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -substrate-wasm-builder = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } -try-runtime-cli = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.37" } - -[patch."https://github.com/paritytech/cumulus"] -cumulus-client-cli = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-client-collator = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-client-consensus-aura = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-client-consensus-common = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-client-network = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-client-service = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-pallet-aura-ext = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-pallet-dmp-queue = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-pallet-parachain-system = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-pallet-session-benchmarking = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-pallet-xcm = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-primitives-core = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-primitives-timestamp = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-primitives-utility = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -cumulus-relay-chain-interface = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } -parachain-info = { git = "https://github.com/darwinia-network/cumulus", branch = "remove-assertion-v0.9.37" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +frame-try-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-collective = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-democracy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-elections-phragmen = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-identity = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-membership = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-preimage = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-scheduler = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-tips = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-treasury = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-keyring = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } From c92e180f5a9787294e5a22a8809b67900da4f9ae Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 09:44:46 +0800 Subject: [PATCH 02/18] Companion for paritytech/cumulus#2067 --- node/src/command.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/src/command.rs b/node/src/command.rs index 1a11952a..947d1adb 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -674,7 +674,7 @@ pub fn run() -> Result<()> { ); let id = ParaId::from(para_id); let parachain_account = - AccountIdConversion::::into_account_truncating(&id); + AccountIdConversion::::into_account_truncating(&id); let state_version = Cli::native_runtime_version(&config.chain_spec).state_version(); let block: Block = cumulus_client_cli::generate_genesis_block(&*config.chain_spec, state_version) From 4140e16d02dfd521a6473a43da6c00b56da141d5 Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 10:15:10 +0800 Subject: [PATCH 03/18] Companion for paritytech/cumulus#697 XCM v3 --- runtime/common/src/xcm_configs.rs | 17 +++--- runtime/crab/src/pallets/polkadot_xcm.rs | 57 +++++++++++++++----- runtime/crab/src/pallets/xcmp_queue.rs | 1 + runtime/darwinia/src/pallets/polkadot_xcm.rs | 53 ++++++++++++++---- runtime/darwinia/src/pallets/xcmp_queue.rs | 1 + runtime/pangolin/src/pallets/polkadot_xcm.rs | 53 ++++++++++++++---- runtime/pangolin/src/pallets/xcmp_queue.rs | 1 + runtime/pangoro/src/pallets/polkadot_xcm.rs | 53 ++++++++++++++---- runtime/pangoro/src/pallets/xcmp_queue.rs | 1 + 9 files changed, 185 insertions(+), 52 deletions(-) diff --git a/runtime/common/src/xcm_configs.rs b/runtime/common/src/xcm_configs.rs index ad47ef8e..436c1dc2 100644 --- a/runtime/common/src/xcm_configs.rs +++ b/runtime/common/src/xcm_configs.rs @@ -70,9 +70,9 @@ where { fn should_execute( origin: &MultiLocation, - message: &mut Xcm, - max_weight: XcmWeight, - weight_credit: &mut XcmWeight, + message: &mut [Instruction], + max_weight: Weight, + weight_credit: &mut Weight, ) -> Result<(), ()> { Deny::should_execute(origin, message, max_weight, weight_credit)?; Allow::should_execute(origin, message, max_weight, weight_credit) @@ -84,12 +84,11 @@ pub struct DenyReserveTransferToRelayChain; impl ShouldExecute for DenyReserveTransferToRelayChain { fn should_execute( origin: &MultiLocation, - - message: &mut Xcm, - _max_weight: XcmWeight, - _weight_credit: &mut XcmWeight, + message: &mut [Instruction], + _max_weight: Weight, + _weight_credit: &mut Weight, ) -> Result<(), ()> { - if message.0.iter().any(|inst| { + if message.iter().any(|inst| { matches!( inst, InitiateReserveWithdraw { @@ -108,7 +107,7 @@ impl ShouldExecute for DenyReserveTransferToRelayChain { // An unexpected reserve transfer has arrived from the Relay Chain. Generally, `IsReserve` // should not allow this, but we just log it here. if matches!(origin, MultiLocation { parents: 1, interior: Here }) - && message.0.iter().any(|inst| matches!(inst, ReserveAssetDeposited { .. })) + && message.iter().any(|inst| matches!(inst, ReserveAssetDeposited { .. })) { log::warn!( target: "xcm::barriers", diff --git a/runtime/crab/src/pallets/polkadot_xcm.rs b/runtime/crab/src/pallets/polkadot_xcm.rs index ba637531..b3ed0165 100644 --- a/runtime/crab/src/pallets/polkadot_xcm.rs +++ b/runtime/crab/src/pallets/polkadot_xcm.rs @@ -36,7 +36,7 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter< >; frame_support::parameter_types! { - pub const RelayNetwork: xcm::latest::prelude::NetworkId = xcm::latest::prelude::NetworkId::Kusama; + pub const RelayNetwork: Option = Some(xcm::latest::NetworkId::Kusama); pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used @@ -77,27 +77,36 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< darwinia_common_runtime::xcm_configs::DenyReserveTransferToRelayChain, ( xcm_builder::TakeWeightCredit, - xcm_builder::AllowTopLevelPaidExecutionFrom, - // Parent and its exec plurality get free execution - xcm_builder::AllowUnpaidExecutionFrom< - darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, + WithComputedOrigin< + ( + xcm_builder::AllowTopLevelPaidExecutionFrom, + // Parent and its exec plurality get free execution + xcm_builder::AllowUnpaidExecutionFrom< + darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, + >, + // Subscriptions for version tracking are OK. + xcm_builder::AllowSubscriptionsFrom< + darwinia_common_runtime::xcm_configs::ParentOrSiblings, + >, + ), + UniversalLocation, + ConstU32<8>, >, // Expected responses are OK. xcm_builder::AllowKnownQueryResponses, - // Subscriptions for version tracking are OK. - xcm_builder::AllowSubscriptionsFrom, ), >; frame_support::parameter_types! { + pub const MaxAssetsIntoHolding: u32 = 64; pub const MaxInstructions: u32 = 100; pub AnchoringSelfReserve: xcm::latest::prelude::MultiLocation = xcm::latest::prelude::MultiLocation::new( 0, xcm::latest::prelude::X1(xcm::latest::prelude::PalletInstance(::index() as u8)) ); + pub UniversalLocation: xcm::latest::prelude::InteriorMultiLocation = xcm::latest::prelude::Parachain(ParachainInfo::parachain_id().into()).into(); // One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate. - pub Ancestry: xcm::latest::prelude::MultiLocation = xcm::latest::prelude::Parachain(ParachainInfo::parachain_id().into()).into(); - pub UnitWeightCost: u64 = 1_000_000_000; + pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024); } pub struct ToTreasury; @@ -122,17 +131,23 @@ impl xcm_builder::TakeRevenue for ToTreasury { pub struct XcmExecutorConfig; impl xcm_executor::Config for XcmExecutorConfig { type AssetClaims = PolkadotXcm; + type AssetExchanger = (); + type AssetLocker = (); // How to withdraw and deposit an asset. type AssetTransactor = LocalAssetTransactor; type AssetTrap = PolkadotXcm; type Barrier = Barrier; + type CallDispatcher = RuntimeCall; + type FeeManager = (); type IsReserve = xcm_builder::NativeAsset; type IsTeleporter = (); - // Teleporting is disabled. - type LocationInverter = xcm_builder::LocationInverter; + type MaxAssetsIntoHolding = MaxAssetsIntoHolding; + type MessageExporter = (); type OriginConverter = XcmOriginToTransactDispatchOrigin; + type PalletInstancesInfo = AllPalletsWithSystem; type ResponseHandler = PolkadotXcm; type RuntimeCall = RuntimeCall; + type SafeCallFilter = Everything; type SubscriptionService = PolkadotXcm; type Trader = xcm_configs::LocalAssetTrader< frame_support::weights::ConstantMultiplier< @@ -145,6 +160,9 @@ impl xcm_executor::Config for XcmExecutorConfig { DealWithFees, ToTreasury, >; + type UniversalAliases = Nothing; + // Teleporting is disabled. + type UniversalLocation = UniversalLocation; type Weigher = xcm_builder::FixedWeightBounds; type XcmSender = XcmRouter; } @@ -156,21 +174,34 @@ pub type LocalOriginToLocation = /// queues. pub type XcmRouter = ( // Two routers - use UMP to communicate with the relay chain: - cumulus_primitives_utility::ParentAsUmp, + cumulus_primitives_utility::ParentAsUmp, // ..and XCMP to communicate with the sibling chains. XcmpQueue, ); +#[cfg(feature = "runtime-benchmarks")] +parameter_types! { + pub ReachableDest: Option = Some(Parent.into()); +} + impl pallet_xcm::Config for Runtime { // ^ Override for AdvertisedXcmVersion default type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; + type Currency = Balances; + type CurrencyMatcher = (); type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin; - type LocationInverter = xcm_builder::LocationInverter; + type MaxLockers = ConstU32<8>; + #[cfg(feature = "runtime-benchmarks")] + type ReachableDest = ReachableDest; type RuntimeCall = RuntimeCall; type RuntimeEvent = RuntimeEvent; type RuntimeOrigin = RuntimeOrigin; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; + type SovereignAccountOf = LocationToAccountId; + type TrustedLockers = (); + type UniversalLocation = UniversalLocation; type Weigher = xcm_builder::FixedWeightBounds; + type WeightInfo = pallet_xcm::TestWeightInfo; type XcmExecuteFilter = frame_support::traits::Everything; type XcmExecutor = xcm_executor::XcmExecutor; type XcmReserveTransferFilter = frame_support::traits::Everything; diff --git a/runtime/crab/src/pallets/xcmp_queue.rs b/runtime/crab/src/pallets/xcmp_queue.rs index f3f8d642..9931ff3c 100644 --- a/runtime/crab/src/pallets/xcmp_queue.rs +++ b/runtime/crab/src/pallets/xcmp_queue.rs @@ -28,4 +28,5 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type VersionWrapper = (); type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo; type XcmExecutor = xcm_executor::XcmExecutor; + type PriceForSiblingDelivery = (); } diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs index 7eb1fbef..98cb926c 100644 --- a/runtime/darwinia/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia/src/pallets/polkadot_xcm.rs @@ -36,7 +36,7 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter< >; frame_support::parameter_types! { - pub const RelayNetwork: xcm::latest::prelude::NetworkId = xcm::latest::prelude::NetworkId::Polkadot; + pub const RelayNetwork: Option = Some(xcm::latest::NetworkId::Polkadot); pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used @@ -77,10 +77,20 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< darwinia_common_runtime::xcm_configs::DenyReserveTransferToRelayChain, ( xcm_builder::TakeWeightCredit, - xcm_builder::AllowTopLevelPaidExecutionFrom, - // Parent and its exec plurality get free execution - xcm_builder::AllowUnpaidExecutionFrom< - darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, + WithComputedOrigin< + ( + xcm_builder::AllowTopLevelPaidExecutionFrom, + // Parent and its exec plurality get free execution + xcm_builder::AllowUnpaidExecutionFrom< + darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, + >, + // Subscriptions for version tracking are OK. + xcm_builder::AllowSubscriptionsFrom< + darwinia_common_runtime::xcm_configs::ParentOrSiblings, + >, + ), + UniversalLocation, + ConstU32<8>, >, // Expected responses are OK. xcm_builder::AllowKnownQueryResponses, @@ -90,14 +100,15 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< >; frame_support::parameter_types! { + pub const MaxAssetsIntoHolding: u32 = 64; pub const MaxInstructions: u32 = 100; pub AnchoringSelfReserve: xcm::latest::prelude::MultiLocation = xcm::latest::prelude::MultiLocation::new( 0, xcm::latest::prelude::X1(xcm::latest::prelude::PalletInstance(::index() as u8)) ); + pub UniversalLocation: xcm::latest::prelude::InteriorMultiLocation = xcm::latest::prelude::Parachain(ParachainInfo::parachain_id().into()).into(); // One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate. - pub Ancestry: xcm::latest::prelude::MultiLocation = xcm::latest::prelude::Parachain(ParachainInfo::parachain_id().into()).into(); - pub UnitWeightCost: u64 = 1_000_000_000; + pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024); } pub struct ToTreasury; @@ -129,7 +140,7 @@ impl xcm_executor::Config for XcmExecutorConfig { type IsReserve = xcm_builder::NativeAsset; type IsTeleporter = (); // Teleporting is disabled. - type LocationInverter = xcm_builder::LocationInverter; + type UniversalLocation = UniversalLocation; type OriginConverter = XcmOriginToTransactDispatchOrigin; type ResponseHandler = PolkadotXcm; type RuntimeCall = RuntimeCall; @@ -147,6 +158,15 @@ impl xcm_executor::Config for XcmExecutorConfig { >; type Weigher = xcm_builder::FixedWeightBounds; type XcmSender = XcmRouter; + type PalletInstancesInfo = AllPalletsWithSystem; + type MaxAssetsIntoHolding = MaxAssetsIntoHolding; + type AssetLocker = (); + type AssetExchanger = (); + type FeeManager = (); + type MessageExporter = (); + type UniversalAliases = Nothing; + type CallDispatcher = RuntimeCall; + type SafeCallFilter = Everything; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. @@ -156,16 +176,21 @@ pub type LocalOriginToLocation = /// queues. pub type XcmRouter = ( // Two routers - use UMP to communicate with the relay chain: - cumulus_primitives_utility::ParentAsUmp, + cumulus_primitives_utility::ParentAsUmp, // ..and XCMP to communicate with the sibling chains. XcmpQueue, ); +#[cfg(feature = "runtime-benchmarks")] +parameter_types! { + pub ReachableDest: Option = Some(Parent.into()); +} + impl pallet_xcm::Config for Runtime { // ^ Override for AdvertisedXcmVersion default type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin; - type LocationInverter = xcm_builder::LocationInverter; + type UniversalLocation = UniversalLocation; type RuntimeCall = RuntimeCall; type RuntimeEvent = RuntimeEvent; type RuntimeOrigin = RuntimeOrigin; @@ -178,6 +203,14 @@ impl pallet_xcm::Config for Runtime { type XcmTeleportFilter = frame_support::traits::Nothing; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; + type Currency = Balances; + type CurrencyMatcher = (); + type TrustedLockers = (); + type SovereignAccountOf = LocationToAccountId; + type MaxLockers = ConstU32<8>; + type WeightInfo = pallet_xcm::TestWeightInfo; + #[cfg(feature = "runtime-benchmarks")] + type ReachableDest = ReachableDest; } impl cumulus_pallet_xcm::Config for Runtime { diff --git a/runtime/darwinia/src/pallets/xcmp_queue.rs b/runtime/darwinia/src/pallets/xcmp_queue.rs index f3f8d642..9931ff3c 100644 --- a/runtime/darwinia/src/pallets/xcmp_queue.rs +++ b/runtime/darwinia/src/pallets/xcmp_queue.rs @@ -28,4 +28,5 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type VersionWrapper = (); type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo; type XcmExecutor = xcm_executor::XcmExecutor; + type PriceForSiblingDelivery = (); } diff --git a/runtime/pangolin/src/pallets/polkadot_xcm.rs b/runtime/pangolin/src/pallets/polkadot_xcm.rs index 4aec5bbe..0bcc91f4 100644 --- a/runtime/pangolin/src/pallets/polkadot_xcm.rs +++ b/runtime/pangolin/src/pallets/polkadot_xcm.rs @@ -36,7 +36,7 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter< >; frame_support::parameter_types! { - pub const RelayNetwork: xcm::latest::prelude::NetworkId = xcm::latest::prelude::NetworkId::Any; + pub const RelayNetwork: Option = None; pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used @@ -77,10 +77,20 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< darwinia_common_runtime::xcm_configs::DenyReserveTransferToRelayChain, ( xcm_builder::TakeWeightCredit, - xcm_builder::AllowTopLevelPaidExecutionFrom, - // Parent and its exec plurality get free execution - xcm_builder::AllowUnpaidExecutionFrom< - darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, + WithComputedOrigin< + ( + xcm_builder::AllowTopLevelPaidExecutionFrom, + // Parent and its exec plurality get free execution + xcm_builder::AllowUnpaidExecutionFrom< + darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, + >, + // Subscriptions for version tracking are OK. + xcm_builder::AllowSubscriptionsFrom< + darwinia_common_runtime::xcm_configs::ParentOrSiblings, + >, + ), + UniversalLocation, + ConstU32<8>, >, // Expected responses are OK. xcm_builder::AllowKnownQueryResponses, @@ -90,14 +100,15 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< >; frame_support::parameter_types! { + pub const MaxAssetsIntoHolding: u32 = 64; pub const MaxInstructions: u32 = 100; pub AnchoringSelfReserve: xcm::latest::prelude::MultiLocation = xcm::latest::prelude::MultiLocation::new( 0, xcm::latest::prelude::X1(xcm::latest::prelude::PalletInstance(::index() as u8)) ); + pub UniversalLocation: xcm::latest::prelude::InteriorMultiLocation = xcm::latest::prelude::Parachain(ParachainInfo::parachain_id().into()).into(); // One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate. - pub Ancestry: xcm::latest::prelude::MultiLocation = xcm::latest::prelude::Parachain(ParachainInfo::parachain_id().into()).into(); - pub UnitWeightCost: u64 = 1_000_000_000; + pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024); } pub struct ToTreasury; @@ -129,7 +140,7 @@ impl xcm_executor::Config for XcmExecutorConfig { type IsReserve = xcm_builder::NativeAsset; type IsTeleporter = (); // Teleporting is disabled. - type LocationInverter = xcm_builder::LocationInverter; + type UniversalLocation = UniversalLocation; type OriginConverter = XcmOriginToTransactDispatchOrigin; type ResponseHandler = PolkadotXcm; type RuntimeCall = RuntimeCall; @@ -147,6 +158,15 @@ impl xcm_executor::Config for XcmExecutorConfig { >; type Weigher = xcm_builder::FixedWeightBounds; type XcmSender = XcmRouter; + type PalletInstancesInfo = AllPalletsWithSystem; + type MaxAssetsIntoHolding = MaxAssetsIntoHolding; + type AssetLocker = (); + type AssetExchanger = (); + type FeeManager = (); + type MessageExporter = (); + type UniversalAliases = Nothing; + type CallDispatcher = RuntimeCall; + type SafeCallFilter = Everything; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. @@ -156,16 +176,21 @@ pub type LocalOriginToLocation = /// queues. pub type XcmRouter = ( // Two routers - use UMP to communicate with the relay chain: - cumulus_primitives_utility::ParentAsUmp, + cumulus_primitives_utility::ParentAsUmp, // ..and XCMP to communicate with the sibling chains. XcmpQueue, ); +#[cfg(feature = "runtime-benchmarks")] +parameter_types! { + pub ReachableDest: Option = Some(Parent.into()); +} + impl pallet_xcm::Config for Runtime { // ^ Override for AdvertisedXcmVersion default type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin; - type LocationInverter = xcm_builder::LocationInverter; + type UniversalLocation = UniversalLocation; type RuntimeCall = RuntimeCall; type RuntimeEvent = RuntimeEvent; type RuntimeOrigin = RuntimeOrigin; @@ -178,6 +203,14 @@ impl pallet_xcm::Config for Runtime { type XcmTeleportFilter = frame_support::traits::Nothing; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; + type Currency = Balances; + type CurrencyMatcher = (); + type TrustedLockers = (); + type SovereignAccountOf = LocationToAccountId; + type MaxLockers = ConstU32<8>; + type WeightInfo = pallet_xcm::TestWeightInfo; + #[cfg(feature = "runtime-benchmarks")] + type ReachableDest = ReachableDest; } impl cumulus_pallet_xcm::Config for Runtime { diff --git a/runtime/pangolin/src/pallets/xcmp_queue.rs b/runtime/pangolin/src/pallets/xcmp_queue.rs index f3f8d642..9931ff3c 100644 --- a/runtime/pangolin/src/pallets/xcmp_queue.rs +++ b/runtime/pangolin/src/pallets/xcmp_queue.rs @@ -28,4 +28,5 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type VersionWrapper = (); type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo; type XcmExecutor = xcm_executor::XcmExecutor; + type PriceForSiblingDelivery = (); } diff --git a/runtime/pangoro/src/pallets/polkadot_xcm.rs b/runtime/pangoro/src/pallets/polkadot_xcm.rs index 4aec5bbe..0bcc91f4 100644 --- a/runtime/pangoro/src/pallets/polkadot_xcm.rs +++ b/runtime/pangoro/src/pallets/polkadot_xcm.rs @@ -36,7 +36,7 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter< >; frame_support::parameter_types! { - pub const RelayNetwork: xcm::latest::prelude::NetworkId = xcm::latest::prelude::NetworkId::Any; + pub const RelayNetwork: Option = None; pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used @@ -77,10 +77,20 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< darwinia_common_runtime::xcm_configs::DenyReserveTransferToRelayChain, ( xcm_builder::TakeWeightCredit, - xcm_builder::AllowTopLevelPaidExecutionFrom, - // Parent and its exec plurality get free execution - xcm_builder::AllowUnpaidExecutionFrom< - darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, + WithComputedOrigin< + ( + xcm_builder::AllowTopLevelPaidExecutionFrom, + // Parent and its exec plurality get free execution + xcm_builder::AllowUnpaidExecutionFrom< + darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality, + >, + // Subscriptions for version tracking are OK. + xcm_builder::AllowSubscriptionsFrom< + darwinia_common_runtime::xcm_configs::ParentOrSiblings, + >, + ), + UniversalLocation, + ConstU32<8>, >, // Expected responses are OK. xcm_builder::AllowKnownQueryResponses, @@ -90,14 +100,15 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< >; frame_support::parameter_types! { + pub const MaxAssetsIntoHolding: u32 = 64; pub const MaxInstructions: u32 = 100; pub AnchoringSelfReserve: xcm::latest::prelude::MultiLocation = xcm::latest::prelude::MultiLocation::new( 0, xcm::latest::prelude::X1(xcm::latest::prelude::PalletInstance(::index() as u8)) ); + pub UniversalLocation: xcm::latest::prelude::InteriorMultiLocation = xcm::latest::prelude::Parachain(ParachainInfo::parachain_id().into()).into(); // One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate. - pub Ancestry: xcm::latest::prelude::MultiLocation = xcm::latest::prelude::Parachain(ParachainInfo::parachain_id().into()).into(); - pub UnitWeightCost: u64 = 1_000_000_000; + pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024); } pub struct ToTreasury; @@ -129,7 +140,7 @@ impl xcm_executor::Config for XcmExecutorConfig { type IsReserve = xcm_builder::NativeAsset; type IsTeleporter = (); // Teleporting is disabled. - type LocationInverter = xcm_builder::LocationInverter; + type UniversalLocation = UniversalLocation; type OriginConverter = XcmOriginToTransactDispatchOrigin; type ResponseHandler = PolkadotXcm; type RuntimeCall = RuntimeCall; @@ -147,6 +158,15 @@ impl xcm_executor::Config for XcmExecutorConfig { >; type Weigher = xcm_builder::FixedWeightBounds; type XcmSender = XcmRouter; + type PalletInstancesInfo = AllPalletsWithSystem; + type MaxAssetsIntoHolding = MaxAssetsIntoHolding; + type AssetLocker = (); + type AssetExchanger = (); + type FeeManager = (); + type MessageExporter = (); + type UniversalAliases = Nothing; + type CallDispatcher = RuntimeCall; + type SafeCallFilter = Everything; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. @@ -156,16 +176,21 @@ pub type LocalOriginToLocation = /// queues. pub type XcmRouter = ( // Two routers - use UMP to communicate with the relay chain: - cumulus_primitives_utility::ParentAsUmp, + cumulus_primitives_utility::ParentAsUmp, // ..and XCMP to communicate with the sibling chains. XcmpQueue, ); +#[cfg(feature = "runtime-benchmarks")] +parameter_types! { + pub ReachableDest: Option = Some(Parent.into()); +} + impl pallet_xcm::Config for Runtime { // ^ Override for AdvertisedXcmVersion default type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin; - type LocationInverter = xcm_builder::LocationInverter; + type UniversalLocation = UniversalLocation; type RuntimeCall = RuntimeCall; type RuntimeEvent = RuntimeEvent; type RuntimeOrigin = RuntimeOrigin; @@ -178,6 +203,14 @@ impl pallet_xcm::Config for Runtime { type XcmTeleportFilter = frame_support::traits::Nothing; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; + type Currency = Balances; + type CurrencyMatcher = (); + type TrustedLockers = (); + type SovereignAccountOf = LocationToAccountId; + type MaxLockers = ConstU32<8>; + type WeightInfo = pallet_xcm::TestWeightInfo; + #[cfg(feature = "runtime-benchmarks")] + type ReachableDest = ReachableDest; } impl cumulus_pallet_xcm::Config for Runtime { diff --git a/runtime/pangoro/src/pallets/xcmp_queue.rs b/runtime/pangoro/src/pallets/xcmp_queue.rs index f3f8d642..9931ff3c 100644 --- a/runtime/pangoro/src/pallets/xcmp_queue.rs +++ b/runtime/pangoro/src/pallets/xcmp_queue.rs @@ -28,4 +28,5 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type VersionWrapper = (); type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo; type XcmExecutor = xcm_executor::XcmExecutor; + type PriceForSiblingDelivery = (); } From 8a59e125e29e96568d179797a402fd766c10e51a Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 10:20:45 +0800 Subject: [PATCH 04/18] Companion for paritytech/cumulus#2096 --- node/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/Cargo.toml b/node/Cargo.toml index b7ee6fa6..71dde80c 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -13,7 +13,7 @@ substrate-build-script-utils = { workspace = true } # crates.io array-bytes = { workspace = true } async-trait = { version = "0.1" } -clap = { version = "4.0", features = ["derive"] } +clap = { version = "4.1", features = ["derive"] } codec = { package = "parity-scale-codec", workspace = true } futures = { version = "0.3" } jsonrpsee = { version = "0.16", features = ["server"] } From 373ef3b31b4b91055c444488bbd4614d1e28f366 Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 10:23:07 +0800 Subject: [PATCH 05/18] Companion for paritytech/cumulus#1863 --- node/src/command.rs | 7 ++----- node/src/service/mod.rs | 8 ++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/node/src/command.rs b/node/src/command.rs index 947d1adb..0776ca42 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -654,14 +654,11 @@ pub fn run() -> Result<()> { runner.run_node_until_exit(|config| async move { let chain_spec = &config.chain_spec; - let hwbench = if !cli.no_hardware_benchmarks { + let hwbench = (!cli.no_hardware_benchmarks).then_some( config.database.path().map(|database_path| { let _ = std::fs::create_dir_all(database_path); sc_sysinfo::gather_hwbench(Some(database_path)) - }) - } else { - None - }; + })).flatten(); set_default_ss58_version(chain_spec); diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs index 3f1369aa..6aa4005a 100644 --- a/node/src/service/mod.rs +++ b/node/src/service/mod.rs @@ -416,6 +416,14 @@ where if let Some(hwbench) = hwbench { sc_sysinfo::print_hwbench(&hwbench); + // Here you can check whether the hardware meets your chains' requirements. Putting a link + // in there and swapping out the requirements for your own are probably a good idea. The + // requirements for a para-chain are dictated by its relay-chain. + if !SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) && validator { + log::warn!( + "⚠️ The hardware does not meet the minimal requirements for role 'Authority'." + ); + } if let Some(ref mut telemetry) = telemetry { let telemetry_handle = telemetry.handle(); From 3506b418683bd400a8a2fd6e953e7f13acf52d35 Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 10:28:03 +0800 Subject: [PATCH 06/18] Companion for paritytech/cumulus#2073 --- runtime/crab/src/lib.rs | 8 ++++++++ runtime/darwinia/src/lib.rs | 8 ++++++++ runtime/pangolin/src/lib.rs | 8 ++++++++ runtime/pangoro/src/lib.rs | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs index 6f7ed1f1..012a6a14 100644 --- a/runtime/crab/src/lib.rs +++ b/runtime/crab/src/lib.rs @@ -215,6 +215,14 @@ sp_api::impl_runtime_apis! { fn authorities() -> Vec { Aura::authorities().into_inner() } + + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } impl sp_api::Core for Runtime { diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs index 5e442f58..f870fc23 100644 --- a/runtime/darwinia/src/lib.rs +++ b/runtime/darwinia/src/lib.rs @@ -215,6 +215,14 @@ sp_api::impl_runtime_apis! { fn authorities() -> Vec { Aura::authorities().into_inner() } + + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } impl sp_api::Core for Runtime { diff --git a/runtime/pangolin/src/lib.rs b/runtime/pangolin/src/lib.rs index 71e36fb3..90b87af8 100644 --- a/runtime/pangolin/src/lib.rs +++ b/runtime/pangolin/src/lib.rs @@ -217,6 +217,14 @@ sp_api::impl_runtime_apis! { fn authorities() -> Vec { Aura::authorities().into_inner() } + + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } impl sp_api::Core for Runtime { diff --git a/runtime/pangoro/src/lib.rs b/runtime/pangoro/src/lib.rs index b69c606a..3693be58 100644 --- a/runtime/pangoro/src/lib.rs +++ b/runtime/pangoro/src/lib.rs @@ -217,6 +217,14 @@ sp_api::impl_runtime_apis! { fn authorities() -> Vec { Aura::authorities().into_inner() } + + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } impl sp_api::Core for Runtime { From e1ca54028895bd5e0cf98afb4385fdb5bb295e35 Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 10:29:48 +0800 Subject: [PATCH 07/18] Companion for paritytech/cumulus#2126 --- runtime/crab/src/pallets/authorship.rs | 2 -- runtime/darwinia/src/pallets/authorship.rs | 2 -- runtime/pangolin/src/pallets/authorship.rs | 2 -- runtime/pangoro/src/pallets/authorship.rs | 2 -- 4 files changed, 8 deletions(-) diff --git a/runtime/crab/src/pallets/authorship.rs b/runtime/crab/src/pallets/authorship.rs index 5b5f8109..80c21590 100644 --- a/runtime/crab/src/pallets/authorship.rs +++ b/runtime/crab/src/pallets/authorship.rs @@ -21,7 +21,5 @@ use crate::*; impl pallet_authorship::Config for Runtime { type EventHandler = (DarwiniaStaking,); - type FilterUncle = (); type FindAuthor = pallet_session::FindAccountFromAuthorIndex; - type UncleGenerations = ConstU32<0>; } diff --git a/runtime/darwinia/src/pallets/authorship.rs b/runtime/darwinia/src/pallets/authorship.rs index 5b5f8109..80c21590 100644 --- a/runtime/darwinia/src/pallets/authorship.rs +++ b/runtime/darwinia/src/pallets/authorship.rs @@ -21,7 +21,5 @@ use crate::*; impl pallet_authorship::Config for Runtime { type EventHandler = (DarwiniaStaking,); - type FilterUncle = (); type FindAuthor = pallet_session::FindAccountFromAuthorIndex; - type UncleGenerations = ConstU32<0>; } diff --git a/runtime/pangolin/src/pallets/authorship.rs b/runtime/pangolin/src/pallets/authorship.rs index 5b5f8109..80c21590 100644 --- a/runtime/pangolin/src/pallets/authorship.rs +++ b/runtime/pangolin/src/pallets/authorship.rs @@ -21,7 +21,5 @@ use crate::*; impl pallet_authorship::Config for Runtime { type EventHandler = (DarwiniaStaking,); - type FilterUncle = (); type FindAuthor = pallet_session::FindAccountFromAuthorIndex; - type UncleGenerations = ConstU32<0>; } diff --git a/runtime/pangoro/src/pallets/authorship.rs b/runtime/pangoro/src/pallets/authorship.rs index 5b5f8109..80c21590 100644 --- a/runtime/pangoro/src/pallets/authorship.rs +++ b/runtime/pangoro/src/pallets/authorship.rs @@ -21,7 +21,5 @@ use crate::*; impl pallet_authorship::Config for Runtime { type EventHandler = (DarwiniaStaking,); - type FilterUncle = (); type FindAuthor = pallet_session::FindAccountFromAuthorIndex; - type UncleGenerations = ConstU32<0>; } From 857a05a2187e4a16d32b1486d70eecf1d692e918 Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 10:57:04 +0800 Subject: [PATCH 08/18] Use prepare branch --- Cargo.lock | 866 ++++++++++++++++++++++++++++------------------------- Cargo.toml | 22 +- 2 files changed, 472 insertions(+), 416 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3f7659bd..1c2b48f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,7 +15,7 @@ dependencies = [ [[package]] name = "account" version = "0.1.1" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.37#3e272b5e0fad227e09880cd5a7c1c709a69f0a92" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.38#81caf339d816df9fab32bd2d7fd71a9d9b6b650f" dependencies = [ "blake2-rfc", "hex", @@ -508,7 +508,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -542,7 +542,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "beefy-gadget", "futures", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "sp-api", "sp-beefy", @@ -738,7 +738,7 @@ dependencies = [ [[package]] name = "bp-darwinia-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "account", "bp-messages", @@ -755,7 +755,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "bp-runtime", "finality-grandpa", @@ -772,7 +772,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "bp-runtime", "frame-support", @@ -785,7 +785,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "bitvec", "bp-runtime", @@ -802,7 +802,7 @@ dependencies = [ [[package]] name = "bp-parachains" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "bp-polkadot-core", "bp-runtime", @@ -815,7 +815,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "bp-messages", "bp-runtime", @@ -834,7 +834,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "frame-support", "frame-system", @@ -855,7 +855,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -870,7 +870,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "bp-header-chain", "bp-message-dispatch", @@ -1693,7 +1693,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "clap", "parity-scale-codec", @@ -1708,7 +1708,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1731,7 +1731,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1760,7 +1760,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "async-trait", "cumulus-client-pov-recovery", @@ -1783,7 +1783,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -1806,7 +1806,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", @@ -1829,7 +1829,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -1857,7 +1857,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "frame-support", "frame-system", @@ -1873,7 +1873,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1890,7 +1890,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -1913,12 +1913,13 @@ dependencies = [ "sp-std", "sp-trie", "sp-version", + "xcm", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1929,7 +1930,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "frame-benchmarking", "frame-support", @@ -1943,7 +1944,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1959,7 +1960,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -1967,8 +1968,10 @@ dependencies = [ "frame-system", "log", "parity-scale-codec", + "polkadot-runtime-common", "rand_chacha 0.3.1", "scale-info", + "sp-io", "sp-runtime", "sp-std", "xcm", @@ -1978,7 +1981,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -1988,12 +1991,13 @@ dependencies = [ "sp-runtime", "sp-std", "sp-trie", + "xcm", ] [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2016,7 +2020,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "cumulus-primitives-core", "futures", @@ -2029,12 +2033,14 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "cumulus-primitives-core", "frame-support", "log", "parity-scale-codec", + "polkadot-runtime-common", + "sp-io", "sp-runtime", "sp-std", "xcm", @@ -2045,7 +2051,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2070,7 +2076,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2090,7 +2096,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-minimal-node" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "array-bytes 6.0.0", "async-trait", @@ -2098,7 +2104,7 @@ dependencies = [ "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "futures", - "lru", + "lru 0.9.0", "polkadot-core-primitives", "polkadot-network-bridge", "polkadot-node-network-protocol", @@ -2130,7 +2136,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2138,7 +2144,7 @@ dependencies = [ "futures", "futures-timer", "jsonrpsee", - "lru", + "lru 0.9.0", "parity-scale-codec", "polkadot-service", "sc-client-api", @@ -2159,7 +2165,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -3470,7 +3476,7 @@ dependencies = [ [[package]] name = "fc-cli" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "clap", "ethereum-types 0.14.1", @@ -3488,7 +3494,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "async-trait", "fc-db", @@ -3507,7 +3513,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "fp-storage", "kvdb-rocksdb", @@ -3526,7 +3532,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "fc-db", "fp-consensus", @@ -3543,7 +3549,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3558,7 +3564,7 @@ dependencies = [ "jsonrpsee", "libsecp256k1", "log", - "lru", + "lru 0.8.1", "parity-scale-codec", "prometheus", "rand 0.8.5", @@ -3585,7 +3591,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3732,7 +3738,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", ] @@ -3749,7 +3755,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "ethereum", "parity-scale-codec", @@ -3761,7 +3767,7 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3775,21 +3781,20 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "evm", "frame-support", "parity-scale-codec", "serde", "sp-core", - "sp-runtime", "sp-std", ] [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3805,7 +3810,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "frame-support", "parity-scale-codec", @@ -3817,7 +3822,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "parity-scale-codec", "serde", @@ -3832,7 +3837,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "frame-support-procedural", @@ -3857,7 +3862,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "Inflector", "array-bytes 4.2.0", @@ -3904,7 +3909,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3915,7 +3920,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3932,7 +3937,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "frame-system", @@ -3961,7 +3966,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "futures", "log", @@ -3977,7 +3982,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "bitflags", "frame-metadata", @@ -4009,7 +4014,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "Inflector", "cfg-expr", @@ -4024,7 +4029,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -4036,7 +4041,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "proc-macro2", "quote", @@ -4046,7 +4051,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "log", @@ -4064,7 +4069,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -4079,7 +4084,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "sp-api", @@ -4088,7 +4093,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "parity-scale-codec", @@ -4430,6 +4435,9 @@ name = "hashbrown" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", +] [[package]] name = "heck" @@ -5075,8 +5083,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "bitvec", "frame-benchmarking", @@ -5172,8 +5180,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "frame-support", "polkadot-primitives", @@ -5354,7 +5362,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "lru", + "lru 0.8.1", "prost", "prost-build", "prost-codec", @@ -5814,6 +5822,15 @@ dependencies = [ "hashbrown 0.12.3", ] +[[package]] +name = "lru" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +dependencies = [ + "hashbrown 0.13.2", +] + [[package]] name = "lru-cache" version = "0.1.2" @@ -6028,7 +6045,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "futures", "log", @@ -6047,7 +6064,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "anyhow", "jsonrpsee", @@ -6307,6 +6324,20 @@ dependencies = [ "memoffset 0.6.5", ] +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", +] + [[package]] name = "nodrop" version = "0.1.14" @@ -6689,7 +6720,7 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.37#16b6c1149a15674d21c87244b7988a667e2c14d9" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.38#0a64a0b761f0a33e8953eccdac55dedb1e9ef580" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -6697,6 +6728,7 @@ dependencies = [ "orml-utilities", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -6706,7 +6738,7 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.37#16b6c1149a15674d21c87244b7988a667e2c14d9" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.38#0a64a0b761f0a33e8953eccdac55dedb1e9ef580" dependencies = [ "frame-support", "parity-scale-codec", @@ -6763,7 +6795,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -6778,7 +6810,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "frame-system", @@ -6794,7 +6826,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "frame-system", @@ -6810,14 +6842,13 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-authorship", "sp-runtime", "sp-std", ] @@ -6825,7 +6856,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -6849,7 +6880,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6869,7 +6900,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -6884,7 +6915,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "frame-system", @@ -6900,7 +6931,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "array-bytes 4.2.0", "beefy-merkle-tree", @@ -6923,7 +6954,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -6941,7 +6972,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -6957,7 +6988,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "bp-header-chain", "bp-runtime", @@ -6979,7 +7010,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "bitvec", "bp-message-dispatch", @@ -7000,7 +7031,7 @@ dependencies = [ [[package]] name = "pallet-bridge-parachains" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "bp-parachains", "bp-polkadot-core", @@ -7021,7 +7052,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7040,7 +7071,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7057,7 +7088,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "assert_matches", "frame-benchmarking", @@ -7074,7 +7105,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7092,7 +7123,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7115,7 +7146,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7128,7 +7159,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7146,7 +7177,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -7172,7 +7203,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "environmental", "evm", @@ -7196,7 +7227,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "fp-evm", ] @@ -7204,7 +7235,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "fp-evm", "sp-core", @@ -7214,7 +7245,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "fp-evm", "frame-support", @@ -7224,7 +7255,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "fp-evm", "num", @@ -7233,7 +7264,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.37#3aaad52672ea4977ad39cf315c022085c23ddfd4" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" dependencies = [ "fp-evm", "ripemd", @@ -7243,7 +7274,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7261,7 +7292,7 @@ dependencies = [ [[package]] name = "pallet-fee-market" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.37#1092b5c91cb64c508dc581bfa2e58f0801970d32" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" dependencies = [ "bp-messages", "bp-runtime", @@ -7280,7 +7311,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7303,7 +7334,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "enumflags2", "frame-benchmarking", @@ -7319,7 +7350,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7339,7 +7370,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7356,7 +7387,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7373,7 +7404,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7390,7 +7421,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7406,7 +7437,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7422,7 +7453,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "frame-system", @@ -7439,7 +7470,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7459,7 +7490,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "sp-api", @@ -7469,7 +7500,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "frame-system", @@ -7486,12 +7517,13 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", + "log", "pallet-babe", "pallet-balances", "pallet-grandpa", @@ -7509,7 +7541,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7526,7 +7558,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7541,7 +7573,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7559,7 +7591,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7574,7 +7606,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "assert_matches", "frame-benchmarking", @@ -7593,7 +7625,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7610,7 +7642,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "frame-system", @@ -7631,7 +7663,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7647,7 +7679,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "frame-system", @@ -7661,7 +7693,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7684,7 +7716,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7695,7 +7727,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "log", "sp-arithmetic", @@ -7704,7 +7736,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7721,7 +7753,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "frame-system", @@ -7735,7 +7767,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7753,7 +7785,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7772,7 +7804,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-support", "frame-system", @@ -7788,7 +7820,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -7804,7 +7836,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -7816,7 +7848,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7833,7 +7865,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7849,7 +7881,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7864,7 +7896,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-benchmarking", "frame-support", @@ -7878,9 +7910,10 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", "log", @@ -7888,6 +7921,7 @@ dependencies = [ "scale-info", "serde", "sp-core", + "sp-io", "sp-runtime", "sp-std", "xcm", @@ -7896,8 +7930,8 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "frame-benchmarking", "frame-support", @@ -7905,9 +7939,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", + "sp-io", "sp-runtime", "sp-std", "xcm", + "xcm-builder", "xcm-executor", ] @@ -8120,7 +8156,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/darwinia-network/cumulus?branch=remove-assertion-v0.9.37#3ea837814e9734c9831f652896a232807e88bed8" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.38#3275e271e8937c06dca44331e98f31ef020a71e6" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -8417,8 +8453,8 @@ checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" [[package]] name = "polkadot-approval-distribution" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "futures", "polkadot-node-metrics", @@ -8432,8 +8468,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "futures", "polkadot-node-network-protocol", @@ -8446,13 +8482,13 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "derive_more", "fatality", "futures", - "lru", + "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -8469,12 +8505,12 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "fatality", "futures", - "lru", + "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -8490,8 +8526,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "clap", "frame-benchmarking-cli", @@ -8505,6 +8541,7 @@ dependencies = [ "sc-cli", "sc-executor", "sc-service", + "sc-storage-monitor", "sc-sysinfo", "sc-tracing", "sp-core", @@ -8517,8 +8554,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "async-trait", "frame-benchmarking", @@ -8561,8 +8598,8 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "always-assert", "bitvec", @@ -8583,8 +8620,8 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "parity-scale-codec", "scale-info", @@ -8595,15 +8632,15 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "derive_more", "fatality", "futures", "futures-timer", "indexmap", - "lru", + "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -8620,8 +8657,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -8634,8 +8671,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "futures", "futures-timer", @@ -8654,8 +8691,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "always-assert", "async-trait", @@ -8678,8 +8715,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "futures", "parity-scale-codec", @@ -8696,15 +8733,15 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "bitvec", "derive_more", "futures", "futures-timer", "kvdb", - "lru", + "lru 0.9.0", "merlin", "parity-scale-codec", "polkadot-node-jaeger", @@ -8725,8 +8762,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "bitvec", "futures", @@ -8745,8 +8782,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "bitvec", "fatality", @@ -8764,8 +8801,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "futures", "polkadot-node-subsystem", @@ -8779,8 +8816,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "async-trait", "futures", @@ -8798,8 +8835,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "futures", "polkadot-node-metrics", @@ -8813,8 +8850,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "futures", "futures-timer", @@ -8830,13 +8867,13 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "fatality", "futures", "kvdb", - "lru", + "lru 0.9.0", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8849,8 +8886,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "async-trait", "futures", @@ -8866,8 +8903,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "bitvec", "fatality", @@ -8884,8 +8921,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "always-assert", "assert_matches", @@ -8916,8 +8953,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "futures", "polkadot-node-primitives", @@ -8932,11 +8969,11 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "futures", - "lru", + "lru 0.9.0", "polkadot-node-metrics", "polkadot-node-subsystem", "polkadot-node-subsystem-types", @@ -8947,8 +8984,8 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "lazy_static", "log", @@ -8965,8 +9002,8 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "bs58", "futures", @@ -8984,8 +9021,8 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "async-trait", "derive_more", @@ -9007,8 +9044,8 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "bounded-vec", "futures", @@ -9029,8 +9066,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -9039,8 +9076,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "async-trait", "derive_more", @@ -9062,8 +9099,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "async-trait", "derive_more", @@ -9072,7 +9109,7 @@ dependencies = [ "futures-channel", "itertools", "kvdb", - "lru", + "lru 0.9.0", "parity-db", "parity-scale-codec", "parking_lot 0.11.2", @@ -9095,13 +9132,13 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "async-trait", "futures", "futures-timer", - "lru", + "lru 0.9.0", "orchestra", "parking_lot 0.12.1", "polkadot-node-metrics", @@ -9118,8 +9155,8 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "derive_more", "frame-support", @@ -9134,8 +9171,8 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "env_logger 0.9.3", "kusama-runtime", @@ -9149,8 +9186,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "bitvec", "hex-literal", @@ -9175,8 +9212,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -9207,8 +9244,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "bitvec", "frame-benchmarking", @@ -9296,8 +9333,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "bitvec", "frame-benchmarking", @@ -9313,6 +9350,7 @@ dependencies = [ "pallet-balances", "pallet-beefy-mmr", "pallet-election-provider-multi-phase", + "pallet-fast-unstake", "pallet-session", "pallet-staking", "pallet-staking-reward-fn", @@ -9344,8 +9382,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "frame-support", "polkadot-primitives", @@ -9358,8 +9396,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "bs58", "parity-scale-codec", @@ -9370,8 +9408,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "bitflags", "bitvec", @@ -9413,11 +9451,12 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "async-trait", "beefy-gadget", + "frame-benchmarking-cli", "frame-support", "frame-system-rpc-runtime-api", "futures", @@ -9426,7 +9465,8 @@ dependencies = [ "kusama-runtime-constants", "kvdb", "kvdb-rocksdb", - "lru", + "log", + "lru 0.9.0", "mmr-gadget", "pallet-babe", "pallet-im-online", @@ -9521,8 +9561,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -9542,8 +9582,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -9613,10 +9653,11 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "precompile-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.37#3e272b5e0fad227e09880cd5a7c1c709a69f0a92" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.38#81caf339d816df9fab32bd2d7fd71a9d9b6b650f" dependencies = [ "affix", "derive_more", + "environmental", "evm", "fp-evm", "frame-support", @@ -9643,7 +9684,7 @@ dependencies = [ [[package]] name = "precompile-utils-macro" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.37#3e272b5e0fad227e09880cd5a7c1c709a69f0a92" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.38#81caf339d816df9fab32bd2d7fd71a9d9b6b650f" dependencies = [ "case", "num_enum", @@ -10376,8 +10417,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "beefy-merkle-tree", "frame-benchmarking", @@ -10462,8 +10503,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "frame-support", "polkadot-primitives", @@ -10506,7 +10547,7 @@ dependencies = [ "log", "netlink-packet-route", "netlink-proto", - "nix", + "nix 0.24.3", "thiserror", "tokio", ] @@ -10680,7 +10721,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "log", "sp-core", @@ -10691,7 +10732,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "futures", @@ -10718,7 +10759,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "futures", "futures-timer", @@ -10741,7 +10782,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -10757,7 +10798,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -10772,7 +10813,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10783,7 +10824,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "array-bytes 4.2.0", "chrono", @@ -10823,7 +10864,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "fnv", "futures", @@ -10849,7 +10890,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "hash-db", "kvdb", @@ -10875,7 +10916,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "futures", @@ -10900,7 +10941,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "futures", @@ -10929,7 +10970,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "fork-tree", @@ -10967,7 +11008,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "futures", "jsonrpsee", @@ -10989,7 +11030,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "fork-tree", "parity-scale-codec", @@ -11002,7 +11043,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "futures", @@ -11025,9 +11066,9 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ - "lru", + "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", @@ -11049,7 +11090,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -11062,7 +11103,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "log", "sc-allocator", @@ -11075,7 +11116,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "cfg-if", "libc", @@ -11092,9 +11133,9 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ - "ahash 0.7.6", + "ahash 0.8.3", "array-bytes 4.2.0", "async-trait", "dyn-clone", @@ -11132,7 +11173,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "finality-grandpa", "futures", @@ -11152,7 +11193,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "ansi_term", "futures", @@ -11167,7 +11208,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -11182,7 +11223,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -11196,7 +11237,7 @@ dependencies = [ "ip_network", "libp2p", "log", - "lru", + "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "pin-project", @@ -11224,7 +11265,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "cid", "futures", @@ -11243,7 +11284,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "bitflags", @@ -11269,14 +11310,14 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ - "ahash 0.7.6", + "ahash 0.8.3", "futures", "futures-timer", "libp2p", "log", - "lru", + "lru 0.8.1", "sc-network-common", "sc-peerset", "sp-runtime", @@ -11287,7 +11328,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "array-bytes 4.2.0", "futures", @@ -11308,7 +11349,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -11316,7 +11357,7 @@ dependencies = [ "futures", "libp2p", "log", - "lru", + "lru 0.8.1", "mockall", "parity-scale-codec", "prost", @@ -11340,7 +11381,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "array-bytes 4.2.0", "futures", @@ -11359,7 +11400,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "array-bytes 4.2.0", "bytes", @@ -11389,7 +11430,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "futures", "libp2p", @@ -11402,7 +11443,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -11411,7 +11452,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "futures", "jsonrpsee", @@ -11435,12 +11476,13 @@ dependencies = [ "sp-runtime", "sp-session", "sp-version", + "tokio", ] [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -11459,7 +11501,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "http", "jsonrpsee", @@ -11474,7 +11516,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "array-bytes 4.2.0", "futures", @@ -11500,7 +11542,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "directories", @@ -11531,6 +11573,7 @@ dependencies = [ "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", + "sc-storage-monitor", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -11565,7 +11608,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "log", "parity-scale-codec", @@ -11573,10 +11616,26 @@ dependencies = [ "sp-core", ] +[[package]] +name = "sc-storage-monitor" +version = "0.1.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +dependencies = [ + "clap", + "futures", + "log", + "nix 0.26.2", + "sc-client-db", + "sc-utils", + "sp-core", + "thiserror", + "tokio", +] + [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -11595,7 +11654,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "futures", "libc", @@ -11614,7 +11673,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "chrono", "futures", @@ -11633,7 +11692,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "ansi_term", "atty", @@ -11664,7 +11723,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11675,13 +11734,14 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "futures", "futures-timer", "linked-hash-map", "log", + "num-traits", "parity-scale-codec", "parking_lot 0.12.1", "sc-client-api", @@ -11701,7 +11761,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "futures", @@ -11715,7 +11775,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "backtrace", "futures", @@ -12119,8 +12179,8 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "slot-range-helper" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "enumn", "parity-scale-codec", @@ -12197,7 +12257,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "hash-db", "log", @@ -12215,7 +12275,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "blake2", "proc-macro-crate", @@ -12227,7 +12287,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "scale-info", @@ -12240,7 +12300,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "integer-sqrt", "num-traits", @@ -12254,7 +12314,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "scale-info", @@ -12264,22 +12324,10 @@ dependencies = [ "sp-std", ] -[[package]] -name = "sp-authorship" -version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" -dependencies = [ - "async-trait", - "parity-scale-codec", - "sp-inherents", - "sp-runtime", - "sp-std", -] - [[package]] name = "sp-beefy" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "scale-info", @@ -12296,7 +12344,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "sp-api", @@ -12308,11 +12356,11 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "futures", "log", - "lru", + "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "sp-api", @@ -12326,7 +12374,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "futures", @@ -12344,7 +12392,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "parity-scale-codec", @@ -12362,7 +12410,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "merlin", @@ -12385,7 +12433,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "scale-info", @@ -12397,7 +12445,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "scale-info", @@ -12410,7 +12458,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "array-bytes 4.2.0", "base58", @@ -12452,7 +12500,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "blake2", "byteorder", @@ -12466,7 +12514,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "proc-macro2", "quote", @@ -12477,7 +12525,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -12486,7 +12534,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "proc-macro2", "quote", @@ -12496,7 +12544,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "environmental", "parity-scale-codec", @@ -12507,7 +12555,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "finality-grandpa", "log", @@ -12525,7 +12573,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -12539,7 +12587,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "bytes", "ed25519", @@ -12564,7 +12612,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "lazy_static", "sp-core", @@ -12575,7 +12623,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "futures", @@ -12592,7 +12640,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "thiserror", "zstd", @@ -12601,7 +12649,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -12619,7 +12667,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "scale-info", @@ -12633,7 +12681,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "sp-api", "sp-core", @@ -12643,7 +12691,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "backtrace", "lazy_static", @@ -12653,7 +12701,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "rustc-hash", "serde", @@ -12663,7 +12711,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "either", "hash256-std-hasher", @@ -12685,7 +12733,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -12703,7 +12751,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "Inflector", "proc-macro-crate", @@ -12715,7 +12763,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "scale-info", @@ -12729,7 +12777,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "scale-info", @@ -12741,7 +12789,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "hash-db", "log", @@ -12761,12 +12809,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -12779,7 +12827,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "futures-timer", @@ -12794,7 +12842,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "sp-std", @@ -12806,7 +12854,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "sp-api", "sp-runtime", @@ -12815,7 +12863,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "log", @@ -12831,18 +12879,18 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ - "ahash 0.7.6", + "ahash 0.8.3", "hash-db", "hashbrown 0.12.3", "lazy_static", - "lru", "memory-db", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", "scale-info", + "schnellru", "sp-core", "sp-std", "thiserror", @@ -12854,7 +12902,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -12871,7 +12919,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -12882,7 +12930,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "impl-trait-for-tuples", "log", @@ -12895,7 +12943,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "parity-scale-codec", "scale-info", @@ -13092,7 +13140,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "platforms 2.0.0", ] @@ -13111,7 +13159,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -13130,7 +13178,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "hyper", "log", @@ -13142,7 +13190,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "async-trait", "jsonrpsee", @@ -13155,7 +13203,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "jsonrpsee", "log", @@ -13174,7 +13222,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "ansi_term", "build-helper", @@ -13671,8 +13719,8 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -13682,8 +13730,8 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "expander 0.0.6", "proc-macro-crate", @@ -13886,7 +13934,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.37#3f1259a3e4e896a39733564a77f24116ebc370cc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" dependencies = [ "clap", "frame-remote-externalities", @@ -14235,9 +14283,9 @@ dependencies = [ [[package]] name = "wasm-opt" -version = "0.110.2" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68e8037b4daf711393f4be2056246d12d975651b14d581520ad5d1f19219cec" +checksum = "84a303793cbc01fb96551badfc7367db6007396bba6bac97936b3c8b6f7fdb41" dependencies = [ "anyhow", "libc", @@ -14251,9 +14299,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.110.2" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91adbad477e97bba3fbd21dd7bfb594e7ad5ceb9169ab1c93ab9cb0ada636b6f" +checksum = "d9c9deb56f8a9f2ec177b3bd642a8205621835944ed5da55f2388ef216aca5a4" dependencies = [ "anyhow", "cxx", @@ -14263,9 +14311,9 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.110.2" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4fa5a322a4e6ac22fd141f498d56afbdbf9df5debeac32380d2dcaa3e06941" +checksum = "4432e28b542738a9776cedf92e8a99d8991c7b4667ee2c7ccddfb479dd2856a7" dependencies = [ "anyhow", "cc", @@ -14758,7 +14806,7 @@ dependencies = [ "lazy_static", "libc", "log", - "nix", + "nix 0.24.3", "rand 0.8.5", "thiserror", "tokio", @@ -14776,8 +14824,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "bitvec", "frame-benchmarking", @@ -14821,6 +14869,7 @@ dependencies = [ "pallet-society", "pallet-staking", "pallet-staking-reward-curve", + "pallet-state-trie-migration", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", @@ -14866,8 +14915,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "frame-support", "polkadot-primitives", @@ -15172,25 +15221,28 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "derivative", "impl-trait-for-tuples", "log", "parity-scale-codec", "scale-info", - "sp-runtime", + "serde", + "sp-core", + "sp-weights", "xcm-procedural", ] [[package]] name = "xcm-builder" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "frame-support", "frame-system", + "impl-trait-for-tuples", "log", "pallet-transaction-payment", "parity-scale-codec", @@ -15206,9 +15258,10 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ + "environmental", "frame-benchmarking", "frame-support", "impl-trait-for-tuples", @@ -15219,19 +15272,22 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-weights", "xcm", ] [[package]] name = "xcm-primitives" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.37#3e272b5e0fad227e09880cd5a7c1c709a69f0a92" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.38#81caf339d816df9fab32bd2d7fd71a9d9b6b650f" dependencies = [ + "cumulus-primitives-core", "ethereum", "ethereum-types 0.14.1", "frame-support", "frame-system", "hex", + "impl-trait-for-tuples", "log", "orml-traits", "parity-scale-codec", @@ -15248,8 +15304,8 @@ dependencies = [ [[package]] name = "xcm-procedural" -version = "0.9.37" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#72309a2b2e68413305a56dce1097041309bd29c6" dependencies = [ "Inflector", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 8f3d7b15..7a51e471 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,17 +69,17 @@ pangolin-runtime = { path = "runtime/pangolin" } pangoro-runtime = { path = "runtime/pangoro" } # darwinia-messages-substrate -bp-darwinia-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } -pallet-bridge-parachains = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +bp-darwinia-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } +pallet-bridge-parachains = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } # frontier fc-cli = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } From 5acfb7e8c71d1e8f29d9b181aa09e1d9ae85da4d Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 10:57:49 +0800 Subject: [PATCH 09/18] Companion for paritytech/substrate#13216 --- pallet/staking/src/lib.rs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pallet/staking/src/lib.rs b/pallet/staking/src/lib.rs index d38d9d86..7a209c99 100644 --- a/pallet/staking/src/lib.rs +++ b/pallet/staking/src/lib.rs @@ -979,14 +979,6 @@ where fn note_author(author: T::AccountId) { Self::reward_by_ids(&[(author, 20)]) } - - fn note_uncle(uncle_author: T::AccountId, _age: T::BlockNumber) { - if let Some(block_author) = >::author() { - Self::reward_by_ids(&[(block_author, 2), (uncle_author, 1)]) - } else { - log::error!("[pallet::staking] block author not set, this should never happen; qed"); - } - } } // Play the role of the session manager. From 7c67b908a09f8952ab0ce998d3327ba4a828508b Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 10:59:08 +0800 Subject: [PATCH 10/18] Companion for darwinia-messages-substrate#254 --- runtime/crab/src/bridges_message/darwinia.rs | 1 - runtime/darwinia/src/bridges_message/crab.rs | 1 - runtime/pangolin/src/bridges_message/pangoro.rs | 1 - runtime/pangoro/src/bridges_message/pangolin.rs | 1 - 4 files changed, 4 deletions(-) diff --git a/runtime/crab/src/bridges_message/darwinia.rs b/runtime/crab/src/bridges_message/darwinia.rs index f6cfcb87..1eadb2b1 100644 --- a/runtime/crab/src/bridges_message/darwinia.rs +++ b/runtime/crab/src/bridges_message/darwinia.rs @@ -96,7 +96,6 @@ impl MessageBridge for WithDarwiniaMessageBridge { const BRIDGED_CHAIN_ID: bp_runtime::ChainId = DARWINIA_CHAIN_ID; const BRIDGED_MESSAGES_PALLET_NAME: &'static str = bridge_runtime_common::pallets::WITH_CRAB_MESSAGES_PALLET_NAME; - const RELAYER_FEE_PERCENT: u32 = 10; const THIS_CHAIN_ID: bp_runtime::ChainId = CRAB_CHAIN_ID; } diff --git a/runtime/darwinia/src/bridges_message/crab.rs b/runtime/darwinia/src/bridges_message/crab.rs index 174adaf1..de21782c 100644 --- a/runtime/darwinia/src/bridges_message/crab.rs +++ b/runtime/darwinia/src/bridges_message/crab.rs @@ -92,7 +92,6 @@ impl MessageBridge for WithCrabMessageBridge { const BRIDGED_CHAIN_ID: bp_runtime::ChainId = CRAB_CHAIN_ID; const BRIDGED_MESSAGES_PALLET_NAME: &'static str = bridge_runtime_common::pallets::WITH_DARWINIA_MESSAGES_PALLET_NAME; - const RELAYER_FEE_PERCENT: u32 = 10; const THIS_CHAIN_ID: bp_runtime::ChainId = DARWINIA_CHAIN_ID; } diff --git a/runtime/pangolin/src/bridges_message/pangoro.rs b/runtime/pangolin/src/bridges_message/pangoro.rs index bb96b0a4..3cb0d202 100644 --- a/runtime/pangolin/src/bridges_message/pangoro.rs +++ b/runtime/pangolin/src/bridges_message/pangoro.rs @@ -96,7 +96,6 @@ impl MessageBridge for WithPangoroMessageBridge { const BRIDGED_CHAIN_ID: bp_runtime::ChainId = PANGORO_CHAIN_ID; const BRIDGED_MESSAGES_PALLET_NAME: &'static str = bridge_runtime_common::pallets::WITH_PANGOLIN_MESSAGES_PALLET_NAME; - const RELAYER_FEE_PERCENT: u32 = 10; const THIS_CHAIN_ID: bp_runtime::ChainId = PANGOLIN_CHAIN_ID; } diff --git a/runtime/pangoro/src/bridges_message/pangolin.rs b/runtime/pangoro/src/bridges_message/pangolin.rs index 12f5cf2e..0ee735f3 100644 --- a/runtime/pangoro/src/bridges_message/pangolin.rs +++ b/runtime/pangoro/src/bridges_message/pangolin.rs @@ -96,7 +96,6 @@ impl MessageBridge for WithPangolinMessageBridge { const BRIDGED_CHAIN_ID: bp_runtime::ChainId = PANGOLIN_CHAIN_ID; const BRIDGED_MESSAGES_PALLET_NAME: &'static str = bridge_runtime_common::pallets::WITH_PANGORO_MESSAGES_PALLET_NAME; - const RELAYER_FEE_PERCENT: u32 = 10; const THIS_CHAIN_ID: bp_runtime::ChainId = PANGORO_CHAIN_ID; } From 412a7ebd3254e37db3d4042b4dc8475ecb6e0a6f Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 13:37:03 +0800 Subject: [PATCH 11/18] Companion for paritytech/polkadot#4097 --- Cargo.lock | 8 ++++---- runtime/common/src/xcm_configs.rs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c2b48f3..c259a423 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,7 +15,7 @@ dependencies = [ [[package]] name = "account" version = "0.1.1" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.38#81caf339d816df9fab32bd2d7fd71a9d9b6b650f" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.38#6b21c49d9c3def2b0cd799f67c1feb136831e749" dependencies = [ "blake2-rfc", "hex", @@ -9653,7 +9653,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "precompile-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.38#81caf339d816df9fab32bd2d7fd71a9d9b6b650f" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.38#6b21c49d9c3def2b0cd799f67c1feb136831e749" dependencies = [ "affix", "derive_more", @@ -9684,7 +9684,7 @@ dependencies = [ [[package]] name = "precompile-utils-macro" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.38#81caf339d816df9fab32bd2d7fd71a9d9b6b650f" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.38#6b21c49d9c3def2b0cd799f67c1feb136831e749" dependencies = [ "case", "num_enum", @@ -15279,7 +15279,7 @@ dependencies = [ [[package]] name = "xcm-primitives" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.38#81caf339d816df9fab32bd2d7fd71a9d9b6b650f" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.38#6b21c49d9c3def2b0cd799f67c1feb136831e749" dependencies = [ "cumulus-primitives-core", "ethereum", diff --git a/runtime/common/src/xcm_configs.rs b/runtime/common/src/xcm_configs.rs index 436c1dc2..3bbba264 100644 --- a/runtime/common/src/xcm_configs.rs +++ b/runtime/common/src/xcm_configs.rs @@ -147,7 +147,7 @@ pub struct LocalAssetTrader< OnUnbalanced: OnUnbalancedT, R: TakeRevenue, >( - XcmWeight, + Weight, Currency::Balance, PhantomData<(WeightToFee, AssetId, AccountId, Currency, OnUnbalanced, R)>, ); @@ -161,12 +161,12 @@ impl< > WeightTrader for LocalAssetTrader { fn new() -> Self { - Self(0, Zero::zero(), PhantomData) + Self(Weight::zero(), Zero::zero(), PhantomData) } fn buy_weight(&mut self, weight: XcmWeight, payment: Assets) -> Result { log::trace!(target: "xcm::weight", "LocalAssetTrader::buy_weight weight: {:?}, payment: {:?}", weight, payment); - let amount = WeightToFee::weight_to_fee(&Weight::from_ref_time(weight)); + let amount = WeightToFee::weight_to_fee(&weight); let u128_amount: u128 = amount.try_into().map_err(|_| XcmError::Overflow)?; let required: MultiAsset = (Concrete(AssetId::get()), u128_amount).into(); let unused = payment.checked_sub(required.clone()).map_err(|_| XcmError::TooExpensive)?; @@ -179,7 +179,7 @@ impl< fn refund_weight(&mut self, weight: XcmWeight) -> Option { log::trace!(target: "xcm::weight", "LocalAssetTrader::refund_weight weight: {:?}", weight); let weight = weight.min(self.0); - let amount = WeightToFee::weight_to_fee(&Weight::from_ref_time(weight)); + let amount = WeightToFee::weight_to_fee(&weight); self.0 -= weight; self.1 = self.1.saturating_sub(amount); let amount: u128 = amount.saturated_into(); From 8c6a3fd583bcaa5c73fe9bcab503bbdb5da471f6 Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 13:40:53 +0800 Subject: [PATCH 12/18] Part companion for paritytech/cumulus#2067 --- runtime/crab/src/pallets/system.rs | 2 +- runtime/darwinia/src/pallets/system.rs | 2 +- runtime/pangolin/src/pallets/system.rs | 2 +- runtime/pangoro/src/pallets/system.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/crab/src/pallets/system.rs b/runtime/crab/src/pallets/system.rs index 1668a491..a62436af 100644 --- a/runtime/crab/src/pallets/system.rs +++ b/runtime/crab/src/pallets/system.rs @@ -32,7 +32,7 @@ pub const WEIGHT_MILLISECS_PER_BLOCK: u64 = 500; pub const MAXIMUM_BLOCK_WEIGHT: frame_support::weights::Weight = frame_support::weights::Weight::from_parts( frame_support::weights::constants::WEIGHT_REF_TIME_PER_MILLIS * WEIGHT_MILLISECS_PER_BLOCK, - cumulus_primitives_core::relay_chain::v2::MAX_POV_SIZE as u64, + cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64, ); frame_support::parameter_types! { diff --git a/runtime/darwinia/src/pallets/system.rs b/runtime/darwinia/src/pallets/system.rs index 2b08d538..d8ea1c4b 100644 --- a/runtime/darwinia/src/pallets/system.rs +++ b/runtime/darwinia/src/pallets/system.rs @@ -32,7 +32,7 @@ pub const WEIGHT_MILLISECS_PER_BLOCK: u64 = 500; pub const MAXIMUM_BLOCK_WEIGHT: frame_support::weights::Weight = frame_support::weights::Weight::from_parts( frame_support::weights::constants::WEIGHT_REF_TIME_PER_MILLIS * WEIGHT_MILLISECS_PER_BLOCK, - cumulus_primitives_core::relay_chain::v2::MAX_POV_SIZE as u64, + cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64, ); frame_support::parameter_types! { diff --git a/runtime/pangolin/src/pallets/system.rs b/runtime/pangolin/src/pallets/system.rs index 1668a491..a62436af 100644 --- a/runtime/pangolin/src/pallets/system.rs +++ b/runtime/pangolin/src/pallets/system.rs @@ -32,7 +32,7 @@ pub const WEIGHT_MILLISECS_PER_BLOCK: u64 = 500; pub const MAXIMUM_BLOCK_WEIGHT: frame_support::weights::Weight = frame_support::weights::Weight::from_parts( frame_support::weights::constants::WEIGHT_REF_TIME_PER_MILLIS * WEIGHT_MILLISECS_PER_BLOCK, - cumulus_primitives_core::relay_chain::v2::MAX_POV_SIZE as u64, + cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64, ); frame_support::parameter_types! { diff --git a/runtime/pangoro/src/pallets/system.rs b/runtime/pangoro/src/pallets/system.rs index 2b08d538..d8ea1c4b 100644 --- a/runtime/pangoro/src/pallets/system.rs +++ b/runtime/pangoro/src/pallets/system.rs @@ -32,7 +32,7 @@ pub const WEIGHT_MILLISECS_PER_BLOCK: u64 = 500; pub const MAXIMUM_BLOCK_WEIGHT: frame_support::weights::Weight = frame_support::weights::Weight::from_parts( frame_support::weights::constants::WEIGHT_REF_TIME_PER_MILLIS * WEIGHT_MILLISECS_PER_BLOCK, - cumulus_primitives_core::relay_chain::v2::MAX_POV_SIZE as u64, + cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64, ); frame_support::parameter_types! { From 25a7b33a13e2773be25a9d18f14b384a51adfb09 Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 13:47:14 +0800 Subject: [PATCH 13/18] Correct companion for cumulus#2073 --- runtime/crab/src/lib.rs | 20 ++++++++++++-------- runtime/darwinia/src/lib.rs | 20 ++++++++++++-------- runtime/pangolin/src/lib.rs | 20 ++++++++++++-------- runtime/pangoro/src/lib.rs | 20 ++++++++++++-------- 4 files changed, 48 insertions(+), 32 deletions(-) diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs index 012a6a14..50288099 100644 --- a/runtime/crab/src/lib.rs +++ b/runtime/crab/src/lib.rs @@ -215,14 +215,6 @@ sp_api::impl_runtime_apis! { fn authorities() -> Vec { Aura::authorities().into_inner() } - - fn query_weight_to_fee(weight: Weight) -> Balance { - TransactionPayment::weight_to_fee(weight) - } - - fn query_length_to_fee(length: u32) -> Balance { - TransactionPayment::length_to_fee(length) - } } impl sp_api::Core for Runtime { @@ -313,6 +305,12 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_fee_details(uxt, len) } + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi @@ -330,6 +328,12 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_call_fee_details(call, len) } + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } impl cumulus_primitives_core::CollectCollationInfo for Runtime { diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs index f870fc23..74af4205 100644 --- a/runtime/darwinia/src/lib.rs +++ b/runtime/darwinia/src/lib.rs @@ -215,14 +215,6 @@ sp_api::impl_runtime_apis! { fn authorities() -> Vec { Aura::authorities().into_inner() } - - fn query_weight_to_fee(weight: Weight) -> Balance { - TransactionPayment::weight_to_fee(weight) - } - - fn query_length_to_fee(length: u32) -> Balance { - TransactionPayment::length_to_fee(length) - } } impl sp_api::Core for Runtime { @@ -313,6 +305,12 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_fee_details(uxt, len) } + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi @@ -330,6 +328,12 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_call_fee_details(call, len) } + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } impl cumulus_primitives_core::CollectCollationInfo for Runtime { diff --git a/runtime/pangolin/src/lib.rs b/runtime/pangolin/src/lib.rs index 90b87af8..7bbbb574 100644 --- a/runtime/pangolin/src/lib.rs +++ b/runtime/pangolin/src/lib.rs @@ -217,14 +217,6 @@ sp_api::impl_runtime_apis! { fn authorities() -> Vec { Aura::authorities().into_inner() } - - fn query_weight_to_fee(weight: Weight) -> Balance { - TransactionPayment::weight_to_fee(weight) - } - - fn query_length_to_fee(length: u32) -> Balance { - TransactionPayment::length_to_fee(length) - } } impl sp_api::Core for Runtime { @@ -315,6 +307,12 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_fee_details(uxt, len) } + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi @@ -332,6 +330,12 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_call_fee_details(call, len) } + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } impl cumulus_primitives_core::CollectCollationInfo for Runtime { diff --git a/runtime/pangoro/src/lib.rs b/runtime/pangoro/src/lib.rs index 3693be58..e4c124f0 100644 --- a/runtime/pangoro/src/lib.rs +++ b/runtime/pangoro/src/lib.rs @@ -217,14 +217,6 @@ sp_api::impl_runtime_apis! { fn authorities() -> Vec { Aura::authorities().into_inner() } - - fn query_weight_to_fee(weight: Weight) -> Balance { - TransactionPayment::weight_to_fee(weight) - } - - fn query_length_to_fee(length: u32) -> Balance { - TransactionPayment::length_to_fee(length) - } } impl sp_api::Core for Runtime { @@ -315,6 +307,12 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_fee_details(uxt, len) } + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi @@ -332,6 +330,12 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_call_fee_details(call, len) } + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } impl cumulus_primitives_core::CollectCollationInfo for Runtime { From fe23fd227c2179aa5c30a7462c806189117d0f64 Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 14:44:09 +0800 Subject: [PATCH 14/18] Fix xcm compilation --- Cargo.lock | 39 ++++++++++---------- runtime/crab/src/lib.rs | 4 +- runtime/crab/src/pallets/polkadot_xcm.rs | 26 +++++++------ runtime/darwinia/src/lib.rs | 2 +- runtime/darwinia/src/pallets/polkadot_xcm.rs | 26 +++++++------ runtime/pangolin/src/lib.rs | 4 +- runtime/pangolin/src/pallets/polkadot_xcm.rs | 26 +++++++------ runtime/pangoro/src/lib.rs | 4 +- runtime/pangoro/src/pallets/polkadot_xcm.rs | 26 +++++++------ 9 files changed, 83 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c259a423..ac078f8d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3476,7 +3476,7 @@ dependencies = [ [[package]] name = "fc-cli" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "clap", "ethereum-types 0.14.1", @@ -3494,7 +3494,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "async-trait", "fc-db", @@ -3513,7 +3513,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "fp-storage", "kvdb-rocksdb", @@ -3532,7 +3532,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "fc-db", "fp-consensus", @@ -3549,7 +3549,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3591,7 +3591,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3755,7 +3755,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "ethereum", "parity-scale-codec", @@ -3767,7 +3767,7 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3781,20 +3781,21 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "evm", "frame-support", "parity-scale-codec", "serde", "sp-core", + "sp-runtime", "sp-std", ] [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3810,7 +3811,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "frame-support", "parity-scale-codec", @@ -3822,7 +3823,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "parity-scale-codec", "serde", @@ -7177,7 +7178,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -7203,7 +7204,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "environmental", "evm", @@ -7227,7 +7228,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "fp-evm", ] @@ -7235,7 +7236,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "fp-evm", "sp-core", @@ -7245,7 +7246,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "fp-evm", "frame-support", @@ -7255,7 +7256,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "fp-evm", "num", @@ -7264,7 +7265,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#7e9c5e5e52cede605cae20cf6b2f02b6cf73043a" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" dependencies = [ "fp-evm", "ripemd", diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs index 50288099..9fd732a7 100644 --- a/runtime/crab/src/lib.rs +++ b/runtime/crab/src/lib.rs @@ -305,7 +305,7 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_fee_details(uxt, len) } - fn query_weight_to_fee(weight: Weight) -> Balance { + fn query_weight_to_fee(weight: frame_support::weights::Weight) -> Balance { TransactionPayment::weight_to_fee(weight) } fn query_length_to_fee(length: u32) -> Balance { @@ -328,7 +328,7 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_call_fee_details(call, len) } - fn query_weight_to_fee(weight: Weight) -> Balance { + fn query_weight_to_fee(weight: frame_support::weights::Weight) -> Balance { TransactionPayment::weight_to_fee(weight) } fn query_length_to_fee(length: u32) -> Balance { diff --git a/runtime/crab/src/pallets/polkadot_xcm.rs b/runtime/crab/src/pallets/polkadot_xcm.rs index b3ed0165..110e976f 100644 --- a/runtime/crab/src/pallets/polkadot_xcm.rs +++ b/runtime/crab/src/pallets/polkadot_xcm.rs @@ -18,6 +18,8 @@ // darwinia use crate::*; +// polkadot +use xcm::latest::prelude::*; // substrate use frame_support::traits::Currency; @@ -36,7 +38,7 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter< >; frame_support::parameter_types! { - pub const RelayNetwork: Option = Some(xcm::latest::NetworkId::Kusama); + pub const RelayNetwork: NetworkId = NetworkId::Kusama; pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used @@ -77,7 +79,7 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< darwinia_common_runtime::xcm_configs::DenyReserveTransferToRelayChain, ( xcm_builder::TakeWeightCredit, - WithComputedOrigin< + xcm_builder::WithComputedOrigin< ( xcm_builder::AllowTopLevelPaidExecutionFrom, // Parent and its exec plurality get free execution @@ -100,21 +102,21 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< frame_support::parameter_types! { pub const MaxAssetsIntoHolding: u32 = 64; pub const MaxInstructions: u32 = 100; - pub AnchoringSelfReserve: xcm::latest::prelude::MultiLocation = xcm::latest::prelude::MultiLocation::new( + pub AnchoringSelfReserve: MultiLocation = MultiLocation::new( 0, - xcm::latest::prelude::X1(xcm::latest::prelude::PalletInstance(::index() as u8)) + X1(PalletInstance(::index() as u8)) ); - pub UniversalLocation: xcm::latest::prelude::InteriorMultiLocation = xcm::latest::prelude::Parachain(ParachainInfo::parachain_id().into()).into(); + pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); // One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate. - pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024); + pub UnitWeightCost: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 64 * 1024); } pub struct ToTreasury; impl xcm_builder::TakeRevenue for ToTreasury { - fn take_revenue(revenue: xcm::latest::prelude::MultiAsset) { - if let xcm::latest::prelude::MultiAsset { - id: xcm::latest::prelude::Concrete(_location), - fun: xcm::latest::prelude::Fungible(amount), + fn take_revenue(revenue: MultiAsset) { + if let MultiAsset { + id: Concrete(_location), + fun: Fungible(amount), } = revenue { let treasury_account = Treasury::account_id(); @@ -147,7 +149,7 @@ impl xcm_executor::Config for XcmExecutorConfig { type PalletInstancesInfo = AllPalletsWithSystem; type ResponseHandler = PolkadotXcm; type RuntimeCall = RuntimeCall; - type SafeCallFilter = Everything; + type SafeCallFilter = frame_support::traits::Everything; type SubscriptionService = PolkadotXcm; type Trader = xcm_configs::LocalAssetTrader< frame_support::weights::ConstantMultiplier< @@ -160,7 +162,7 @@ impl xcm_executor::Config for XcmExecutorConfig { DealWithFees, ToTreasury, >; - type UniversalAliases = Nothing; + type UniversalAliases = frame_support::traits::Nothing; // Teleporting is disabled. type UniversalLocation = UniversalLocation; type Weigher = xcm_builder::FixedWeightBounds; diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs index 74af4205..70f99fcf 100644 --- a/runtime/darwinia/src/lib.rs +++ b/runtime/darwinia/src/lib.rs @@ -305,7 +305,7 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_fee_details(uxt, len) } - fn query_weight_to_fee(weight: Weight) -> Balance { + fn query_weight_to_fee(weight: frame_support::weights::Weight) -> Balance { TransactionPayment::weight_to_fee(weight) } fn query_length_to_fee(length: u32) -> Balance { diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs index 98cb926c..b49f2801 100644 --- a/runtime/darwinia/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia/src/pallets/polkadot_xcm.rs @@ -18,6 +18,8 @@ // darwinia use crate::*; +// polkadot +use use xcm::latest::prelude::*; // substrate use frame_support::traits::Currency; @@ -36,7 +38,7 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter< >; frame_support::parameter_types! { - pub const RelayNetwork: Option = Some(xcm::latest::NetworkId::Polkadot); + pub const RelayNetwork: NetworkId = NetworkId::Polkadot; pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used @@ -77,7 +79,7 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< darwinia_common_runtime::xcm_configs::DenyReserveTransferToRelayChain, ( xcm_builder::TakeWeightCredit, - WithComputedOrigin< + xcm_builder::WithComputedOrigin< ( xcm_builder::AllowTopLevelPaidExecutionFrom, // Parent and its exec plurality get free execution @@ -102,21 +104,21 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< frame_support::parameter_types! { pub const MaxAssetsIntoHolding: u32 = 64; pub const MaxInstructions: u32 = 100; - pub AnchoringSelfReserve: xcm::latest::prelude::MultiLocation = xcm::latest::prelude::MultiLocation::new( + pub AnchoringSelfReserve: MultiLocation = MultiLocation::new( 0, - xcm::latest::prelude::X1(xcm::latest::prelude::PalletInstance(::index() as u8)) + X1(PalletInstance(::index() as u8)) ); - pub UniversalLocation: xcm::latest::prelude::InteriorMultiLocation = xcm::latest::prelude::Parachain(ParachainInfo::parachain_id().into()).into(); + pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); // One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate. - pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024); + pub UnitWeightCost: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 64 * 1024); } pub struct ToTreasury; impl xcm_builder::TakeRevenue for ToTreasury { - fn take_revenue(revenue: xcm::latest::prelude::MultiAsset) { - if let xcm::latest::prelude::MultiAsset { - id: xcm::latest::prelude::Concrete(_location), - fun: xcm::latest::prelude::Fungible(amount), + fn take_revenue(revenue: MultiAsset) { + if let MultiAsset { + id: Concrete(_location), + fun: Fungible(amount), } = revenue { let treasury_account = Treasury::account_id(); @@ -164,9 +166,9 @@ impl xcm_executor::Config for XcmExecutorConfig { type AssetExchanger = (); type FeeManager = (); type MessageExporter = (); - type UniversalAliases = Nothing; + type UniversalAliases = frame_support::traits::Nothing; type CallDispatcher = RuntimeCall; - type SafeCallFilter = Everything; + type SafeCallFilter = frame_support::traits::Everything; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. diff --git a/runtime/pangolin/src/lib.rs b/runtime/pangolin/src/lib.rs index 7bbbb574..8e77ccd6 100644 --- a/runtime/pangolin/src/lib.rs +++ b/runtime/pangolin/src/lib.rs @@ -307,7 +307,7 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_fee_details(uxt, len) } - fn query_weight_to_fee(weight: Weight) -> Balance { + fn query_weight_to_fee(weight: frame_support::weights::Weight) -> Balance { TransactionPayment::weight_to_fee(weight) } fn query_length_to_fee(length: u32) -> Balance { @@ -330,7 +330,7 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_call_fee_details(call, len) } - fn query_weight_to_fee(weight: Weight) -> Balance { + fn query_weight_to_fee(weight: frame_support::weights::Weight) -> Balance { TransactionPayment::weight_to_fee(weight) } fn query_length_to_fee(length: u32) -> Balance { diff --git a/runtime/pangolin/src/pallets/polkadot_xcm.rs b/runtime/pangolin/src/pallets/polkadot_xcm.rs index 0bcc91f4..bc073a7a 100644 --- a/runtime/pangolin/src/pallets/polkadot_xcm.rs +++ b/runtime/pangolin/src/pallets/polkadot_xcm.rs @@ -18,6 +18,8 @@ // darwinia use crate::*; +// polkadot +use xcm::latest::prelude::*; // substrate use frame_support::traits::Currency; @@ -36,7 +38,7 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter< >; frame_support::parameter_types! { - pub const RelayNetwork: Option = None; + pub const RelayNetwork: NetworkId = NetworkId::Rococo; pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used @@ -77,7 +79,7 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< darwinia_common_runtime::xcm_configs::DenyReserveTransferToRelayChain, ( xcm_builder::TakeWeightCredit, - WithComputedOrigin< + xcm_builder::WithComputedOrigin< ( xcm_builder::AllowTopLevelPaidExecutionFrom, // Parent and its exec plurality get free execution @@ -102,21 +104,21 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< frame_support::parameter_types! { pub const MaxAssetsIntoHolding: u32 = 64; pub const MaxInstructions: u32 = 100; - pub AnchoringSelfReserve: xcm::latest::prelude::MultiLocation = xcm::latest::prelude::MultiLocation::new( + pub AnchoringSelfReserve: MultiLocation = MultiLocation::new( 0, - xcm::latest::prelude::X1(xcm::latest::prelude::PalletInstance(::index() as u8)) + X1(PalletInstance(::index() as u8)) ); - pub UniversalLocation: xcm::latest::prelude::InteriorMultiLocation = xcm::latest::prelude::Parachain(ParachainInfo::parachain_id().into()).into(); + pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); // One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate. - pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024); + pub UnitWeightCost: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 64 * 1024); } pub struct ToTreasury; impl xcm_builder::TakeRevenue for ToTreasury { - fn take_revenue(revenue: xcm::latest::prelude::MultiAsset) { - if let xcm::latest::prelude::MultiAsset { - id: xcm::latest::prelude::Concrete(_location), - fun: xcm::latest::prelude::Fungible(amount), + fn take_revenue(revenue: MultiAsset) { + if let MultiAsset { + id: Concrete(_location), + fun: Fungible(amount), } = revenue { let treasury_account = Treasury::account_id(); @@ -164,9 +166,9 @@ impl xcm_executor::Config for XcmExecutorConfig { type AssetExchanger = (); type FeeManager = (); type MessageExporter = (); - type UniversalAliases = Nothing; + type UniversalAliases = frame_support::traits::Nothing; type CallDispatcher = RuntimeCall; - type SafeCallFilter = Everything; + type SafeCallFilter = frame_support::traits::Everything; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. diff --git a/runtime/pangoro/src/lib.rs b/runtime/pangoro/src/lib.rs index e4c124f0..3bf5dea2 100644 --- a/runtime/pangoro/src/lib.rs +++ b/runtime/pangoro/src/lib.rs @@ -307,7 +307,7 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_fee_details(uxt, len) } - fn query_weight_to_fee(weight: Weight) -> Balance { + fn query_weight_to_fee(weight: frame_support::weights::Weight) -> Balance { TransactionPayment::weight_to_fee(weight) } fn query_length_to_fee(length: u32) -> Balance { @@ -330,7 +330,7 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_call_fee_details(call, len) } - fn query_weight_to_fee(weight: Weight) -> Balance { + fn query_weight_to_fee(weight: frame_support::weights::Weight) -> Balance { TransactionPayment::weight_to_fee(weight) } fn query_length_to_fee(length: u32) -> Balance { diff --git a/runtime/pangoro/src/pallets/polkadot_xcm.rs b/runtime/pangoro/src/pallets/polkadot_xcm.rs index 0bcc91f4..e3c9969a 100644 --- a/runtime/pangoro/src/pallets/polkadot_xcm.rs +++ b/runtime/pangoro/src/pallets/polkadot_xcm.rs @@ -18,6 +18,8 @@ // darwinia use crate::*; +// polkadot +use xcm::latest::prelude::*; // substrate use frame_support::traits::Currency; @@ -36,7 +38,7 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter< >; frame_support::parameter_types! { - pub const RelayNetwork: Option = None; + pub const RelayNetwork: NetworkId = NetworkId::Westend; pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used @@ -77,7 +79,7 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< darwinia_common_runtime::xcm_configs::DenyReserveTransferToRelayChain, ( xcm_builder::TakeWeightCredit, - WithComputedOrigin< + xcm_builder::WithComputedOrigin< ( xcm_builder::AllowTopLevelPaidExecutionFrom, // Parent and its exec plurality get free execution @@ -102,21 +104,21 @@ pub type Barrier = darwinia_common_runtime::xcm_configs::DenyThenTry< frame_support::parameter_types! { pub const MaxAssetsIntoHolding: u32 = 64; pub const MaxInstructions: u32 = 100; - pub AnchoringSelfReserve: xcm::latest::prelude::MultiLocation = xcm::latest::prelude::MultiLocation::new( + pub AnchoringSelfReserve: MultiLocation = MultiLocation::new( 0, - xcm::latest::prelude::X1(xcm::latest::prelude::PalletInstance(::index() as u8)) + X1(PalletInstance(::index() as u8)) ); - pub UniversalLocation: xcm::latest::prelude::InteriorMultiLocation = xcm::latest::prelude::Parachain(ParachainInfo::parachain_id().into()).into(); + pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); // One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate. - pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024); + pub UnitWeightCost: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 64 * 1024); } pub struct ToTreasury; impl xcm_builder::TakeRevenue for ToTreasury { - fn take_revenue(revenue: xcm::latest::prelude::MultiAsset) { - if let xcm::latest::prelude::MultiAsset { - id: xcm::latest::prelude::Concrete(_location), - fun: xcm::latest::prelude::Fungible(amount), + fn take_revenue(revenue: MultiAsset) { + if let MultiAsset { + id: Concrete(_location), + fun: Fungible(amount), } = revenue { let treasury_account = Treasury::account_id(); @@ -164,9 +166,9 @@ impl xcm_executor::Config for XcmExecutorConfig { type AssetExchanger = (); type FeeManager = (); type MessageExporter = (); - type UniversalAliases = Nothing; + type UniversalAliases = frame_support::traits::Nothing; type CallDispatcher = RuntimeCall; - type SafeCallFilter = Everything; + type SafeCallFilter = frame_support::traits::Everything; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. From d36bd4dbb0b9a98cd8264a1243e27907f878b6ed Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 15:33:39 +0800 Subject: [PATCH 15/18] Fix compilation done --- node/src/chain_spec/mod.rs | 1 + node/src/service/mod.rs | 2 +- pallet/message-transact/src/lib.rs | 9 +++++++-- runtime/darwinia/src/lib.rs | 2 +- runtime/darwinia/src/pallets/polkadot_xcm.rs | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/node/src/chain_spec/mod.rs b/node/src/chain_spec/mod.rs index 8855326f..95ddfc64 100644 --- a/node/src/chain_spec/mod.rs +++ b/node/src/chain_spec/mod.rs @@ -125,6 +125,7 @@ fn get_from_seed(seed: &str) -> ::Public .public() } +#[allow(dead_code)] fn load_config(name: &'static str) -> GenericChainSpec where E: DeserializeOwned, diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs index 6aa4005a..655f7d3d 100644 --- a/node/src/service/mod.rs +++ b/node/src/service/mod.rs @@ -419,7 +419,7 @@ where // Here you can check whether the hardware meets your chains' requirements. Putting a link // in there and swapping out the requirements for your own are probably a good idea. The // requirements for a para-chain are dictated by its relay-chain. - if !SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) && validator { + if !frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) && validator { log::warn!( "⚠️ The hardware does not meet the minimal requirements for role 'Authority'." ); diff --git a/pallet/message-transact/src/lib.rs b/pallet/message-transact/src/lib.rs index b5463f6b..ceb44aad 100644 --- a/pallet/message-transact/src/lib.rs +++ b/pallet/message-transact/src/lib.rs @@ -38,6 +38,7 @@ use pallet_evm::{FeeCalculator, GasWeightMapping}; use frame_support::{traits::EnsureOrigin, PalletError, RuntimeDebug}; use sp_core::{H160, U256}; use sp_std::boxed::Box; +use sp_runtime::traits::BadOrigin; pub use pallet::*; @@ -62,6 +63,10 @@ impl> + From> EnsureOrigin { type Success = H160; + fn ensure_origin(o: O) -> Result { + Self::try_origin(o).map_err(|_| BadOrigin) + } + fn try_origin(o: O) -> Result { o.into().map(|o| match o { LcmpEthOrigin::MessageTransact(id) => id, @@ -69,8 +74,8 @@ impl> + From> EnsureOrigin } #[cfg(feature = "runtime-benchmarks")] - fn successful_origin() -> O { - O::from(LcmpEthOrigin::MessageTransact(Default::default())) + fn try_successful_origin() -> Result { + Ok(O::from(LcmpEthOrigin::MessageTransact(Default::default()))) } } diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs index 70f99fcf..bc22f23b 100644 --- a/runtime/darwinia/src/lib.rs +++ b/runtime/darwinia/src/lib.rs @@ -328,7 +328,7 @@ sp_api::impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_call_fee_details(call, len) } - fn query_weight_to_fee(weight: Weight) -> Balance { + fn query_weight_to_fee(weight: frame_support::weights::Weight) -> Balance { TransactionPayment::weight_to_fee(weight) } fn query_length_to_fee(length: u32) -> Balance { diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs index b49f2801..b19c9b1e 100644 --- a/runtime/darwinia/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia/src/pallets/polkadot_xcm.rs @@ -19,7 +19,7 @@ // darwinia use crate::*; // polkadot -use use xcm::latest::prelude::*; +use xcm::latest::prelude::*; // substrate use frame_support::traits::Currency; From 731a4e6d41576d4741834679494f6d05033da993 Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 15:54:11 +0800 Subject: [PATCH 16/18] Fix compilation with benchmark --- Cargo.lock | 38 ++++++++++---------- pallet/message-transact/Cargo.toml | 3 ++ runtime/crab/Cargo.toml | 1 + runtime/crab/src/pallets/polkadot_xcm.rs | 2 +- runtime/darwinia/Cargo.toml | 1 + runtime/darwinia/src/pallets/polkadot_xcm.rs | 2 +- runtime/pangolin/Cargo.toml | 1 + runtime/pangolin/src/pallets/polkadot_xcm.rs | 2 +- runtime/pangoro/Cargo.toml | 1 + runtime/pangoro/src/pallets/polkadot_xcm.rs | 2 +- 10 files changed, 30 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ac078f8d..0f956a28 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3476,7 +3476,7 @@ dependencies = [ [[package]] name = "fc-cli" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "clap", "ethereum-types 0.14.1", @@ -3494,7 +3494,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "async-trait", "fc-db", @@ -3513,7 +3513,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "fp-storage", "kvdb-rocksdb", @@ -3532,7 +3532,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "fc-db", "fp-consensus", @@ -3549,7 +3549,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3591,7 +3591,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3755,7 +3755,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "ethereum", "parity-scale-codec", @@ -3767,7 +3767,7 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3781,7 +3781,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "evm", "frame-support", @@ -3795,7 +3795,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3811,7 +3811,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "frame-support", "parity-scale-codec", @@ -3823,7 +3823,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "parity-scale-codec", "serde", @@ -7178,7 +7178,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -7204,7 +7204,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "environmental", "evm", @@ -7228,7 +7228,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "fp-evm", ] @@ -7236,7 +7236,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "fp-evm", "sp-core", @@ -7246,7 +7246,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "fp-evm", "frame-support", @@ -7256,7 +7256,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "fp-evm", "num", @@ -7265,7 +7265,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#3da6241e6cb992bbdbf01f09a7c6add48df1b34d" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.38#28c1f8a80152cabdf98afe58dc37fa963682d978" dependencies = [ "fp-evm", "ripemd", diff --git a/pallet/message-transact/Cargo.toml b/pallet/message-transact/Cargo.toml index 4dd96788..7e3788b3 100644 --- a/pallet/message-transact/Cargo.toml +++ b/pallet/message-transact/Cargo.toml @@ -49,6 +49,9 @@ sp-io = { workspace = true } [features] default = ["std"] + +runtime-benchmarks = [] + std = [ # crates.io "codec/std", diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml index e3839b12..4c76c01b 100644 --- a/runtime/crab/Cargo.toml +++ b/runtime/crab/Cargo.toml @@ -260,6 +260,7 @@ runtime-benchmarks = [ # darwinia "darwinia-common-runtime/runtime-benchmarks", "darwinia-deposit/runtime-benchmarks", + "darwinia-message-transact/runtime-benchmarks", # darwinia-messages-substrate "bridge-runtime-common/runtime-benchmarks", diff --git a/runtime/crab/src/pallets/polkadot_xcm.rs b/runtime/crab/src/pallets/polkadot_xcm.rs index 110e976f..ef2a250f 100644 --- a/runtime/crab/src/pallets/polkadot_xcm.rs +++ b/runtime/crab/src/pallets/polkadot_xcm.rs @@ -182,7 +182,7 @@ pub type XcmRouter = ( ); #[cfg(feature = "runtime-benchmarks")] -parameter_types! { +frame_support::parameter_types! { pub ReachableDest: Option = Some(Parent.into()); } diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml index 80f46198..59fcd858 100644 --- a/runtime/darwinia/Cargo.toml +++ b/runtime/darwinia/Cargo.toml @@ -261,6 +261,7 @@ runtime-benchmarks = [ # darwinia "darwinia-common-runtime/runtime-benchmarks", "darwinia-deposit/runtime-benchmarks", + "darwinia-message-transact/runtime-benchmarks", # darwinia-messages-substrate "bridge-runtime-common/runtime-benchmarks", diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs index b19c9b1e..3cd332cb 100644 --- a/runtime/darwinia/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia/src/pallets/polkadot_xcm.rs @@ -184,7 +184,7 @@ pub type XcmRouter = ( ); #[cfg(feature = "runtime-benchmarks")] -parameter_types! { +frame_support::parameter_types! { pub ReachableDest: Option = Some(Parent.into()); } diff --git a/runtime/pangolin/Cargo.toml b/runtime/pangolin/Cargo.toml index 7f02d681..eb969bf6 100644 --- a/runtime/pangolin/Cargo.toml +++ b/runtime/pangolin/Cargo.toml @@ -258,6 +258,7 @@ runtime-benchmarks = [ # darwinia "darwinia-common-runtime/runtime-benchmarks", "darwinia-deposit/runtime-benchmarks", + "darwinia-message-transact/runtime-benchmarks", # darwinia-messages-substrate "bridge-runtime-common/runtime-benchmarks", diff --git a/runtime/pangolin/src/pallets/polkadot_xcm.rs b/runtime/pangolin/src/pallets/polkadot_xcm.rs index bc073a7a..29b6d2a1 100644 --- a/runtime/pangolin/src/pallets/polkadot_xcm.rs +++ b/runtime/pangolin/src/pallets/polkadot_xcm.rs @@ -184,7 +184,7 @@ pub type XcmRouter = ( ); #[cfg(feature = "runtime-benchmarks")] -parameter_types! { +frame_support::parameter_types! { pub ReachableDest: Option = Some(Parent.into()); } diff --git a/runtime/pangoro/Cargo.toml b/runtime/pangoro/Cargo.toml index ce67499b..b14d4d59 100644 --- a/runtime/pangoro/Cargo.toml +++ b/runtime/pangoro/Cargo.toml @@ -259,6 +259,7 @@ runtime-benchmarks = [ # darwinia "darwinia-common-runtime/runtime-benchmarks", "darwinia-deposit/runtime-benchmarks", + "darwinia-message-transact/runtime-benchmarks", # darwinia-messages-substrate "bridge-runtime-common/runtime-benchmarks", diff --git a/runtime/pangoro/src/pallets/polkadot_xcm.rs b/runtime/pangoro/src/pallets/polkadot_xcm.rs index e3c9969a..76299fae 100644 --- a/runtime/pangoro/src/pallets/polkadot_xcm.rs +++ b/runtime/pangoro/src/pallets/polkadot_xcm.rs @@ -184,7 +184,7 @@ pub type XcmRouter = ( ); #[cfg(feature = "runtime-benchmarks")] -parameter_types! { +frame_support::parameter_types! { pub ReachableDest: Option = Some(Parent.into()); } From b3b86e241a18cfdca765fc9f3860273426cf4c4f Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 16:10:58 +0800 Subject: [PATCH 17/18] Replace prepare branch --- Cargo.lock | 28 ++++++++++++++-------------- Cargo.toml | 22 +++++++++++----------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0f956a28..1d80760a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -738,7 +738,7 @@ dependencies = [ [[package]] name = "bp-darwinia-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "account", "bp-messages", @@ -755,7 +755,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "bp-runtime", "finality-grandpa", @@ -772,7 +772,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "bp-runtime", "frame-support", @@ -785,7 +785,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "bitvec", "bp-runtime", @@ -802,7 +802,7 @@ dependencies = [ [[package]] name = "bp-parachains" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "bp-polkadot-core", "bp-runtime", @@ -815,7 +815,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "bp-messages", "bp-runtime", @@ -834,7 +834,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "frame-support", "frame-system", @@ -855,7 +855,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -870,7 +870,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "bp-header-chain", "bp-message-dispatch", @@ -6973,7 +6973,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -6989,7 +6989,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "bp-header-chain", "bp-runtime", @@ -7011,7 +7011,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "bitvec", "bp-message-dispatch", @@ -7032,7 +7032,7 @@ dependencies = [ [[package]] name = "pallet-bridge-parachains" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "bp-parachains", "bp-polkadot-core", @@ -7293,7 +7293,7 @@ dependencies = [ [[package]] name = "pallet-fee-market" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.38#13267a91a97a46fcf02ce137272331733b88e512" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.38#b5bf1f59cc9ff8e38f9d1baa65b2dfca68980f0a" dependencies = [ "bp-messages", "bp-runtime", diff --git a/Cargo.toml b/Cargo.toml index 7a51e471..8f3d7b15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,17 +69,17 @@ pangolin-runtime = { path = "runtime/pangolin" } pangoro-runtime = { path = "runtime/pangoro" } # darwinia-messages-substrate -bp-darwinia-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } -pallet-bridge-parachains = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "prepare-polkadot-v0.9.38" } +bp-darwinia-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +pallet-bridge-parachains = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.38" } # frontier fc-cli = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.38" } From 0d4adbad8d006be7f893cf4ef6c47488d0d48daa Mon Sep 17 00:00:00 2001 From: Guantong Date: Thu, 2 Mar 2023 16:44:40 +0800 Subject: [PATCH 18/18] Format --- node/src/service/mod.rs | 4 +- pallet/message-transact/src/lib.rs | 4 +- runtime/crab/src/pallets/polkadot_xcm.rs | 6 +-- runtime/crab/src/pallets/xcmp_queue.rs | 2 +- runtime/darwinia/src/pallets/polkadot_xcm.rs | 46 +++++++++----------- runtime/darwinia/src/pallets/xcmp_queue.rs | 2 +- runtime/pangolin/src/pallets/polkadot_xcm.rs | 46 +++++++++----------- runtime/pangolin/src/pallets/xcmp_queue.rs | 2 +- runtime/pangoro/src/pallets/polkadot_xcm.rs | 46 +++++++++----------- runtime/pangoro/src/pallets/xcmp_queue.rs | 2 +- 10 files changed, 73 insertions(+), 87 deletions(-) diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs index 655f7d3d..ae6eaf74 100644 --- a/node/src/service/mod.rs +++ b/node/src/service/mod.rs @@ -419,7 +419,9 @@ where // Here you can check whether the hardware meets your chains' requirements. Putting a link // in there and swapping out the requirements for your own are probably a good idea. The // requirements for a para-chain are dictated by its relay-chain. - if !frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) && validator { + if !frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) + && validator + { log::warn!( "⚠️ The hardware does not meet the minimal requirements for role 'Authority'." ); diff --git a/pallet/message-transact/src/lib.rs b/pallet/message-transact/src/lib.rs index ceb44aad..32dae253 100644 --- a/pallet/message-transact/src/lib.rs +++ b/pallet/message-transact/src/lib.rs @@ -37,8 +37,8 @@ use pallet_evm::{FeeCalculator, GasWeightMapping}; // substrate use frame_support::{traits::EnsureOrigin, PalletError, RuntimeDebug}; use sp_core::{H160, U256}; -use sp_std::boxed::Box; use sp_runtime::traits::BadOrigin; +use sp_std::boxed::Box; pub use pallet::*; @@ -75,7 +75,7 @@ impl> + From> EnsureOrigin #[cfg(feature = "runtime-benchmarks")] fn try_successful_origin() -> Result { - Ok(O::from(LcmpEthOrigin::MessageTransact(Default::default()))) + Ok(O::from(LcmpEthOrigin::MessageTransact(Default::default()))) } } diff --git a/runtime/crab/src/pallets/polkadot_xcm.rs b/runtime/crab/src/pallets/polkadot_xcm.rs index ef2a250f..dacb2808 100644 --- a/runtime/crab/src/pallets/polkadot_xcm.rs +++ b/runtime/crab/src/pallets/polkadot_xcm.rs @@ -114,11 +114,7 @@ frame_support::parameter_types! { pub struct ToTreasury; impl xcm_builder::TakeRevenue for ToTreasury { fn take_revenue(revenue: MultiAsset) { - if let MultiAsset { - id: Concrete(_location), - fun: Fungible(amount), - } = revenue - { + if let MultiAsset { id: Concrete(_location), fun: Fungible(amount) } = revenue { let treasury_account = Treasury::account_id(); let _ = Balances::deposit_creating(&treasury_account, amount); diff --git a/runtime/crab/src/pallets/xcmp_queue.rs b/runtime/crab/src/pallets/xcmp_queue.rs index 9931ff3c..5b07d20c 100644 --- a/runtime/crab/src/pallets/xcmp_queue.rs +++ b/runtime/crab/src/pallets/xcmp_queue.rs @@ -24,9 +24,9 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type ControllerOrigin = frame_system::EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; type ExecuteOverweightOrigin = frame_system::EnsureRoot; + type PriceForSiblingDelivery = (); type RuntimeEvent = RuntimeEvent; type VersionWrapper = (); type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo; type XcmExecutor = xcm_executor::XcmExecutor; - type PriceForSiblingDelivery = (); } diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs index 3cd332cb..b0b688a4 100644 --- a/runtime/darwinia/src/pallets/polkadot_xcm.rs +++ b/runtime/darwinia/src/pallets/polkadot_xcm.rs @@ -116,11 +116,7 @@ frame_support::parameter_types! { pub struct ToTreasury; impl xcm_builder::TakeRevenue for ToTreasury { fn take_revenue(revenue: MultiAsset) { - if let MultiAsset { - id: Concrete(_location), - fun: Fungible(amount), - } = revenue - { + if let MultiAsset { id: Concrete(_location), fun: Fungible(amount) } = revenue { let treasury_account = Treasury::account_id(); let _ = Balances::deposit_creating(&treasury_account, amount); @@ -135,17 +131,23 @@ impl xcm_builder::TakeRevenue for ToTreasury { pub struct XcmExecutorConfig; impl xcm_executor::Config for XcmExecutorConfig { type AssetClaims = PolkadotXcm; + type AssetExchanger = (); + type AssetLocker = (); // How to withdraw and deposit an asset. type AssetTransactor = LocalAssetTransactor; type AssetTrap = PolkadotXcm; type Barrier = Barrier; + type CallDispatcher = RuntimeCall; + type FeeManager = (); type IsReserve = xcm_builder::NativeAsset; type IsTeleporter = (); - // Teleporting is disabled. - type UniversalLocation = UniversalLocation; + type MaxAssetsIntoHolding = MaxAssetsIntoHolding; + type MessageExporter = (); type OriginConverter = XcmOriginToTransactDispatchOrigin; + type PalletInstancesInfo = AllPalletsWithSystem; type ResponseHandler = PolkadotXcm; type RuntimeCall = RuntimeCall; + type SafeCallFilter = frame_support::traits::Everything; type SubscriptionService = PolkadotXcm; type Trader = xcm_configs::LocalAssetTrader< frame_support::weights::ConstantMultiplier< @@ -158,17 +160,11 @@ impl xcm_executor::Config for XcmExecutorConfig { DealWithFees, ToTreasury, >; + type UniversalAliases = frame_support::traits::Nothing; + // Teleporting is disabled. + type UniversalLocation = UniversalLocation; type Weigher = xcm_builder::FixedWeightBounds; type XcmSender = XcmRouter; - type PalletInstancesInfo = AllPalletsWithSystem; - type MaxAssetsIntoHolding = MaxAssetsIntoHolding; - type AssetLocker = (); - type AssetExchanger = (); - type FeeManager = (); - type MessageExporter = (); - type UniversalAliases = frame_support::traits::Nothing; - type CallDispatcher = RuntimeCall; - type SafeCallFilter = frame_support::traits::Everything; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. @@ -191,13 +187,21 @@ frame_support::parameter_types! { impl pallet_xcm::Config for Runtime { // ^ Override for AdvertisedXcmVersion default type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; + type Currency = Balances; + type CurrencyMatcher = (); type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin; - type UniversalLocation = UniversalLocation; + type MaxLockers = ConstU32<8>; + #[cfg(feature = "runtime-benchmarks")] + type ReachableDest = ReachableDest; type RuntimeCall = RuntimeCall; type RuntimeEvent = RuntimeEvent; type RuntimeOrigin = RuntimeOrigin; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; + type SovereignAccountOf = LocationToAccountId; + type TrustedLockers = (); + type UniversalLocation = UniversalLocation; type Weigher = xcm_builder::FixedWeightBounds; + type WeightInfo = pallet_xcm::TestWeightInfo; type XcmExecuteFilter = frame_support::traits::Everything; type XcmExecutor = xcm_executor::XcmExecutor; type XcmReserveTransferFilter = frame_support::traits::Everything; @@ -205,14 +209,6 @@ impl pallet_xcm::Config for Runtime { type XcmTeleportFilter = frame_support::traits::Nothing; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; - type Currency = Balances; - type CurrencyMatcher = (); - type TrustedLockers = (); - type SovereignAccountOf = LocationToAccountId; - type MaxLockers = ConstU32<8>; - type WeightInfo = pallet_xcm::TestWeightInfo; - #[cfg(feature = "runtime-benchmarks")] - type ReachableDest = ReachableDest; } impl cumulus_pallet_xcm::Config for Runtime { diff --git a/runtime/darwinia/src/pallets/xcmp_queue.rs b/runtime/darwinia/src/pallets/xcmp_queue.rs index 9931ff3c..5b07d20c 100644 --- a/runtime/darwinia/src/pallets/xcmp_queue.rs +++ b/runtime/darwinia/src/pallets/xcmp_queue.rs @@ -24,9 +24,9 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type ControllerOrigin = frame_system::EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; type ExecuteOverweightOrigin = frame_system::EnsureRoot; + type PriceForSiblingDelivery = (); type RuntimeEvent = RuntimeEvent; type VersionWrapper = (); type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo; type XcmExecutor = xcm_executor::XcmExecutor; - type PriceForSiblingDelivery = (); } diff --git a/runtime/pangolin/src/pallets/polkadot_xcm.rs b/runtime/pangolin/src/pallets/polkadot_xcm.rs index 29b6d2a1..b95d6c7d 100644 --- a/runtime/pangolin/src/pallets/polkadot_xcm.rs +++ b/runtime/pangolin/src/pallets/polkadot_xcm.rs @@ -116,11 +116,7 @@ frame_support::parameter_types! { pub struct ToTreasury; impl xcm_builder::TakeRevenue for ToTreasury { fn take_revenue(revenue: MultiAsset) { - if let MultiAsset { - id: Concrete(_location), - fun: Fungible(amount), - } = revenue - { + if let MultiAsset { id: Concrete(_location), fun: Fungible(amount) } = revenue { let treasury_account = Treasury::account_id(); let _ = Balances::deposit_creating(&treasury_account, amount); @@ -135,17 +131,23 @@ impl xcm_builder::TakeRevenue for ToTreasury { pub struct XcmExecutorConfig; impl xcm_executor::Config for XcmExecutorConfig { type AssetClaims = PolkadotXcm; + type AssetExchanger = (); + type AssetLocker = (); // How to withdraw and deposit an asset. type AssetTransactor = LocalAssetTransactor; type AssetTrap = PolkadotXcm; type Barrier = Barrier; + type CallDispatcher = RuntimeCall; + type FeeManager = (); type IsReserve = xcm_builder::NativeAsset; type IsTeleporter = (); - // Teleporting is disabled. - type UniversalLocation = UniversalLocation; + type MaxAssetsIntoHolding = MaxAssetsIntoHolding; + type MessageExporter = (); type OriginConverter = XcmOriginToTransactDispatchOrigin; + type PalletInstancesInfo = AllPalletsWithSystem; type ResponseHandler = PolkadotXcm; type RuntimeCall = RuntimeCall; + type SafeCallFilter = frame_support::traits::Everything; type SubscriptionService = PolkadotXcm; type Trader = xcm_configs::LocalAssetTrader< frame_support::weights::ConstantMultiplier< @@ -158,17 +160,11 @@ impl xcm_executor::Config for XcmExecutorConfig { DealWithFees, ToTreasury, >; + type UniversalAliases = frame_support::traits::Nothing; + // Teleporting is disabled. + type UniversalLocation = UniversalLocation; type Weigher = xcm_builder::FixedWeightBounds; type XcmSender = XcmRouter; - type PalletInstancesInfo = AllPalletsWithSystem; - type MaxAssetsIntoHolding = MaxAssetsIntoHolding; - type AssetLocker = (); - type AssetExchanger = (); - type FeeManager = (); - type MessageExporter = (); - type UniversalAliases = frame_support::traits::Nothing; - type CallDispatcher = RuntimeCall; - type SafeCallFilter = frame_support::traits::Everything; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. @@ -191,13 +187,21 @@ frame_support::parameter_types! { impl pallet_xcm::Config for Runtime { // ^ Override for AdvertisedXcmVersion default type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; + type Currency = Balances; + type CurrencyMatcher = (); type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin; - type UniversalLocation = UniversalLocation; + type MaxLockers = ConstU32<8>; + #[cfg(feature = "runtime-benchmarks")] + type ReachableDest = ReachableDest; type RuntimeCall = RuntimeCall; type RuntimeEvent = RuntimeEvent; type RuntimeOrigin = RuntimeOrigin; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; + type SovereignAccountOf = LocationToAccountId; + type TrustedLockers = (); + type UniversalLocation = UniversalLocation; type Weigher = xcm_builder::FixedWeightBounds; + type WeightInfo = pallet_xcm::TestWeightInfo; type XcmExecuteFilter = frame_support::traits::Everything; type XcmExecutor = xcm_executor::XcmExecutor; type XcmReserveTransferFilter = frame_support::traits::Everything; @@ -205,14 +209,6 @@ impl pallet_xcm::Config for Runtime { type XcmTeleportFilter = frame_support::traits::Nothing; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; - type Currency = Balances; - type CurrencyMatcher = (); - type TrustedLockers = (); - type SovereignAccountOf = LocationToAccountId; - type MaxLockers = ConstU32<8>; - type WeightInfo = pallet_xcm::TestWeightInfo; - #[cfg(feature = "runtime-benchmarks")] - type ReachableDest = ReachableDest; } impl cumulus_pallet_xcm::Config for Runtime { diff --git a/runtime/pangolin/src/pallets/xcmp_queue.rs b/runtime/pangolin/src/pallets/xcmp_queue.rs index 9931ff3c..5b07d20c 100644 --- a/runtime/pangolin/src/pallets/xcmp_queue.rs +++ b/runtime/pangolin/src/pallets/xcmp_queue.rs @@ -24,9 +24,9 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type ControllerOrigin = frame_system::EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; type ExecuteOverweightOrigin = frame_system::EnsureRoot; + type PriceForSiblingDelivery = (); type RuntimeEvent = RuntimeEvent; type VersionWrapper = (); type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo; type XcmExecutor = xcm_executor::XcmExecutor; - type PriceForSiblingDelivery = (); } diff --git a/runtime/pangoro/src/pallets/polkadot_xcm.rs b/runtime/pangoro/src/pallets/polkadot_xcm.rs index 76299fae..4287ad25 100644 --- a/runtime/pangoro/src/pallets/polkadot_xcm.rs +++ b/runtime/pangoro/src/pallets/polkadot_xcm.rs @@ -116,11 +116,7 @@ frame_support::parameter_types! { pub struct ToTreasury; impl xcm_builder::TakeRevenue for ToTreasury { fn take_revenue(revenue: MultiAsset) { - if let MultiAsset { - id: Concrete(_location), - fun: Fungible(amount), - } = revenue - { + if let MultiAsset { id: Concrete(_location), fun: Fungible(amount) } = revenue { let treasury_account = Treasury::account_id(); let _ = Balances::deposit_creating(&treasury_account, amount); @@ -135,17 +131,23 @@ impl xcm_builder::TakeRevenue for ToTreasury { pub struct XcmExecutorConfig; impl xcm_executor::Config for XcmExecutorConfig { type AssetClaims = PolkadotXcm; + type AssetExchanger = (); + type AssetLocker = (); // How to withdraw and deposit an asset. type AssetTransactor = LocalAssetTransactor; type AssetTrap = PolkadotXcm; type Barrier = Barrier; + type CallDispatcher = RuntimeCall; + type FeeManager = (); type IsReserve = xcm_builder::NativeAsset; type IsTeleporter = (); - // Teleporting is disabled. - type UniversalLocation = UniversalLocation; + type MaxAssetsIntoHolding = MaxAssetsIntoHolding; + type MessageExporter = (); type OriginConverter = XcmOriginToTransactDispatchOrigin; + type PalletInstancesInfo = AllPalletsWithSystem; type ResponseHandler = PolkadotXcm; type RuntimeCall = RuntimeCall; + type SafeCallFilter = frame_support::traits::Everything; type SubscriptionService = PolkadotXcm; type Trader = xcm_configs::LocalAssetTrader< frame_support::weights::ConstantMultiplier< @@ -158,17 +160,11 @@ impl xcm_executor::Config for XcmExecutorConfig { DealWithFees, ToTreasury, >; + type UniversalAliases = frame_support::traits::Nothing; + // Teleporting is disabled. + type UniversalLocation = UniversalLocation; type Weigher = xcm_builder::FixedWeightBounds; type XcmSender = XcmRouter; - type PalletInstancesInfo = AllPalletsWithSystem; - type MaxAssetsIntoHolding = MaxAssetsIntoHolding; - type AssetLocker = (); - type AssetExchanger = (); - type FeeManager = (); - type MessageExporter = (); - type UniversalAliases = frame_support::traits::Nothing; - type CallDispatcher = RuntimeCall; - type SafeCallFilter = frame_support::traits::Everything; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. @@ -191,13 +187,21 @@ frame_support::parameter_types! { impl pallet_xcm::Config for Runtime { // ^ Override for AdvertisedXcmVersion default type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; + type Currency = Balances; + type CurrencyMatcher = (); type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin; - type UniversalLocation = UniversalLocation; + type MaxLockers = ConstU32<8>; + #[cfg(feature = "runtime-benchmarks")] + type ReachableDest = ReachableDest; type RuntimeCall = RuntimeCall; type RuntimeEvent = RuntimeEvent; type RuntimeOrigin = RuntimeOrigin; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; + type SovereignAccountOf = LocationToAccountId; + type TrustedLockers = (); + type UniversalLocation = UniversalLocation; type Weigher = xcm_builder::FixedWeightBounds; + type WeightInfo = pallet_xcm::TestWeightInfo; type XcmExecuteFilter = frame_support::traits::Everything; type XcmExecutor = xcm_executor::XcmExecutor; type XcmReserveTransferFilter = frame_support::traits::Everything; @@ -205,14 +209,6 @@ impl pallet_xcm::Config for Runtime { type XcmTeleportFilter = frame_support::traits::Nothing; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; - type Currency = Balances; - type CurrencyMatcher = (); - type TrustedLockers = (); - type SovereignAccountOf = LocationToAccountId; - type MaxLockers = ConstU32<8>; - type WeightInfo = pallet_xcm::TestWeightInfo; - #[cfg(feature = "runtime-benchmarks")] - type ReachableDest = ReachableDest; } impl cumulus_pallet_xcm::Config for Runtime { diff --git a/runtime/pangoro/src/pallets/xcmp_queue.rs b/runtime/pangoro/src/pallets/xcmp_queue.rs index 9931ff3c..5b07d20c 100644 --- a/runtime/pangoro/src/pallets/xcmp_queue.rs +++ b/runtime/pangoro/src/pallets/xcmp_queue.rs @@ -24,9 +24,9 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type ControllerOrigin = frame_system::EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; type ExecuteOverweightOrigin = frame_system::EnsureRoot; + type PriceForSiblingDelivery = (); type RuntimeEvent = RuntimeEvent; type VersionWrapper = (); type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo; type XcmExecutor = xcm_executor::XcmExecutor; - type PriceForSiblingDelivery = (); }