Missing migrations, dead code removal

AstarNetwork · Aug 8, 2024 · 16aa6eb · 16aa6eb
1 parent 2dca9d9
commit 16aa6eb
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 90 deletions.
diff --git a/pallets/unified-accounts/src/lib.rs b/pallets/unified-accounts/src/lib.rs
@@ -88,7 +88,6 @@ use sp_std::marker::PhantomData;
 
 pub use pallet::*;
 
-pub mod migration;
 pub mod weights;
 pub use weights::WeightInfo;
 

diff --git a/pallets/unified-accounts/src/migration.rs b/pallets/unified-accounts/src/migration.rs
diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs
@@ -718,7 +718,7 @@ impl pallet_contracts::Config for Runtime {
     type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
     type Debug = ();
     type Environment = ();
-    type Migrations = ();
+    type Migrations = (pallet_contracts::migration::v16::Migration<Runtime>,);
     type Xcm = ();
     type UploadOrigin = EnsureSigned<<Self as frame_system::Config>::AccountId>;
     type InstantiateOrigin = EnsureSigned<<Self as frame_system::Config>::AccountId>;
@@ -1025,7 +1025,6 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
                         | RuntimeCall::XcmpQueue(..)
                         | RuntimeCall::PolkadotXcm(..)
                         | RuntimeCall::CumulusXcm(..)
-                        | RuntimeCall::DmpQueue(..)
                         | RuntimeCall::XcAssetConfig(..)
                         // Skip entire EVM pallet
                         // Skip entire Ethereum pallet
@@ -1226,7 +1225,6 @@ construct_runtime!(
         XcmpQueue: cumulus_pallet_xcmp_queue = 50,
         PolkadotXcm: pallet_xcm = 51,
         CumulusXcm: cumulus_pallet_xcm = 52,
-        DmpQueue: cumulus_pallet_dmp_queue = 53,
         XcAssetConfig: pallet_xc_asset_config = 54,
         XTokens: orml_xtokens = 55,
         MessageQueue: pallet_message_queue = 56,
@@ -1297,17 +1295,23 @@ parameter_types! {
     ];
 }
 
+parameter_types! {
+    pub const DmpQueuePalletName: &'static str = "DmpQueue";
+}
+
 /// All migrations that will run on the next runtime upgrade.
 ///
 /// Once done, migrations should be removed from the tuple.
 pub type Migrations = (
     // permanent migration, do not remove
     pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
-    // XCM V3 -> V4
-    pallet_xc_asset_config::migrations::versioned::V2ToV3<Runtime>,
-    pallet_identity::migration::versioned::V0ToV1<Runtime, 250>,
     // dapp-staking dyn tier threshold migrations
     pallet_dapp_staking_v3::migration::versioned_migrations::V7ToV8<Runtime, TierThresholds>,
+    frame_support::migrations::RemovePallet<
+        DmpQueuePalletName,
+        <Runtime as frame_system::Config>::DbWeight,
+    >,
+    pallet_contracts::Migration<Runtime>,
 );
 
 type EventRecord = frame_system::EventRecord<

diff --git a/runtime/astar/src/xcm_config.rs b/runtime/astar/src/xcm_config.rs
@@ -341,19 +341,6 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
     type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight<Runtime>;
 }
 
