openethereum · dvdplm · Aug 15, 2019 · Feb 7, 2019 · Feb 8, 2019 · Feb 8, 2019
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -73,7 +73,7 @@ ethcore-secretstore = { path = "secret-store", optional = true }
 
 registrar = { path = "util/registrar" }
 
-parity-util-mem = { version = "0.1", features = ["jemalloc-global"] }
+parity-util-mem = { version = "0.2.0", features = ["jemalloc-global"] }
 
 [build-dependencies]
 rustc_version = "0.2"

diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -32,8 +32,8 @@ ethkey = { path = "../accounts/ethkey" }
 evm = { path = "evm" }
 trie-vm-factories = { path = "trie-vm-factories" }
 futures = "0.1"
-hash-db = "0.12.4"
-parity-util-mem = "0.1"
+hash-db = "0.15.0"
+parity-util-mem = "0.2.0"
 itertools = "0.5"
 journaldb = { path = "../util/journaldb" }
 keccak-hash = "0.2.0"
@@ -53,7 +53,7 @@ parity-bytes = "0.1"
 parity-snappy = "0.1"
 parking_lot = "0.8"
 pod = { path = "pod" }
-trie-db = "0.12.4"
+trie-db = "0.15.0"
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
 rand = "0.6"
 rayon = "1.1"
@@ -86,7 +86,7 @@ parity-runtime = { path = "../util/runtime" }
 rlp_compress = { path = "../util/rlp-compress" }
 serde_json = "1.0"
 tempdir = "0.3"
-trie-standardmap = "0.12.4"
+trie-standardmap = "0.15.0"
 machine = { path = "./machine", features = ["test-helpers"] }
 
 [features]

diff --git a/ethcore/account-db/Cargo.toml b/ethcore/account-db/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 ethereum-types = "0.6"
-hash-db = "0.12.4"
+hash-db = "0.15.0"
 keccak-hash = "0.2.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 kvdb = "0.1"

diff --git a/ethcore/account-state/Cargo.toml b/ethcore/account-state/Cargo.toml
@@ -12,22 +12,22 @@ derive_more = "0.15.0"
 ethereum-types = "0.6.0"
 ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
 trie-vm-factories = { path = "../trie-vm-factories" }
-hash-db = "0.12.4"
+hash-db = "0.15.0"
 journaldb = { path = "../../util/journaldb" }
 keccak-hash = "0.2.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 kvdb = "0.1.0"
 log = "0.4"
 lru-cache = "0.1.2"
-memory-db = "0.12.4"
+memory-db = "0.15.0"
 parity-bytes = "0.1.0"
-parity-util-mem = "0.1.0"
+parity-util-mem = "0.2.0"
 parking_lot = "0.8.0"
 pod = { path = "../pod" }
 rlp = "0.4.0"
 serde = { version = "1.0", features = ["derive"] }
 trace = { path = "../trace" }
-trie-db = "0.12.4"
+trie-db = "0.15.0"
 
 [dev-dependencies]
 account-db = { path = "../account-db" }

diff --git a/ethcore/blockchain/Cargo.toml b/ethcore/blockchain/Cargo.toml
@@ -14,7 +14,7 @@ common-types = { path = "../types" }
 ethcore-db = { path = "../db" }
 ethereum-types = "0.6.0"
 keccak-hash = "0.2.0"
-parity-util-mem = "0.1"
+parity-util-mem = "0.2.0"
 itertools = "0.5"
 kvdb = "0.1"
 log = "0.4"

diff --git a/ethcore/db/Cargo.toml b/ethcore/db/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 common-types = { path = "../types" }
 ethereum-types = "0.6.0"
 kvdb = "0.1"
-parity-util-mem = "0.1"
+parity-util-mem = "0.2.0"
 parking_lot = "0.8"
 rlp = "0.4.0"
 rlp_derive = { path = "../../util/rlp-derive" }
diff --git a/ethcore/evm/Cargo.toml b/ethcore/evm/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 bit-set = "0.4"
 parity-bytes = "0.1"
 ethereum-types = "0.6.0"
-parity-util-mem = "0.1"
+parity-util-mem = "0.2.0"
 lazy_static = "1.0"
 log = "0.4"
 vm = { path = "../vm" }

diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml
@@ -17,14 +17,14 @@ ethcore-db = { path = "../db" }
 ethcore-blockchain = { path = "../blockchain" }
 ethereum-types = "0.6.0"
 machine = { path = "../machine" }
