git.delta.rocks / unique-network / refs/commits / 8545aff0545e

difftreelog

feat use state_version = 1

Yaroslav Bolyukin2023-05-31parent: #fbb698d.patch.diff
in: master

10 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5892,6 +5892,7 @@
  "pallet-preimage",
  "pallet-refungible",
  "pallet-session",
+ "pallet-state-trie-migration",
  "pallet-structure",
  "pallet-sudo",
  "pallet-template-transaction-payment",
@@ -9395,6 +9396,7 @@
  "pallet-preimage",
  "pallet-refungible",
  "pallet-session",
+ "pallet-state-trie-migration",
  "pallet-structure",
  "pallet-sudo",
  "pallet-template-transaction-payment",
@@ -13812,6 +13814,7 @@
  "pallet-preimage",
  "pallet-refungible",
  "pallet-session",
+ "pallet-state-trie-migration",
  "pallet-structure",
  "pallet-sudo",
  "pallet-template-transaction-payment",
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -107,6 +107,7 @@
 pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 pallet-preimage = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+pallet-state-trie-migration = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
modifiedruntime/common/config/substrate.rsdiffbeforeafterboth
--- a/runtime/common/config/substrate.rs
+++ b/runtime/common/config/substrate.rs
@@ -31,7 +31,7 @@
 use sp_arithmetic::traits::One;
 use frame_system::{
 	limits::{BlockLength, BlockWeights},
-	EnsureRoot,
+	EnsureRoot, EnsureNever,
 };
 use pallet_transaction_payment::{Multiplier, ConstFeeMultiplier};
 use crate::{
@@ -116,6 +116,22 @@
 }
 
 parameter_types! {
+	pub const MigrationMaxKeyLen: u32 = 512;
+}
+
+impl pallet_state_trie_migration::Config for Runtime {
+	type WeightInfo = pallet_state_trie_migration::weights::SubstrateWeight<Self>;
+	type RuntimeEvent = RuntimeEvent;
+	type Currency = Balances;
+	type SignedDepositPerItem = ();
+	type SignedDepositBase = ();
+	type ControlOrigin = EnsureRoot<AccountId>;
+	// Only root can perform this migration
+	type SignedFilter = EnsureNever<AccountId>;
+	type MaxKeyLen = MigrationMaxKeyLen;
+}
+
+parameter_types! {
 	pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
 }
