state trie inner hashing runtime migration

Cargo.toml

@@ -114,6 +114,7 @@ members = [
 	"frame/staking",
 	"frame/staking/reward-curve",
 	"frame/staking/reward-fn",
+	"frame/state-migrate-0-to-1",
 	"frame/sudo",
 	"frame/support",
 	"frame/support/procedural",
@@ -271,4 +272,11 @@ yamux = { opt-level = 3 }
 zeroize = { opt-level = 3 }
 [profile.release]
 # Substrate runtime requires unwinding.
-panic = "unwind"
+panic = "unwind"
+
+[patch.crates-io]
+hash-db = { git = "https://github.com/cheme/trie.git", branch = "hashed-value-simple4-new" }
+memory-db = { git = "https://github.com/cheme/trie.git", branch = "hashed-value-simple4-new" }
+trie-db = { git = "https://github.com/cheme/trie.git", branch = "hashed-value-simple4-new" }
+trie-root = { git = "https://github.com/cheme/trie.git", branch = "hashed-value-simple4-new" }
+trie-bench = { git = "https://github.com/cheme/trie.git", branch = "hashed-value-simple4-new" }

bin/node/bench/src/generator.rs

@@ -20,7 +20,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use kvdb::KeyValueDB;
 use node_primitives::Hash;
-use sp_trie::{trie_types::TrieDBMut, TrieMut};
+use sp_trie::{trie_types::TrieDBMutV1, TrieMut};
 
 use crate::simple_trie::SimpleTrie;
 
@@ -43,8 +43,7 @@ pub fn generate_trie(
 		);
 		let mut trie = SimpleTrie { db, overlay: &mut overlay };
 		{
-			let mut trie_db = TrieDBMut::new(&mut trie, &mut root);
-
+			let mut trie_db = TrieDBMutV1::<crate::simple_trie::Hasher>::new(&mut trie, &mut root);
 			for (key, value) in key_values {
 				trie_db.insert(&key, &value).expect("trie insertion failed");
 			}

bin/node/bench/src/trie.rs

@@ -23,7 +23,7 @@ use kvdb::KeyValueDB;
 use lazy_static::lazy_static;
 use rand::Rng;
 use sp_state_machine::Backend as _;
-use sp_trie::{trie_types::TrieDBMut, TrieMut as _};
+use sp_trie::{trie_types::TrieDBMutV1, TrieMut as _};
 use std::{borrow::Cow, collections::HashMap, sync::Arc};
 
 use node_primitives::Hash;
@@ -286,8 +286,8 @@ impl core::Benchmark for TrieWriteBenchmark {
 
 		let mut overlay = HashMap::new();
 		let mut trie = SimpleTrie { db: kvdb.clone(), overlay: &mut overlay };
-		let mut trie_db_mut =
-			TrieDBMut::from_existing(&mut trie, &mut new_root).expect("Failed to create TrieDBMut");
+		let mut trie_db_mut = TrieDBMutV1::from_existing(&mut trie, &mut new_root)
+			.expect("Failed to create TrieDBMut");
 
 		for (warmup_key, warmup_value) in self.warmup_keys.iter() {
 			let value = trie_db_mut

bin/node/cli/src/service.rs

@@ -422,7 +422,13 @@ pub fn new_full_base(
 							&parent,
 						)?;
 
-					Ok((timestamp, slot, uncles, storage_proof))
+					let state_migration =
+						sc_client_api::state_migration_inherents::new_migration_provider(
+							&*client_clone,
+							&parent,
+						)?;
+
+					Ok((timestamp, slot, uncles, storage_proof, state_migration))
 				}
 			},
 			force_authoring,

bin/node/executor/benches/bench.rs

@@ -83,14 +83,14 @@ fn construct_block<E: Externalities>(
 	parent_hash: Hash,
 	extrinsics: Vec<CheckedExtrinsic>,
 ) -> (Vec<u8>, Hash) {
-	use sp_trie::{trie_types::Layout, TrieConfiguration};
+	use sp_trie::{LayoutV0, TrieConfiguration};
 
 	// sign extrinsics.
 	let extrinsics = extrinsics.into_iter().map(sign).collect::<Vec<_>>();
 
 	// calculate the header fields that we can.
 	let extrinsics_root =
-		Layout::<BlakeTwo256>::ordered_trie_root(extrinsics.iter().map(Encode::encode))
+		LayoutV0::<BlakeTwo256>::ordered_trie_root(extrinsics.iter().map(Encode::encode))
 			.to_fixed_bytes()
 			.into();
 

bin/node/executor/tests/common.rs

@@ -130,6 +130,12 @@ pub fn new_test_ext(code: &[u8], support_changes_trie: bool) -> TestExternalitie
 			.build_storage()
 			.unwrap(),
 	);
+
+	use sp_core::hashing::twox_128;
+	// set migration progress to Finished (no inherent provider),
+	// this could be remove when migration module got removed from test runtime.
+	let k = [twox_128(b"StateMigrate0To1"), twox_128(b"MigrationProgress")].concat();
+	ext.ext().place_storage(k, Some(vec![1u8])); // Finished encoded.
 	ext.changes_trie_storage().insert(0, GENESIS_HASH.into(), Default::default());
 	ext
 }
@@ -145,7 +151,7 @@ pub fn construct_block(
 	extrinsics: Vec<CheckedExtrinsic>,
 	babe_slot: Slot,
 ) -> (Vec<u8>, Hash) {
-	use sp_trie::{trie_types::Layout, TrieConfiguration};
+	use sp_trie::{LayoutV1 as Layout, TrieConfiguration};
 
 	// sign extrinsics.
 	let extrinsics = extrinsics.into_iter().map(sign).collect::<Vec<_>>();

bin/node/runtime/Cargo.toml

@@ -85,6 +85,7 @@ pallet-session = { version = "4.0.0-dev", features = [
 pallet-session-benchmarking = { version = "4.0.0-dev", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
 pallet-staking = { version = "4.0.0-dev", default-features = false, path = "../../../frame/staking" }
 pallet-staking-reward-curve = { version = "4.0.0-dev", default-features = false, path = "../../../frame/staking/reward-curve" }
+pallet-state-migrate-0-to-1 = { version = "4.0.0-dev", default-features = false, path = "../../../frame/state-migrate-0-to-1" }
 pallet-scheduler = { version = "4.0.0-dev", default-features = false, path = "../../../frame/scheduler" }
 pallet-society = { version = "4.0.0-dev", default-features = false, path = "../../../frame/society" }
 pallet-sudo = { version = "4.0.0-dev", default-features = false, path = "../../../frame/sudo" }
@@ -135,6 +136,7 @@ std = [
 	"pallet-multisig/std",
 	"pallet-identity/std",
 	"pallet-scheduler/std",
+	"pallet-state-migrate-0-to-1/std",
 	"node-primitives/std",
 	"sp-offchain/std",
 	"pallet-offences/std",

bin/node/runtime/src/lib.rs

@@ -1241,6 +1241,18 @@ impl pallet_transaction_storage::Config for Runtime {
 	type WeightInfo = pallet_transaction_storage::weights::SubstrateWeight<Runtime>;
 }
 
+parameter_types! {
+	pub const MigrationWeight: Weight = 500_000_000_000;
+	pub const MigrationMaxSize: u32 = 300;
+	pub const Threshold: u32 = 33;
+}
+
+impl pallet_state_migrate_0_to_1::Config for Runtime {
+	type MigrationWeight = MigrationWeight;
+	type MigrationMaxSize = MigrationMaxSize;
+	type Threshold = Threshold;
+}
+
 construct_runtime!(
 	pub enum Runtime where
 		Block = Block,
@@ -1288,6 +1300,7 @@ construct_runtime!(
 		Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>},
 		TransactionStorage: pallet_transaction_storage::{Pallet, Call, Storage, Inherent, Config<T>, Event<T>},
 		BagsList: pallet_bags_list::{Pallet, Call, Storage, Event<T>},
+		StateMigrate0To1: pallet_state_migrate_0_to_1::{Pallet, Call, Storage, Inherent},
 	}
 );
 
@@ -1380,6 +1393,12 @@ impl_runtime_apis! {
 		}
 	}
 
+	impl pallet_state_migrate_0_to_1::CalcPayload<Block> for Runtime {
+		fn calculate_pending_migration_size() -> u64 {
+			StateMigrate0To1::calculate_pending_migration_size()
+		}
+	}
+
 	impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
 		fn validate_transaction(
 			source: TransactionSource,

client/api/Cargo.toml

@@ -20,6 +20,8 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
 sc-executor = { version = "0.10.0-dev", path = "../executor" }
 sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
+sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" } # This should be remove as a dependency with the state migration inherent.
+async-trait = { version = "0.1.50" } # This could be remove as a dependency with the state migration inherent.
 fnv = "1.0.6"
 futures = "0.3.1"
 hash-db = { version = "0.15.2", default-features = false }