From 337089ac40bac756d88b9ae30a3be1f82538b216 Mon Sep 17 00:00:00 2001 From: Zhang Zhuo Date: Sun, 6 Aug 2023 00:49:37 +0800 Subject: [PATCH] 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 --- Cargo.lock | 22 +++++++++++----------- prover/Cargo.toml | 12 ++++++------ prover/src/zkevm/circuit.rs | 2 +- types/Cargo.toml | 2 +- utils.sh | 6 +++--- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 128ef8083..93afdd281 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ dependencies = [ [[package]] name = "aggregator" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.2#225db80d26b6a2ed4aa5ad2462c887a58acdfd00" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "ark-std", "env_logger 0.10.0", @@ -418,7 +418,7 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bus-mapping" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.2#225db80d26b6a2ed4aa5ad2462c887a58acdfd00" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "eth-types", "ethers-core 0.17.0", @@ -1121,7 +1121,7 @@ dependencies = [ [[package]] name = "eth-types" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.2#225db80d26b6a2ed4aa5ad2462c887a58acdfd00" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "ethers-core 0.17.0", "ethers-signers", @@ -1386,7 +1386,7 @@ dependencies = [ [[package]] name = "external-tracer" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.2#225db80d26b6a2ed4aa5ad2462c887a58acdfd00" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "eth-types", "geth-utils", @@ -1599,7 +1599,7 @@ dependencies = [ [[package]] name = "gadgets" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.2#225db80d26b6a2ed4aa5ad2462c887a58acdfd00" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "digest 0.7.6", "eth-types", @@ -1639,7 +1639,7 @@ dependencies = [ [[package]] name = "geth-utils" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.2#225db80d26b6a2ed4aa5ad2462c887a58acdfd00" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "env_logger 0.9.3", "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)", @@ -2245,7 +2245,7 @@ dependencies = [ [[package]] name = "keccak256" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.2#225db80d26b6a2ed4aa5ad2462c887a58acdfd00" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "env_logger 0.9.3", "eth-types", @@ -2445,7 +2445,7 @@ dependencies = [ [[package]] name = "mock" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.2#225db80d26b6a2ed4aa5ad2462c887a58acdfd00" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "eth-types", "ethers-core 0.17.0", @@ -2460,7 +2460,7 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.2#225db80d26b6a2ed4aa5ad2462c887a58acdfd00" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "bus-mapping", "eth-types", @@ -3360,7 +3360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d470e29e933dac4101180fd6574971892315c414cf2961a192729089687cc9b" dependencies = [ "derive_more", - "primitive-types 0.11.1", + "primitive-types 0.12.1", "rlp", "ruint-macro", "rustc_version", @@ -4711,7 +4711,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] name = "zkevm-circuits" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.2#225db80d26b6a2ed4aa5ad2462c887a58acdfd00" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b" dependencies = [ "array-init", "bus-mapping", diff --git a/prover/Cargo.toml b/prover/Cargo.toml index 074af260b..be0cf1f19 100644 --- 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 index 53a2cb6e8..ad8a696e6 100644 --- 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 index 5b20e3aa3..e2ca57858 100644 --- 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 index b166250af..b8b951083 100644 --- 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