fix all; towards 053; also change max tx num to 100 (#199)

* also change max tx num to 100 * Fix zkevm-circuits to `v0.5.3`. --------- Co-authored-by: Steven Gu <[email protected]>
scroll-tech · Aug 5, 2023 · 337089a · 337089a
1 parent cf95001
commit 337089a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/prover/Cargo.toml b/prover/Cargo.toml
@@ -8,12 +8,12 @@ edition = "2021"
 [dependencies]
 halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_02_02" }
 
-aggregator = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.2" }
-bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.2" }
-eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.2" }
-zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.2", default-features = false, features = ["test","scroll","scroll-trace","shanghai"] }
-mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.2" }
-mock = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.2" }
+aggregator = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.3" }
+bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.3" }
+eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.3" }
+zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.3", default-features = false, features = ["test","scroll","scroll-trace","shanghai"] }
+mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.3" }
+mock = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.3" }
 
 snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" }
 snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" }

diff --git a/prover/src/zkevm/circuit.rs b/prover/src/zkevm/circuit.rs
@@ -20,7 +20,7 @@ pub use self::builder::{
 // TODO: more smart row capacity checking rather than max_of(row_usage_details) > 1<<20 - 256
 // Need to compare with real row nums like MAX_MPT_ROWS/MAX_KECCAK_ROWS etc.
 ////// params for degree = 20 ////////////
-const MAX_TXS: usize = 32;
+const MAX_TXS: usize = 100;
 const MAX_INNER_BLOCKS: usize = 100;
 const MAX_EXP_STEPS: usize = 10_000;
 const MAX_CALLDATA: usize = 400_000;

diff --git a/types/Cargo.toml b/types/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.4.0"
 edition = "2021"
 
 [dependencies]
-eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.2" }
+eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.5.3" }
 base64 = "0.13.0"
 blake2 = "0.10.3"
 ethers-core = "0.17.0"

diff --git a/utils.sh b/utils.sh
@@ -18,9 +18,9 @@ function simple_tests() {
 }
 
 function replace_zkevm_circuits_branch() {
-	FROM=feat/testing0801
-	TO=develop
-	sed -i 's#zkevm-circuits.git", branch = "'$FROM'#zkevm-circuits.git", branch = "'$TO'#' */Cargo.toml
+	FROM='tag = "v0.5.2"'
+	TO='branch = "develop"'
+	sed -i "s#zkevm-circuits.git\", $FROM#zkevm-circuits.git\", $TO#" */Cargo.toml
 	cargo update -p zkevm-circuits
 	cargo update -p eth-types
 	git diff */Cargo.toml Cargo.lock