Merge branch 'master' into child-trie-soft-min

core/state-machine/src/lib.rs

@@ -24,8 +24,10 @@ use log::warn;
 use hash_db::Hasher;
 use heapsize::HeapSizeOf;
 use parity_codec::{Decode, Encode};
-use primitives::{storage::well_known_keys, NativeOrEncoded, NeverNativeValue, OffchainExt};
-use primitives::subtrie::SubTrie;
+use primitives::{
+	storage::well_known_keys, NativeOrEncoded, NeverNativeValue, OffchainExt,
+	subtrie::SubTrie,
+};
 
 pub mod backend;
 mod changes_trie;
@@ -38,7 +40,7 @@ mod trie_backend;
 mod trie_backend_essence;
 
 use overlayed_changes::OverlayedChangeSet;
-pub use trie::{TrieMut, TrieDBMut, DBValue, MemoryDB};
+pub use trie::{TrieMut, TrieDBMut, DBValue, MemoryDB, Recorder as ProofRecorder};
 pub use testing::TestExternalities;
 pub use basic::BasicExternalities;
 pub use ext::Ext;
@@ -55,7 +57,7 @@ pub use changes_trie::{
 pub use overlayed_changes::OverlayedChanges;
 pub use proving_backend::{
 	create_proof_check_backend, create_proof_check_backend_storage,
-	Recorder as ProofRecorder, ProvingBackend,
+	ProvingBackend,
 };
 pub use trie_backend_essence::{TrieBackendStorage, Storage};
 pub use trie_backend::TrieBackend;
@@ -994,7 +996,7 @@ mod tests {
 		// Note that proof of get_subtrie should use standard child proof
 		let subtrie1 = remote_backend.child_trie(b"sub1").unwrap().unwrap();
 		let _remote_root = remote_backend.storage_root(::std::iter::empty()).0;
-		let (v, remote_proof) = prove_child_read(remote_backend, &subtrie1, b"value3").unwrap();
+		let (_v, remote_proof) = prove_child_read(remote_backend, &subtrie1, b"value3").unwrap();
 		let local_result1 = read_child_proof_check::<Blake2Hasher>(remote_proof.clone(), &subtrie1, b"value3").unwrap();
 		let local_result2 = read_child_proof_check::<Blake2Hasher>(remote_proof.clone(), &subtrie1, b"value2").unwrap();
 		assert_eq!(local_result1, Some(vec![142]));

core/state-machine/src/proving_backend.rs

@@ -21,7 +21,10 @@ use log::debug;
 use hash_db::Hasher;
 use heapsize::HeapSizeOf;
 use hash_db::HashDB;
-use trie::{Recorder, MemoryDB, PrefixedMemoryDB, TrieError, read_trie_value_with, read_child_trie_value_with, record_all_keys};
+use trie::{
+	MemoryDB, PrefixedMemoryDB, TrieError, Recorder,
+	read_trie_value_with, read_child_trie_value_with, record_all_keys
+};
 use crate::trie_backend::TrieBackend;
 use crate::trie_backend_essence::{Ephemeral, TrieBackendEssence, TrieBackendStorage};
 use crate::{Error, ExecutionError, Backend};

core/state-machine/src/testing.rs

@@ -161,7 +161,7 @@ impl<H: Hasher> Externalities<H> for TestExternalities<H> where H::Out: Ord + He
 	}
 
 	fn child_storage_root(&mut self, _subtrie: &SubTrie) -> Vec<u8> {
-		unimplemented!()
+		vec![]
 	}
 
 	fn storage_changes_root(&mut self, parent: H::Out, parent_num: u64) -> Option<H::Out> {

core/trie/src/lib.rs

@@ -158,11 +158,7 @@ pub fn is_child_trie_key_valid<H: Hasher>(storage_key: &[u8]) -> bool {
 
 /// Determine the default child trie root.
 pub fn default_child_trie_root<H: Hasher>() -> Vec<u8> {
-	let mut db = MemoryDB::default();
-	let mut root = H::Out::default();
-	let mut empty = TrieDBMut::<H>::new(&mut db, &mut root);
-	empty.commit();
-	empty.root().as_ref().to_vec()
+	trie_root::<H, _, Vec<u8>, Vec<u8>>(core::iter::empty()).as_ref().iter().cloned().collect()
 }
 
 /// Determine a child trie root given its ordered contents, closed form. H is the default hasher, but a generic

node/runtime/src/lib.rs

@@ -58,7 +58,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("node"),
 	impl_name: create_runtime_str!("substrate-node"),
 	authoring_version: 10,
-	spec_version: 66,
+	spec_version: 69,
 	impl_version: 68,
 	apis: RUNTIME_API_VERSIONS,
 };

srml/contract/src/account_db.rs

@@ -26,9 +26,10 @@ use rstd::collections::btree_map::{BTreeMap, Entry};
 use rstd::prelude::*;
 use runtime_io::blake2_256;
 use runtime_primitives::traits::Zero;
-use srml_support::{StorageMap, traits::{UpdateBalanceOutcome,
-	SignedImbalance, Currency, Imbalance}, storage::child};
 use substrate_primitives::subtrie::SubTrie;
+use srml_support::traits::{Currency, Imbalance, SignedImbalance, UpdateBalanceOutcome};
+use srml_support::{storage::child, StorageMap};
+use system;
 
 // Note: we don't provide Option<Contract> because we can't create
 // the trie_id in the overlay, thus we provide an overlay on the fields
@@ -79,7 +80,7 @@ impl<T: Trait> AccountDb<T> for DirectAccountDb {
 		// TODO pass optional SubTrie or change def to use subtrie (put the subtrie in cache (rc one of
 		// the overlays)) EMCH TODO create an issue for a following pr
 		trie_id.and_then(|id|child::get_child_trie(&id).and_then(|subtrie|
-			child::get_raw(&subtrie, location)
+			child::get_raw(&subtrie, &blake2_256(location))
 		))
 	}
 	fn get_code_hash(&self, account: &T::AccountId) -> Option<CodeHash<T>> {
@@ -144,21 +145,21 @@ impl<T: Trait> AccountDb<T> for DirectAccountDb {
 				// TODO put in cache (there is also a scheme change to do to avoid indirection)
 				// TODO also switch to using address instead of trie_id that way no need to store
 				// trie_id (subtrie field at address).
-				let subtrie = child::get_child_trie(&info.trie_id[..]).unwrap_or_else(||{
-					let new_subtrie = SubTrie::new(info.trie_id.clone(), &info.trie_id[..]);
+				let subtrie = child::get_child_trie(&new_info.trie_id[..]).unwrap_or_else(||{
+					let new_subtrie = SubTrie::new(new_info.trie_id.clone(), &new_info.trie_id[..]);
 					child::set_child_trie(&new_subtrie);
 					new_subtrie
 				});
 
 				for (k, v) in changed.storage.into_iter() {
-					if let Some(value) = child::get_raw(&subtrie, &k) {
-						new_storage_size -= value.len() as u64;
+					if let Some(value) = child::get_raw(&subtrie, &blake2_256(&k)) {
+						new_info.storage_size -= value.len() as u64;
 					}
 					if let Some(value) = v {
-						new_storage_size += value.len() as u64;
-						child::put_raw(&subtrie, &k, &value[..]);
+						new_info.storage_size += value.len() as u64;
+						child::put_raw(&subtrie, &blake2_256(&k), &value[..]);
 					} else {
-						child::kill(&subtrie, &k);
+						child::kill(&subtrie, &blake2_256(&k));
 					}
 				}
 

srml/contract/src/lib.rs

@@ -594,10 +594,11 @@ decl_storage! {
 
 impl<T: Trait> OnFreeBalanceZero<T::AccountId> for Module<T> {
 	fn on_free_balance_zero(who: &T::AccountId) {
-		<CodeHashOf<T>>::remove(who);
-		<AccountInfoOf<T>>::get(who)
-			.and_then(|info|child::get_child_trie(&info.trie_id[..]))
-			.map(|subtrie|child::kill_storage(&subtrie));
+		if let Some(ContractInfo::Alive(info)) = <ContractInfoOf<T>>::get(who) {
+			child::get_child_trie(&info.trie_id[..])
+				.map(|subtrie|child::kill_storage(&subtrie));
+		}
+		<ContractInfoOf<T>>::remove(who);
 	}
 }
 

srml/contract/src/rent.rs

@@ -18,6 +18,7 @@ use crate::{BalanceOf, ContractInfo, ContractInfoOf, Module, TombstoneContractIn
 use runtime_primitives::traits::{As, Bounded, CheckedDiv, CheckedMul, Saturating, Zero};
 use srml_support::traits::{Currency, ExistenceRequirement, Imbalance, WithdrawReason};
 use srml_support::StorageMap;
+use substrate_primitives::subtrie::SubTrie;
 
 #[derive(PartialEq, Eq, Copy, Clone)]
 #[must_use]
@@ -154,17 +155,23 @@ fn try_evict_or_and_pay_rent<T: Trait>(
 		if !is_below_subsistence {
 			// The contract has funds above subsistence deposit and that means it can afford to
 			// leave tombstone.
+			let subtrie = runtime_io::get_child_trie(&contract.trie_id[..]).unwrap_or_else(||{
+				let new_subtrie = SubTrie::new(contract.trie_id.clone(), &contract.trie_id[..]);
+				runtime_io::set_child_trie(&new_subtrie);
+				new_subtrie
+			});
+
 
 			// Note: this operation is heavy.
-			let child_storage_root = runtime_io::child_storage_root(&contract.trie_id);
+			let child_storage_root = runtime_io::child_storage_root(&subtrie);
 
 			let tombstone = TombstoneContractInfo::new(
 				child_storage_root,
 				contract.storage_size,
 				contract.code_hash,
 			);
 			<ContractInfoOf<T>>::insert(account, ContractInfo::Tombstone(tombstone));
-			runtime_io::kill_child_storage(&contract.trie_id);
+			runtime_io::kill_child_storage(&subtrie);
 		}
 
 		RentOutcome::Evicted

srml/contract/src/tests.rs

@@ -37,9 +37,11 @@ use srml_support::{
 	traits::Currency, StorageMap,
 };
 use std::sync::atomic::{AtomicUsize, Ordering};
-#[cfg(test)]
 use substrate_primitives::subtrie::SubTrie;
-use crate::account_db::{DirectAccountDb, OverlayAccountDb, AccountDb};
+use substrate_primitives::storage::well_known_keys;
+use substrate_primitives::Blake2Hasher;
+use system::{self, EventRecord, Phase};
+use {balances, consensus, wabt};
 
 mod contract {
 	// Re-export contents of the root. This basically