From 00618f47c5988446e74a3ff882ef1d5b26053530 Mon Sep 17 00:00:00 2001 From: Emeric Chevalier Date: Tue, 30 Jan 2024 09:19:53 +0100 Subject: [PATCH 01/15] Remove state trie migration to kusama, add it to polkadot --- relay/kusama/Cargo.toml | 1 - relay/kusama/src/lib.rs | 85 -------------------------------------- relay/polkadot/Cargo.toml | 1 + relay/polkadot/src/lib.rs | 87 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 87 insertions(+), 87 deletions(-) diff --git a/relay/kusama/Cargo.toml b/relay/kusama/Cargo.toml index 0c83062836..103abb5d83 100644 --- a/relay/kusama/Cargo.toml +++ b/relay/kusama/Cargo.toml @@ -84,7 +84,6 @@ pallet-session = { default-features = false , version = "25.0.0" } pallet-society = { default-features = false, version = "25.0.0" } frame-support = { default-features = false , version = "25.0.0" } pallet-staking = { default-features = false , version = "25.0.0" } -pallet-state-trie-migration = { default-features = false , version = "26.0.0" } pallet-staking-runtime-api = { default-features = false , version = "11.0.0" } frame-system = { default-features = false , version = "25.0.0" } frame-system-rpc-runtime-api = { default-features = false , version = "23.0.0" } diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index f1db72848f..0bcc844694 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -1473,26 +1473,6 @@ 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; - type SignedFilter = frame_support::traits::NeverEnsureOrigin; - - // Use same weights as substrate ones. - type WeightInfo = pallet_state_trie_migration::weights::SubstrateWeight; - type MaxKeyLen = MigrationMaxKeyLen; -} - impl pallet_asset_rate::Config for Runtime { type WeightInfo = weights::pallet_asset_rate::WeightInfo; type RuntimeEvent = RuntimeEvent; @@ -1626,9 +1606,6 @@ construct_runtime! { Auctions: auctions::{Pallet, Call, Storage, Event} = 72, Crowdloan: crowdloan::{Pallet, Call, Storage, Event} = 73, - // State trie migration pallet, only temporary. - StateTrieMigration: pallet_state_trie_migration = 98, - // Pallet for sending XCM. XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 99, @@ -2668,65 +2645,3 @@ mod remote_tests { }); } } - -mod init_state_migration { - use super::Runtime; - use frame_support::traits::OnRuntimeUpgrade; - use pallet_state_trie_migration::{AutoLimits, MigrationLimits, MigrationProcess}; - #[cfg(not(feature = "std"))] - use sp_std::prelude::*; - - /// Initialize an automatic migration process. - pub struct InitMigrate; - impl OnRuntimeUpgrade for InitMigrate { - #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result, sp_runtime::DispatchError> { - use parity_scale_codec::Encode; - let migration_should_start = AutoLimits::::get().is_none() && - MigrationProcess::::get() == Default::default(); - Ok(migration_should_start.encode()) - } - - fn on_runtime_upgrade() -> frame_support::weights::Weight { - if AutoLimits::::get().is_some() { - log::warn!("Automatic trie migration already started, not proceeding."); - return ::DbWeight::get().reads(1) - }; - - if MigrationProcess::::get() != Default::default() { - log::warn!("MigrationProcess is not Default. Not proceeding."); - return ::DbWeight::get().reads(2) - }; - - // Migration is not already running and `MigraitonProcess` is Default. Ready to run - // migrations. - // - // We use limits to target 600ko proofs per block and - // avg 800_000_000_000 of weight per block. - // See spreadsheet 4800_400 in - // https://raw.githubusercontent.com/cheme/substrate/try-runtime-mig/ksm.ods - AutoLimits::::put(Some(MigrationLimits { item: 4_800, size: 204800 * 2 })); - log::info!("Automatic trie migration started."); - ::DbWeight::get().reads_writes(2, 1) - } - - #[cfg(feature = "try-runtime")] - fn post_upgrade( - migration_should_start_bytes: Vec, - ) -> Result<(), sp_runtime::DispatchError> { - use parity_scale_codec::Decode; - let migration_should_start: bool = - Decode::decode(&mut migration_should_start_bytes.as_slice()) - .expect("failed to decode migration should start"); - - if migration_should_start { - frame_support::ensure!( - AutoLimits::::get().is_some(), - sp_runtime::DispatchError::Other("Automigration did not start as expected.") - ); - } - - Ok(()) - } - } -} diff --git a/relay/polkadot/Cargo.toml b/relay/polkadot/Cargo.toml index 3d15818361..48b82272f4 100644 --- a/relay/polkadot/Cargo.toml +++ b/relay/polkadot/Cargo.toml @@ -81,6 +81,7 @@ pallet-staking = { default-features = false , version = "25.0.0" } pallet-staking-reward-fn = { default-features = false, version = "16.0.0" } pallet-staking-reward-curve = { version = "10.0.0" } pallet-staking-runtime-api = { default-features = false , version = "11.0.0" } +pallet-state-trie-migration = { default-features = false , version = "26.0.0" } frame-system = { default-features = false , version = "25.0.0" } frame-system-rpc-runtime-api = { default-features = false , version = "23.0.0" } polkadot-runtime-constants = { package = "polkadot-runtime-constants", path = "constants", default-features = false } diff --git a/relay/polkadot/src/lib.rs b/relay/polkadot/src/lib.rs index 7835ff0f82..fee2321bc6 100644 --- a/relay/polkadot/src/lib.rs +++ b/relay/polkadot/src/lib.rs @@ -148,7 +148,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 25, - state_version: 0, + state_version: 1, }; /// The BABE epoch configuration at genesis. @@ -1527,6 +1527,26 @@ impl frame_support::traits::OnRuntimeUpgrade for InitiateNominationPools { } } +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; + type SignedFilter = frame_support::traits::NeverEnsureOrigin; + + // Use same weights as substrate ones. + type WeightInfo = pallet_state_trie_migration::weights::SubstrateWeight; + type MaxKeyLen = MigrationMaxKeyLen; +} + impl pallet_asset_rate::Config for Runtime { type WeightInfo = weights::pallet_asset_rate::WeightInfo; type RuntimeEvent = RuntimeEvent; @@ -1637,6 +1657,9 @@ construct_runtime! { Auctions: auctions::{Pallet, Call, Storage, Event} = 72, Crowdloan: crowdloan::{Pallet, Call, Storage, Event} = 73, + // State trie migration pallet, only temporary. + StateTrieMigration: pallet_state_trie_migration = 98, + // Pallet for sending XCM. XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 99, @@ -2896,3 +2919,65 @@ mod remote_tests { }); } } + +mod init_state_migration { + use super::Runtime; + use frame_support::traits::OnRuntimeUpgrade; + use pallet_state_trie_migration::{AutoLimits, MigrationLimits, MigrationProcess}; + #[cfg(not(feature = "std"))] + use sp_std::prelude::*; + + /// Initialize an automatic migration process. + pub struct InitMigrate; + impl OnRuntimeUpgrade for InitMigrate { + #[cfg(feature = "try-runtime")] + fn pre_upgrade() -> Result, sp_runtime::DispatchError> { + use parity_scale_codec::Encode; + let migration_should_start = AutoLimits::::get().is_none() && + MigrationProcess::::get() == Default::default(); + Ok(migration_should_start.encode()) + } + + fn on_runtime_upgrade() -> frame_support::weights::Weight { + if AutoLimits::::get().is_some() { + log::warn!("Automatic trie migration already started, not proceeding."); + return ::DbWeight::get().reads(1) + }; + + if MigrationProcess::::get() != Default::default() { + log::warn!("MigrationProcess is not Default. Not proceeding."); + return ::DbWeight::get().reads(2) + }; + + // Migration is not already running and `MigraitonProcess` is Default. Ready to run + // migrations. + // + // We use limits to target 600ko proofs per block and + // avg 800_000_000_000 of weight per block. + // See spreadsheet 4800_400 in + // https://raw.githubusercontent.com/cheme/substrate/try-runtime-mig/ksm.ods + AutoLimits::::put(Some(MigrationLimits { item: 4_800, size: 204800 * 2 })); + log::info!("Automatic trie migration started."); + ::DbWeight::get().reads_writes(2, 1) + } + + #[cfg(feature = "try-runtime")] + fn post_upgrade( + migration_should_start_bytes: Vec, + ) -> Result<(), sp_runtime::DispatchError> { + use parity_scale_codec::Decode; + let migration_should_start: bool = + Decode::decode(&mut migration_should_start_bytes.as_slice()) + .expect("failed to decode migration should start"); + + if migration_should_start { + frame_support::ensure!( + AutoLimits::::get().is_some(), + sp_runtime::DispatchError::Other("Automigration did not start as expected.") + ); + } + + Ok(()) + } + } +} From 46601d56eac0341d6eed420f0276c60b01d219b7 Mon Sep 17 00:00:00 2001 From: Emeric Chevalier Date: Tue, 30 Jan 2024 09:32:11 +0100 Subject: [PATCH 02/15] migration in unreleased. --- CHANGELOG.md | 1 + relay/kusama/Cargo.toml | 3 --- relay/polkadot/Cargo.toml | 3 +++ relay/polkadot/src/lib.rs | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c73c49bb5..234a6dafe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Added +- Remove state-trie-migration pallet from kusama, add state trie migration to V1 on polkadot ([polkadot-fellows/runtimes#170](https://github.com/polkadot-fellows/runtimes/pull/170)) - Introduce chain spec generator ([polkadot-fellows/runtimes#127](https://github.com/polkadot-fellows/runtimes/pull/127)) - Add [Encointer](https://encointer.org) system parachain runtime, completing [RFC22](https://github.com/polkadot-fellows/RFCs/blob/main/text/ 0022-adopt-encointer-runtime.md) ([polkadot-fellows/runtimes#80](https://github.com/polkadot-fellows/runtimes/pull/80)) diff --git a/relay/kusama/Cargo.toml b/relay/kusama/Cargo.toml index 103abb5d83..88daf36fea 100644 --- a/relay/kusama/Cargo.toml +++ b/relay/kusama/Cargo.toml @@ -194,7 +194,6 @@ std = [ "pallet-society/std", "pallet-staking-runtime-api/std", "pallet-staking/std", - "pallet-state-trie-migration/std", "pallet-timestamp/std", "pallet-tips/std", "pallet-transaction-payment-rpc-runtime-api/std", @@ -275,7 +274,6 @@ runtime-benchmarks = [ "pallet-session-benchmarking/runtime-benchmarks", "pallet-society/runtime-benchmarks", "pallet-staking/runtime-benchmarks", - "pallet-state-trie-migration/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", "pallet-tips/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", @@ -335,7 +333,6 @@ try-runtime = [ "pallet-session/try-runtime", "pallet-society/try-runtime", "pallet-staking/try-runtime", - "pallet-state-trie-migration/try-runtime", "pallet-timestamp/try-runtime", "pallet-tips/try-runtime", "pallet-transaction-payment/try-runtime", diff --git a/relay/polkadot/Cargo.toml b/relay/polkadot/Cargo.toml index 48b82272f4..bc77999e37 100644 --- a/relay/polkadot/Cargo.toml +++ b/relay/polkadot/Cargo.toml @@ -189,6 +189,7 @@ std = [ "pallet-staking-reward-fn/std", "pallet-staking-runtime-api/std", "pallet-staking/std", + "pallet-state-trie-migration/std", "pallet-timestamp/std", "pallet-tips/std", "pallet-transaction-payment-rpc-runtime-api/std", @@ -267,6 +268,7 @@ runtime-benchmarks = [ "pallet-scheduler/runtime-benchmarks", "pallet-session-benchmarking/runtime-benchmarks", "pallet-staking/runtime-benchmarks", + "pallet-state-trie-migration/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", "pallet-tips/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", @@ -322,6 +324,7 @@ try-runtime = [ "pallet-scheduler/try-runtime", "pallet-session/try-runtime", "pallet-staking/try-runtime", + "pallet-state-trie-migration/try-runtime", "pallet-timestamp/try-runtime", "pallet-tips/try-runtime", "pallet-transaction-payment/try-runtime", diff --git a/relay/polkadot/src/lib.rs b/relay/polkadot/src/lib.rs index fee2321bc6..2f87381471 100644 --- a/relay/polkadot/src/lib.rs +++ b/relay/polkadot/src/lib.rs @@ -1726,6 +1726,8 @@ pub mod migrations { pub type Unreleased = ( // Upgrade SessionKeys to include BEEFY key UpgradeSessionKeys, + init_state_migration::InitMigrate, + pallet_nomination_pools::migration::versioned_migrations::V5toV6, pallet_nomination_pools::migration::versioned_migrations::V5toV6, pallet_nomination_pools::migration::versioned_migrations::V6ToV7, ); From 2562c33b2bd85fdfeef0581c24eac4ef4026b540 Mon Sep 17 00:00:00 2001 From: Emeric Chevalier Date: Tue, 30 Jan 2024 09:38:27 +0100 Subject: [PATCH 03/15] update cargo lock --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 22eb85231b..efd16c75cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8856,6 +8856,7 @@ dependencies = [ "pallet-staking-reward-curve", "pallet-staking-reward-fn", "pallet-staking-runtime-api", + "pallet-state-trie-migration", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", @@ -12319,7 +12320,6 @@ dependencies = [ "pallet-society", "pallet-staking", "pallet-staking-runtime-api", - "pallet-state-trie-migration", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", From a5c669345c6537c0f6c49193822206d68c612128 Mon Sep 17 00:00:00 2001 From: cheme Date: Wed, 14 Feb 2024 14:23:20 +0100 Subject: [PATCH 04/15] Update relay/polkadot/src/lib.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bastian Köcher --- relay/polkadot/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/relay/polkadot/src/lib.rs b/relay/polkadot/src/lib.rs index cac4d01e0b..47372a04ec 100644 --- a/relay/polkadot/src/lib.rs +++ b/relay/polkadot/src/lib.rs @@ -1728,7 +1728,6 @@ pub mod migrations { UpgradeSessionKeys, init_state_migration::InitMigrate, pallet_nomination_pools::migration::versioned_migrations::V5toV6, - pallet_nomination_pools::migration::versioned_migrations::V5toV6, pallet_nomination_pools::migration::versioned_migrations::V6ToV7, ); } From fb43dde3c54ba769ac46b678c55f56e3f72a8a90 Mon Sep 17 00:00:00 2001 From: cheme Date: Wed, 14 Feb 2024 14:38:24 +0100 Subject: [PATCH 05/15] clear kusama state migration state --- Cargo.lock | 1 + relay/kusama/Cargo.toml | 4 ++++ relay/kusama/src/lib.rs | 44 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index c98c676b40..91c7c1634e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12321,6 +12321,7 @@ dependencies = [ "pallet-society", "pallet-staking", "pallet-staking-runtime-api", + "pallet-state-trie-migration", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", diff --git a/relay/kusama/Cargo.toml b/relay/kusama/Cargo.toml index 444664cd58..98ca1a3786 100644 --- a/relay/kusama/Cargo.toml +++ b/relay/kusama/Cargo.toml @@ -84,6 +84,7 @@ pallet-session = { default-features = false , version = "25.0.0" } pallet-society = { default-features = false, version = "25.0.0" } frame-support = { default-features = false , version = "25.0.0" } pallet-staking = { default-features = false , version = "25.0.0" } +pallet-state-trie-migration = { default-features = false , version = "26.0.0" } pallet-staking-runtime-api = { default-features = false , version = "11.0.0" } frame-system = { default-features = false , version = "25.0.0" } frame-system-rpc-runtime-api = { default-features = false , version = "23.0.0" } @@ -194,6 +195,7 @@ std = [ "pallet-society/std", "pallet-staking-runtime-api/std", "pallet-staking/std", + "pallet-state-trie-migration/std", "pallet-timestamp/std", "pallet-tips/std", "pallet-transaction-payment-rpc-runtime-api/std", @@ -274,6 +276,7 @@ runtime-benchmarks = [ "pallet-session-benchmarking/runtime-benchmarks", "pallet-society/runtime-benchmarks", "pallet-staking/runtime-benchmarks", + "pallet-state-trie-migration/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", "pallet-tips/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", @@ -333,6 +336,7 @@ try-runtime = [ "pallet-session/try-runtime", "pallet-society/try-runtime", "pallet-staking/try-runtime", + "pallet-state-trie-migration/try-runtime", "pallet-timestamp/try-runtime", "pallet-tips/try-runtime", "pallet-transaction-payment/try-runtime", diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index 8f5e92b2f1..ea0f1eb20b 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -1647,6 +1647,7 @@ pub mod migrations { /// Unreleased migrations. Add new ones here: pub type Unreleased = ( + clean_state_migration::CleanMigrate, pallet_nomination_pools::migration::versioned_migrations::V5toV6, pallet_nomination_pools::migration::versioned_migrations::V6ToV7, ); @@ -2640,3 +2641,46 @@ mod remote_tests { }); } } + +mod clean_state_migration { + use super::Runtime; + use frame_support::{pallet_prelude::*, storage_alias, traits::OnRuntimeUpgrade}; + use pallet_state_trie_migration::MigrationLimits; + + #[storage_alias] + type AutoLimits = StorageValue, ValueQuery>; + + // Actual type of value is `MigrationTask`, putting a dummy + // one to avoid the trait constraint on T. + // Since we only use `kill` it is fine. + #[storage_alias] + type MigrationProcess = StorageValue; + + #[storage_alias] + type SignedMigrationMaxLimits = StorageValue; + + pub struct CleanMigrate; + + impl OnRuntimeUpgrade for CleanMigrate { + #[cfg(feature = "try-runtime")] + fn pre_upgrade() -> Result, &'static str> { + Ok(Default::default()) + } + + fn on_runtime_upgrade() -> frame_support::weights::Weight { + MigrationProcess::kill(); + AutoLimits::kill(); + SignedMigrationMaxLimits::kill(); + ::DbWeight::get().writes(3) + } + + #[cfg(feature = "try-runtime")] + fn post_upgrade(_state: Vec) -> Result<(), &'static str> { + frame_support::ensure!( + !AutoLimits::exists() && !SignedMigrationMaxLimits::exists(), + "State migration clean.", + ); + Ok(()) + } + } +} From ee799549bbd241dfd0d7e7a4548e945b2429ac51 Mon Sep 17 00:00:00 2001 From: cheme Date: Wed, 14 Feb 2024 14:51:25 +0100 Subject: [PATCH 06/15] fix --- relay/kusama/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index ea0f1eb20b..6b1f47e04b 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -1647,7 +1647,7 @@ pub mod migrations { /// Unreleased migrations. Add new ones here: pub type Unreleased = ( - clean_state_migration::CleanMigrate, + crate::clean_state_migration::CleanMigrate, pallet_nomination_pools::migration::versioned_migrations::V5toV6, pallet_nomination_pools::migration::versioned_migrations::V6ToV7, ); From 43ed739763c4f70113a5505e05d6d6f68b04b4ba Mon Sep 17 00:00:00 2001 From: cheme Date: Wed, 14 Feb 2024 15:18:08 +0100 Subject: [PATCH 07/15] nostd --- relay/kusama/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index 6b1f47e04b..2d71328b23 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -2646,6 +2646,7 @@ mod clean_state_migration { use super::Runtime; use frame_support::{pallet_prelude::*, storage_alias, traits::OnRuntimeUpgrade}; use pallet_state_trie_migration::MigrationLimits; + use std_std::vec::Vec; #[storage_alias] type AutoLimits = StorageValue, ValueQuery>; From d0569caef0ec5678d85e51ae948460e62cc9de62 Mon Sep 17 00:00:00 2001 From: cheme Date: Wed, 14 Feb 2024 15:21:20 +0100 Subject: [PATCH 08/15] fix --- relay/kusama/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index 2d71328b23..15ddbb7600 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -2646,7 +2646,7 @@ mod clean_state_migration { use super::Runtime; use frame_support::{pallet_prelude::*, storage_alias, traits::OnRuntimeUpgrade}; use pallet_state_trie_migration::MigrationLimits; - use std_std::vec::Vec; + use sp_std::vec::Vec; #[storage_alias] type AutoLimits = StorageValue, ValueQuery>; From 4c7d743a7f770e30b3aef88c9ed3e0b9da760e6b Mon Sep 17 00:00:00 2001 From: cheme Date: Wed, 14 Feb 2024 15:48:50 +0100 Subject: [PATCH 09/15] new error --- relay/kusama/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index 15ddbb7600..466cc07d0f 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -2664,7 +2664,7 @@ mod clean_state_migration { impl OnRuntimeUpgrade for CleanMigrate { #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result, &'static str> { + fn pre_upgrade() -> Result, sp_runtime::DispatchErroR> { Ok(Default::default()) } @@ -2676,7 +2676,7 @@ mod clean_state_migration { } #[cfg(feature = "try-runtime")] - fn post_upgrade(_state: Vec) -> Result<(), &'static str> { + fn post_upgrade(_state: Vec) -> Result<(), sp_runtime::DispatchError> { frame_support::ensure!( !AutoLimits::exists() && !SignedMigrationMaxLimits::exists(), "State migration clean.", From 342e60afe5e0ce67c8dd8d3718c1b134ab246293 Mon Sep 17 00:00:00 2001 From: cheme Date: Wed, 14 Feb 2024 17:39:51 +0100 Subject: [PATCH 10/15] fix --- relay/kusama/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index 466cc07d0f..f7a5df5b15 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -2664,7 +2664,7 @@ mod clean_state_migration { impl OnRuntimeUpgrade for CleanMigrate { #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result, sp_runtime::DispatchErroR> { + fn pre_upgrade() -> Result, sp_runtime::DispatchError> { Ok(Default::default()) } From 9cf2f52277b24cf50ccd45a7922f093835a15158 Mon Sep 17 00:00:00 2001 From: cheme Date: Wed, 14 Feb 2024 17:48:44 +0100 Subject: [PATCH 11/15] avoid lock changes --- Cargo.lock | 769 ++------------------------------------ relay/kusama/Cargo.toml | 2 +- relay/polkadot/Cargo.toml | 2 +- 3 files changed, 39 insertions(+), 734 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fa5090d455..d78ed550a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -211,20 +211,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "aquamarine" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074b80d14d0240b6ce94d68f059a2d26a5d77280ae142662365a21ef6e2594ef" -dependencies = [ - "include_dir", - "itertools 0.10.5", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "ark-bls12-377" version = "0.4.0" @@ -496,7 +482,7 @@ dependencies = [ "pallet-nfts-runtime-api", "pallet-proxy 27.0.0", "pallet-session 27.0.0", - "pallet-state-trie-migration 28.0.0", + "pallet-state-trie-migration", "pallet-timestamp 26.0.0", "pallet-transaction-payment 27.0.0", "pallet-transaction-payment-rpc-runtime-api 27.0.0", @@ -2504,7 +2490,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bc86fdc17ef11f9adcd7565a4238107a3538426990fa4ffed8e6dc1d40582a2" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 2.0.1", "proc-macro2", "quote", "syn 2.0.48", @@ -3865,32 +3851,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "frame-benchmarking" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b16f7f853f64ec6fbc981b3e224cc3400752662da140ec62c160b5b859bab68" -dependencies = [ - "frame-support 28.0.0", - "frame-support-procedural 23.0.0", - "frame-system 28.0.0", - "linregress", - "log", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "sp-api 26.0.0", - "sp-application-crypto 30.0.0", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-runtime 31.0.1", - "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "static_assertions", -] - [[package]] name = "frame-election-provider-solution-type" version = "12.0.0" @@ -4017,7 +3977,7 @@ version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "023504bbdd0e8d1ebe3d9d289b009337cdb9a24c5e74615ffd7b188aa1664c2d" dependencies = [ - "aquamarine 0.3.2", + "aquamarine", "bitflags 1.3.2", "docify", "environmental", @@ -4058,7 +4018,7 @@ version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "654f8001ac929387a460ed2b1dd9ef70af81221ef2b3519bf4c91ecef88f68e4" dependencies = [ - "aquamarine 0.3.2", + "aquamarine", "array-bytes 6.2.2", "bitflags 1.3.2", "docify", @@ -4094,48 +4054,6 @@ dependencies = [ "tt-call", ] -[[package]] -name = "frame-support" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48b00bb3e82c465a435b08827e7abe5144345bc1a998848bdd7ce72fa203bb5" -dependencies = [ - "aquamarine 0.4.0", - "array-bytes 6.2.2", - "bitflags 1.3.2", - "docify", - "environmental", - "frame-metadata", - "frame-support-procedural 23.0.0", - "impl-trait-for-tuples", - "k256", - "log", - "macro_magic", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "serde_json", - "smallvec", - "sp-api 26.0.0", - "sp-arithmetic 23.0.0", - "sp-core 28.0.0", - "sp-core-hashing-proc-macro 15.0.0", - "sp-debug-derive 14.0.0", - "sp-genesis-builder 0.7.0", - "sp-inherents 26.0.0", - "sp-io 30.0.0", - "sp-metadata-ir 0.6.0", - "sp-runtime 31.0.1", - "sp-staking 26.0.0", - "sp-state-machine 0.35.0", - "sp-std 14.0.0", - "sp-tracing 16.0.0", - "sp-weights 27.0.0", - "static_assertions", - "tt-call", -] - [[package]] name = "frame-support-procedural" version = "20.0.0" @@ -4146,7 +4064,7 @@ dependencies = [ "cfg-expr", "derive-syn-parse", "expander 2.0.0", - "frame-support-procedural-tools 9.0.0", + "frame-support-procedural-tools", "itertools 0.10.5", "macro_magic", "proc-macro-warning", @@ -4166,7 +4084,7 @@ dependencies = [ "cfg-expr", "derive-syn-parse", "expander 2.0.0", - "frame-support-procedural-tools 9.0.0", + "frame-support-procedural-tools", "itertools 0.10.5", "macro_magic", "proc-macro-warning", @@ -4176,52 +4094,19 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "frame-support-procedural" -version = "23.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be717139a0da9b31b559356db73f6ce48876d331e833ebdc32de3a9ad581e15" -dependencies = [ - "Inflector", - "cfg-expr", - "derive-syn-parse", - "expander 2.0.0", - "frame-support-procedural-tools 10.0.0", - "itertools 0.10.5", - "macro_magic", - "proc-macro-warning", - "proc-macro2", - "quote", - "sp-core-hashing 15.0.0", - "syn 2.0.48", -] - [[package]] name = "frame-support-procedural-tools" version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3ac1266522a8c9a2d2d26d205ec3028b88582d5f3cd5cbc75d0ec8271d197b7" dependencies = [ - "frame-support-procedural-tools-derive 10.0.0", + "frame-support-procedural-tools-derive", "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.48", ] -[[package]] -name = "frame-support-procedural-tools" -version = "10.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3363df38464c47a73eb521a4f648bfcc7537a82d70347ef8af3f73b6d019e910" -dependencies = [ - "frame-support-procedural-tools-derive 11.0.0", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "frame-support-procedural-tools-derive" version = "10.0.0" @@ -4233,17 +4118,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "frame-support-procedural-tools-derive" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68672b9ec6fe72d259d3879dc212c5e42e977588cdac830c76f54d9f492aeb58" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "frame-system" version = "25.0.0" @@ -4285,27 +4159,6 @@ dependencies = [ "sp-weights 26.0.0", ] -[[package]] -name = "frame-system" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983b3215c8d97775b90dc1db88f858c46401682bd2fb8572bdd102ff8c2ca2a6" -dependencies = [ - "cfg-if", - "docify", - "frame-support 28.0.0", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-runtime 31.0.1", - "sp-std 14.0.0", - "sp-version 29.0.0", - "sp-weights 27.0.0", -] - [[package]] name = "frame-system-benchmarking" version = "25.0.0" @@ -4577,16 +4430,6 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] -[[package]] -name = "getrandom_or_panic" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" -dependencies = [ - "rand 0.8.5", - "rand_core 0.6.4", -] - [[package]] name = "ghash" version = "0.5.0" @@ -6272,18 +6115,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.6.4", - "zeroize", -] - [[package]] name = "mick-jaeger" version = "0.1.8" @@ -7159,7 +6990,7 @@ version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46d48f60b6da70607edc794cc05e72ae70ea532ec539094ffcc4c7c9250a453b" dependencies = [ - "aquamarine 0.3.2", + "aquamarine", "docify", "frame-benchmarking 27.0.0", "frame-election-provider-support 27.0.0", @@ -8572,24 +8403,6 @@ dependencies = [ "sp-std 13.0.0", ] -[[package]] -name = "pallet-state-trie-migration" -version = "29.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a48713905a318b0307e523fd3d3ca4b197ce74b2520203ded0d02e8a6c6bbd7" -dependencies = [ - "frame-benchmarking 28.0.0", - "frame-support 28.0.0", - "frame-system 28.0.0", - "log", - "parity-scale-codec", - "scale-info", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-runtime 31.0.1", - "sp-std 14.0.0", -] - [[package]] name = "pallet-sudo" version = "27.0.0" @@ -9144,7 +8957,7 @@ version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 2.0.1", "proc-macro2", "quote", "syn 1.0.109", @@ -9594,7 +9407,7 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain-primitives 3.0.0", "polkadot-primitives 4.0.0", - "schnorrkel 0.9.1", + "schnorrkel", "serde", "sp-application-crypto 27.0.0", "sp-consensus-babe 0.29.0", @@ -9618,7 +9431,7 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain-primitives 5.0.0", "polkadot-primitives 6.0.0", - "schnorrkel 0.9.1", + "schnorrkel", "serde", "sp-application-crypto 29.0.0", "sp-consensus-babe 0.31.0", @@ -9878,7 +9691,7 @@ dependencies = [ "pallet-staking-reward-curve", "pallet-staking-reward-fn 18.0.0", "pallet-staking-runtime-api", - "pallet-state-trie-migration 29.0.0", + "pallet-state-trie-migration", "pallet-timestamp 26.0.0", "pallet-tips", "pallet-transaction-payment 27.0.0", @@ -10346,22 +10159,14 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" dependencies = [ + "toml_datetime", "toml_edit 0.20.2", ] -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -11340,7 +11145,7 @@ dependencies = [ "sp-core 25.0.0", "sp-keyring 28.0.0", "sp-keystore 0.31.0", - "sp-panic-handler 12.0.0", + "sp-panic-handler", "sp-runtime 28.0.0", "sp-version 26.0.0", "thiserror", @@ -11383,7 +11188,7 @@ dependencies = [ "sp-core 27.0.0", "sp-keyring 30.0.0", "sp-keystore 0.33.0", - "sp-panic-handler 12.0.0", + "sp-panic-handler", "sp-runtime 30.0.1", "sp-version 28.0.0", "thiserror", @@ -11610,7 +11415,7 @@ dependencies = [ "sp-core 25.0.0", "sp-externalities 0.23.0", "sp-io 27.0.0", - "sp-panic-handler 12.0.0", + "sp-panic-handler", "sp-runtime-interface 21.0.0", "sp-trie 26.0.0", "sp-version 26.0.0", @@ -11633,7 +11438,7 @@ dependencies = [ "sp-core 27.0.0", "sp-externalities 0.24.0", "sp-io 29.0.0", - "sp-panic-handler 12.0.0", + "sp-panic-handler", "sp-runtime-interface 23.0.0", "sp-trie 28.0.0", "sp-version 28.0.0", @@ -12835,7 +12640,7 @@ dependencies = [ "arrayvec 0.5.2", "curve25519-dalek 2.1.3", "getrandom 0.1.16", - "merlin 2.0.1", + "merlin", "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", @@ -12843,25 +12648,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "schnorrkel" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0" -dependencies = [ - "aead", - "arrayref", - "arrayvec 0.7.4", - "curve25519-dalek 4.1.2", - "getrandom_or_panic", - "merlin 3.0.0", - "rand_core 0.6.4", - "serde_bytes", - "sha2 0.10.8", - "subtle 2.5.0", - "zeroize", -] - [[package]] name = "scopeguard" version = "1.2.0" @@ -13014,15 +12800,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde_bytes" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" -dependencies = [ - "serde", -] - [[package]] name = "serde_derive" version = "1.0.195" @@ -13334,28 +13111,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sp-api" -version = "26.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dea138c6dbf282ab57756492f0232ea0a08575ca9cbe2b7b1ead49000f238a7" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "scale-info", - "sp-api-proc-macro 15.0.0", - "sp-core 28.0.0", - "sp-externalities 0.25.0", - "sp-metadata-ir 0.6.0", - "sp-runtime 31.0.1", - "sp-state-machine 0.35.0", - "sp-std 14.0.0", - "sp-trie 29.0.0", - "sp-version 29.0.0", - "thiserror", -] - [[package]] name = "sp-api-proc-macro" version = "12.0.0" @@ -13380,22 +13135,7 @@ dependencies = [ "Inflector", "blake2 0.10.6", "expander 2.0.0", - "proc-macro-crate 2.0.0", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "sp-api-proc-macro" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0694be2891593450916d6b53a274d234bccbc86bcbada36ba23fc356989070c7" -dependencies = [ - "Inflector", - "blake2 0.10.6", - "expander 2.0.0", - "proc-macro-crate 3.1.0", + "proc-macro-crate 2.0.1", "proc-macro2", "quote", "syn 2.0.48", @@ -13429,20 +13169,6 @@ dependencies = [ "sp-std 13.0.0", ] -[[package]] -name = "sp-application-crypto" -version = "30.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4fe7a9b7fa9da76272b201e2fb3c7900d97d32a46b66af9a04dad457f73c71" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-std 14.0.0", -] - [[package]] name = "sp-arithmetic" version = "20.0.0" @@ -13473,21 +13199,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "sp-arithmetic" -version = "23.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42721f072b421f292a072e8f52a3b3c0fbc27428f0c9fe24067bc47046bad63" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-std 14.0.0", - "static_assertions", -] - [[package]] name = "sp-authority-discovery" version = "23.0.0" @@ -13790,7 +13501,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "merlin 2.0.1", + "merlin", "parity-scale-codec", "parking_lot 0.12.1", "paste", @@ -13798,7 +13509,7 @@ dependencies = [ "rand 0.8.5", "regex", "scale-info", - "schnorrkel 0.9.1", + "schnorrkel", "secp256k1 0.24.3", "secrecy", "serde", @@ -13838,14 +13549,14 @@ dependencies = [ "itertools 0.10.5", "libsecp256k1", "log", - "merlin 2.0.1", + "merlin", "parity-scale-codec", "parking_lot 0.12.1", "paste", "primitive-types", "rand 0.8.5", "scale-info", - "schnorrkel 0.9.1", + "schnorrkel", "secp256k1 0.28.1", "secrecy", "serde", @@ -13863,52 +13574,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sp-core" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f230cb12575455070da0fc174815958423a0b9a641d5e304a9457113c7cb4007" -dependencies = [ - "array-bytes 6.2.2", - "bip39", - "bitflags 1.3.2", - "blake2 0.10.6", - "bounded-collections", - "bs58 0.5.0", - "dyn-clonable", - "ed25519-zebra", - "futures", - "hash-db", - "hash256-std-hasher", - "impl-serde", - "itertools 0.10.5", - "libsecp256k1", - "log", - "merlin 3.0.0", - "parity-scale-codec", - "parking_lot 0.12.1", - "paste", - "primitive-types", - "rand 0.8.5", - "scale-info", - "schnorrkel 0.11.4", - "secp256k1 0.28.1", - "secrecy", - "serde", - "sp-core-hashing 15.0.0", - "sp-debug-derive 14.0.0", - "sp-externalities 0.25.0", - "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "ss58-registry", - "substrate-bip39", - "thiserror", - "tracing", - "w3f-bls", - "zeroize", -] - [[package]] name = "sp-core-hashing" version = "13.0.0" @@ -13938,24 +13603,10 @@ dependencies = [ ] [[package]] -name = "sp-core-hashing" -version = "15.0.0" +name = "sp-core-hashing-proc-macro" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0f4990add7b2cefdeca883c0efa99bb4d912cb2196120e1500c0cc099553b0" -dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.8", - "sha3", - "twox-hash", -] - -[[package]] -name = "sp-core-hashing-proc-macro" -version = "13.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ce3e6931303769197da81facefa86159fa1085dcd96ecb7e7407b5b93582a0" +checksum = "42ce3e6931303769197da81facefa86159fa1085dcd96ecb7e7407b5b93582a0" dependencies = [ "quote", "sp-core-hashing 13.0.0", @@ -13973,17 +13624,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "sp-core-hashing-proc-macro" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7527f8dda7667c41009b2cd0efaddcb81709b9741bd5ee6d17b11bad835cc698" -dependencies = [ - "quote", - "sp-core-hashing 15.0.0", - "syn 2.0.48", -] - [[package]] name = "sp-database" version = "9.0.0" @@ -14016,17 +13656,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "sp-debug-derive" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "sp-externalities" version = "0.23.0" @@ -14051,18 +13680,6 @@ dependencies = [ "sp-storage 18.0.0", ] -[[package]] -name = "sp-externalities" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63867ec85950ced90d4ab1bba902a47db1b1efdf2829f653945669b2bb470a9c" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 14.0.0", - "sp-storage 19.0.0", -] - [[package]] name = "sp-genesis-builder" version = "0.4.0" @@ -14087,18 +13704,6 @@ dependencies = [ "sp-std 13.0.0", ] -[[package]] -name = "sp-genesis-builder" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfdc79df83221ec5a279cbbd08fd6f8be164b9b081c8e84593ce2c2ebd5d66c0" -dependencies = [ - "serde_json", - "sp-api 26.0.0", - "sp-runtime 31.0.1", - "sp-std 14.0.0", -] - [[package]] name = "sp-inherents" version = "23.0.0" @@ -14129,21 +13734,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sp-inherents" -version = "26.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3caf2d1288549d7e6c32b453f2d4855d498bb88600101011e35653e022a6f2" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "sp-runtime 31.0.1", - "sp-std 14.0.0", - "thiserror", -] - [[package]] name = "sp-io" version = "27.0.0" @@ -14194,31 +13784,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "sp-io" -version = "30.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55f26d89feedaf0faf81688b6e1e1e81329cd8b4c6a4fd6c5b97ed9dd068b8a" -dependencies = [ - "bytes", - "ed25519-dalek", - "libsecp256k1", - "log", - "parity-scale-codec", - "rustversion", - "secp256k1 0.28.1", - "sp-core 28.0.0", - "sp-externalities 0.25.0", - "sp-keystore 0.34.0", - "sp-runtime-interface 24.0.0", - "sp-state-machine 0.35.0", - "sp-std 14.0.0", - "sp-tracing 16.0.0", - "sp-trie 29.0.0", - "tracing", - "tracing-core", -] - [[package]] name = "sp-keyring" version = "28.0.0" @@ -14269,19 +13834,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sp-keystore" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96806a28a62ed9ddecd0b28857b1344d029390f7c5c42a2ff9199cbf5638635c" -dependencies = [ - "parity-scale-codec", - "parking_lot 0.12.1", - "sp-core 28.0.0", - "sp-externalities 0.25.0", - "thiserror", -] - [[package]] name = "sp-maybe-compressed-blob" version = "9.0.0" @@ -14326,18 +13878,6 @@ dependencies = [ "sp-std 13.0.0", ] -[[package]] -name = "sp-metadata-ir" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0b5e87e56c1bb26d9524d48dd127121d630f895bd5914a34f0b017489f7c1d" -dependencies = [ - "frame-metadata", - "parity-scale-codec", - "scale-info", - "sp-std 14.0.0", -] - [[package]] name = "sp-mixnet" version = "0.1.0" @@ -14446,17 +13986,6 @@ dependencies = [ "regex", ] -[[package]] -name = "sp-panic-handler" -version = "13.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f5a17a0a11de029a8b811cb6e8b32ce7e02183cc04a3e965c383246798c416" -dependencies = [ - "backtrace", - "lazy_static", - "regex", -] - [[package]] name = "sp-rpc" version = "23.0.0" @@ -14527,31 +14056,6 @@ dependencies = [ "sp-weights 26.0.0", ] -[[package]] -name = "sp-runtime" -version = "31.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3bb49a4475d390198dfd3d41bef4564ab569fbaf1b5e38ae69b35fc01199d91" -dependencies = [ - "docify", - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "paste", - "rand 0.8.5", - "scale-info", - "serde", - "simple-mermaid", - "sp-application-crypto 30.0.0", - "sp-arithmetic 23.0.0", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-std 14.0.0", - "sp-weights 27.0.0", -] - [[package]] name = "sp-runtime-interface" version = "21.0.0" @@ -14590,25 +14094,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "sp-runtime-interface" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f66b66d8cec3d785fa6289336c1d9cbd4305d5d84f7134378c4d79ed7983e6fb" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.25.0", - "sp-runtime-interface-proc-macro 17.0.0", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-tracing 16.0.0", - "sp-wasm-interface 20.0.0", - "static_assertions", -] - [[package]] name = "sp-runtime-interface-proc-macro" version = "15.0.0" @@ -14630,21 +14115,7 @@ checksum = "5ebdb4aff8286f5095871b2f950037d690edb0fed0590af5f6735352533a53b6" dependencies = [ "Inflector", "expander 2.0.0", - "proc-macro-crate 2.0.0", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "17.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfaf6e85b2ec12a4b99cd6d8d57d083e30c94b7f1b0d8f93547121495aae6f0c" -dependencies = [ - "Inflector", - "expander 2.0.0", - "proc-macro-crate 3.1.0", + "proc-macro-crate 2.0.1", "proc-macro2", "quote", "syn 2.0.48", @@ -14712,21 +14183,6 @@ dependencies = [ "sp-std 13.0.0", ] -[[package]] -name = "sp-staking" -version = "26.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0e68be3fff84dd8ee552f9d13dd2e9eab3663e0bddfc6c6c88de02aaca1e311" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 28.0.0", - "sp-runtime 31.0.1", - "sp-std 14.0.0", -] - [[package]] name = "sp-state-machine" version = "0.32.0" @@ -14741,7 +14197,7 @@ dependencies = [ "smallvec", "sp-core 25.0.0", "sp-externalities 0.23.0", - "sp-panic-handler 12.0.0", + "sp-panic-handler", "sp-std 12.0.0", "sp-trie 26.0.0", "thiserror", @@ -14763,7 +14219,7 @@ dependencies = [ "smallvec", "sp-core 27.0.0", "sp-externalities 0.24.0", - "sp-panic-handler 12.0.0", + "sp-panic-handler", "sp-std 13.0.0", "sp-trie 28.0.0", "thiserror", @@ -14771,28 +14227,6 @@ dependencies = [ "trie-db", ] -[[package]] -name = "sp-state-machine" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718c779ad1d6fcc0be64c7ce030b33fa44b5c8914b3a1319ef63bb5f27fb98df" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", - "smallvec", - "sp-core 28.0.0", - "sp-externalities 0.25.0", - "sp-panic-handler 13.0.0", - "sp-std 14.0.0", - "sp-trie 29.0.0", - "thiserror", - "tracing", - "trie-db", -] - [[package]] name = "sp-statement-store" version = "7.0.0" @@ -14855,12 +14289,6 @@ version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71323a3b5f189085d11123ce397b3cdfaec4437071243b51f68a38a4833fbaa7" -[[package]] -name = "sp-std" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834" - [[package]] name = "sp-storage" version = "17.0.0" @@ -14889,20 +14317,6 @@ dependencies = [ "sp-std 13.0.0", ] -[[package]] -name = "sp-storage" -version = "19.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb92d7b24033a8a856d6e20dd980b653cbd7af7ec471cc988b1b7c1d2e3a32b" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 14.0.0", - "sp-std 14.0.0", -] - [[package]] name = "sp-timestamp" version = "23.0.0" @@ -14957,19 +14371,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "sp-tracing" -version = "16.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0351810b9d074df71c4514c5228ed05c250607cba131c1c9d1526760ab69c05c" -dependencies = [ - "parity-scale-codec", - "sp-std 14.0.0", - "tracing", - "tracing-core", - "tracing-subscriber", -] - [[package]] name = "sp-transaction-pool" version = "23.0.0" @@ -15073,31 +14474,6 @@ dependencies = [ "trie-root", ] -[[package]] -name = "sp-trie" -version = "29.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4d24d84a0beb44a71dcac1b41980e1edf7fb722c7f3046710136a283cd479b" -dependencies = [ - "ahash 0.8.8", - "hash-db", - "lazy_static", - "memory-db", - "nohash-hasher", - "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", - "scale-info", - "schnellru", - "sp-core 28.0.0", - "sp-externalities 0.25.0", - "sp-std 14.0.0", - "thiserror", - "tracing", - "trie-db", - "trie-root", -] - [[package]] name = "sp-version" version = "26.0.0" @@ -15112,7 +14488,7 @@ dependencies = [ "sp-core-hashing-proc-macro 13.0.0", "sp-runtime 28.0.0", "sp-std 12.0.0", - "sp-version-proc-macro 12.0.0", + "sp-version-proc-macro", "thiserror", ] @@ -15130,25 +14506,7 @@ dependencies = [ "sp-core-hashing-proc-macro 14.0.0", "sp-runtime 30.0.1", "sp-std 13.0.0", - "sp-version-proc-macro 12.0.0", - "thiserror", -] - -[[package]] -name = "sp-version" -version = "29.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afd1b053394347e22f541696bca4a9ac3ec848b50d1b86f5018d2b771f39f11a" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "parity-wasm", - "scale-info", - "serde", - "sp-core-hashing-proc-macro 15.0.0", - "sp-runtime 31.0.1", - "sp-std 14.0.0", - "sp-version-proc-macro 13.0.0", + "sp-version-proc-macro", "thiserror", ] @@ -15164,18 +14522,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "sp-version-proc-macro" -version = "13.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9bc3fed32d6dacbbbfb28dd1fe0224affbb737cb6cbfca1d9149351c2b69a7d" -dependencies = [ - "parity-scale-codec", - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "sp-wasm-interface" version = "18.0.0" @@ -15204,20 +14550,6 @@ dependencies = [ "wasmtime", ] -[[package]] -name = "sp-wasm-interface" -version = "20.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef97172c42eb4c6c26506f325f48463e9bc29b2034a587f1b9e48c751229bee" -dependencies = [ - "anyhow", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-std 14.0.0", - "wasmtime", -] - [[package]] name = "sp-weights" version = "24.0.0" @@ -15250,22 +14582,6 @@ dependencies = [ "sp-std 13.0.0", ] -[[package]] -name = "sp-weights" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e874bdf9dd3fd3242f5b7867a4eaedd545b02f29041a46d222a9d9d5caaaa5c" -dependencies = [ - "bounded-collections", - "parity-scale-codec", - "scale-info", - "serde", - "smallvec", - "sp-arithmetic 23.0.0", - "sp-debug-derive 14.0.0", - "sp-std 14.0.0", -] - [[package]] name = "spin" version = "0.5.2" @@ -15380,7 +14696,7 @@ dependencies = [ "pallet-society", "pallet-staking 27.0.0", "pallet-staking-runtime-api", - "pallet-state-trie-migration 29.0.0", + "pallet-state-trie-migration", "pallet-timestamp 26.0.0", "pallet-tips", "pallet-transaction-payment 27.0.0", @@ -15673,7 +14989,7 @@ checksum = "e620c7098893ba667438b47169c00aacdd9e7c10e042250ce2b60b087ec97328" dependencies = [ "hmac 0.11.0", "pbkdf2 0.8.0", - "schnorrkel 0.9.1", + "schnorrkel", "sha2 0.9.9", "zeroize", ] @@ -16165,9 +15481,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] @@ -16198,17 +15514,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.1.0", - "toml_datetime", - "winnow", -] - [[package]] name = "tower" version = "0.4.13" diff --git a/relay/kusama/Cargo.toml b/relay/kusama/Cargo.toml index ae45c13577..2aa26d106b 100644 --- a/relay/kusama/Cargo.toml +++ b/relay/kusama/Cargo.toml @@ -83,7 +83,7 @@ pallet-session = { default-features = false , version = "27.0.0" } pallet-society = { default-features = false, version = "27.0.0" } frame-support = { default-features = false , version = "27.0.0" } pallet-staking = { default-features = false , version = "27.0.0" } -pallet-state-trie-migration = { default-features = false , version = "29.0.0" } +pallet-state-trie-migration = { default-features = false , version = "28.0.0" } pallet-staking-runtime-api = { default-features = false , version = "13.0.0" } frame-system = { default-features = false , version = "27.0.0" } frame-system-rpc-runtime-api = { default-features = false , version = "25.0.0" } diff --git a/relay/polkadot/Cargo.toml b/relay/polkadot/Cargo.toml index 74578dd9e5..ca562b73ea 100644 --- a/relay/polkadot/Cargo.toml +++ b/relay/polkadot/Cargo.toml @@ -80,7 +80,7 @@ pallet-staking = { default-features = false , version = "27.0.0" } pallet-staking-reward-fn = { default-features = false, version = "18.0.0" } pallet-staking-reward-curve = { version = "10.0.0" } pallet-staking-runtime-api = { default-features = false , version = "13.0.0" } -pallet-state-trie-migration = { default-features = false , version = "29.0.0" } +pallet-state-trie-migration = { default-features = false , version = "28.0.0" } frame-system = { default-features = false , version = "27.0.0" } frame-system-rpc-runtime-api = { default-features = false , version = "25.0.0" } polkadot-runtime-constants = { package = "polkadot-runtime-constants", path = "constants", default-features = false } From fdfb381e3dacf0e3c92a85bc282237d8ad92dd6e Mon Sep 17 00:00:00 2001 From: Emeric Chevalier Date: Thu, 29 Feb 2024 17:06:22 +0100 Subject: [PATCH 12/15] review changes --- relay/kusama/src/lib.rs | 50 +++++------------------------------------ 1 file changed, 5 insertions(+), 45 deletions(-) diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index 0c2f9bfdff..18495f1894 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -1646,9 +1646,13 @@ pub type Migrations = migrations::Unreleased; pub mod migrations { use super::{parachains_configuration, Runtime}; + parameter_types! { + const StateTrieMigrationName: &str = "StateTrieMigration"; + } + /// Unreleased migrations. Add new ones here: pub type Unreleased = ( - crate::clean_state_migration::CleanMigrate, + frame_support::migrations::RemovePallet, pallet_nomination_pools::migration::versioned::V5toV6, pallet_nomination_pools::migration::versioned::V6ToV7, pallet_nomination_pools::migration::versioned::V7ToV8, @@ -2691,47 +2695,3 @@ mod remote_tests { }); } } - -mod clean_state_migration { - use super::Runtime; - use frame_support::{pallet_prelude::*, storage_alias, traits::OnRuntimeUpgrade}; - use pallet_state_trie_migration::MigrationLimits; - use sp_std::vec::Vec; - - #[storage_alias] - type AutoLimits = StorageValue, ValueQuery>; - - // Actual type of value is `MigrationTask`, putting a dummy - // one to avoid the trait constraint on T. - // Since we only use `kill` it is fine. - #[storage_alias] - type MigrationProcess = StorageValue; - - #[storage_alias] - type SignedMigrationMaxLimits = StorageValue; - - pub struct CleanMigrate; - - impl OnRuntimeUpgrade for CleanMigrate { - #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result, sp_runtime::DispatchError> { - Ok(Default::default()) - } - - fn on_runtime_upgrade() -> frame_support::weights::Weight { - MigrationProcess::kill(); - AutoLimits::kill(); - SignedMigrationMaxLimits::kill(); - ::DbWeight::get().writes(3) - } - - #[cfg(feature = "try-runtime")] - fn post_upgrade(_state: Vec) -> Result<(), sp_runtime::DispatchError> { - frame_support::ensure!( - !AutoLimits::exists() && !SignedMigrationMaxLimits::exists(), - "State migration clean.", - ); - Ok(()) - } - } -} From bbeb66bb82c6e046550ca36c9b49fc86858b09c0 Mon Sep 17 00:00:00 2001 From: Emeric Chevalier Date: Thu, 29 Feb 2024 17:21:05 +0100 Subject: [PATCH 13/15] missing conflict resolution --- relay/polkadot/src/lib.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/relay/polkadot/src/lib.rs b/relay/polkadot/src/lib.rs index 12b22c3a91..36e2b1e9eb 100644 --- a/relay/polkadot/src/lib.rs +++ b/relay/polkadot/src/lib.rs @@ -1690,14 +1690,7 @@ pub mod migrations { /// Unreleased migrations. Add new ones here: pub type Unreleased = ( -<<<<<<< HEAD - // Upgrade SessionKeys to include BEEFY key - UpgradeSessionKeys, init_state_migration::InitMigrate, - pallet_nomination_pools::migration::versioned::V5toV6, - pallet_nomination_pools::migration::versioned::V6ToV7, -======= ->>>>>>> main pallet_nomination_pools::migration::versioned::V7ToV8, pallet_staking::migrations::v14::MigrateToV14, parachains_configuration::migration::v10::MigrateToV10, From b9269c0fb82933cf2203acf6fca2f334fbf7af99 Mon Sep 17 00:00:00 2001 From: Emeric Chevalier Date: Thu, 29 Feb 2024 17:25:22 +0100 Subject: [PATCH 14/15] update dep --- relay/kusama/Cargo.toml | 2 -- relay/polkadot/Cargo.toml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/relay/kusama/Cargo.toml b/relay/kusama/Cargo.toml index 87eee79a1b..7360b0776c 100644 --- a/relay/kusama/Cargo.toml +++ b/relay/kusama/Cargo.toml @@ -72,7 +72,6 @@ pallet-session = { default-features = false , version = "28.0.0" } pallet-society = { default-features = false, version = "28.0.0" } frame-support = { default-features = false, features = [ "tuples-96" ] , version = "28.0.0" } pallet-staking = { default-features = false , version = "28.0.0" } -pallet-state-trie-migration = { default-features = false , version = "29.0.0" } pallet-staking-runtime-api = { default-features = false , version = "14.0.0" } frame-system = { default-features = false , version = "28.0.0" } frame-system-rpc-runtime-api = { default-features = false , version = "26.0.0" } @@ -177,7 +176,6 @@ std = [ "pallet-society/std", "pallet-staking-runtime-api/std", "pallet-staking/std", - "pallet-state-trie-migration/std", "pallet-timestamp/std", "pallet-transaction-payment-rpc-runtime-api/std", "pallet-transaction-payment/std", diff --git a/relay/polkadot/Cargo.toml b/relay/polkadot/Cargo.toml index c9d7072f6d..3121934e05 100644 --- a/relay/polkadot/Cargo.toml +++ b/relay/polkadot/Cargo.toml @@ -70,7 +70,7 @@ pallet-staking = { default-features = false , version = "28.0.0" } pallet-staking-reward-fn = { default-features = false, version = "19.0.0" } pallet-staking-reward-curve = { version = "11.0.0" } pallet-staking-runtime-api = { default-features = false , version = "14.0.0" } -pallet-state-trie-migration = { default-features = false , version = "28.0.0" } +pallet-state-trie-migration = { default-features = false , version = "29.0.0" } frame-system = { default-features = false , version = "28.0.0" } frame-system-rpc-runtime-api = { default-features = false , version = "26.0.0" } polkadot-runtime-constants = { package = "polkadot-runtime-constants", path = "constants", default-features = false } From 7ad07a773bcbf68ed81bea5f9edba8278d843ae5 Mon Sep 17 00:00:00 2001 From: Emeric Chevalier Date: Thu, 29 Feb 2024 17:30:48 +0100 Subject: [PATCH 15/15] clean cargo --- relay/kusama/Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/relay/kusama/Cargo.toml b/relay/kusama/Cargo.toml index 7360b0776c..fc58aacd0a 100644 --- a/relay/kusama/Cargo.toml +++ b/relay/kusama/Cargo.toml @@ -246,7 +246,6 @@ runtime-benchmarks = [ "pallet-session-benchmarking/runtime-benchmarks", "pallet-society/runtime-benchmarks", "pallet-staking/runtime-benchmarks", - "pallet-state-trie-migration/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", "pallet-utility/runtime-benchmarks", @@ -301,7 +300,6 @@ try-runtime = [ "pallet-session/try-runtime", "pallet-society/try-runtime", "pallet-staking/try-runtime", - "pallet-state-trie-migration/try-runtime", "pallet-timestamp/try-runtime", "pallet-transaction-payment/try-runtime", "pallet-treasury/try-runtime",