Cleanup migrations

Author: akru

Cargo.lock

@@ -161,7 +161,6 @@ pallet-migrations = { version = "13.0.0", default-features = false }
 pallet-preimage = { version = "43.0.0", default-features = false }
 pallet-scheduler = { version = "44.0.0", default-features = false }
 pallet-session = { version = "43.0.0", default-features = false }
-pallet-state-trie-migration = { version = "48.0.0", default-features = false }
 pallet-treasury = { version = "42.0.0", default-features = false }
 pallet-utility = { version = "43.0.0", default-features = false }
 pallet-vesting = { version = "43.0.0", default-features = false }

Cargo.toml

@@ -43,7 +43,6 @@ frame-metadata-hash-extension.workspace = true
 pallet-identity.workspace = true
 pallet-scheduler.workspace = true
 pallet-session.workspace = true
-pallet-state-trie-migration.workspace = true
 pallet-treasury.workspace = true
 pallet-membership.workspace = true
 pallet-migrations.workspace = true
@@ -199,7 +198,6 @@ try-runtime = [
   "pallet-migrations/try-runtime",
   "pallet-multisig/try-runtime",
   "pallet-session/try-runtime",
-  "pallet-state-trie-migration/try-runtime",
   "pallet-timestamp/try-runtime",
   "pallet-transaction-payment/try-runtime",
   "pallet-utility/try-runtime",

runtime/robonomics/Cargo.toml

@@ -84,7 +84,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: alloc::borrow::Cow::Borrowed("robonomics"),
     impl_name: alloc::borrow::Cow::Borrowed("robonomics-airalab"),
     authoring_version: 1,
-    spec_version: 40,
+    spec_version: 41,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,
@@ -204,7 +204,7 @@ impl cumulus_pallet_aura_ext::Config for Runtime {}
 
 impl pallet_timestamp::Config for Runtime {
     type Moment = u64;
-    type OnTimestampSet = ();
+    type OnTimestampSet = Aura;
     type MinimumPeriod = ConstU64<0>;
     type WeightInfo = ();
 }
@@ -537,7 +537,7 @@ construct_runtime! {
         Timestamp: pallet_timestamp = 12,
         Multisig: pallet_multisig = 15,
         MultiBlockMigrations: pallet_migrations = 16,
-        StateTrieMigration: pallet_state_trie_migration = 17,
+        // Ex: StateTrieMigration: pallet_state_trie_migration = 17,
 
         // Parachain systems.
         ParachainSystem: cumulus_pallet_parachain_system = 21,
@@ -628,98 +628,7 @@ pub type Executive = frame_executive::Executive<
 >;
 
 /// Migrations to apply on runtime upgrade.
-pub type Migrations = (
-    pallet_multisig::migrations::v1::MigrateToV1<Runtime>,
-    //cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
-    //cumulus_pallet_xcmp_queue::migration::v5::MigrateV4ToV5<Runtime>,
-    InitMigrationStorage,
-    // permanent
-    //pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
-);
-
-pub struct InitMigrationStorage;
-impl frame_support::traits::OnRuntimeUpgrade for InitMigrationStorage {
-    fn on_runtime_upgrade() -> Weight {
-        use sp_core::crypto::Ss58Codec;
-        use sp_keyring::Sr25519Keyring;
-
-        // setup sudo
-        if let Ok(sudo_key) =
-            AccountId::from_ss58check("5Cakru1BpXPiezeD2LRZh3pJamHcbX9yZ13KLBxuqdTpgnYF")
-        {
-            let _ = Sudo::set_key(RuntimeOrigin::root(), sudo_key.into());
-        }
-
-        // setup collators
-        use pallet_collator_selection::{CandidacyBond, DesiredCandidates, Invulnerables};
-        let desired_candidates = 25;
-        let candidacy_bond = 32 * XRT;
-        let invulnerables: Vec<AccountId> = vec![
-            Sr25519Keyring::Alice.to_account_id(),
-            Sr25519Keyring::Bob.to_account_id(),
-        ];
-
-        let bounded_invulnerables: BoundedVec<
-            _,
-            <Runtime as pallet_collator_selection::Config>::MaxInvulnerables,
-        > = invulnerables
-            .clone()
-            .try_into()
-            .expect("genesis invulnerables are more than T::MaxInvulnerables");
-
-        DesiredCandidates::<Runtime>::put(desired_candidates);
-        CandidacyBond::<Runtime>::put(candidacy_bond);
-        Invulnerables::<Runtime>::put(bounded_invulnerables);
-
-        // Genesis init pallet_session
-        use pallet_session::{NextKeys, QueuedKeys, SessionHandler, SessionManager, Validators};
-
-        // insert genesis keys
-        NextKeys::<Runtime>::insert(
-            Sr25519Keyring::Alice.to_account_id(),
-            SessionKeys {
-                aura: Sr25519Keyring::Alice.public().into(),
-            },
-        );
-        NextKeys::<Runtime>::insert(
-            Sr25519Keyring::Bob.to_account_id(),
-            SessionKeys {
-                aura: Sr25519Keyring::Bob.public().into(),
-            },
-        );
-
-        // init validators
-        let initial_validators_0 =
-            <Runtime as pallet_session::Config>::SessionManager::new_session_genesis(0)
-                .unwrap_or_else(|| {
-                    frame_support::print(
-                        "No initial validator provided by `SessionManager`, use \
-                    session config keys to generate initial validator set.",
-                    );
-                    invulnerables
-                });
-
-        let initial_validators_1 =
-            <Runtime as pallet_session::Config>::SessionManager::new_session_genesis(1)
-                .unwrap_or_else(|| initial_validators_0.clone());
-
-        let queued_keys: Vec<_> = initial_validators_1
-            .into_iter()
-            .filter_map(|v| pallet_session::Pallet::<Runtime>::load_keys(&v).map(|k| (v, k)))
-            .collect();
-
-        <Runtime as pallet_session::Config>::SessionHandler::on_genesis_session::<
-            <Runtime as pallet_session::Config>::Keys,
-        >(&queued_keys);
-
-        Validators::<Runtime>::put(initial_validators_0);
-        QueuedKeys::<Runtime>::put(queued_keys);
-
-        <Runtime as pallet_session::Config>::SessionManager::start_session(0);
-
-        Default::default()
-    }
-}
+pub type Migrations = ();
 
 #[cfg(feature = "runtime-benchmarks")]
 extern crate frame_benchmarking;
@@ -943,66 +852,7 @@ impl_runtime_apis! {
     }
 }
 
-/// Recovery block executor that pass blocks when authorities list is empty.
-pub struct BlockExecutor<T, I>(core::marker::PhantomData<(T, I)>);
-
-impl<Block, T, I> frame_support::traits::ExecuteBlock<Block> for BlockExecutor<T, I>
-where
-    Block: BlockT,
-    T: cumulus_pallet_aura_ext::Config,
-    I: frame_support::traits::ExecuteBlock<Block>,
-{
-    fn execute_block(block: Block) {
-        if pallet_aura::Authorities::<T>::get().len() > 0 {
-            // Execute block with aura pallet
-            cumulus_pallet_aura_ext::BlockExecutor::<T, I>::execute_block(block);
-        } else {
-            // Workaround because we don't have authorities
-            use sp_consensus_aura::digests::CompatibleDigestItem;
-            use sp_runtime::{traits::Header, RuntimeAppPublic};
-
-            // Filter aura digests befor pass block to executor
-            let (mut header, extrinsics) = block.deconstruct();
-            header.digest_mut().logs.retain(|s|
-                CompatibleDigestItem::<<T::AuthorityId as RuntimeAppPublic>::Signature>::as_aura_seal(s)
-                    .is_none()
-            );
-
-            I::execute_block(Block::new(header, extrinsics));
-        }
-    }
-}
-
 cumulus_pallet_parachain_system::register_validate_block! {
     Runtime = Runtime,
-    BlockExecutor = BlockExecutor<Runtime, Executive>,
-}
-
-parameter_types! {
-    // The deposit configuration for the singed migration. Specially if you want to allow any signed account to do the migration (see `SignedFilter`, these deposits should be high)
-    pub const MigrationSignedDepositPerItem: Balance = COASE;
-    pub const MigrationSignedDepositBase: Balance = 2_000 * COASE;
-    pub const MigrationMaxKeyLen: u32 = 512;
-}
-
-impl pallet_state_trie_migration::Config for Runtime {
-    type RuntimeEvent = RuntimeEvent;
-    type Currency = Balances;
-    type RuntimeHoldReason = RuntimeHoldReason;
-    type SignedDepositPerItem = MigrationSignedDepositPerItem;
-    type SignedDepositBase = MigrationSignedDepositBase;
-    // An origin that can control the whole pallet: should be Root, or a part of your council.
-    type ControlOrigin = frame_system::EnsureSignedBy<RootMigController, AccountId>;
-    // specific account for the migration, can trigger the signed migrations.
-    type SignedFilter = frame_system::EnsureSignedBy<MigController, AccountId>;
-
-    // Replace this with weight based on your runtime.
-    type WeightInfo = pallet_state_trie_migration::weights::SubstrateWeight<Runtime>;
-
-    type MaxKeyLen = MigrationMaxKeyLen;
-}
-
-frame_support::ord_parameter_types! {
-    pub const MigController: AccountId = AccountId::from(hex_literal::hex!("16eb796bee0c857db3d646ee7070252707aec0c7d82b2eda856632f6a2306a58"));
-    pub const RootMigController: AccountId = AccountId::from(hex_literal::hex!("16eb796bee0c857db3d646ee7070252707aec0c7d82b2eda856632f6a2306a58"));
+    BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
 }