chore: post 1.14 release (#723)

* Remove executed runtime migrations * Remove DMP pallet + migration (makes also `try-runtime` still fail since pallet version is `2` but storage version after cleanup is `0`)
KILTprotocol · Sep 12, 2024 · d9552b7 · d9552b7
1 parent 6847de9
commit d9552b7
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 440 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -100,7 +100,6 @@ frame-system-benchmarking           = { git = "https://github.com/paritytech/pol
 # Cumulus (with default disabled)
 
 cumulus-pallet-aura-ext         = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.7.0" }
-cumulus-pallet-dmp-queue        = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.7.0" }
 cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.7.0" }
 cumulus-pallet-xcm              = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.7.0" }
 cumulus-pallet-xcmp-queue       = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-crates-io-v1.7.0" }

diff --git a/runtimes/peregrine/Cargo.toml b/runtimes/peregrine/Cargo.toml
@@ -94,7 +94,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, features = ["parameterized-consensus-hook"] }
 cumulus-pallet-xcm              = { workspace = true }
 cumulus-pallet-xcmp-queue       = { workspace = true }
@@ -126,7 +125,6 @@ fast-gov = ["runtime-common/fast-gov"]
 runtime-benchmarks = [
   "attestation/runtime-benchmarks",
   "ctype/runtime-benchmarks",
-  "cumulus-pallet-dmp-queue/runtime-benchmarks",
   "cumulus-pallet-parachain-system/runtime-benchmarks",
   "cumulus-pallet-session-benchmarking/runtime-benchmarks",
   "cumulus-pallet-xcmp-queue/runtime-benchmarks",
@@ -175,7 +173,6 @@ std = [
   "attestation/std",
   "ctype/std",
   "cumulus-pallet-aura-ext/std",
-  "cumulus-pallet-dmp-queue/std",
   "cumulus-pallet-parachain-system/std",
   "cumulus-pallet-session-benchmarking/std",
   "cumulus-pallet-xcm/std",
@@ -258,7 +255,6 @@ try-runtime = [
   "attestation/try-runtime",
   "ctype/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/runtimes/peregrine/src/lib.rs b/runtimes/peregrine/src/lib.rs
@@ -1111,8 +1111,7 @@ construct_runtime! {
 		PolkadotXcm: pallet_xcm = 83,
 		// Does nothing cool, just provides an origin.
 		CumulusXcm: cumulus_pallet_xcm exclude_parts { Call } = 84,
-		// delete after lazy runtime Migration
-		DmpQueue: cumulus_pallet_dmp_queue = 85,
+		// DmpQueue: cumulus_pallet_dmp_queue = 85,
 		// Queue and pass DMP messages on to be executed.
 		MessageQueue: pallet_message_queue = 86,
 	}
@@ -1201,13 +1200,13 @@ pub type Executive = frame_executive::Executive<
 	Runtime,
 	// Executes pallet hooks in the order of definition in construct_runtime
 	AllPalletsWithSystem,
-	(
-		runtime_common::migrations::BumpStorageVersion<Runtime>,
-		cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
-		pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
-	),
+	frame_support::migrations::RemovePallet<DmpPalletName, <Runtime as frame_system::Config>::DbWeight>,
 >;
 
+parameter_types! {
+	pub const DmpPalletName: &'static str = "DmpQueue";
+}
+
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
 
@@ -1258,7 +1257,6 @@ mod benches {
 		[pallet_assets, Fungibles]
 		[pallet_message_queue, MessageQueue]
 		[cumulus_pallet_parachain_system, ParachainSystem]
-		[cumulus_pallet_dmp_queue, DmpQueue]
 		[frame_benchmarking::baseline, Baseline::<Runtime>]
 	);
 

diff --git a/runtimes/peregrine/src/weights/cumulus_pallet_dmp_queue.rs b/runtimes/peregrine/src/weights/cumulus_pallet_dmp_queue.rs
diff --git a/runtimes/peregrine/src/weights/mod.rs b/runtimes/peregrine/src/weights/mod.rs
@@ -19,7 +19,6 @@
 
 pub mod attestation;
 pub mod ctype;
-pub mod cumulus_pallet_dmp_queue;
 pub mod cumulus_pallet_parachain_system;
 pub mod delegation;
 pub mod did;

diff --git a/runtimes/peregrine/src/xcm_config.rs b/runtimes/peregrine/src/xcm_config.rs
@@ -25,7 +25,7 @@ use crate::{
 use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
 use frame_support::{
 	parameter_types,
-	traits::{Contains, EnqueueWithOrigin, Everything, Nothing, TransformOrigin},
+	traits::{Contains, Everything, Nothing, TransformOrigin},
 };
 use frame_system::EnsureRoot;
 use pallet_asset_switch::xcm::{
@@ -330,14 +330,3 @@ impl pallet_message_queue::Config for Runtime {
 	type MaxStale = MaxStale;
 	type ServiceWeight = ServiceWeight;
 }
-
-// Remove me in 1.15.0
-parameter_types! {
-	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
-}
-
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type DmpSink = EnqueueWithOrigin<MessageQueue, RelayOrigin>;
-	type WeightInfo = crate::weights::cumulus_pallet_dmp_queue::WeightInfo<Runtime>;
-}
diff --git a/runtimes/spiritnet/Cargo.toml b/runtimes/spiritnet/Cargo.toml
@@ -92,7 +92,6 @@ pallet-vesting             = { workspace = true }
 
 # Cumulus dependencies
 cumulus-pallet-aura-ext         = { workspace = true }
-cumulus-pallet-dmp-queue        = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook"] }
 cumulus-pallet-xcm              = { workspace = true }
 cumulus-pallet-xcmp-queue       = { workspace = true }
@@ -125,7 +124,6 @@ fast-gov = ["runtime-common/fast-gov"]
 runtime-benchmarks = [
   "attestation/runtime-benchmarks",
   "ctype/runtime-benchmarks",
-  "cumulus-pallet-dmp-queue/runtime-benchmarks",
   "cumulus-pallet-parachain-system/runtime-benchmarks",
   "cumulus-pallet-session-benchmarking/runtime-benchmarks",
   "cumulus-pallet-xcmp-queue/runtime-benchmarks",
@@ -175,7 +173,6 @@ std = [
   "attestation/std",
   "ctype/std",
   "cumulus-pallet-aura-ext/std",
-  "cumulus-pallet-dmp-queue/std",
   "cumulus-pallet-parachain-system/std",
   "cumulus-pallet-session-benchmarking/std",
   "cumulus-pallet-xcm/std",
@@ -257,7 +254,6 @@ try-runtime = [
   "attestation/try-runtime",
   "ctype/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",