difftreelog
feat use state_version = 1
in: master
10 files changed
Cargo.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",
Cargo.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" }
runtime/common/config/substrate.rsdiffbeforeafterboth1// 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/>.1617use frame_support::{18 traits::{Everything, ConstU32, NeverEnsureOrigin},19 weights::{20 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight},21 ConstantMultiplier,22 },23 dispatch::DispatchClass,24 parameter_types, PalletId,25};26use sp_runtime::{27 generic,28 traits::{BlakeTwo256, AccountIdLookup},29 Perbill, Permill, Percent,30};31use sp_arithmetic::traits::One;32use frame_system::{33 limits::{BlockLength, BlockWeights},34 EnsureRoot,35};36use pallet_transaction_payment::{Multiplier, ConstFeeMultiplier};37use crate::{38 runtime_common::DealWithFees, Runtime, RuntimeEvent, RuntimeCall, RuntimeOrigin, PalletInfo,39 System, Balances, SS58Prefix, Version,40};41use up_common::{types::*, constants::*};4243parameter_types! {44 pub const BlockHashCount: BlockNumber = 2400;45 pub RuntimeBlockLength: BlockLength =46 BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);47 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);48 pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;49 pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()50 .base_block(BlockExecutionWeight::get())51 .for_class(DispatchClass::all(), |weights| {52 weights.base_extrinsic = ExtrinsicBaseWeight::get();53 })54 .for_class(DispatchClass::Normal, |weights| {55 weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);56 })57 .for_class(DispatchClass::Operational, |weights| {58 weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);59 // Operational transactions have some extra reserved space, so that they60 // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.61 weights.reserved = Some(62 MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT63 );64 })65 .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)66 .build_or_panic();67}6869impl frame_system::Config for Runtime {70 /// The data to be stored in an account.71 type AccountData = pallet_balances::AccountData<Balance>;72 /// The identifier used to distinguish between accounts.73 type AccountId = AccountId;74 /// The basic call filter to use in dispatchable.75 type BaseCallFilter = Everything;76 /// Maximum number of block number to block hash mappings to keep (oldest pruned first).77 type BlockHashCount = BlockHashCount;78 /// The maximum length of a block (in bytes).79 type BlockLength = RuntimeBlockLength;80 /// The index type for blocks.81 type BlockNumber = BlockNumber;82 /// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.83 type BlockWeights = RuntimeBlockWeights;84 /// The aggregated dispatch type that is available for extrinsics.85 type RuntimeCall = RuntimeCall;86 /// The weight of database operations that the runtime can invoke.87 type DbWeight = RocksDbWeight;88 /// The ubiquitous event type.89 type RuntimeEvent = RuntimeEvent;90 /// The type for hashing blocks and tries.91 type Hash = Hash;92 /// The hashing algorithm used.93 type Hashing = BlakeTwo256;94 /// The header type.95 type Header = generic::Header<BlockNumber, BlakeTwo256>;96 /// The index type for storing how many extrinsics an account has signed.97 type Index = Index;98 /// The lookup mechanism to get account ID from whatever is passed in dispatchers.99 type Lookup = AccountIdLookup<AccountId, ()>;100 /// What to do if an account is fully reaped from the system.101 type OnKilledAccount = ();102 /// What to do if a new account is created.103 type OnNewAccount = ();104 type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;105 /// The ubiquitous origin type.106 type RuntimeOrigin = RuntimeOrigin;107 /// This type is being generated by `construct_runtime!`.108 type PalletInfo = PalletInfo;109 /// This is used as an identifier of the chain. 42 is the generic substrate prefix.110 type SS58Prefix = SS58Prefix;111 /// Weight information for the extrinsics of this pallet.112 type SystemWeightInfo = frame_system::weights::SubstrateWeight<Self>;113 /// Version of the runtime.114 type Version = Version;115 type MaxConsumers = ConstU32<16>;116}117118parameter_types! {119 pub const MinimumPeriod: u64 = SLOT_DURATION / 2;120}121122impl pallet_timestamp::Config for Runtime {123 /// A timestamp: milliseconds since the unix epoch.124 type Moment = u64;125 type OnTimestampSet = ();126 type MinimumPeriod = MinimumPeriod;127 type WeightInfo = ();128}129130parameter_types! {131 // pub const ExistentialDeposit: u128 = 500;132 pub const ExistentialDeposit: u128 = EXISTENTIAL_DEPOSIT;133 pub const MaxLocks: u32 = 50;134 pub const MaxReserves: u32 = 50;135 pub const MaxHolds: u32 = 10;136 pub const MaxFreezes: u32 = 10;137}138139impl pallet_balances::Config for Runtime {140 type MaxLocks = MaxLocks;141 type MaxReserves = MaxReserves;142 type ReserveIdentifier = [u8; 16];143 /// The type for recording an account's balance.144 type Balance = Balance;145 /// The ubiquitous event type.146 type RuntimeEvent = RuntimeEvent;147 // FIXME: Is () the new treasury?148 type DustRemoval = ();149 type ExistentialDeposit = ExistentialDeposit;150 type AccountStore = System;151 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;152 type HoldIdentifier = [u8; 16];153 type FreezeIdentifier = [u8; 16];154 type MaxHolds = MaxHolds;155 type MaxFreezes = MaxFreezes;156}157158parameter_types! {159 /// This value increases the priority of `Operational` transactions by adding160 /// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.161 pub const OperationalFeeMultiplier: u8 = 5;162163 pub FeeMultiplier: Multiplier = Multiplier::one();164}165166impl pallet_transaction_payment::Config for Runtime {167 type RuntimeEvent = RuntimeEvent;168 type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;169 type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;170 type OperationalFeeMultiplier = OperationalFeeMultiplier;171 type WeightToFee = pallet_configuration::WeightToFee<Self, Balance>;172 type FeeMultiplierUpdate = ConstFeeMultiplier<FeeMultiplier>;173}174175parameter_types! {176 pub const ProposalBond: Permill = Permill::from_percent(5);177 pub const ProposalBondMinimum: Balance = 1 * UNIQUE;178 pub const ProposalBondMaximum: Balance = 1000 * UNIQUE;179 pub const SpendPeriod: BlockNumber = 5 * MINUTES;180 pub const Burn: Permill = Permill::from_percent(0);181 pub const TipCountdown: BlockNumber = 1 * DAYS;182 pub const TipFindersFee: Percent = Percent::from_percent(20);183 pub const TipReportDepositBase: Balance = 1 * UNIQUE;184 pub const DataDepositPerByte: Balance = 1 * CENTIUNIQUE;185 pub const BountyDepositBase: Balance = 1 * UNIQUE;186 pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;187 pub const TreasuryModuleId: PalletId = PalletId(*b"py/trsry");188 pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;189 pub const MaximumReasonLength: u32 = 16384;190 pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);191 pub const BountyValueMinimum: Balance = 5 * UNIQUE;192 pub const MaxApprovals: u32 = 100;193}194195impl pallet_treasury::Config for Runtime {196 type PalletId = TreasuryModuleId;197 type Currency = Balances;198 type ApproveOrigin = EnsureRoot<AccountId>;199 type RejectOrigin = EnsureRoot<AccountId>;200 type SpendOrigin = NeverEnsureOrigin<u128>;201 type RuntimeEvent = RuntimeEvent;202 type OnSlash = ();203 type ProposalBond = ProposalBond;204 type ProposalBondMinimum = ProposalBondMinimum;205 type ProposalBondMaximum = ProposalBondMaximum;206 type SpendPeriod = SpendPeriod;207 type Burn = Burn;208 type BurnDestination = ();209 type SpendFunds = ();210 type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;211 type MaxApprovals = MaxApprovals;212}213214impl pallet_sudo::Config for Runtime {215 type RuntimeEvent = RuntimeEvent;216 type RuntimeCall = RuntimeCall;217}218219parameter_types! {220 pub const MaxAuthorities: u32 = 100_000;221}222223impl pallet_aura::Config for Runtime {224 type AuthorityId = AuraId;225 type DisabledValidators = ();226 type MaxAuthorities = MaxAuthorities;227}runtime/common/construct_runtime.rsdiffbeforeafterboth--- a/runtime/common/construct_runtime.rs
+++ b/runtime/common/construct_runtime.rs
@@ -25,6 +25,7 @@
UncheckedExtrinsic = UncheckedExtrinsic
{
System: frame_system = 0,
+ StateTrieMigration: pallet_state_trie_migration = 1,
ParachainSystem: cumulus_pallet_parachain_system = 20,
ParachainInfo: parachain_info = 21,
runtime/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 }
runtime/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! {
runtime/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 }
runtime/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! {
runtime/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 }
runtime/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! {