mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-17 10:11:03 +00:00
State trie migration rococo runtime changes. (#6127)
* add state-trie-migration (warn key need to be changed) * rococo root * restore master benchs (weights from substrate are used). * use ord_parameter macro. * do not upgrade runtime version yet * apply review changes * to test ci * Revert "to test ci" This reverts commit 5df6c5c74c5d172f254579cbb76caeb44af80ec2. * test ci * Revert "test ci" This reverts commit 0747761644ba566f9756e195e5304758370dc52c. Co-authored-by: parity-processbot <>
This commit is contained in:
Generated
+18
@@ -5370,6 +5370,23 @@ dependencies = [
|
|||||||
"sp-arithmetic",
|
"sp-arithmetic",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pallet-state-trie-migration"
|
||||||
|
version = "4.0.0-dev"
|
||||||
|
source = "git+https://github.com/paritytech/substrate?branch=master#4a5a9dea00c9b4e4d34ff56368451aa4dac09d77"
|
||||||
|
dependencies = [
|
||||||
|
"frame-benchmarking",
|
||||||
|
"frame-support",
|
||||||
|
"frame-system",
|
||||||
|
"log",
|
||||||
|
"parity-scale-codec",
|
||||||
|
"scale-info",
|
||||||
|
"sp-core",
|
||||||
|
"sp-io",
|
||||||
|
"sp-runtime",
|
||||||
|
"sp-std",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pallet-sudo"
|
name = "pallet-sudo"
|
||||||
version = "4.0.0-dev"
|
version = "4.0.0-dev"
|
||||||
@@ -8137,6 +8154,7 @@ dependencies = [
|
|||||||
"pallet-session",
|
"pallet-session",
|
||||||
"pallet-society",
|
"pallet-society",
|
||||||
"pallet-staking",
|
"pallet-staking",
|
||||||
|
"pallet-state-trie-migration",
|
||||||
"pallet-sudo",
|
"pallet-sudo",
|
||||||
"pallet-timestamp",
|
"pallet-timestamp",
|
||||||
"pallet-tips",
|
"pallet-tips",
|
||||||
|
|||||||
@@ -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-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-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-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 = { 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-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 }
|
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-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 }
|
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-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
|
||||||
runtime-parachains = { package = "polkadot-runtime-parachains", path = "../parachains", 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 }
|
xcm-builder = { package = "xcm-builder", path = "../../xcm/xcm-builder", default-features = false }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
hex-literal = "0.3.4"
|
|
||||||
tiny-keccak = { version = "2.0.2", features = ["keccak"] }
|
tiny-keccak = { version = "2.0.2", features = ["keccak"] }
|
||||||
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
|
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
|
||||||
sp-trie = { 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-beefy-mmr/std",
|
||||||
"pallet-bounties/std",
|
"pallet-bounties/std",
|
||||||
"pallet-child-bounties/std",
|
"pallet-child-bounties/std",
|
||||||
|
"pallet-state-trie-migration/std",
|
||||||
"pallet-transaction-payment/std",
|
"pallet-transaction-payment/std",
|
||||||
"pallet-transaction-payment-rpc-runtime-api/std",
|
"pallet-transaction-payment-rpc-runtime-api/std",
|
||||||
"pallet-collective/std",
|
"pallet-collective/std",
|
||||||
@@ -207,7 +208,6 @@ runtime-benchmarks = [
|
|||||||
"pallet-vesting/runtime-benchmarks",
|
"pallet-vesting/runtime-benchmarks",
|
||||||
"pallet-xcm/runtime-benchmarks",
|
"pallet-xcm/runtime-benchmarks",
|
||||||
"frame-system-benchmarking/runtime-benchmarks",
|
"frame-system-benchmarking/runtime-benchmarks",
|
||||||
"hex-literal",
|
|
||||||
"xcm-builder/runtime-benchmarks",
|
"xcm-builder/runtime-benchmarks",
|
||||||
"runtime-parachains/runtime-benchmarks",
|
"runtime-parachains/runtime-benchmarks",
|
||||||
"pallet-xcm-benchmarks/runtime-benchmarks",
|
"pallet-xcm-benchmarks/runtime-benchmarks",
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
|
|||||||
#[cfg(feature = "disable-runtime-api")]
|
#[cfg(feature = "disable-runtime-api")]
|
||||||
apis: sp_version::create_apis_vec![[]],
|
apis: sp_version::create_apis_vec![[]],
|
||||||
transaction_version: 15,
|
transaction_version: 15,
|
||||||
state_version: 0,
|
state_version: 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
/// The BABE epoch configuration at genesis.
|
/// The BABE epoch configuration at genesis.
|
||||||
@@ -1416,6 +1416,9 @@ construct_runtime! {
|
|||||||
// Validator Manager pallet.
|
// Validator Manager pallet.
|
||||||
ValidatorManager: validator_manager::{Pallet, Call, Storage, Event<T>} = 252,
|
ValidatorManager: validator_manager::{Pallet, Call, Storage, Event<T>} = 252,
|
||||||
|
|
||||||
|
// State trie migration pallet, only temporary.
|
||||||
|
StateTrieMigration: pallet_state_trie_migration = 254,
|
||||||
|
|
||||||
// Sudo.
|
// Sudo.
|
||||||
Sudo: pallet_sudo::{Pallet, Call, Storage, Event<T>, Config<T>} = 255,
|
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.
|
/// The payload being signed in transactions.
|
||||||
pub type SignedPayload = generic::SignedPayload<RuntimeCall, SignedExtra>;
|
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")]
|
#[cfg(feature = "runtime-benchmarks")]
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate frame_benchmarking;
|
extern crate frame_benchmarking;
|
||||||
|
|||||||
Reference in New Issue
Block a user