diff --git a/Cargo.dev.toml b/Cargo.dev.toml index bdf769718..aab5a7c8a 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -37,71 +37,70 @@ resolver = "2" split-debuginfo = "unpacked" [patch.'https://github.com/paritytech/substrate'] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sc-utils = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } -sp-weights = { git = "https://github.com/paritytech//substrate", rev = "3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sc-utils = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } +sp-weights = { git = "https://github.com/paritytech//substrate", rev = "a2037bdedef0aa812017efee1d0fa63d4f5fcbae" } [patch.'https://github.com/paritytech/cumulus'] -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "f603a61ff370fc33740c9373833c3c6ba1486846" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "01148b992ec26408de50288332f92672da984a53" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "01148b992ec26408de50288332f92672da984a53" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "01148b992ec26408de50288332f92672da984a53" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "01148b992ec26408de50288332f92672da984a53" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "01148b992ec26408de50288332f92672da984a53" } [patch.'https://github.com/paritytech/polkadot'] -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" } -xcm = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "8b2d97fab286d978b83b7de68b736595678a60d3" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "8b2d97fab286d978b83b7de68b736595678a60d3" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "8b2d97fab286d978b83b7de68b736595678a60d3" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "8b2d97fab286d978b83b7de68b736595678a60d3" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "8b2d97fab286d978b83b7de68b736595678a60d3" } +xcm = { git = "https://github.com/paritytech//polkadot", rev = "8b2d97fab286d978b83b7de68b736595678a60d3" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "8b2d97fab286d978b83b7de68b736595678a60d3" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "8b2d97fab286d978b83b7de68b736595678a60d3" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "8b2d97fab286d978b83b7de68b736595678a60d3" } \ No newline at end of file diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml index a9224df0d..c1f3d8fda 100644 --- a/asset-registry/Cargo.toml +++ b/asset-registry/Cargo.toml @@ -13,37 +13,38 @@ serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } # substrate -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.42" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.42" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.42" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.42" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.43" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.43" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.43" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.43" } # orml orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] # substrate -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +pallet-message-queue = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } # orml orml-tokens = { path = "../tokens" } @@ -80,4 +81,4 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-xcm/try-runtime", -] +] \ No newline at end of file diff --git a/asset-registry/src/mock/mod.rs b/asset-registry/src/mock/mod.rs index 9e347f54f..97661ddc1 100644 --- a/asset-registry/src/mock/mod.rs +++ b/asset-registry/src/mock/mod.rs @@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize}; use sp_core::bounded::BoundedVec; use sp_io::TestExternalities; use sp_runtime::{traits::Convert, AccountId32}; -use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain}; +use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt}; pub mod para; pub mod relay; @@ -211,7 +211,11 @@ decl_test_parachain! { decl_test_relay_chain! { pub struct Relay { Runtime = relay::Runtime, + RuntimeCall = relay::RuntimeCall, + RuntimeEvent = relay::RuntimeEvent, XcmConfig = relay::XcmConfig, + MessageQueue = relay::MessageQueue, + System = relay::System, new_ext = relay_ext(), } } diff --git a/asset-registry/src/mock/para.rs b/asset-registry/src/mock/para.rs index 25d1d4422..e08e297cd 100644 --- a/asset-registry/src/mock/para.rs +++ b/asset-registry/src/mock/para.rs @@ -322,6 +322,8 @@ impl pallet_xcm::Config for Runtime { type MaxLockers = ConstU32<8>; type WeightInfo = pallet_xcm::TestWeightInfo; type AdminOrigin = EnsureRoot; + type MaxRemoteLockConsumers = ConstU32<0>; + type RemoteLockConsumerIdentifier = (); #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; } diff --git a/asset-registry/src/mock/relay.rs b/asset-registry/src/mock/relay.rs index e5bf538fc..d8b020466 100644 --- a/asset-registry/src/mock/relay.rs +++ b/asset-registry/src/mock/relay.rs @@ -2,11 +2,15 @@ use crate::Weight; use cumulus_primitives_core::ParaId; use frame_support::{ construct_runtime, parameter_types, - traits::{ConstU128, ConstU32, ConstU64, Everything, Nothing}, - weights::IdentityFee, + traits::{ConstU128, ConstU32, ConstU64, Everything, Nothing, ProcessMessage, ProcessMessageError}, + weights::{IdentityFee, WeightMeter}, }; use frame_system::EnsureRoot; -use polkadot_runtime_parachains::{configuration, origin, shared, ump}; +use polkadot_runtime_parachains::{ + configuration, + inclusion::{AggregateMessageOrigin, UmpQueueId}, + origin, shared, +}; use sp_core::H256; use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32}; use xcm::v3::prelude::*; @@ -159,23 +163,56 @@ impl pallet_xcm::Config for Runtime { type MaxLockers = ConstU32<8>; type WeightInfo = pallet_xcm::TestWeightInfo; type AdminOrigin = EnsureRoot; + type MaxRemoteLockConsumers = ConstU32<0>; + type RemoteLockConsumerIdentifier = (); #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; } -impl ump::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type UmpSink = ump::XcmSink, Runtime>; - type FirstMessageFactorPercent = ConstU64<100>; - type ExecuteOverweightOrigin = EnsureRoot; - type WeightInfo = polkadot_runtime_parachains::ump::TestWeightInfo; -} - impl origin::Config for Runtime {} type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; +parameter_types! { + pub MessageQueueServiceWeight: Weight = Weight::from_parts(1_000_000_000, 1_000_000); + pub const MessageQueueHeapSize: u32 = 65_536; + pub const MessageQueueMaxStale: u32 = 16; +} + +pub struct MessageProcessor; +impl ProcessMessage for MessageProcessor { + type Origin = AggregateMessageOrigin; + + fn process_message( + message: &[u8], + origin: Self::Origin, + meter: &mut WeightMeter, + id: &mut [u8; 32], + ) -> Result { + let para = match origin { + AggregateMessageOrigin::Ump(UmpQueueId::Para(para)) => para, + }; + xcm_builder::ProcessXcmMessage::, RuntimeCall>::process_message( + message, + Junction::Parachain(para.into()), + meter, + id, + ) + } +} + +impl pallet_message_queue::Config for Runtime { + type RuntimeEvent = RuntimeEvent; + type Size = u32; + type HeapSize = MessageQueueHeapSize; + type MaxStale = MessageQueueMaxStale; + type ServiceWeight = MessageQueueServiceWeight; + type MessageProcessor = MessageProcessor; + type QueueChangeHandler = (); + type WeightInfo = (); +} + construct_runtime!( pub enum Runtime where Block = Block, @@ -185,7 +222,7 @@ construct_runtime!( System: frame_system::{Pallet, Call, Storage, Config, Event}, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, ParasOrigin: origin::{Pallet, Origin}, - ParasUmp: ump::{Pallet, Call, Storage, Event}, XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, + MessageQueue: pallet_message_queue::{Pallet, Event}, } ); diff --git a/auction/Cargo.toml b/auction/Cargo.toml index 3ebe0cebb..21ea01665 100644 --- a/auction/Cargo.toml +++ b/auction/Cargo.toml @@ -12,16 +12,16 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } [features] default = ["std"] @@ -39,4 +39,4 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", -] +] \ No newline at end of file diff --git a/authority/Cargo.toml b/authority/Cargo.toml index a4929d42f..bffe7048e 100644 --- a/authority/Cargo.toml +++ b/authority/Cargo.toml @@ -12,18 +12,18 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.145", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } [dev-dependencies] -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -pallet-root-testing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +pallet-root-testing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } [features] default = ["std"] @@ -47,4 +47,4 @@ runtime-benchmarks = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", -] +] \ No newline at end of file diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index 13a7d6f89..07a469c6c 100644 --- a/bencher/Cargo.toml +++ b/bencher/Cargo.toml @@ -26,18 +26,18 @@ hash-db = { version = "0.15.2", default-features = false, optional = true } bencher-procedural = { path = "bencher-procedural", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.42" } -sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.42" } -sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.42" } -sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["rocksdb"], optional = true , branch = "polkadot-v0.9.42" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.42" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.43" } +sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.43" } +sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.43" } +sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["rocksdb"], optional = true , branch = "polkadot-v0.9.43" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.43" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.43" } [features] default = ["std"] @@ -73,4 +73,4 @@ std = [ ] bench = [ "sp-io/disable_panic_handler", -] +] \ No newline at end of file diff --git a/bencher/test/Cargo.toml b/bencher/test/Cargo.toml index 8989a58d0..619149faf 100644 --- a/bencher/test/Cargo.toml +++ b/bencher/test/Cargo.toml @@ -15,16 +15,16 @@ required-features = ["bench"] serde = { version = "1.0.136", optional = true } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } orml-bencher = { path = "..", default-features = false } orml-weight-meter = { path = "../../weight-meter", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } [features] default = ["std"] @@ -43,4 +43,4 @@ std = [ bench = [ "orml-bencher/bench", "orml-weight-meter/bench", -] +] \ No newline at end of file diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index 377bbf36b..f8ed367d4 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -14,19 +14,19 @@ paste = "1.0.7" scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } [dev-dependencies] hex-literal = "0.3.4" -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } [features] default = [ "std" ] @@ -44,4 +44,4 @@ std = [ "sp-runtime/std", "sp-std/std", "sp-storage/std", -] +] \ No newline at end of file diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index 5a695ffe7..ba4ecb924 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -12,18 +12,18 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" } @@ -45,4 +45,4 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", -] +] \ No newline at end of file diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index f8add14dc..f9b929a7c 100644 --- a/gradually-update/Cargo.toml +++ b/gradually-update/Cargo.toml @@ -12,12 +12,12 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } [features] default = ["std"] @@ -36,4 +36,4 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", -] +] \ No newline at end of file diff --git a/nft/Cargo.toml b/nft/Cargo.toml index 635aa4bf0..fcec97760 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -12,14 +12,14 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } [features] default = ["std"] @@ -36,4 +36,4 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", -] +] \ No newline at end of file diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index a526b4d16..cd234b8dd 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -12,18 +12,18 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } [features] default = ["std"] @@ -44,4 +44,4 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", -] +] \ No newline at end of file diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml index b02f24da0..1bffefa3c 100644 --- a/oracle/rpc/Cargo.toml +++ b/oracle/rpc/Cargo.toml @@ -12,8 +12,8 @@ jsonrpsee = { version = "0.16.2", features = ["client", "server", "macros"] } tracing = "0.1.29" tracing-core = "0.1.28" -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -orml-oracle-rpc-runtime-api = { path = "runtime-api", version = "0.4.1-dev" } +orml-oracle-rpc-runtime-api = { path = "runtime-api", version = "0.4.1-dev" } \ No newline at end of file diff --git a/oracle/rpc/runtime-api/Cargo.toml b/oracle/rpc/runtime-api/Cargo.toml index a7fd3a512..9803d3e88 100644 --- a/oracle/rpc/runtime-api/Cargo.toml +++ b/oracle/rpc/runtime-api/Cargo.toml @@ -8,8 +8,8 @@ description = "Runtime API module for orml-oracle-rpc." [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } [features] default = ["std"] @@ -17,4 +17,4 @@ std = [ "codec/std", "sp-api/std", "sp-std/std" -] +] \ No newline at end of file diff --git a/payments/Cargo.toml b/payments/Cargo.toml index 5f8be98d2..47690d600 100644 --- a/payments/Cargo.toml +++ b/payments/Cargo.toml @@ -14,18 +14,18 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = log = { version = "0.4.17", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } orml-traits = {path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] serde = "1.0.136" -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } orml-tokens = { path = "../tokens", version = "0.4.1-dev", default-features = false } @@ -45,4 +45,4 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", -] +] \ No newline at end of file diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index e6be7a9a3..1996b478c 100644 --- a/rewards/Cargo.toml +++ b/rewards/Cargo.toml @@ -12,17 +12,17 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } [features] default = ["std"] @@ -42,4 +42,4 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", -] +] \ No newline at end of file diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index b510e4eb4..9e8cf6240 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -12,19 +12,19 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } [features] default = ["std"] @@ -47,4 +47,4 @@ runtime-benchmarks = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", -] +] \ No newline at end of file diff --git a/tokens/rpc/Cargo.toml b/tokens/rpc/Cargo.toml index 1fd420c3d..33f105ad6 100644 --- a/tokens/rpc/Cargo.toml +++ b/tokens/rpc/Cargo.toml @@ -12,11 +12,11 @@ jsonrpsee = { version = "0.16.2", features = ["client", "server", "macros"] } tracing = "0.1.29" tracing-core = "0.1.28" -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -orml-tokens-rpc-runtime-api = { version = "0.4.1-dev", path = "./runtime-api" } +orml-tokens-rpc-runtime-api = { version = "0.4.1-dev", path = "./runtime-api" } \ No newline at end of file diff --git a/tokens/rpc/runtime-api/Cargo.toml b/tokens/rpc/runtime-api/Cargo.toml index d77defc5e..72488ae43 100644 --- a/tokens/rpc/runtime-api/Cargo.toml +++ b/tokens/rpc/runtime-api/Cargo.toml @@ -8,9 +8,9 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } orml-tokens = { default-features = false, path = "../../../tokens" } [features] @@ -21,4 +21,4 @@ std = [ "sp-api/std", "sp-runtime/std", "orml-tokens/std", -] +] \ No newline at end of file diff --git a/traits/Cargo.toml b/traits/Cargo.toml index bce8152c9..68c4fe66e 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -14,13 +14,13 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = num-traits = { version = "0.2.14", default-features = false } impl-trait-for-tuples = "0.2.2" -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.42" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.43" } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } @@ -38,4 +38,4 @@ std = [ "frame-support/std", "orml-utilities/std", "xcm/std", -] +] \ No newline at end of file diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index 0de83283d..6d8c2258b 100644 --- a/unknown-tokens/Cargo.toml +++ b/unknown-tokens/Cargo.toml @@ -12,18 +12,18 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.42" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.43" } orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } hex-literal = "0.3.4" [features] @@ -42,4 +42,4 @@ std = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", -] +] \ No newline at end of file diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index 9f808d49a..08eb30cd1 100644 --- a/utilities/Cargo.toml +++ b/utilities/Cargo.toml @@ -12,15 +12,15 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } [dev-dependencies] serde_json = "1.0.64" -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } [features] default = ["std"] @@ -32,4 +32,4 @@ std = [ "sp-runtime/std", "sp-std/std", "sp-io/std", -] +] \ No newline at end of file diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index b733a1674..e6f41b64d 100644 --- a/vesting/Cargo.toml +++ b/vesting/Cargo.toml @@ -12,15 +12,15 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } [features] default = ["std"] @@ -43,4 +43,4 @@ runtime-benchmarks = [ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", -] +] \ No newline at end of file diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml index b98d0f3f7..200c25701 100644 --- a/weight-meter/Cargo.toml +++ b/weight-meter/Cargo.toml @@ -10,19 +10,19 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } weight-meter-procedural = { path = "weight-meter-procedural", default-features = false } [dev-dependencies] serde = "1.0.136" codec = { package = "parity-scale-codec", version = "3.4.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } orml-bencher = { path = "../bencher" } @@ -35,4 +35,4 @@ std = [ ] bench = [ "weight-meter-procedural/bench", -] +] \ No newline at end of file diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index 76b0665e7..0627a099c 100644 --- a/xcm-support/Cargo.toml +++ b/xcm-support/Cargo.toml @@ -10,12 +10,12 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.42" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.42" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.43" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.43" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } @@ -29,4 +29,4 @@ std = [ "sp-std/std", "xcm-executor/std", "xcm/std", -] +] \ No newline at end of file diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index 6a4406210..dfd76fb99 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -11,15 +11,15 @@ edition = "2021" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.42" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.42" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.43" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.43" } [dev-dependencies] -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } [features] default = ["std"] @@ -36,4 +36,4 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-xcm/try-runtime", -] +] \ No newline at end of file diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index 926174ffa..2dac48f4f 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -13,19 +13,19 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true } # substrate -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.43" } # cumulus -cumulus-primitives-core = { default-features = false , git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-primitives-core = { default-features = false , git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.42" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.42" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.42" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.43" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.43" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.43" } # orml orml-traits = { path = "../traits", default-features = false} @@ -33,21 +33,22 @@ orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] # substrate -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +pallet-message-queue = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } # cumulus -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } # orml orml-tokens = { path = "../tokens" } @@ -84,4 +85,4 @@ try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", "pallet-xcm/try-runtime", -] +] \ No newline at end of file diff --git a/xtokens/src/mock/mod.rs b/xtokens/src/mock/mod.rs index bac4e881e..56aa63012 100644 --- a/xtokens/src/mock/mod.rs +++ b/xtokens/src/mock/mod.rs @@ -10,7 +10,7 @@ use sp_runtime::{AccountId32, BoundedVec}; use xcm_executor::traits::WeightTrader; use xcm_executor::Assets; -use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain}; +use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt}; pub mod para; pub mod para_relative_view; @@ -208,7 +208,11 @@ decl_test_parachain! { decl_test_relay_chain! { pub struct Relay { Runtime = relay::Runtime, + RuntimeCall = relay::RuntimeCall, + RuntimeEvent = relay::RuntimeEvent, XcmConfig = relay::XcmConfig, + MessageQueue = relay::MessageQueue, + System = relay::System, new_ext = relay_ext(), } } diff --git a/xtokens/src/mock/para.rs b/xtokens/src/mock/para.rs index ea774d339..086d2250e 100644 --- a/xtokens/src/mock/para.rs +++ b/xtokens/src/mock/para.rs @@ -233,6 +233,8 @@ impl pallet_xcm::Config for Runtime { type MaxLockers = ConstU32<8>; type WeightInfo = pallet_xcm::TestWeightInfo; type AdminOrigin = EnsureRoot; + type MaxRemoteLockConsumers = ConstU32<0>; + type RemoteLockConsumerIdentifier = (); #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; } diff --git a/xtokens/src/mock/para_relative_view.rs b/xtokens/src/mock/para_relative_view.rs index 66b779d03..f25f0f96e 100644 --- a/xtokens/src/mock/para_relative_view.rs +++ b/xtokens/src/mock/para_relative_view.rs @@ -236,6 +236,8 @@ impl pallet_xcm::Config for Runtime { type MaxLockers = ConstU32<8>; type WeightInfo = pallet_xcm::TestWeightInfo; type AdminOrigin = EnsureRoot; + type MaxRemoteLockConsumers = ConstU32<0>; + type RemoteLockConsumerIdentifier = (); #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; } diff --git a/xtokens/src/mock/para_teleport.rs b/xtokens/src/mock/para_teleport.rs index f4c4c41d8..cd600eac5 100644 --- a/xtokens/src/mock/para_teleport.rs +++ b/xtokens/src/mock/para_teleport.rs @@ -234,6 +234,8 @@ impl pallet_xcm::Config for Runtime { type MaxLockers = ConstU32<8>; type WeightInfo = pallet_xcm::TestWeightInfo; type AdminOrigin = EnsureRoot; + type MaxRemoteLockConsumers = ConstU32<0>; + type RemoteLockConsumerIdentifier = (); #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; } diff --git a/xtokens/src/mock/relay.rs b/xtokens/src/mock/relay.rs index fa9b080ea..b18061325 100644 --- a/xtokens/src/mock/relay.rs +++ b/xtokens/src/mock/relay.rs @@ -1,7 +1,7 @@ use frame_support::{ construct_runtime, parameter_types, - traits::{ConstU128, ConstU32, ConstU64, Everything, Nothing}, - weights::IdentityFee, + traits::{ConstU128, ConstU32, ConstU64, Everything, Nothing, ProcessMessage, ProcessMessageError}, + weights::{IdentityFee, WeightMeter}, }; use frame_system::EnsureRoot; use sp_core::H256; @@ -9,7 +9,11 @@ use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32}; use crate::Weight; use cumulus_primitives_core::ParaId; -use polkadot_runtime_parachains::{configuration, origin, shared, ump}; +use polkadot_runtime_parachains::{ + configuration, + inclusion::{AggregateMessageOrigin, UmpQueueId}, + origin, shared, +}; use xcm::v3::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative, ChildParachainConvertsVia, @@ -165,23 +169,56 @@ impl pallet_xcm::Config for Runtime { type MaxLockers = ConstU32<8>; type WeightInfo = pallet_xcm::TestWeightInfo; type AdminOrigin = EnsureRoot; + type MaxRemoteLockConsumers = ConstU32<0>; + type RemoteLockConsumerIdentifier = (); #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; } -impl ump::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type UmpSink = ump::XcmSink, Runtime>; - type FirstMessageFactorPercent = ConstU64<100>; - type ExecuteOverweightOrigin = EnsureRoot; - type WeightInfo = polkadot_runtime_parachains::ump::TestWeightInfo; -} - impl origin::Config for Runtime {} type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; +parameter_types! { + pub MessageQueueServiceWeight: Weight = Weight::from_parts(1_000_000_000, 1_000_000); + pub const MessageQueueHeapSize: u32 = 65_536; + pub const MessageQueueMaxStale: u32 = 16; +} + +pub struct MessageProcessor; +impl ProcessMessage for MessageProcessor { + type Origin = AggregateMessageOrigin; + + fn process_message( + message: &[u8], + origin: Self::Origin, + meter: &mut WeightMeter, + id: &mut [u8; 32], + ) -> Result { + let para = match origin { + AggregateMessageOrigin::Ump(UmpQueueId::Para(para)) => para, + }; + xcm_builder::ProcessXcmMessage::, RuntimeCall>::process_message( + message, + Junction::Parachain(para.into()), + meter, + id, + ) + } +} + +impl pallet_message_queue::Config for Runtime { + type RuntimeEvent = RuntimeEvent; + type Size = u32; + type HeapSize = MessageQueueHeapSize; + type MaxStale = MessageQueueMaxStale; + type ServiceWeight = MessageQueueServiceWeight; + type MessageProcessor = MessageProcessor; + type QueueChangeHandler = (); + type WeightInfo = (); +} + construct_runtime!( pub enum Runtime where Block = Block, @@ -191,7 +228,7 @@ construct_runtime!( System: frame_system::{Pallet, Call, Storage, Config, Event}, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, ParasOrigin: origin::{Pallet, Origin}, - ParasUmp: ump::{Pallet, Call, Storage, Event}, XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, + MessageQueue: pallet_message_queue::{Pallet, Event}, } );