v0.8.1: (1) aggregate 15 chunks (2) parallel assignment (#262)

* Test max-snark. * U * Update layer3.config. * Update configs. * U * Revert "U" This reverts commit aa997ef. * U * upgrade zkevm circuits * add CircuitCapacityChecker::get_tx_num * Set `KECCAK_ROW=50` when init batch-prover. --------- Co-authored-by: Zhuo Zhang <[email protected]>
scroll-tech · Sep 7, 2023 · b6d98c3 · b6d98c3
1 parent b38be04
commit b6d98c3
Show file tree

Hide file tree

Showing 10 changed files with 391 additions and 40 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/Cargo.toml b/bin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bin"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/prover/Cargo.toml b/prover/Cargo.toml
@@ -1,19 +1,19 @@
 [package]
 name = "prover"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [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.8.0" }
-bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.8.0" }
-eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.8.0" }
-mock = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.8.0" }
-mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.8.0" }
-zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.8.0", default-features = false, features = ["shanghai", "scroll"] }
+aggregator = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.8.1" }
+bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.8.1" }
+eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.8.1" }
+mock = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.8.1" }
+mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.8.1" }
+zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.8.1", default-features = false, features = ["shanghai", "scroll", "parallel_syn"] }
 
 snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.4" }
 snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.4", default-features = false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }

diff --git a/prover/configs/layer3.config b/prover/configs/layer3.config
@@ -1,11 +1,11 @@
 {
   "strategy": "Simple",
-  "degree": 19,
+  "degree": 20,
   "num_advice": [
-    80
+    59
   ],
   "num_lookup_advice": [
-    10
+    7
   ],
   "num_fixed": 2,
   "lookup_bits": 18,

diff --git a/prover/configs/layer4.config b/prover/configs/layer4.config
@@ -1,8 +1,8 @@
 {
   "strategy": "Simple",
-  "degree": 25,
+  "degree": 26,
   "num_advice": [
-    3
+    1
   ],
   "num_lookup_advice": [
     1

diff --git a/prover/src/aggregator/prover.rs b/prover/src/aggregator/prover.rs
@@ -1,15 +1,15 @@
 use crate::{
     common,
     config::{LayerId, AGG_DEGREES},
-    consts::{AGG_VK_FILENAME, CHUNK_PROTOCOL_FILENAME},
+    consts::{AGG_KECCAK_ROW, AGG_VK_FILENAME, CHUNK_PROTOCOL_FILENAME},
     io::{force_to_read, try_to_read},
     BatchProof, ChunkProof,
 };
 use aggregator::{ChunkHash, MAX_AGG_SNARKS};
 use anyhow::{bail, Result};
 use sha2::{Digest, Sha256};
 use snark_verifier_sdk::Snark;
-use std::iter::repeat;
+use std::{env, iter::repeat};
 
 #[derive(Debug)]
 pub struct Prover {
@@ -21,6 +21,8 @@ pub struct Prover {
 
 impl Prover {
     pub fn from_dirs(params_dir: &str, assets_dir: &str) -> Self {
+        env::set_var("KECCAK_ROW", AGG_KECCAK_ROW.to_string());
+
         let inner = common::Prover::from_params_dir(params_dir, &AGG_DEGREES);
         let chunk_protocol = force_to_read(assets_dir, &CHUNK_PROTOCOL_FILENAME);
 

diff --git a/prover/src/consts.rs b/prover/src/consts.rs
@@ -1,6 +1,7 @@
 use crate::utils::read_env_var;
 use once_cell::sync::Lazy;
 
+pub static AGG_KECCAK_ROW: Lazy<usize> = Lazy::new(|| read_env_var("AGG_KECCAK_ROW", 50));
 pub static AGG_VK_FILENAME: Lazy<String> =
     Lazy::new(|| read_env_var("AGG_VK_FILENAME", "agg_vk.vkey".to_string()));
 pub static CHUNK_PROTOCOL_FILENAME: Lazy<String> =

diff --git a/prover/src/zkevm/capacity_checker.rs b/prover/src/zkevm/capacity_checker.rs
@@ -148,6 +148,9 @@ impl CircuitCapacityChecker {
         self.acc_row_usage = RowUsage::new();
         self.row_usages = Vec::new();
     }
+    pub fn get_tx_num(&self) -> usize {
+        self.row_usages.len()
+    }
     pub fn get_acc_row_usage(&self, normalize: bool) -> RowUsage {
         if normalize {
             self.acc_row_usage.normalize()

diff --git a/prover/tests/test_data/full_proof_1.json b/prover/tests/test_data/full_proof_1.json
diff --git a/utils.sh b/utils.sh
@@ -18,13 +18,13 @@ function simple_tests() {
 }
 
 function replace_zkevm_circuits_branch() {
-	TO='tag = "v0.8.0"'
-	FROM='branch = "develop"'
+	TO='tag = "v0.8.1"'
+	FROM='branch = "feat/max_snark=16"'
 	#FROM='branch = "refactor/partial-db"'
 	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
+	#git diff */Cargo.toml Cargo.lock
 }
 
 replace_zkevm_circuits_branch