-memory-db = "0.12.4"
-trie-db = "0.12.4"
+memory-db = "0.15.0"
+trie-db = "0.15.0"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 ethcore-network = { path = "../../util/network" }
 ethcore-miner = { path = "../../miner" }
 ethcore-io = { path = "../../util/io" }
-hash-db = "0.12.4"
-parity-util-mem = "0.1"
+hash-db = "0.15.0"
+parity-util-mem = "0.2.0"
 vm = { path = "../vm" }
 fastmap = { path = "../../util/fastmap" }
 failsafe = { version = "0.3.0", default-features = false, features = ["parking_lot_mutex"] }

diff --git a/ethcore/pod/Cargo.toml b/ethcore/pod/Cargo.toml
@@ -11,7 +11,7 @@ common-types = { path = "../types" }
 ethereum-types = "0.6"
 ethjson = { path = "../../json" }
 ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
-hash-db = "0.12"
+hash-db = "0.15.0"
 itertools = "0.8"
 keccak-hash = "0.2.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
@@ -21,7 +21,7 @@ parity-bytes = "0.1.0"
 rlp = "0.4"
 rustc-hex = "1"
 serde = { version = "1.0", features = ["derive"] }
-trie-db = "0.12.4"
+trie-db = "0.15.0"
 triehash = { package = "triehash-ethereum", version = "0.2",  path = "../../util/triehash-ethereum" }
 
 [dev-dependencies]

diff --git a/ethcore/pod/src/account.rs b/ethcore/pod/src/account.rs
@@ -26,7 +26,7 @@ use keccak_hasher::KeccakHasher;
 use triehash::sec_trie_root;
 use parity_bytes::Bytes;
 use trie_db::TrieFactory;
-use ethtrie::RlpCodec;
+use ethtrie::Layout;
 use ethjson;
 use common_types::account_diff::*;
 use rlp::{self, RlpStream};
@@ -70,7 +70,7 @@ impl PodAccount {
 	}
 
 	/// Place additional data into given hash DB.