modifiedruntime/common/construct_runtime.rsdiffbeforeafterboth
before · runtime/common/construct_runtime.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#[macro_export]18macro_rules! construct_runtime {19	() => {20		frame_support::construct_runtime! {2122			pub enum Runtime where23				Block = Block,24				NodeBlock = opaque::Block,25				UncheckedExtrinsic = UncheckedExtrinsic26			{27				System: frame_system = 0,2829				ParachainSystem: cumulus_pallet_parachain_system = 20,30				ParachainInfo: parachain_info = 21,3132				#[cfg(feature = "collator-selection")]33				Authorship: pallet_authorship = 22,3435				#[cfg(feature = "collator-selection")]36				CollatorSelection: pallet_collator_selection = 23,3738				#[cfg(feature = "collator-selection")]39				Session: pallet_session = 24,4041				Aura: pallet_aura = 25,42				AuraExt: cumulus_pallet_aura_ext = 26,4344				Balances: pallet_balances = 30,45				// RandomnessCollectiveFlip = 3146				Timestamp: pallet_timestamp = 32,47				TransactionPayment: pallet_transaction_payment = 33,48				Treasury: pallet_treasury = 34,49				Sudo: pallet_sudo = 35,50				Vesting: orml_vesting = 37,5152				XTokens: orml_xtokens = 38,53				Tokens: orml_tokens = 39,54				// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,5556				#[cfg(feature = "collator-selection")]57				Identity: pallet_identity = 40,5859				#[cfg(feature = "preimage")]60				Preimage: pallet_preimage = 41,6162				// XCM helpers.63				XcmpQueue: cumulus_pallet_xcmp_queue = 50,64				PolkadotXcm: pallet_xcm = 51,65				CumulusXcm: cumulus_pallet_xcm = 52,66				DmpQueue: cumulus_pallet_dmp_queue = 53,6768				// Unique Pallets69				Inflation: pallet_inflation = 60,70				Unique: pallet_unique::{Pallet, Call, Storage} = 61,7172				// #[cfg(feature = "scheduler")]73				// Scheduler: pallet_unique_scheduler_v2 = 62,7475				Configuration: pallet_configuration = 63,7677				Charging: pallet_charge_transaction = 64,78				// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,79				Common: pallet_common = 66,80				Fungible: pallet_fungible = 67,8182				#[cfg(feature = "refungible")]83				Refungible: pallet_refungible = 68,8485				Nonfungible: pallet_nonfungible = 69,86				Structure: pallet_structure = 70,8788				// RmrkCore: pallet_proxy_rmrk_core = 71,8990				// RmrkEquip: pallet_proxy_rmrk_equip = 72,9192				#[cfg(feature = "app-promotion")]93				AppPromotion: pallet_app_promotion = 73,9495				#[cfg(feature = "foreign-assets")]96				ForeignAssets: pallet_foreign_assets = 80,9798				// Frontier99				EVM: pallet_evm = 100,100				Ethereum: pallet_ethereum = 101,101102				EvmCoderSubstrate: pallet_evm_coder_substrate = 150,103				EvmContractHelpers: pallet_evm_contract_helpers = 151,104				EvmTransactionPayment: pallet_evm_transaction_payment = 152,105				EvmMigration: pallet_evm_migration = 153,106107				Maintenance: pallet_maintenance = 154,108109				BalancesAdapter: pallet_balances_adapter = 155,110111				#[cfg(feature = "pallet-test-utils")]112				TestUtils: pallet_test_utils = 255,113			}114		}115	};116}
after · runtime/common/construct_runtime.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#[macro_export]18macro_rules! construct_runtime {19	() => {20		frame_support::construct_runtime! {2122			pub enum Runtime where23				Block = Block,24				NodeBlock = opaque::Block,25				UncheckedExtrinsic = UncheckedExtrinsic26			{27				System: frame_system = 0,28				StateTrieMigration: pallet_state_trie_migration = 1,2930				ParachainSystem: cumulus_pallet_parachain_system = 20,31				ParachainInfo: parachain_info = 21,3233				#[cfg(feature = "collator-selection")]34				Authorship: pallet_authorship = 22,3536				#[cfg(feature = "collator-selection")]37				CollatorSelection: pallet_collator_selection = 23,3839				#[cfg(feature = "collator-selection")]40				Session: pallet_session = 24,4142				Aura: pallet_aura = 25,43				AuraExt: cumulus_pallet_aura_ext = 26,4445				Balances: pallet_balances = 30,46				// RandomnessCollectiveFlip = 3147				Timestamp: pallet_timestamp = 32,48				TransactionPayment: pallet_transaction_payment = 33,49				Treasury: pallet_treasury = 34,50				Sudo: pallet_sudo = 35,51				Vesting: orml_vesting = 37,5253				XTokens: orml_xtokens = 38,54				Tokens: orml_tokens = 39,55				// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,5657				#[cfg(feature = "collator-selection")]58				Identity: pallet_identity = 40,5960				#[cfg(feature = "preimage")]61				Preimage: pallet_preimage = 41,6263				// XCM helpers.64				XcmpQueue: cumulus_pallet_xcmp_queue = 50,65				PolkadotXcm: pallet_xcm = 51,66				CumulusXcm: cumulus_pallet_xcm = 52,67				DmpQueue: cumulus_pallet_dmp_queue = 53,6869				// Unique Pallets70				Inflation: pallet_inflation = 60,71				Unique: pallet_unique::{Pallet, Call, Storage} = 61,7273				// #[cfg(feature = "scheduler")]74				// Scheduler: pallet_unique_scheduler_v2 = 62,7576				Configuration: pallet_configuration = 63,7778				Charging: pallet_charge_transaction = 64,79				// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,80				Common: pallet_common = 66,81				Fungible: pallet_fungible = 67,8283				#[cfg(feature = "refungible")]84				Refungible: pallet_refungible = 68,8586				Nonfungible: pallet_nonfungible = 69,87				Structure: pallet_structure = 70,8889				// RmrkCore: pallet_proxy_rmrk_core = 71,9091				// RmrkEquip: pallet_proxy_rmrk_equip = 72,9293				#[cfg(feature = "app-promotion")]94				AppPromotion: pallet_app_promotion = 73,9596				#[cfg(feature = "foreign-assets")]97				ForeignAssets: pallet_foreign_assets = 80,9899				// Frontier100				EVM: pallet_evm = 100,101				Ethereum: pallet_ethereum = 101,102103				EvmCoderSubstrate: pallet_evm_coder_substrate = 150,104				EvmContractHelpers: pallet_evm_contract_helpers = 151,105				EvmTransactionPayment: pallet_evm_transaction_payment = 152,106				EvmMigration: pallet_evm_migration = 153,107108				Maintenance: pallet_maintenance = 154,109110				BalancesAdapter: pallet_balances_adapter = 155,111112				#[cfg(feature = "pallet-test-utils")]113				TestUtils: pallet_test_utils = 255,114			}115		}116	};117}
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -73,6 +73,7 @@
 	"pallet-authorship/std",
 	"pallet-preimage/std",
 	"pallet-session/std",
+	"pallet-state-trie-migration/std",
 	"sp-consensus-aura/std",
 	'app-promotion-rpc/std',
 	'evm-coder/std',
@@ -225,6 +226,7 @@
 pallet-balances = { features = ["insecure_zero_ed"], workspace = true }
 pallet-preimage = { workspace = true }
 pallet-session = { workspace = true }
+pallet-state-trie-migration = { workspace = true }
 pallet-sudo = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -56,7 +56,7 @@
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 3,
-	state_version: 0,
+	state_version: 1,
 };
 
 parameter_types! {
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -75,6 +75,7 @@
 	"pallet-identity/std",
 	"pallet-preimage/std",
 	"pallet-session/std",
+	"pallet-state-trie-migration/std",
 	"sp-consensus-aura/std",
 	'app-promotion-rpc/std',
 	'evm-coder/std',
@@ -217,6 +218,7 @@
 pallet-balances = { features = ["insecure_zero_ed"], workspace = true }
 pallet-preimage = { workspace = true }
 pallet-session = { workspace = true }
+pallet-state-trie-migration = { workspace = true }
 pallet-sudo = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -59,7 +59,7 @@
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 3,
-	state_version: 0,
+	state_version: 1,
 };
 
 parameter_types! {
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -72,6 +72,7 @@
 	"pallet-identity/std",
 	"pallet-preimage/std",
 	"pallet-session/std",
+	"pallet-state-trie-migration/std",
 	"sp-consensus-aura/std",
 	'app-promotion-rpc/std',
 	'evm-coder/std',
@@ -216,6 +217,7 @@
 pallet-balances = { features = ["insecure_zero_ed"], workspace = true }
 pallet-preimage = { workspace = true }
 pallet-session = { workspace = true }
+pallet-state-trie-migration = { workspace = true }
 pallet-sudo = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -56,7 +56,7 @@
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 3,
-	state_version: 0,
+	state_version: 1,
 };
 
 parameter_types! {