Merge pull request 0xPolygonZero#45 from topos-protocol/bump

topos-protocol · Dec 18, 2023 · e99c13d · e99c13d
2 parents 229457f + 4835443
commit e99c13d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -12,5 +12,5 @@ anyhow = { version = "1.0.71", features = ["backtrace"] }
 ethereum-types = "0.14.1"
 eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5" }
 flexi_logger = { version = "0.25.4", features = ["async"] }
-plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "71dff6e9827f501bc59416dc25ce06c4aec030ab" }
+plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "536cd1c89c7d5fc546ed4f1b8c9dd653300878ae" }
 serde = {version = "1.0.163", 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 = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5" }
-plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "71dff6e9827f501bc59416dc25ce06c4aec030ab" }
+plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "536cd1c89c7d5fc546ed4f1b8c9dd653300878ae" }
 
 anyhow = { version = "1.0.71", features = ["backtrace"] }
 bytes = "1.4.0"

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 = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "71dff6e9827f501bc59416dc25ce06c4aec030ab" }
-plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "71dff6e9827f501bc59416dc25ce06c4aec030ab" }
+plonky2 = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "536cd1c89c7d5fc546ed4f1b8c9dd653300878ae" }
+plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "536cd1c89c7d5fc546ed4f1b8c9dd653300878ae" }
 
 anyhow = { version = "1.0", features = ["backtrace"] }
 askama = "0.12.0"

diff --git a/evm_test_runner/src/plonky2_runner.rs b/evm_test_runner/src/plonky2_runner.rs
@@ -293,6 +293,7 @@ fn run_test_and_get_test_result(test: TestVariantRunInfo, witness_only: bool) ->
                 &StarkConfig::standard_fast_config(),
                 inputs,
                 &mut TimingTree::default(),
+                None,
             );
 
             timing.filter(Duration::from_millis(100)).print();
-Original file line number
+Diff line change
@@ Expand Up @@
                     &StarkConfig::standard_fast_config(),
                     inputs,
                     &mut TimingTree::default(),
+                    None,
                 );
                 timing.filter(Duration::from_millis(100)).print();
@@ Expand Down @@