diff --git a/Cargo.lock b/Cargo.lock index 3647a7b81..f8c3b0b04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1103,7 +1103,6 @@ dependencies = [ "bifrost-vtoken-voting", "bifrost-xcm-interface", "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", @@ -1257,7 +1256,6 @@ dependencies = [ "bifrost-vtoken-voting", "bifrost-xcm-interface", "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", @@ -1412,7 +1410,6 @@ dependencies = [ "bifrost-asset-registry", "bifrost-primitives", "bifrost-xcm-interface", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", @@ -3260,25 +3257,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "cumulus-pallet-dmp-queue" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ebf036bcb1e61c943cf588d14b903234594fb2538f2d7dae36e20fcc3c86e8" -dependencies = [ - "cumulus-primitives-core", - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-io", - "sp-runtime", - "sp-std", - "staging-xcm", -] - [[package]] name = "cumulus-pallet-parachain-system" version = "0.8.1" diff --git a/Cargo.toml b/Cargo.toml index 5fd46544d..ba572d23c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -124,7 +124,6 @@ orml-oracle = { git = "https://github.com/bifrost-finance/open-runtime-m cumulus-client-collator = { version = "0.8.0", default-features = false } cumulus-client-consensus-proposer = { version = "0.8.0", default-features = false } cumulus-pallet-aura-ext = { version = "0.8.0", default-features = false } -cumulus-pallet-dmp-queue = { version = "0.8.0", default-features = false } cumulus-pallet-parachain-system = { version = "0.8.0", default-features = false, features = ["parameterized-consensus-hook"] } cumulus-pallet-xcm = { version = "0.8.0", default-features = false } cumulus-pallet-xcmp-queue = { version = "0.8.0", default-features = false } diff --git a/runtime/bifrost-kusama/Cargo.toml b/runtime/bifrost-kusama/Cargo.toml index fee68ce52..3df0cc57f 100644 --- a/runtime/bifrost-kusama/Cargo.toml +++ b/runtime/bifrost-kusama/Cargo.toml @@ -72,7 +72,6 @@ sp-genesis-builder = { workspace = true } # Cumulus dependencies cumulus-pallet-aura-ext = { workspace = true } -cumulus-pallet-dmp-queue = { workspace = true } cumulus-pallet-parachain-system = { workspace = true } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } @@ -206,7 +205,6 @@ std = [ "sp-version/std", "cumulus-pallet-aura-ext/std", - "cumulus-pallet-dmp-queue/std", "cumulus-pallet-parachain-system/std", "cumulus-pallet-xcm/std", "cumulus-pallet-xcmp-queue/std", @@ -348,7 +346,6 @@ try-runtime = [ "cumulus-pallet-xcmp-queue/try-runtime", "pallet-xcm/try-runtime", "cumulus-pallet-xcm/try-runtime", - "cumulus-pallet-dmp-queue/try-runtime", "pallet-utility/try-runtime", "pallet-scheduler/try-runtime", "pallet-proxy/try-runtime", diff --git a/runtime/bifrost-kusama/src/lib.rs b/runtime/bifrost-kusama/src/lib.rs index 04a181203..a93e1549a 100644 --- a/runtime/bifrost-kusama/src/lib.rs +++ b/runtime/bifrost-kusama/src/lib.rs @@ -1934,7 +1934,6 @@ construct_runtime! { XcmpQueue: cumulus_pallet_xcmp_queue = 40, PolkadotXcm: pallet_xcm = 41, CumulusXcm: cumulus_pallet_xcm = 42, - DmpQueue: cumulus_pallet_dmp_queue = 43, MessageQueue: pallet_message_queue = 44, // utilities @@ -2030,6 +2029,10 @@ pub type CheckedExtrinsic = generic::CheckedExtrinsic; +parameter_types! { + pub const DmpQueuePalletName: &'static str = "DmpQueue"; +} + /// All migrations that will run on the next runtime upgrade. /// /// This contains the combined migrations of the last 10 releases. It allows to skip runtime @@ -2042,7 +2045,14 @@ pub mod migrations { use super::*; /// Unreleased migrations. Add new ones here: - pub type Unreleased = (bifrost_slpx::migration::v1::MigrateToV1,); + pub type Unreleased = ( + bifrost_slpx::migration::v1::MigrateToV1, + frame_support::migrations::RemovePallet< + DmpQueuePalletName, + ::DbWeight, + >, + pallet_xcm::migration::MigrateToLatestXcmVersion, + ); } /// Executive: handles dispatch to the various modules. diff --git a/runtime/bifrost-kusama/src/xcm_config.rs b/runtime/bifrost-kusama/src/xcm_config.rs index bdc1dcc6f..edecccb34 100644 --- a/runtime/bifrost-kusama/src/xcm_config.rs +++ b/runtime/bifrost-kusama/src/xcm_config.rs @@ -728,12 +728,6 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type PriceForSiblingDelivery = NoPriceForMessageDelivery; } -impl cumulus_pallet_dmp_queue::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight; - type DmpSink = frame_support::traits::EnqueueWithOrigin; -} - parameter_types! { pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block; } diff --git a/runtime/bifrost-polkadot/Cargo.toml b/runtime/bifrost-polkadot/Cargo.toml index c30f52443..c152356c3 100644 --- a/runtime/bifrost-polkadot/Cargo.toml +++ b/runtime/bifrost-polkadot/Cargo.toml @@ -71,7 +71,6 @@ sp-genesis-builder = { workspace = true } # Cumulus dependencies cumulus-pallet-aura-ext = { workspace = true } -cumulus-pallet-dmp-queue = { workspace = true } cumulus-pallet-parachain-system = { workspace = true } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } @@ -200,7 +199,6 @@ std = [ "sp-genesis-builder/std", "cumulus-pallet-aura-ext/std", - "cumulus-pallet-dmp-queue/std", "cumulus-pallet-parachain-system/std", "cumulus-pallet-xcm/std", "cumulus-pallet-xcmp-queue/std", @@ -325,7 +323,6 @@ try-runtime = [ "bifrost-vtoken-voting/try-runtime", "bifrost-xcm-interface/try-runtime", "cumulus-pallet-aura-ext/try-runtime", - "cumulus-pallet-dmp-queue/try-runtime", "cumulus-pallet-parachain-system/try-runtime", "cumulus-pallet-xcm/try-runtime", "cumulus-pallet-xcmp-queue/try-runtime", diff --git a/runtime/bifrost-polkadot/src/lib.rs b/runtime/bifrost-polkadot/src/lib.rs index 20075a15c..2dce7de4a 100644 --- a/runtime/bifrost-polkadot/src/lib.rs +++ b/runtime/bifrost-polkadot/src/lib.rs @@ -1769,7 +1769,6 @@ construct_runtime! { XcmpQueue: cumulus_pallet_xcmp_queue = 40, PolkadotXcm: pallet_xcm = 41, CumulusXcm: cumulus_pallet_xcm = 42, - DmpQueue: cumulus_pallet_dmp_queue = 43, MessageQueue: pallet_message_queue = 44, // utilities @@ -1864,6 +1863,10 @@ pub type CheckedExtrinsic = generic::CheckedExtrinsic; +parameter_types! { + pub const DmpQueuePalletName: &'static str = "DmpQueue"; +} + /// All migrations that will run on the next runtime upgrade. /// /// This contains the combined migrations of the last 10 releases. It allows to skip runtime @@ -1876,7 +1879,14 @@ pub mod migrations { use super::*; /// Unreleased migrations. Add new ones here: - pub type Unreleased = (bifrost_slpx::migration::v1::MigrateToV1,); + pub type Unreleased = ( + bifrost_slpx::migration::v1::MigrateToV1, + frame_support::migrations::RemovePallet< + DmpQueuePalletName, + ::DbWeight, + >, + pallet_xcm::migration::MigrateToLatestXcmVersion, + ); } /// Executive: handles dispatch to the various modules. diff --git a/runtime/bifrost-polkadot/src/xcm_config.rs b/runtime/bifrost-polkadot/src/xcm_config.rs index ce5e7eefa..22d7e397e 100644 --- a/runtime/bifrost-polkadot/src/xcm_config.rs +++ b/runtime/bifrost-polkadot/src/xcm_config.rs @@ -579,12 +579,6 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type PriceForSiblingDelivery = NoPriceForMessageDelivery; } -impl cumulus_pallet_dmp_queue::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight; - type DmpSink = frame_support::traits::EnqueueWithOrigin; -} - parameter_types! { pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block; } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 3be219214..359d7a842 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -44,7 +44,6 @@ cumulus-pallet-parachain-system = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-timestamp = { workspace = true } cumulus-primitives-utility = { workspace = true } -cumulus-pallet-dmp-queue = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } cumulus-pallet-xcm = { workspace = true } parachain-info = { workspace = true } @@ -98,7 +97,6 @@ std = [ "pallet-treasury/std", "pallet-scheduler/std", "pallet-transaction-payment/std", - "cumulus-pallet-dmp-queue/std", "cumulus-pallet-parachain-system/std", "cumulus-pallet-xcmp-queue/std", "cumulus-pallet-xcm/std",