Merge branch 'master' into ao-5535-followup

* master: State trie migration rococo runtime changes. (#6127) Add a few staking params to fast-runtime build (#5424)
paritytech · Nov 11, 2022 · 0606aab · 0606aab
2 parents 9ee1e3b + 0f9244b
commit 0606aab
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
@@ -548,10 +548,19 @@ impl pallet_staking::EraPayout<Balance> for EraPayout {
 parameter_types! {
  // Six sessions in an era (6 hours).
  pub const SessionsPerEra: SessionIndex = prod_or_fast!(6, 1);
+
  // 28 eras for unbonding (7 days).
- pub const BondingDuration: sp_staking::EraIndex = 28;
+ pub BondingDuration: sp_staking::EraIndex = prod_or_fast!(
+ 28,
+ 28,
+ "DOT_BONDING_DURATION"
+ );
  // 27 eras in which slashes can be cancelled (slightly less than 7 days).
- pub const SlashDeferDuration: sp_staking::EraIndex = 27;
+ pub SlashDeferDuration: sp_staking::EraIndex = prod_or_fast!(
+ 27,
+ 27,
+ "DOT_SLASH_DEFER_DURATION"
+ );
  pub const MaxNominatorRewardedPerValidator: u32 = 512;
  pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17);
  // 24

diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
@@ -534,9 +534,18 @@ pallet_staking_reward_curve::build! {
 parameter_types! {
  // Six sessions in an era (24 hours).
  pub const SessionsPerEra: SessionIndex = prod_or_fast!(6, 1);
+
  // 28 eras for unbonding (28 days).
- pub const BondingDuration: sp_staking::EraIndex = 28;
- pub const SlashDeferDuration: sp_staking::EraIndex = 27;
+ pub BondingDuration: sp_staking::EraIndex = prod_or_fast!(
+ 28,
+ 28,
+ "DOT_BONDING_DURATION"
+ );
+ pub SlashDeferDuration: sp_staking::EraIndex = prod_or_fast!(
+ 27,
+ 27,
+ "DOT_SLASH_DEFER_DURATION"
+ );
  pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
  pub const MaxNominatorRewardedPerValidator: u32 = 512;
  pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17);

diff --git a/runtime/rococo/Cargo.toml b/runtime/rococo/Cargo.toml
@@ -41,6 +41,7 @@ pallet-beefy = { git = "https://github.com/paritytech/substrate", branch = "mast
 pallet-beefy-mmr = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-state-trie-migration = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -77,7 +78,7 @@ pallet-xcm-benchmarks = { path = "../../xcm/pallet-xcm-benchmarks", default-feat
 
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
 frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-hex-literal = { version = "0.3.4", optional = true }
+hex-literal = { version = "0.3.4" }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 runtime-parachains = { package = "polkadot-runtime-parachains", path = "../parachains", default-features = false }
@@ -89,7 +90,6 @@ xcm-executor = { package = "xcm-executor", path = "../../xcm/xcm-executor", defa
 xcm-builder = { package = "xcm-builder", path = "../../xcm/xcm-builder", default-features = false }
 
 [dev-dependencies]
-hex-literal = "0.3.4"
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -124,6 +124,7 @@ std = [
  "pallet-beefy-mmr/std",
  "pallet-bounties/std",
  "pallet-child-bounties/std",
+ "pallet-state-trie-migration/std",
  "pallet-transaction-payment/std",
  "pallet-transaction-payment-rpc-runtime-api/std",
  "pallet-collective/std",
@@ -207,7 +208,6 @@ runtime-benchmarks = [
  "pallet-vesting/runtime-benchmarks",
  "pallet-xcm/runtime-benchmarks",
  "frame-system-benchmarking/runtime-benchmarks",
- "hex-literal",
  "xcm-builder/runtime-benchmarks",
  "runtime-parachains/runtime-benchmarks",
  "pallet-xcm-benchmarks/runtime-benchmarks",

diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs
@@ -115,7 +115,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
  #[cfg(feature = "disable-runtime-api")]
  apis: sp_version::create_apis_vec![[]],
  transaction_version: 15,
- state_version: 0,
+ state_version: 1,
 };
 
 /// The BABE epoch configuration at genesis.
@@ -1416,6 +1416,9 @@ construct_runtime! {
  // Validator Manager pallet.
  ValidatorManager: validator_manager::{Pallet, Call, Storage, Event<T>} = 252,
 
+ // State trie migration pallet, only temporary.
+ StateTrieMigration: pallet_state_trie_migration = 254,
+
  // Sudo.
  Sudo: pallet_sudo::{Pallet, Call, Storage, Event<T>, Config<T>} = 255,
  }
@@ -1466,6 +1469,31 @@ pub type Executive = frame_executive::Executive<
 /// The payload being signed in transactions.
 pub type SignedPayload = generic::SignedPayload<RuntimeCall, SignedExtra>;
 
+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>;
+ // specific account for the migration, can trigger the signed migrations.
+ type SignedFilter = frame_system::EnsureSignedBy<MigController, AccountId>;
+
+ // Use same weights as substrate ones.
+ 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!("52bc71c1eca5353749542dfdf0af97bf764f9c2f44e860cd485f1cd86400f649"));
+}
+
 #[cfg(feature = "runtime-benchmarks")]
 #[macro_use]
 extern crate frame_benchmarking;