Merge pull request #15 from mir-protocol/state_hash_hack

Temp hack for filling in the expected state trie hash
0xPolygonZero · Feb 27, 2023 · 02a23d1 · 02a23d1
2 parents bcb11ce + bc4fcdb
commit 02a23d1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -11,5 +11,5 @@ edition = "2021"
 ethereum-types = "0.14.0"
 eth_trie_utils = "0.4.1"
 flexi_logger = { version = "0.25.1", features = ["async"] }
-plonky2_evm = { git = "https://github.com/mir-protocol/plonky2.git", rev = "6f2d99c7bce0728aff0374cf6bddff6c08b409ba" }
+plonky2_evm = { git = "https://github.com/mir-protocol/plonky2.git", rev = "5aafbaad491b89805b649650131ab80ee8c79605" }
 serde = {version = "1.0.147", features = ["derive"] }
diff --git a/eth_test_parser/Cargo.toml b/eth_test_parser/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 [dependencies]
 common = { path = "../common" }
 eth_trie_utils = "0.4.1"
-plonky2_evm = { git = "https://github.com/mir-protocol/plonky2.git", rev = "6f2d99c7bce0728aff0374cf6bddff6c08b409ba" }
+plonky2_evm = { git = "https://github.com/mir-protocol/plonky2.git", rev = "5aafbaad491b89805b649650131ab80ee8c79605" }
 
 anyhow = { version = "1.0.66", features = ["backtrace"] }
 clap = {version = "4.0.19", features = ["derive"] }

diff --git a/eth_test_parser/src/main.rs b/eth_test_parser/src/main.rs
@@ -46,11 +46,14 @@ async fn run(ProgArgs { no_fetch, out_path }: ProgArgs) -> anyhow::Result<()> {
     let generation_input_handles = get_deserialized_test_bodies()?.filter_map(|res| {
         match res {
             Ok((test_dir_entry, test_body)) => Some(tokio::task::spawn_blocking(move || {
+                // TODO: For now if there are multiple txn variants, we're just going to pick
+                // the first one. Later we will switch to processing all txns in the test.
+                let state_trie_hash = test_body.post.merge[0].hash;
                 (
                     test_dir_entry,
                     serde_cbor::to_vec(&ParsedTest {
                         plonky2_inputs: test_body.into_generation_inputs(),
-                        expected_final_account_states: None,
+                        expected_final_account_states: Some(state_trie_hash),
                     })
                     .unwrap(),
                 )

diff --git a/evm_test_runner/Cargo.toml b/evm_test_runner/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 
 [dependencies]
 common = { path = "../common" }
-plonky2 = { version = "0.1.1", features = ["timing"] }
-plonky2_evm = { git = "https://github.com/mir-protocol/plonky2.git", rev = "6f2d99c7bce0728aff0374cf6bddff6c08b409ba" }
+plonky2 = { version = "0.1.3", features = ["timing"] }
+plonky2_evm = { git = "https://github.com/mir-protocol/plonky2.git", rev = "5aafbaad491b89805b649650131ab80ee8c79605" }
 
 anyhow = { version = "1.0", features = ["backtrace"] }
 askama = "0.11.1"