diff --git a/Cargo.lock b/Cargo.lock index 9c9e6bbfd..c0bd1e51c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -123,7 +123,6 @@ dependencies = [ "pallet-proxy", "pallet-scheduler", "pallet-session", - "pallet-state-trie-migration", "pallet-sudo", "pallet-timestamp", "pallet-tips", @@ -5434,23 +5433,6 @@ dependencies = [ "sp-arithmetic", ] -[[package]] -name = "pallet-state-trie-migration" -version = "39.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bcdde046a530b78cf8caa8faef67208a38093658f5fa3668b183967df4ac82" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", -] - [[package]] name = "pallet-sudo" version = "37.0.0" diff --git a/runtime/acala/Cargo.toml b/runtime/acala/Cargo.toml index fc3c8d48d..dc81dbe14 100644 --- a/runtime/acala/Cargo.toml +++ b/runtime/acala/Cargo.toml @@ -55,7 +55,6 @@ sp-staking = { workspace = true } sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } -pallet-state-trie-migration = { workspace = true, optional = true } # cumulus cumulus-pallet-aura-ext = { workspace = true } @@ -200,7 +199,6 @@ std = [ "sp-transaction-pool/std", "sp-version/std", "substrate-wasm-builder", - "pallet-state-trie-migration/std", "cumulus-pallet-aura-ext/std", "cumulus-pallet-parachain-system/std", @@ -297,7 +295,6 @@ runtime-benchmarks = [ "pallet-utility/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "sp-staking/runtime-benchmarks", - "pallet-state-trie-migration/runtime-benchmarks", "cumulus-pallet-parachain-system/runtime-benchmarks", "cumulus-pallet-xcmp-queue/runtime-benchmarks", @@ -358,7 +355,6 @@ try-runtime = [ "pallet-transaction-payment/try-runtime", "pallet-treasury/try-runtime", "pallet-utility/try-runtime", - "pallet-state-trie-migration/try-runtime", "cumulus-pallet-aura-ext/try-runtime", "cumulus-pallet-parachain-system/try-runtime", diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs index 589ebed22..66545b7a0 100644 --- a/runtime/acala/src/lib.rs +++ b/runtime/acala/src/lib.rs @@ -1832,32 +1832,6 @@ impl orml_parameters::Config for Runtime { type WeightInfo = (); } -frame_support::ord_parameter_types! { - pub const MigController: AccountId = AccountId::from(hex_literal::hex!("ec68c9ec1f6233f3d8169e06e2c94df703c45c05eef923169bf2703b08797315")); -} - -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 MigrationSignedDepositPerItem: Balance = dollar(ACA); - pub MigrationSignedDepositBase: Balance = dollar(ACA); - pub const MigrationMaxKeyLen: u32 = 512; -} - -impl pallet_state_trie_migration::Config for Runtime { - // An origin that can control the whole pallet: should be Root, or a part of your council. - type ControlOrigin = EnsureRootOrTwoThirdsTechnicalCommittee; - // specific account for the migration, can trigger the signed migrations. - type SignedFilter = frame_system::EnsureSignedBy; - type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type RuntimeHoldReason = RuntimeHoldReason; - type MaxKeyLen = MigrationMaxKeyLen; - type SignedDepositPerItem = MigrationSignedDepositPerItem; - type SignedDepositBase = MigrationSignedDepositBase; - // Replace this with weight based on your runtime. - type WeightInfo = pallet_state_trie_migration::weights::SubstrateWeight; -} - construct_runtime!( pub enum Runtime { // Core & Utility @@ -1967,8 +1941,6 @@ construct_runtime!( // Parachain System, always put it at the end ParachainSystem: cumulus_pallet_parachain_system = 30, - StateTrieMigration: pallet_state_trie_migration = 254, - // Temporary Sudo: pallet_sudo = 255, } @@ -2015,8 +1987,12 @@ pub type Executive = frame_executive::Executive< Migrations, >; +parameter_types! { + pub const StateTrieMigrationName: &'static str = "StateTrieMigration"; +} + #[allow(unused_parens)] -type Migrations = (); +type Migrations = (frame_support::migrations::RemovePallet); #[cfg(feature = "runtime-benchmarks")] #[macro_use] diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs index e7fe7b8f9..96a44a5f9 100644 --- a/runtime/karura/src/lib.rs +++ b/runtime/karura/src/lib.rs @@ -1995,12 +1995,8 @@ pub type Executive = frame_executive::Executive< Migrations, >; -parameter_types! { - pub const StateTrieMigrationName: &'static str = "StateTrieMigration"; -} - #[allow(unused_parens)] -type Migrations = (frame_support::migrations::RemovePallet); +type Migrations = (); #[cfg(feature = "runtime-benchmarks")] #[macro_use]