Fix key collision for child trie

bin/node/executor/src/lib.rs

@@ -42,7 +42,7 @@ mod tests {
 	use state_machine::TestExternalities as CoreTestExternalities;
 	use primitives::{
 		Blake2Hasher, NeverNativeValue, NativeOrEncoded, map,
-		traits::{CodeExecutor, Externalities}, storage::well_known_keys,
+		traits::{CodeExecutor, Externalities}, storage::{well_known_keys, Storage},
 	};
 	use sp_runtime::{
 		Fixed64, traits::{Header as HeaderT, Hash as HashT, Convert}, ApplyExtrinsicResult,
@@ -143,20 +143,23 @@ mod tests {
 
 	#[test]
 	fn panic_execution_with_foreign_code_gives_error() {
-		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(BLOATY_CODE, (map![
-			<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
-				69_u128.encode()
-			},
-			<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
-				69_u128.encode()
-			},
-			<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => {
-				0_u128.encode()
-			},
-			<system::BlockHash<Runtime>>::hashed_key_for(0) => {
-				vec![0u8; 32]
-			}
-		], map![]));
+		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(BLOATY_CODE, Storage {
+			top: map![
+				<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
+					69_u128.encode()
+				},
+				<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
+					69_u128.encode()
+				},
+				<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => {
+					0_u128.encode()
+				},
+				<system::BlockHash<Runtime>>::hashed_key_for(0) => {
+					vec![0u8; 32]
+				}
+			],
+			children: map![],
+		});
 
 		let r = executor_call::<NeverNativeValue, fn() -> _>(
 			&mut t,
@@ -179,20 +182,23 @@ mod tests {
 
 	#[test]
 	fn bad_extrinsic_with_native_equivalent_code_gives_error() {
-		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(COMPACT_CODE, (map![
-			<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
-				69_u128.encode()
-			},
-			<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
-				69_u128.encode()
-			},
-			<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => {
-				0_u128.encode()
-			},
-			<system::BlockHash<Runtime>>::hashed_key_for(0) => {
-				vec![0u8; 32]
-			}
-		], map![]));
+		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(COMPACT_CODE, Storage {
+			top: map![
+				<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
+					69_u128.encode()
+				},
+				<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
+					69_u128.encode()
+				},
+				<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => {
+					0_u128.encode()
+				},
+				<system::BlockHash<Runtime>>::hashed_key_for(0) => {
+					vec![0u8; 32]
+				}
+			],
+			children: map![],
+		});
 
 		let r = executor_call::<NeverNativeValue, fn() -> _>(
 			&mut t,
@@ -215,16 +221,19 @@ mod tests {
 
 	#[test]
 	fn successful_execution_with_native_equivalent_code_gives_ok() {
-		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(COMPACT_CODE, (map![
-			<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
-				(111 * DOLLARS).encode()
-			},
-			<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
-				(111 * DOLLARS).encode()
-			},
-			<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => vec![0u8; 16],
-			<system::BlockHash<Runtime>>::hashed_key_for(0) => vec![0u8; 32]
-		], map![]));
+		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(COMPACT_CODE, Storage {
+			top: map![
+				<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
+					(111 * DOLLARS).encode()
+				},
+				<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
+					(111 * DOLLARS).encode()
+				},
+				<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => vec![0u8; 16],
+				<system::BlockHash<Runtime>>::hashed_key_for(0) => vec![0u8; 32]
+			],
+			children: map![],
+		});
 
 		let r = executor_call::<NeverNativeValue, fn() -> _>(
 			&mut t,
@@ -254,16 +263,19 @@ mod tests {
 
 	#[test]
 	fn successful_execution_with_foreign_code_gives_ok() {
-		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(BLOATY_CODE, (map![
-			<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
-				(111 * DOLLARS).encode()
-			},
-			<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
-				(111 * DOLLARS).encode()
-			},
-			<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => vec![0u8; 16],
-			<system::BlockHash<Runtime>>::hashed_key_for(0) => vec![0u8; 32]
-		], map![]));
+		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(BLOATY_CODE, Storage {
+			top: map![
+				<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
+					(111 * DOLLARS).encode()
+				},
+				<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
+					(111 * DOLLARS).encode()
+				},
+				<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => vec![0u8; 16],
+				<system::BlockHash<Runtime>>::hashed_key_for(0) => vec![0u8; 32]
+			],
+			children: map![],
+		});
 
 		let r = executor_call::<NeverNativeValue, fn() -> _>(
 			&mut t,
@@ -828,16 +840,19 @@ mod tests {
 
 	#[test]
 	fn panic_execution_gives_error() {
-		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(BLOATY_CODE, (map![
-			<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
-				0_u128.encode()
-			},
-			<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
-				0_u128.encode()
-			},
-			<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => vec![0u8; 16],
-			<system::BlockHash<Runtime>>::hashed_key_for(0) => vec![0u8; 32]
-		], map![]));
+		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(BLOATY_CODE, Storage {
+			top: map![
+				<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
+					0_u128.encode()
+				},
+				<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
+					0_u128.encode()
+				},
+				<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => vec![0u8; 16],
+				<system::BlockHash<Runtime>>::hashed_key_for(0) => vec![0u8; 32]
+			],
+			children: map![],
+		});
 
 		let r = executor_call::<NeverNativeValue, fn() -> _>(
 			&mut t,
@@ -860,16 +875,19 @@ mod tests {
 
 	#[test]
 	fn successful_execution_gives_ok() {
-		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(COMPACT_CODE, (map![
-			<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
-				(111 * DOLLARS).encode()
-			},
-			<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
-				(111 * DOLLARS).encode()
-			},
-			<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => vec![0u8; 16],
-			<system::BlockHash<Runtime>>::hashed_key_for(0) => vec![0u8; 32]
-		], map![]));
+		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(COMPACT_CODE, Storage {
+			top: map![
+				<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
+					(111 * DOLLARS).encode()
+				},
+				<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
+					(111 * DOLLARS).encode()
+				},
+				<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => vec![0u8; 16],
+				<system::BlockHash<Runtime>>::hashed_key_for(0) => vec![0u8; 32]
+			],
+			children: map![],
+		});
 
 		let r = executor_call::<NeverNativeValue, fn() -> _>(
 			&mut t,
@@ -1037,19 +1055,22 @@ mod tests {
 		//   - 1 MILLICENTS in substrate node.
 		//   - 1 milli-dot based on current polkadot runtime.
 		// (this baed on assigning 0.1 CENT to the cheapest tx with `weight = 100`)
-		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(COMPACT_CODE, (map![
-			<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
-				(100 * DOLLARS).encode()
-			},
-			<balances::FreeBalance<Runtime>>::hashed_key_for(bob()) => {
-				(10 * DOLLARS).encode()
-			},
-			<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
-				(110 * DOLLARS).encode()
-			},
-			<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => vec![0u8; 16],
-			<system::BlockHash<Runtime>>::hashed_key_for(0) => vec![0u8; 32]
-		], map![]));
+		let mut t = TestExternalities::<Blake2Hasher>::new_with_code(COMPACT_CODE, Storage {
+			top: map![
+				<balances::FreeBalance<Runtime>>::hashed_key_for(alice()) => {
+					(100 * DOLLARS).encode()
+				},
+				<balances::FreeBalance<Runtime>>::hashed_key_for(bob()) => {
+					(10 * DOLLARS).encode()
+				},
+				<balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
+					(110 * DOLLARS).encode()
+				},
+				<indices::NextEnumSet<Runtime>>::hashed_key().to_vec() => vec![0u8; 16],
+				<system::BlockHash<Runtime>>::hashed_key_for(0) => vec![0u8; 32]
+			],
+			children: map![],
+		});
 
 		let tip = 1_000_000;
 		let xt = sign(CheckedExtrinsic {

bin/node/testing/src/client.rs

@@ -42,7 +42,7 @@ pub struct GenesisParameters {
 }
 
 impl test_client::GenesisInit for GenesisParameters {
-	fn genesis_storage(&self) -> (StorageOverlay, ChildrenStorageOverlay) {
+	fn genesis_storage(&self) -> Storage {
 		crate::genesis::config(self.support_changes_trie, None).build_storage().unwrap()
 	}
 }

client/api/src/backend.rs

@@ -20,7 +20,7 @@ use std::sync::Arc;
 use std::collections::HashMap;
 use primitives::ChangesTrieConfiguration;
 use primitives::offchain::OffchainStorage;
-use sp_runtime::{generic::BlockId, Justification, StorageOverlay, ChildrenStorageOverlay};
+use sp_runtime::{generic::BlockId, Justification, Storage};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 use state_machine::backend::Backend as StateBackend;
 use state_machine::{ChangesTrieStorage as StateChangesTrieStorage, ChangesTrieTransaction};
@@ -134,7 +134,7 @@ pub trait BlockImportOperation<Block, H> where
 	fn update_db_storage(&mut self, update: <Self::State as StateBackend<H>>::Transaction) -> sp_blockchain::Result<()>;
 
 	/// Inject storage data into the database replacing any existing data.
-	fn reset_storage(&mut self, top: StorageOverlay, children: ChildrenStorageOverlay) -> sp_blockchain::Result<H::Out>;
+	fn reset_storage(&mut self, storage: Storage) -> sp_blockchain::Result<H::Out>;
 
 	/// Set storage changes.
 	fn update_storage(

client/api/src/light.rs

@@ -26,7 +26,7 @@ use sp_runtime::{
     },
     generic::BlockId
 };
-use primitives::{ChangesTrieConfiguration};
+use primitives::ChangesTrieConfiguration;
 use state_machine::StorageProof;
 use sp_blockchain::{
 	HeaderMetadata, well_known_cache_keys, HeaderBackend, Cache as BlockchainCache,
@@ -81,6 +81,11 @@ pub struct RemoteReadChildRequest<Header: HeaderT> {
 	pub header: Header,
 	/// Storage key for child.
 	pub storage_key: Vec<u8>,
+	/// Child trie source information.
+	pub child_info: Vec<u8>,
+	/// Child type, its required to resolve `child_info`
+	/// content and choose child implementation.
+	pub child_type: u32,
 	/// Child storage key to read.
 	pub keys: Vec<Vec<u8>>,
 	/// Number of times to retry request. None means that default RETRY_COUNT is used.