misc trace fixes; disable batch inv in halo2 (scroll-tech#1129)

* disable batch inv in halo2 * fix cargo lock * more trace fixes
teetub2 · Mar 7, 2024 · cc0bc9b · cc0bc9b
1 parent cd9de97
commit cc0bc9b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/geth-utils/l2geth/trace.go b/geth-utils/l2geth/trace.go
@@ -226,6 +226,7 @@ func Trace(config TraceConfig) (*types.BlockTrace, error) {
 		GasLimit:   toBigInt(config.Block.GasLimit).Uint64(),
 		Extra:      []byte{},
 		Time:       toBigInt(config.Block.Timestamp).Uint64(),
+		BaseFee:    toBigInt(config.Block.BaseFee),
 	}
 	block := types.NewBlockWithHeader(header).WithBody(txs, nil)
 

diff --git a/testool/Config.toml b/testool/Config.toml
@@ -58,7 +58,7 @@ tests = []
 desc = "unimplemented"
 paths = [
 #   "EIP1559",
-   "stExample/eip1559Filler.yml",
+#   "stExample/eip1559Filler.yml",
     "stEIP1559/valCausesOOFFiller.yml",
     "stExample/mergeTestFiller.yml",
 #   "EIP2930",
@@ -72,7 +72,7 @@ paths = [
 #    "stTimeConsuming", # full of useless sstore tests
 #    "stExample",
 #    "stQuadraticComplexityTest",
-#    "50000"
+    "50000"
 ]
 
 [[skip_paths]]

diff --git a/testool/src/statetest/executor.rs b/testool/src/statetest/executor.rs
@@ -194,9 +194,9 @@ fn into_traceconfig(st: StateTest) -> (String, TraceConfig, StateTestResult) {
             accounts,
             logger_config: LoggerConfig {
                 enable_memory: cfg!(feature = "enable-memory")
-                    && bus_mapping::util::GETH_TRACE_CHECK_LEVEL.should_check(),
-                disable_stack: !cfg!(feature = "enable-stack")
-                    && bus_mapping::util::GETH_TRACE_CHECK_LEVEL.should_check(),
+                    || bus_mapping::util::GETH_TRACE_CHECK_LEVEL.should_check(),
+                disable_stack: !(cfg!(feature = "enable-stack")
+                    || bus_mapping::util::GETH_TRACE_CHECK_LEVEL.should_check()),
                 disable_storage: !cfg!(feature = "enable-storage"),
                 ..Default::default()
             },

diff --git a/testool/src/statetest/suite.rs b/testool/src/statetest/suite.rs
@@ -40,7 +40,7 @@ pub fn load_statetests_suite(
                 let path = file.as_path().to_string_lossy();
                 let tcs = (|| -> Result<Vec<StateTest>> {
                     let src = std::fs::read_to_string(&file)?;
-                    log::debug!(target: "testool", "Reading file {:?}", file);
+                    //log::debug!(target: "testool", "Reading file {:?}", file);
                     let tcs = match ext {
                         "yml" => YamlStateTestBuilder::new(&compiler).load_yaml(&path, &src),
                         "json" => JsonStateTestBuilder::new(&compiler).load_json(&path, &src),

diff --git a/zkevm-circuits/Cargo.toml b/zkevm-circuits/Cargo.toml
@@ -67,7 +67,7 @@ warn-unimplemented = ["eth-types/warn-unimplemented"]
 onephase = [] # debug only
 zktrie = []
 poseidon-codehash = []
-parallel_syn = ["hash-circuit/parallel_syn", "halo2_proofs/parallel_syn"]
+parallel_syn = ["hash-circuit/parallel_syn", "halo2_proofs/parallel_syn", "mpt-zktrie/parallel_syn"]
 
 debug-annotations = []
 enable-stack = ["bus-mapping/enable-stack"]

diff --git a/zktrie/Cargo.toml b/zktrie/Cargo.toml
@@ -8,7 +8,7 @@ license.workspace = true
 
 [dependencies]
 halo2_proofs.workspace = true
-mpt-circuits = { package = "halo2-mpt-circuits", git = "https://github.com/scroll-tech/mpt-circuit.git", branch = "v0.7" }
+mpt-circuits = { package = "halo2-mpt-circuits", git = "https://github.com/scroll-tech/mpt-circuit.git", branch = "v0.7", default-features=false }
 zktrie = { git = "https://github.com/scroll-tech/zktrie.git", tag = "v0.7.1" }
 hash-circuit.workspace = true
 eth-types = { path = "../eth-types" }
@@ -23,3 +23,5 @@ serde_json.workspace = true
 
 [features]
 default = []
+parallel_syn = ["mpt-circuits/parallel_syn"]
+