Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temp hack for filling in the expected state trie hash #15

Merged
merged 3 commits into from
Feb 27, 2023
Merged

Temp hack for filling in the expected state trie hash #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5040655
Temp hack for filling in the expected state trie hash
BGluth Feb 27, 2023
7d8eb54
Comment fix
BGluth Feb 27, 2023
bc4fcdb
Bumped `plonky2_evm` dep
BGluth Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
2 changes: 1 addition & 1 deletion eth_test_parser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
5 changes: 4 additions & 1 deletion eth_test_parser/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
)
Expand Down
4 changes: 2 additions & 2 deletions evm_test_runner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down