-	pub fn insert_additional(&self, db: &mut dyn HashDB<KeccakHasher, DBValue>, factory: &TrieFactory<KeccakHasher, RlpCodec>) {
+	pub fn insert_additional(&self, db: &mut dyn HashDB<KeccakHasher, DBValue>, factory: &TrieFactory<Layout>) {
 		match self.code {
 			Some(ref c) if !c.is_empty() => { db.insert(hash_db::EMPTY_PREFIX, c); }
 			_ => {}

diff --git a/ethcore/private-tx/Cargo.toml b/ethcore/private-tx/Cargo.toml
@@ -22,14 +22,14 @@ ethjson = { path = "../../json" }
 ethkey = { path = "../../accounts/ethkey" }
 fetch = { path = "../../util/fetch" }
 futures = "0.1"
-parity-util-mem = "0.1"
+parity-util-mem = "0.2.0"
 keccak-hash = "0.2.0"
 log = "0.4"
 machine = { path = "../machine" }
 parity-bytes = "0.1"
 parity-crypto = "0.4.0"
 parking_lot = "0.8"
-trie-db = "0.12.4"
+trie-db = "0.15.0"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 rand = "0.3"
 rlp = "0.4.0"

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
@@ -91,7 +91,7 @@ use verification::queue::kind::blocks::Unverified;
 use verification::{Verifier, BlockQueue};
 use verification;
 use ansi_term::Colour;
-
+use ethtrie::Layout;
 // re-export
 pub use blockchain::CacheSize as BlockChainCacheSize;
 use db::{Writable, Readable, keys::BlockDetails};
@@ -726,7 +726,7 @@ impl Client {
 			false => TrieSpec::Secure,
 		};
 
-		let trie_factory = TrieFactory::new(trie_spec);
+		let trie_factory = TrieFactory::new(trie_spec, Layout);
 		let factories = Factories {
 			vm: VmFactory::new(config.vm_type.clone(), config.jump_table_size),
 			trie: trie_factory,

diff --git a/ethcore/src/client/evm_test_client.rs b/ethcore/src/client/evm_test_client.rs
@@ -158,7 +158,7 @@ impl<'a> EvmTestClient<'a> {
 	fn factories(trie_spec: trie::TrieSpec) -> Factories {
 		Factories {
 			vm: trie_vm_factories::VmFactory::new(VMType::Interpreter, 5 * 1024),
-			trie: trie::TrieFactory::new(trie_spec),
+			trie: trie::TrieFactory::new(trie_spec, ethtrie::Layout),
 			accountdb: Default::default(),
 		}
 	}

diff --git a/ethcore/src/executive_state.rs b/ethcore/src/executive_state.rs
@@ -1658,13 +1658,14 @@ mod tests {
 	#[test]
 	fn should_get_full_pod_storage_values() {
 		use trie::{TrieFactory, TrieSpec};
+		use ethtrie;
 
 		let a = Address::from_low_u64_be(10);
 		let db = get_temp_state_db();
 
 		let factories = Factories {
 			vm: Default::default(),
-			trie: TrieFactory::new(TrieSpec::Fat),
+			trie: TrieFactory::new(TrieSpec::Fat, ethtrie::Layout),
 			accountdb: Default::default(),
 		};
 

diff --git a/ethcore/src/json_tests/trie.rs b/ethcore/src/json_tests/trie.rs
@@ -16,7 +16,6 @@
 
 use ethjson;
 use trie::{TrieFactory, TrieSpec};
-use ethtrie::RlpCodec;
 use ethereum_types::H256;
 
 use super::HookType;
@@ -28,7 +27,7 @@ pub use self::secure::run_test_file as run_secure_test_file;
 
 fn test_trie<H: FnMut(&str, HookType)>(json: &[u8], trie: TrieSpec, start_stop_hook: &mut H) -> Vec<String> {
 	let tests = ethjson::trie::Test::load(json).unwrap();
-	let factory = TrieFactory::<_, RlpCodec>::new(trie);
+	let factory = TrieFactory::new(trie, ethtrie::Layout);
 	let mut result = vec![];
 
 	for (name, test) in tests.into_iter() {

diff --git a/ethcore/state-db/Cargo.toml b/ethcore/state-db/Cargo.toml
@@ -12,7 +12,7 @@ bloom_journal = { package = "ethcore-bloom-journal", path = "../../util/bloom" }
 common-types = { path = "../types"}
 ethcore-db = { path = "../db" }
 ethereum-types = "0.6.0"
-hash-db = "0.12.4"
+hash-db = "0.15.0"
 keccak-hash = "0.2.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 journaldb = { path = "../../util/journaldb" }

diff --git a/ethcore/sync/Cargo.toml b/ethcore/sync/Cargo.toml
@@ -20,7 +20,7 @@ ethereum-types = "0.6.0"
 ethkey = { path = "../../accounts/ethkey" }
 ethstore = { path = "../../accounts/ethstore" }
 fastmap = { path = "../../util/fastmap" }
-hash-db = "0.12.4"
+hash-db = "0.15.0"
 keccak-hash = "0.2.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 kvdb = "0.1"
@@ -29,7 +29,7 @@ machine = { path = "../machine" }
 macros = { path = "../../util/macros" }
 parity-bytes = "0.1"
 parking_lot = "0.8"
-parity-util-mem = "0.1"
+parity-util-mem = "0.2.0"
 rand = "0.6"
 rlp = "0.4.0"
 trace-time = "0.1"

diff --git a/ethcore/trace/Cargo.toml b/ethcore/trace/Cargo.toml
@@ -14,7 +14,7 @@ evm = { path = "../evm" }
 kvdb = "0.1.0"
 log = "0.4"
 parity-bytes = "0.1.0"
-parity-util-mem = "0.1"
+parity-util-mem = "0.2.0"
 parking_lot = "0.8.0"
 rlp = "0.4.0"
 rlp_derive = { path = "../../util/rlp-derive" }

diff --git a/ethcore/trie-vm-factories/Cargo.toml b/ethcore/trie-vm-factories/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-trie-db = "0.12.4"
+trie-db = "0.15.0"
 ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
 account-db = { path = "../account-db" }
 evm = { path = "../evm" }

diff --git a/ethcore/trie-vm-factories/src/lib.rs b/ethcore/trie-vm-factories/src/lib.rs
@@ -15,12 +15,11 @@
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use trie_db::TrieFactory;
-use ethtrie::RlpCodec;
+use ethtrie::Layout;
 use account_db::Factory as AccountFactory;
 use evm::{Factory as EvmFactory, VMType};
 use vm::{Exec, ActionParams, VersionedSchedule, Schedule};
 use wasm::WasmInterpreter;
-use keccak_hasher::KeccakHasher;
 
 const WASM_MAGIC_NUMBER: &'static [u8; 4] = b"\0asm";
 
@@ -67,7 +66,7 @@ pub struct Factories {
 	/// factory for evm.
 	pub vm: VmFactory,
 	/// factory for tries.
-	pub trie: TrieFactory<KeccakHasher, RlpCodec>,
+	pub trie: TrieFactory<Layout>,
 	/// factory for account databases.
 	pub accountdb: AccountFactory,
 }
diff --git a/ethcore/types/Cargo.toml b/ethcore/types/Cargo.toml
@@ -13,7 +13,7 @@ ethjson = { path = "../../json" }
 ethkey = { path = "../../accounts/ethkey" }
 keccak-hash = "0.2.0"
 parity-bytes = "0.1"
-parity-util-mem = "0.1"
+parity-util-mem = "0.2.0"
 parity-snappy = "0.1"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 rlp = "0.4.0"

diff --git a/miner/Cargo.toml b/miner/Cargo.toml
@@ -23,7 +23,7 @@ ethabi-contract = "8.0"
 ethcore-call-contract = { path = "../ethcore/call-contract" }
 ethereum-types = "0.6.0"
 futures = "0.1"
-parity-util-mem = "0.1"
+parity-util-mem = "0.2.0"
 keccak-hash = "0.2.0"
 linked-hash-map = "0.5"
 log = "0.4"

diff --git a/util/journaldb/Cargo.toml b/util/journaldb/Cargo.toml
@@ -9,12 +9,12 @@ edition = "2018"
 [dependencies]
 parity-bytes = "0.1"
 ethereum-types = "0.6.0"
-hash-db = "0.12.4"
-malloc_size_of = { version = "0.1", package = "parity-util-mem" }
+hash-db = "0.15.0"
+malloc_size_of = { version = "0.2", package = "parity-util-mem" }
 keccak-hasher = { path = "../keccak-hasher" }
 kvdb = "0.1"
 log = "0.4"
-memory-db = "0.12.4"
+memory-db = "0.15.0"
 parking_lot = "0.8"
 fastmap = { path = "../../util/fastmap" }
 rlp = "0.4.0"

diff --git a/util/journaldb/src/earlymergedb.rs b/util/journaldb/src/earlymergedb.rs
@@ -343,7 +343,7 @@ impl JournalDB for EarlyMergeDB {
 			Some(ref c) => c.read().size_of(&mut ops),
 			None => 0
 		}
- 	}
+	}
 
 	fn state(&self, id: &H256) -> Option<Bytes> {
 		self.backing.get_by_prefix(self.column, &id[0..DB_PREFIX_LEN]).map(|b| b.into_vec())

diff --git a/util/keccak-hasher/Cargo.toml b/util/keccak-hasher/Cargo.toml
@@ -8,5 +8,5 @@ license = "GPL-3.0"
 [dependencies]
 ethereum-types = "0.6.0"
 tiny-keccak = "1.4.2"
-hash-db = "0.12.4"
+hash-db = "0.15.0"
 plain_hasher = "0.2"
diff --git a/util/memory-cache/Cargo.toml b/util/memory-cache/Cargo.toml
@@ -6,5 +6,5 @@ description = "An LRU-cache which operates on memory used"
 license = "GPL3"
 
 [dependencies]
-parity-util-mem = "0.1"
+parity-util-mem = "0.2.0"
 lru-cache = "0.1"
diff --git a/util/patricia-trie-ethereum/Cargo.toml b/util/patricia-trie-ethereum/Cargo.toml
@@ -6,15 +6,15 @@ description = "Merkle-Patricia Trie (Ethereum Style)"
 license = "GPL-3.0"
 
 [dependencies]
-trie-db = "0.12.4"
+trie-db = "0.15.0"
 keccak-hasher = { version = "0.1.1", path = "../keccak-hasher" }
-hash-db = "0.12.4"
+hash-db = "0.15.0"
 rlp = "0.4.0"
 parity-bytes = "0.1"
 ethereum-types = "0.6.0"
 elastic-array = "0.10"
 
 [dev-dependencies]
-memory-db = "0.12.4"
+memory-db = "0.15.0"
 keccak-hash = "0.2.0"
 journaldb = { path = "../journaldb" }