From dab954806499fff7721fe280dbcfebc09b8853b7 Mon Sep 17 00:00:00 2001 From: ferrell-code Date: Fri, 28 Jun 2024 02:42:56 -0400 Subject: [PATCH] Remove DMP Queue (#1340) * remove dmp pallet Signed-off-by: Charles Ferrell * fix integration test Signed-off-by: Charles Ferrell * [no ci] remove migration Signed-off-by: Charles Ferrell --------- Signed-off-by: Charles Ferrell Signed-off-by: Jamie Co-authored-by: Jamie --- Cargo.lock | 22 ------------------- Cargo.toml | 1 - runtime/calamari/Cargo.toml | 3 --- runtime/calamari/src/lib.rs | 6 ++--- runtime/calamari/src/xcm_config.rs | 6 ----- runtime/common/Cargo.toml | 1 - runtime/integration-tests/Cargo.toml | 1 - .../src/integrations_mock/mod.rs | 2 +- .../src/integrations_mock/test_calamari.rs | 2 -- .../src/integrations_mock/test_manta.rs | 2 -- runtime/manta/Cargo.toml | 3 --- runtime/manta/src/lib.rs | 4 ++-- runtime/manta/src/xcm_config.rs | 6 ----- 13 files changed, 6 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b5f96bcec..eac6cf8e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1554,7 +1554,6 @@ dependencies = [ "async-backing-primitives", "calamari-vesting", "csv", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", @@ -2620,24 +2619,6 @@ dependencies = [ "sp-transaction-pool", ] -[[package]] -name = "cumulus-pallet-dmp-queue" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.6.0#a115b1dff31b70168fed20b582089d51d9b0d3bd" -dependencies = [ - "cumulus-primitives-core", - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "staging-xcm", -] - [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" @@ -5114,7 +5095,6 @@ dependencies = [ "calamari-runtime", "calamari-vesting", "cfg-if", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", @@ -6422,7 +6402,6 @@ version = "4.7.0" dependencies = [ "async-backing-primitives", "csv", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", @@ -11406,7 +11385,6 @@ dependencies = [ name = "runtime-common" version = "4.7.0" dependencies = [ - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", diff --git a/Cargo.toml b/Cargo.toml index 7739fb152..191f929a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -166,7 +166,6 @@ cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/po cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.6.0" } cumulus-client-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.6.0" } cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.6.0" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.6.0", default-features = false } cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.6.0", default-features = false, features = [ "parameterized-consensus-hook", ] } diff --git a/runtime/calamari/Cargo.toml b/runtime/calamari/Cargo.toml index 5d00105e1..0e3c8344c 100644 --- a/runtime/calamari/Cargo.toml +++ b/runtime/calamari/Cargo.toml @@ -68,7 +68,6 @@ pallet-ranked-collective = { workspace = true } pallet-referenda = { workspace = true } # Cumulus dependencies -cumulus-pallet-dmp-queue = { workspace = true } cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook"] } cumulus-pallet-session-benchmarking = { workspace = true, optional = true } cumulus-pallet-xcm = { workspace = true } @@ -221,7 +220,6 @@ try-runtime = [ 'parachain-info/try-runtime', 'cumulus-pallet-parachain-system/try-runtime', 'cumulus-pallet-xcmp-queue/try-runtime', - 'cumulus-pallet-dmp-queue/try-runtime', 'pallet-aura-style-filter/try-runtime', 'manta-collator-selection/try-runtime', 'cumulus-pallet-xcm/try-runtime', @@ -290,7 +288,6 @@ std = [ 'runtime-common/std', 'parachain-info/std', 'cumulus-pallet-parachain-system/std', - 'cumulus-pallet-dmp-queue/std', "cumulus-pallet-xcmp-queue/std", 'cumulus-pallet-xcm/std', 'cumulus-primitives-core/std', diff --git a/runtime/calamari/src/lib.rs b/runtime/calamari/src/lib.rs index f6e623aa9..9d5256451 100644 --- a/runtime/calamari/src/lib.rs +++ b/runtime/calamari/src/lib.rs @@ -273,7 +273,7 @@ impl Contains for BaseFilter { | pallet_democracy::Call::clear_public_proposals {..}) | RuntimeCall::Treasury(_) // Treasury calls are filtered while it is accumulating funds. // Filter callables from XCM pallets, we use XTokens exclusively - | RuntimeCall::XcmpQueue(_) | RuntimeCall::DmpQueue(_) => false, + | RuntimeCall::XcmpQueue(_) => false, // Explicitly ALLOWED calls | RuntimeCall::Multisig(_) @@ -1057,7 +1057,7 @@ construct_runtime!( XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event} = 30, PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 31, CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin} = 32, - DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event} = 33, + // DMP queue pallet used to occupy 33 XTokens: orml_xtokens::{Pallet, Call, Event, Storage} = 34, MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event} = 35, @@ -1113,7 +1113,7 @@ pub type CheckedExtrinsic = generic::CheckedExtrinsic; +pub type OnRuntimeUpgradeHooks = (); /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, diff --git a/runtime/calamari/src/xcm_config.rs b/runtime/calamari/src/xcm_config.rs index 141eea7ba..125235149 100644 --- a/runtime/calamari/src/xcm_config.rs +++ b/runtime/calamari/src/xcm_config.rs @@ -350,12 +350,6 @@ parameter_types! { pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent; } -impl cumulus_pallet_dmp_queue::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type DmpSink = EnqueueWithOrigin; - type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight; -} - /// We wrap AssetId for XToken #[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)] pub enum CurrencyId { diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 201296f9a..55fc5daf0 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -47,7 +47,6 @@ xcm-executor = { workspace = true, features = ["std"] } xcm-simulator = { workspace = true } # Cumulus dependencies -cumulus-pallet-dmp-queue = { workspace = true, features = ["std"] } cumulus-pallet-parachain-system = { workspace = true, features = ["std"] } cumulus-pallet-xcm = { workspace = true, features = ["std"] } cumulus-pallet-xcmp-queue = { workspace = true, features = ["std"] } diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml index 5ea660fff..72cd2af27 100644 --- a/runtime/integration-tests/Cargo.toml +++ b/runtime/integration-tests/Cargo.toml @@ -47,7 +47,6 @@ polkadot-runtime-parachains = { workspace = true, features = ["std"] } xcm-simulator = { workspace = true } # Cumulus dependencies -cumulus-pallet-dmp-queue = { workspace = true, features = ["std"] } cumulus-pallet-parachain-system = { workspace = true, features = ["std"] } cumulus-pallet-xcm = { workspace = true, features = ["std"] } cumulus-pallet-xcmp-queue = { workspace = true, features = ["std"] } diff --git a/runtime/integration-tests/src/integrations_mock/mod.rs b/runtime/integration-tests/src/integrations_mock/mod.rs index cd4758f5b..af19f0782 100644 --- a/runtime/integration-tests/src/integrations_mock/mod.rs +++ b/runtime/integration-tests/src/integrations_mock/mod.rs @@ -62,7 +62,7 @@ cfg_if::cfg_if! { RuntimeOrigin, ParachainStaking, PolkadotXcm, Range, Runtime, Session, System, Timestamp, TransactionPause, TransactionPayment, Treasury, Utility, TechnicalCommittee, Council, EnactmentPeriod, VotingPeriod, LaunchPeriod, Preimage, Democracy, Scheduler, Aura, Multisig, ParachainSystem, ParachainInfo, - XTokens, DmpQueue, CumulusXcm, XcmpQueue, AuraAuthorFilter, NonPausablePallets, AllPalletsWithSystem + XTokens, CumulusXcm, XcmpQueue, AuraAuthorFilter, NonPausablePallets, AllPalletsWithSystem }; type RuntimeAssetConfig = manta_runtime::assets_config::MantaAssetConfig; type RuntimeConcreteFungibleLedger = manta_runtime::assets_config::MantaConcreteFungibleLedger; diff --git a/runtime/integration-tests/src/integrations_mock/test_calamari.rs b/runtime/integration-tests/src/integrations_mock/test_calamari.rs index 5cc52b3bd..5d016d0e5 100644 --- a/runtime/integration-tests/src/integrations_mock/test_calamari.rs +++ b/runtime/integration-tests/src/integrations_mock/test_calamari.rs @@ -103,7 +103,6 @@ fn verify_pallet_prefixes() { is_pallet_prefix::("XcmpQueue"); is_pallet_prefix::("PolkadotXcm"); is_pallet_prefix::("CumulusXcm"); - is_pallet_prefix::("DmpQueue"); is_pallet_prefix::("XTokens"); is_pallet_prefix::("Utility"); @@ -304,7 +303,6 @@ fn verify_calamari_pallet_indices() { is_pallet_index::(30); is_pallet_index::(31); is_pallet_index::(32); - is_pallet_index::(33); is_pallet_index::(34); is_pallet_index::(40); diff --git a/runtime/integration-tests/src/integrations_mock/test_manta.rs b/runtime/integration-tests/src/integrations_mock/test_manta.rs index 34d73b650..b34956c3a 100644 --- a/runtime/integration-tests/src/integrations_mock/test_manta.rs +++ b/runtime/integration-tests/src/integrations_mock/test_manta.rs @@ -66,7 +66,6 @@ fn verify_pallet_prefixes() { is_pallet_prefix::("XcmpQueue"); is_pallet_prefix::("PolkadotXcm"); is_pallet_prefix::("CumulusXcm"); - is_pallet_prefix::("DmpQueue"); is_pallet_prefix::("XTokens"); is_pallet_prefix::("Utility"); @@ -192,7 +191,6 @@ fn verify_manta_pallet_indices() { is_pallet_index::(30); is_pallet_index::(31); is_pallet_index::(32); - is_pallet_index::(33); is_pallet_index::(34); is_pallet_index::(40); diff --git a/runtime/manta/Cargo.toml b/runtime/manta/Cargo.toml index 132a7c301..819b863b1 100644 --- a/runtime/manta/Cargo.toml +++ b/runtime/manta/Cargo.toml @@ -63,7 +63,6 @@ pallet-treasury = { workspace = true } pallet-utility = { workspace = true } # Cumulus dependencies -cumulus-pallet-dmp-queue = { workspace = true } cumulus-pallet-parachain-system = { workspace = true } cumulus-pallet-session-benchmarking = { workspace = true, optional = true } cumulus-pallet-xcm = { workspace = true } @@ -198,7 +197,6 @@ try-runtime = [ "parachain-info/try-runtime", 'pallet-aura/try-runtime', 'pallet-xcm/try-runtime', - "cumulus-pallet-dmp-queue/try-runtime", 'pallet-aura-style-filter/try-runtime', 'manta-collator-selection/try-runtime', 'pallet-sudo/try-runtime', @@ -269,7 +267,6 @@ std = [ 'runtime-common/std', 'parachain-info/std', 'cumulus-pallet-parachain-system/std', - 'cumulus-pallet-dmp-queue/std', "cumulus-pallet-xcmp-queue/std", "cumulus-pallet-xcm/std", "cumulus-primitives-core/std", diff --git a/runtime/manta/src/lib.rs b/runtime/manta/src/lib.rs index f88151324..25c329643 100644 --- a/runtime/manta/src/lib.rs +++ b/runtime/manta/src/lib.rs @@ -999,7 +999,7 @@ construct_runtime!( XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event} = 30, PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 31, CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin} = 32, - DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event} = 33, + // DMP queue pallet used to occupy 33 XTokens: orml_xtokens::{Pallet, Call, Event, Storage} = 34, MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event} = 35, @@ -1053,7 +1053,7 @@ pub type CheckedExtrinsic = generic::CheckedExtrinsic; +pub type OnRuntimeUpgradeHooks = (); /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, diff --git a/runtime/manta/src/xcm_config.rs b/runtime/manta/src/xcm_config.rs index c170e1cb8..f19a3ad7d 100644 --- a/runtime/manta/src/xcm_config.rs +++ b/runtime/manta/src/xcm_config.rs @@ -299,12 +299,6 @@ parameter_types! { pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent; } -impl cumulus_pallet_dmp_queue::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type DmpSink = EnqueueWithOrigin; - type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight; -} - impl cumulus_pallet_xcm::Config for Runtime { type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor;