Merge branch 'master' into child_uuid_step1

client/db/src/lib.rs

@@ -200,7 +200,7 @@ impl<B: BlockT> StateBackend<Blake2Hasher> for RefTrackingState<B> {
 		storage_key: &[u8],
 		child_info: ChildInfo,
 		delta: I,
-	) -> (Vec<u8>, bool, Self::Transaction)
+	) -> (H256, bool, Self::Transaction)
 		where
 			I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
 	{

client/db/src/storage_cache.rs

@@ -595,7 +595,7 @@ impl<H: Hasher, S: StateBackend<H>, B: BlockT> StateBackend<H> for CachingState<
 		storage_key: &[u8],
 		child_info: ChildInfo,
 		delta: I,
-	) -> (Vec<u8>, bool, Self::Transaction)
+	) -> (H::Out, bool, Self::Transaction)
 		where
 			I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
 			H::Out: Ord

client/src/light/backend.rs

@@ -22,7 +22,9 @@ use std::sync::Arc;
 use parking_lot::RwLock;
 
 use primitives::storage::{ChildInfo, OwnedChildInfo};
-use state_machine::{Backend as StateBackend, TrieBackend, backend::InMemory as InMemoryState, ChangesTrieTransaction};
+use state_machine::{
+	Backend as StateBackend, TrieBackend, backend::InMemory as InMemoryState, ChangesTrieTransaction
+};
 use primitives::offchain::storage::InMemOffchainStorage;
 use sr_primitives::{generic::BlockId, Justification, StorageOverlay, ChildrenStorageOverlay};
 use sr_primitives::traits::{Block as BlockT, NumberFor, Zero, Header};
@@ -425,7 +427,7 @@ impl<H: Hasher> StateBackend<H> for GenesisOrUnavailableState<H>
 		storage_key: &[u8],
 		child_info: ChildInfo,
 		delta: I,
-	) -> (Vec<u8>, bool, Self::Transaction)
+	) -> (H::Out, bool, Self::Transaction)
 	where
 		I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>
 	{

primitives/externalities/src/lib.rs

@@ -43,17 +43,21 @@ pub trait Externalities: ExtensionStore {
 	fn storage_hash(&self, key: &[u8]) -> Option<Vec<u8>>;
 
 	/// Get child storage value hash. This may be optimized for large values.
+	///
+	/// Returns an `Option` that holds the SCALE encoded hash.
 	fn child_storage_hash(
 		&self,
 		storage_key: ChildStorageKey,
 		child_info: ChildInfo,
 		key: &[u8],
-	) -> Option<H256>;
+	) -> Option<Vec<u8>>;
 
 	/// Read original runtime storage, ignoring any overlayed changes.
 	fn original_storage(&self, key: &[u8]) -> Option<Vec<u8>>;
 
 	/// Read original runtime child storage, ignoring any overlayed changes.
+	///
+	/// Returns an `Option` that holds the SCALE encoded hash.
 	fn original_child_storage(
 		&self,
 		storage_key: ChildStorageKey,
@@ -69,14 +73,18 @@ pub trait Externalities: ExtensionStore {
 
 	/// Get original child storage value hash, ignoring any overlayed changes.
 	/// This may be optimized for large values.
+	///
+	/// Returns an `Option` that holds the SCALE encoded hash.
 	fn original_child_storage_hash(
 		&self,
 		storage_key: ChildStorageKey,
 		child_info: ChildInfo,
 		key: &[u8],
-	) -> Option<H256>;
+	) -> Option<Vec<u8>>;
 
 	/// Read child runtime storage.
+	///
+	/// Returns an `Option` that holds the SCALE encoded hash.
 	fn child_storage(
 		&self,
 		storage_key: ChildStorageKey,

primitives/sr-io/src/lib.rs

@@ -246,6 +246,10 @@ pub trait Storage {
 	}
 
 	/// "Commit" all existing operations and compute the resulting child storage root.
+	///
+	/// The hashing algorithm is defined by the `Block`.
+	///
+	/// Returns the SCALE encoded hash.
 	fn child_root(
 		&mut self,
 		child_storage_key: &[u8],

primitives/state-machine/src/backend.rs

@@ -25,6 +25,7 @@ use trie::{
 	TrieMut, MemoryDB, child_trie_root, default_child_trie_root, TrieConfiguration,
 	trie_types::{TrieDBMut, Layout},
 };
+use codec::{Encode, Codec};
 use primitives::storage::{ChildInfo, OwnedChildInfo};
 
 pub(crate) type StorageTuple = (
@@ -132,7 +133,7 @@ pub trait Backend<H: Hasher>: std::fmt::Debug {
 		storage_key: &[u8],
 		child_info: ChildInfo,
 		delta: I,
-	) -> (Vec<u8>, bool, Self::Transaction)
+	) -> (H::Out, bool, Self::Transaction)
 	where
 		I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
 		H::Out: Ord;
@@ -176,7 +177,7 @@ pub trait Backend<H: Hasher>: std::fmt::Debug {
 		I1: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
 		I2i: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
 		I2: IntoIterator<Item=(Vec<u8>, I2i, OwnedChildInfo)>,
-		<H as Hasher>::Out: Ord,
+		H::Out: Ord + Encode,
 	{
 		let mut txs: Self::Transaction = Default::default();
 		let mut child_roots: Vec<_> = Default::default();
@@ -253,7 +254,7 @@ impl<'a, T: Backend<H>, H: Hasher> Backend<H> for &'a T {
 		storage_key: &[u8],
 		child_info: ChildInfo,
 		delta: I,
-	) -> (Vec<u8>, bool, Self::Transaction)
+	) -> (H::Out, bool, Self::Transaction)
 	where
 		I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
 		H::Out: Ord,
@@ -514,7 +515,7 @@ impl<H: Hasher> Backend<H> for InMemory<H> where H::Out: Codec {
 		storage_key: &[u8],
 		child_info: ChildInfo,
 		delta: I,
-	) -> (Vec<u8>, bool, Self::Transaction)
+	) -> (H::Out, bool, Self::Transaction)
 	where
 		I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
 		H::Out: Ord

primitives/state-machine/src/basic.rs

@@ -142,16 +142,16 @@ impl Externalities for BasicExternalities {
 		storage_key: ChildStorageKey,
 		child_info: ChildInfo,
 		key: &[u8],
-	) -> Option<H256> {
-		self.child_storage(storage_key, child_info, key).map(|v| Blake2Hasher::hash(&v))
+	) -> Option<Vec<u8>> {
+		self.child_storage(storage_key, child_info, key).map(|v| Blake2Hasher::hash(&v).encode())
 	}
 
 	fn original_child_storage_hash(
 		&self,
 		storage_key: ChildStorageKey,
 		child_info: ChildInfo,
 		key: &[u8],
-	) -> Option<H256> {
+	) -> Option<Vec<u8>> {
 		self.child_storage_hash(storage_key, child_info, key)
 	}
 

primitives/state-machine/src/ext.rs

@@ -259,7 +259,7 @@ where
 		storage_key: ChildStorageKey,
 		_child_info: ChildInfo,
 		key: &[u8],
-	) -> Option<H256> {
+	) -> Option<Vec<u8>> {
 		let _guard = panic_handler::AbortGuard::force_abort();
 		let result = self.overlay
 			.child_storage(storage_key.as_ref(), key)
@@ -303,7 +303,7 @@ where
 		storage_key: ChildStorageKey,
 		child_info: ChildInfo,
 		key: &[u8],
-	) -> Option<H256> {
+	) -> Option<Vec<u8>> {
 		let _guard = panic_handler::AbortGuard::force_abort();
 		let result = self.backend
 			.child_storage_hash(storage_key.as_ref(), child_info, key)
@@ -530,6 +530,7 @@ where
 					self.backend.child_storage_root(storage_key, child_info.as_ref(), delta)
 				};
 
+				let root = root.encode();
 				if is_empty {
 					self.overlay.set_storage(storage_key.into(), None);
 				} else {
@@ -546,6 +547,7 @@ where
 				// empty overlay
 				let root = self
 					.storage(storage_key.as_ref())
+					.and_then(|k| Decode::decode(&mut &k[..]).ok())
 					.unwrap_or(
 						default_child_trie_root::<Layout<H>>(storage_key.as_ref())
 					);
@@ -554,7 +556,7 @@ where
 					HexDisplay::from(&storage_key.as_ref()),
 					HexDisplay::from(&root.as_ref()),
 				);
-				root
+				root.encode()
 			}
 		}
 	}

