Merge pull request #16 from koushiro/evm-companion-141

Companion of evm#141
rust-blockchain · Nov 14, 2022 · 41b2e25 · 41b2e25
2 parents 4f7e566 + e0185d8
commit 41b2e25
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 352 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ethcore-builtin/Cargo.toml b/ethcore-builtin/Cargo.toml
@@ -9,9 +9,9 @@ edition = "2018"
 bn = { git = "https://github.com/paritytech/bn", default-features = false }
 byteorder = "1.3.2"
 eip-152 = { path = "../EIP-152" }
-ethereum-types = "0.13"
+ethereum-types = "0.14"
 ethjson = { path = "../ethjson" }
-keccak-hash = "0.7"
+keccak-hash = "0.10"
 log = "0.4"
 num = "0.2"
 parity-bytes = "0.1"

diff --git a/ethjson/Cargo.toml b/ethjson/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-ethereum-types = "0.13"
+ethereum-types = "0.14"
 rustc-hex = "2.1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

diff --git a/jsontests/Cargo.toml b/jsontests/Cargo.toml
@@ -10,17 +10,17 @@ edition = "2018"
 
 [dependencies]
 evm = { path = "../evm" }
-primitive-types = "0.11"
+ethereum = "0.14.0"
+primitive-types = "0.12"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 hex = "0.4"
 clap = "2.32"
 ethjson = { path = "../ethjson", features = ["test-helpers"] }
 libsecp256k1 = "0.7"
-triehash-ethereum = { path = "../triehash-ethereum" }
 ethcore-builtin = { path = "../ethcore-builtin" }
 rlp = "0.5"
-sha3 = "0.8"
+sha3 = "0.10"
 parity-bytes = "0.1"
-env_logger = "0.8"
+env_logger = "0.9"
 lazy_static = "1.4.0"
diff --git a/jsontests/src/utils.rs b/jsontests/src/utils.rs
@@ -123,7 +123,7 @@ pub fn assert_valid_hash(h: &H256, b: &BTreeMap<H160, MemoryAccount>) {
 	let tree = b
 		.iter()
 		.map(|(address, account)| {
-			let storage_root = triehash_ethereum::sec_trie_root(
+			let storage_root = ethereum::util::sec_trie_root(
 				account
 					.storage
 					.iter()
@@ -143,7 +143,7 @@ pub fn assert_valid_hash(h: &H256, b: &BTreeMap<H160, MemoryAccount>) {
 		})
 		.collect::<Vec<_>>();
 
-	let root = triehash_ethereum::sec_trie_root(tree);
+	let root = ethereum::util::sec_trie_root(tree);
 	let expect = h.clone().into();
 
 	if root != expect {

diff --git a/keccak-hasher/Cargo.toml b/keccak-hasher/Cargo.toml
diff --git a/keccak-hasher/src/lib.rs b/keccak-hasher/src/lib.rs
diff --git a/triehash-ethereum/Cargo.toml b/triehash-ethereum/Cargo.toml
diff --git a/triehash-ethereum/src/lib.rs b/triehash-ethereum/src/lib.rs