-parameter_types! {
-    pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
-}
-
-// TODO: This pallet should be removed after the lazy migration is done and
-// event `Completed` is emitted.
-// https://github.com/paritytech/polkadot-sdk/pull/1246
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-    type RuntimeEvent = RuntimeEvent;
-    type DmpSink = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
-    type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight<Runtime>;
-}
-
 parameter_types! {
     /// The absolute location in perspective of the whole network.
     pub AstarLocationAbsolute: Location = Location {

diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs
@@ -764,7 +764,7 @@ impl pallet_contracts::Config for Runtime {
     type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
     type Debug = ();
     type Environment = ();
-    type Migrations = ();
+    type Migrations = (pallet_contracts::migration::v16::Migration<Runtime>,);
     type Xcm = ();
     type UploadOrigin = EnsureSigned<<Self as frame_system::Config>::AccountId>;
     type InstantiateOrigin = EnsureSigned<<Self as frame_system::Config>::AccountId>;
@@ -1058,7 +1058,6 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
                         | RuntimeCall::XcmpQueue(..)
                         | RuntimeCall::PolkadotXcm(..)
                         | RuntimeCall::CumulusXcm(..)
-                        | RuntimeCall::DmpQueue(..)
                         | RuntimeCall::XcAssetConfig(..)
                         // Skip entire EVM pallet
                         // Skip entire Ethereum pallet
@@ -1549,7 +1548,6 @@ construct_runtime!(
         XcmpQueue: cumulus_pallet_xcmp_queue = 50,
         PolkadotXcm: pallet_xcm = 51,
         CumulusXcm: cumulus_pallet_xcm = 52,
-        DmpQueue: cumulus_pallet_dmp_queue = 53,
         XcAssetConfig: pallet_xc_asset_config = 54,
         XTokens: orml_xtokens = 55,
         MessageQueue: pallet_message_queue = 56,
@@ -1638,6 +1636,10 @@ parameter_types! {
     ];
 }
 
+parameter_types! {
+    pub const DmpQueuePalletName: &'static str = "DmpQueue";
+}
+
 /// All migrations that will run on the next runtime upgrade.
 ///
 /// Once done, migrations should be removed from the tuple.
@@ -1646,6 +1648,11 @@ pub type Migrations = (
     pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
     // dapp-staking dyn tier threshold migrations
     pallet_dapp_staking_v3::migration::versioned_migrations::V7ToV8<Runtime, TierThresholds>,
+    frame_support::migrations::RemovePallet<
+        DmpQueuePalletName,
+        <Runtime as frame_system::Config>::DbWeight,
+    >,
+    pallet_contracts::Migration<Runtime>,
 );
 
 type EventRecord = frame_system::EventRecord<

diff --git a/runtime/shibuya/src/xcm_config.rs b/runtime/shibuya/src/xcm_config.rs
@@ -270,16 +270,6 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
     type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight<Runtime>;
 }
 
-parameter_types! {
-    pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
-}
-
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-    type RuntimeEvent = RuntimeEvent;
-    type DmpSink = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
-    type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight<Runtime>;
-}
-
 parameter_types! {
     /// The absolute location in perspective of the whole network.
     pub ShibuyaLocationAbsolute: Location = Location {

diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs
@@ -746,7 +746,7 @@ impl pallet_contracts::Config for Runtime {
     type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
     type Debug = ();
     type Environment = ();
-    type Migrations = ();
+    type Migrations = (pallet_contracts::migration::v16::Migration<Runtime>,);
     type Xcm = ();
     type UploadOrigin = EnsureSigned<<Self as frame_system::Config>::AccountId>;
     type InstantiateOrigin = EnsureSigned<<Self as frame_system::Config>::AccountId>;
@@ -1024,7 +1024,6 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
                         | RuntimeCall::XcmpQueue(..)
                         | RuntimeCall::PolkadotXcm(..)
                         | RuntimeCall::CumulusXcm(..)
-                        | RuntimeCall::DmpQueue(..)
                         | RuntimeCall::XcAssetConfig(..)
                         // Skip entire EVM pallet
                         // Skip entire Ethereum pallet
@@ -1225,7 +1224,6 @@ construct_runtime!(
         XcmpQueue: cumulus_pallet_xcmp_queue = 50,
         PolkadotXcm: pallet_xcm = 51,
         CumulusXcm: cumulus_pallet_xcm = 52,
-        DmpQueue: cumulus_pallet_dmp_queue = 53,
         XcAssetConfig: pallet_xc_asset_config = 54,
         XTokens: orml_xtokens = 55,
         MessageQueue: pallet_message_queue = 56,
@@ -1297,18 +1295,22 @@ parameter_types! {
     ];
 }
 
+parameter_types! {
+    pub const DmpQueuePalletName: &'static str = "DmpQueue";
+}
+
 /// All migrations that will run on the next runtime upgrade.
 ///
 /// Once done, migrations should be removed from the tuple.
 pub type Migrations = (
-    cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
-    // permanent migration, do not remove
     pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
-    // XCM V3 -> V4
-    pallet_xc_asset_config::migrations::versioned::V2ToV3<Runtime>,
-    pallet_identity::migration::versioned::V0ToV1<Runtime, 250>,
     // dapp-staking dyn tier threshold migrations
     pallet_dapp_staking_v3::migration::versioned_migrations::V7ToV8<Runtime, TierThresholds>,
+    frame_support::migrations::RemovePallet<
+        DmpQueuePalletName,
+        <Runtime as frame_system::Config>::DbWeight,
+    >,
+    pallet_contracts::Migration<Runtime>,
 );
 
 type EventRecord = frame_system::EventRecord<

diff --git a/runtime/shiden/src/xcm_config.rs b/runtime/shiden/src/xcm_config.rs
@@ -345,16 +345,6 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
     type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight<Runtime>;
 }
 
-parameter_types! {
-    pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
-}
-
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-    type RuntimeEvent = RuntimeEvent;
-    type DmpSink = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
-    type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight<Runtime>;
-}
-
 parameter_types! {
     /// The absolute location in perspective of the whole network.
     pub ShidenLocationAbsolute: Location = Location {