primitives/state-machine/src/proving_backend.rs

@@ -335,7 +335,7 @@ impl<'a, S, H> Backend<H> for ProvingBackend<'a, S, H>
 		storage_key: &[u8],
 		child_info: ChildInfo,
 		delta: I,
-	) -> (Vec<u8>, bool, Self::Transaction)
+	) -> (H::Out, bool, Self::Transaction)
 	where
 		I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
 		H::Out: Ord

primitives/state-machine/src/trie_backend.rs

@@ -23,6 +23,7 @@ use trie::trie_types::{TrieDB, TrieError, Layout};
 use crate::trie_backend_essence::{TrieBackendEssence, TrieBackendStorage, Ephemeral};
 use crate::Backend;
 use primitives::storage::ChildInfo;
+use codec::{Codec, Decode};
 
 /// Patricia trie-based backend. Transaction type is an overlay of changes to commit.
 pub struct TrieBackend<S: TrieBackendStorage<H>, H: Hasher> {
@@ -181,7 +182,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
 		storage_key: &[u8],
 		child_info: ChildInfo,
 		delta: I,
-	) -> (Vec<u8>, bool, Self::Transaction)
+	) -> (H::Out, bool, Self::Transaction)
 	where
 		I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
 		H::Out: Ord,

primitives/state-machine/src/trie_backend_essence.rs

@@ -27,6 +27,7 @@ use trie::{Trie, MemoryDB, PrefixedMemoryDB, DBValue,
 use trie::trie_types::{TrieDB, TrieError, Layout};
 use crate::backend::Consolidate;
 use primitives::storage::ChildInfo;
+use codec::Encode;
 
 /// Patricia trie-based storage trait.
 pub trait Storage<H: Hasher>: Send + Sync {
@@ -89,7 +90,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 			root
 		} else {
 			fetched_root = self.storage(storage_key)?
-				.unwrap_or(default_child_trie_root::<Layout<H>>(storage_key));
+				.unwrap_or(default_child_trie_root::<Layout<H>>(storage_key).encode());
 			&fetched_root
 		};
 
@@ -117,7 +118,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
 			root
 		} else {
 			fetched_root = match self.storage(storage_key) {
-				Ok(v) => v.unwrap_or(default_child_trie_root::<Layout<H>>(storage_key)),
+				Ok(v) => v.unwrap_or(default_child_trie_root::<Layout<H>>(storage_key).encode()),
 				Err(e) => {
 					debug!(target: "trie", "Error while iterating child storage: {}", e);
 					return;