This repository has been archived by the owner on Nov 15, 2023. It is now read-only.
Kusama state version switch and migration. #7015
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -140,7 +140,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { | |
| #[cfg(feature = "disable-runtime-api")] | ||
| apis: sp_version::create_apis_vec![[]], | ||
| transaction_version: 23, | ||
| state_version: 1, | ||
| }; | ||
|
|
||
| /// The BABE epoch configuration at genesis. | ||
|
|
@@ -1340,6 +1340,26 @@ impl pallet_nomination_pools::Config for Runtime { | |
| type MaxPointsToBalance = MaxPointsToBalance; | ||
| } | ||
|
|
||
| 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 = 1 * CENTS; | ||
| pub const MigrationSignedDepositBase: Balance = 20 * CENTS * 100; | ||
| pub const MigrationMaxKeyLen: u32 = 512; | ||
| } | ||
|
|
||
| impl pallet_state_trie_migration::Config for Runtime { | ||
| type RuntimeEvent = RuntimeEvent; | ||
| type Currency = Balances; | ||
| type SignedDepositPerItem = MigrationSignedDepositPerItem; | ||
| type SignedDepositBase = MigrationSignedDepositBase; | ||
| type ControlOrigin = EnsureRoot<AccountId>; | ||
| type SignedFilter = frame_support::traits::NeverEnsureOrigin<AccountId>; | ||
|
|
||
| // Use same weights as substrate ones. | ||
| type WeightInfo = pallet_state_trie_migration::weights::SubstrateWeight<Runtime>; | ||
|
There was a problem hiding this comment. Would be more appropriate to benchmark it properly in this runtime. There was a problem hiding this comment. yes, not sure how much change it will be to do so (in theory there is no reason to see significant change: only wasm bin size may interfere a tiny bit maybe). |
||
| type MaxKeyLen = MigrationMaxKeyLen; | ||
| } | ||
|
|
||
| construct_runtime! { | ||
| pub enum Runtime where | ||
| Block = Block, | ||
|
|
@@ -1456,6 +1476,9 @@ construct_runtime! { | |
| Auctions: auctions::{Pallet, Call, Storage, Event<T>} = 72, | ||
| Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 73, | ||
|
|
||
| // State trie migration pallet, only temporary. | ||
| StateTrieMigration: pallet_state_trie_migration = 98, | ||
|
|
||
| // Pallet for sending XCM. | ||
| XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config} = 99, | ||
|
|
||
|
|
@@ -1534,6 +1557,7 @@ pub mod migrations { | |
|
|
||
| /// Unreleased migrations. Add new ones here: | ||
| pub type Unreleased = ( | ||
| init_state_migration::InitMigrate, | ||
| pallet_society::migrations::MigrateToV2<Runtime, (), past_payouts::PastPayouts>, | ||
| pallet_im_online::migration::v1::Migration<Runtime>, | ||
| ); | ||
|
|
@@ -2478,3 +2502,52 @@ mod remote_tests { | |
| }); | ||
| } | ||
| } | ||
|
|
||
| mod init_state_migration { | ||
liamaharon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| use super::Runtime; | ||
| use frame_support::traits::OnRuntimeUpgrade; | ||
| use pallet_state_trie_migration::{AutoLimits, MigrationLimits, MigrationProcess}; | ||
| #[cfg(feature = "try-runtime")] | ||
| use sp_runtime::DispatchError; | ||
| #[cfg(not(feature = "std"))] | ||
| use sp_std::prelude::*; | ||
|
|
||
| /// Initialize an automatic migration process. | ||
| pub struct InitMigrate; | ||
|
There was a problem hiding this comment. You need to add it to the list of migrations. |
||
| impl OnRuntimeUpgrade for InitMigrate { | ||
| #[cfg(feature = "try-runtime")] | ||
| fn pre_upgrade() -> Result<Vec<u8>, DispatchError> { | ||
| frame_support::ensure!( | ||
| AutoLimits::<Runtime>::get().is_none(), | ||
| DispatchError::Other("Automigration already started.") | ||
| ); | ||
| Ok(Default::default()) | ||
| } | ||
|
|
||
| fn on_runtime_upgrade() -> frame_support::weights::Weight { | ||
| if MigrationProcess::<Runtime>::get() == Default::default() && | ||
| AutoLimits::<Runtime>::get().is_none() | ||
| { | ||
| // We use limits to target 600ko proofs per block and | ||
| // avg 800_000_000_000 of weight per block. | ||
|
There was a problem hiding this comment. Can lower to 600 (using 3200 instead of 4800 move to 510 blocks the migration time so not taking really longer). Could make sense to calculate better weight as I believe it is an overestimate (iterating on data since iterator improvement may be cheaper than random data access). There was a problem hiding this comment. 800ms sounds good! For some reason I thought we measure ref time in nanoseconds, but ty @crystalin |
||
| // See spreadsheet 4800_400 in | ||
| // https://raw.githubusercontent.com/cheme/substrate/try-runtime-mig/ksm.ods | ||
| AutoLimits::<Runtime>::put(Some(MigrationLimits { item: 4_800, size: 204800 * 2 })); | ||
| log::info!("Automatic trie migration started."); | ||
| <Runtime as frame_system::Config>::DbWeight::get().reads_writes(2, 1) | ||
| } else { | ||
| log::info!("Automatic trie migration not started."); | ||
| <Runtime as frame_system::Config>::DbWeight::get().reads(2) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(feature = "try-runtime")] | ||
| fn post_upgrade(_state: Vec<u8>) -> Result<(), DispatchError> { | ||
| frame_support::ensure!( | ||
| AutoLimits::<Runtime>::get().is_some(), | ||
| DispatchError::Other("Automigration started.") | ||
| ); | ||
| Ok(()) | ||
| } | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure? it would be hard to acquire.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not very comfortable with having a privilege account.
Actually I recently reconsider bringing back the inherent version of the migration (the main issue was the code was a bit everywhere and less cleanly separated, but looking backward, it would have really feel more comfortable to me).