chore: auto version bump [bot]

Co-authored-by: georgehao <haohongfan@gmail.com>
Co-authored-by: colin <102356659+colinlyguo@users.noreply.github.com>
Co-authored-by: Rohit Narurkar <rohit.narurkar@proton.me>

common/libzkp/impl/Cargo.lock

@@ -31,7 +31,7 @@ dependencies = [
 [[package]]
 name = "aggregator"
 version = "0.12.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0#6a1f65a1f99429f3725ef4d6788f5643bb61aa6f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.2#6f7b46a3b1ccf9dc448735e8455e1ac6f9e30643"
 dependencies = [
  "ark-std 0.3.0",
  "bitstream-io",
@@ -65,7 +65,7 @@ dependencies = [
 [[package]]
 name = "aggregator"
 version = "0.13.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.0#cf71a0e324d42f7895363f4f3e8575d79bb7ea97"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.1#4009e5593f13ba73f64f556011ee5ef47bc4ebf3"
 dependencies = [
  "ark-std 0.3.0",
  "bitstream-io",
@@ -571,7 +571,7 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 [[package]]
 name = "bus-mapping"
 version = "0.12.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0#6a1f65a1f99429f3725ef4d6788f5643bb61aa6f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.2#6f7b46a3b1ccf9dc448735e8455e1ac6f9e30643"
 dependencies = [
  "eth-types 0.12.0",
  "ethers-core",
@@ -596,7 +596,7 @@ dependencies = [
 [[package]]
 name = "bus-mapping"
 version = "0.13.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.0#cf71a0e324d42f7895363f4f3e8575d79bb7ea97"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.1#4009e5593f13ba73f64f556011ee5ef47bc4ebf3"
 dependencies = [
  "eth-types 0.13.0",
  "ethers-core",
@@ -1183,7 +1183,7 @@ dependencies = [
 [[package]]
 name = "eth-types"
 version = "0.12.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0#6a1f65a1f99429f3725ef4d6788f5643bb61aa6f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.2#6f7b46a3b1ccf9dc448735e8455e1ac6f9e30643"
 dependencies = [
  "base64 0.13.1",
  "ethers-core",
@@ -1211,7 +1211,7 @@ dependencies = [
 [[package]]
 name = "eth-types"
 version = "0.13.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.0#cf71a0e324d42f7895363f4f3e8575d79bb7ea97"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.1#4009e5593f13ba73f64f556011ee5ef47bc4ebf3"
 dependencies = [
  "base64 0.13.1",
  "ethers-core",
@@ -1367,7 +1367,7 @@ dependencies = [
 [[package]]
 name = "external-tracer"
 version = "0.12.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0#6a1f65a1f99429f3725ef4d6788f5643bb61aa6f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.2#6f7b46a3b1ccf9dc448735e8455e1ac6f9e30643"
 dependencies = [
  "eth-types 0.12.0",
  "geth-utils 0.12.0",
@@ -1380,7 +1380,7 @@ dependencies = [
 [[package]]
 name = "external-tracer"
 version = "0.13.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.0#cf71a0e324d42f7895363f4f3e8575d79bb7ea97"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.1#4009e5593f13ba73f64f556011ee5ef47bc4ebf3"
 dependencies = [
  "eth-types 0.13.0",
  "geth-utils 0.13.0",
@@ -1562,7 +1562,7 @@ dependencies = [
 [[package]]
 name = "gadgets"
 version = "0.12.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0#6a1f65a1f99429f3725ef4d6788f5643bb61aa6f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.2#6f7b46a3b1ccf9dc448735e8455e1ac6f9e30643"
 dependencies = [
  "eth-types 0.12.0",
  "halo2_proofs",
@@ -1574,7 +1574,7 @@ dependencies = [
 [[package]]
 name = "gadgets"
 version = "0.13.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.0#cf71a0e324d42f7895363f4f3e8575d79bb7ea97"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.1#4009e5593f13ba73f64f556011ee5ef47bc4ebf3"
 dependencies = [
  "eth-types 0.13.0",
  "halo2_proofs",
@@ -1597,7 +1597,7 @@ dependencies = [
 [[package]]
 name = "geth-utils"
 version = "0.12.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0#6a1f65a1f99429f3725ef4d6788f5643bb61aa6f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.2#6f7b46a3b1ccf9dc448735e8455e1ac6f9e30643"
 dependencies = [
  "env_logger 0.10.0",
  "gobuild",
@@ -1607,7 +1607,7 @@ dependencies = [
 [[package]]
 name = "geth-utils"
 version = "0.13.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.0#cf71a0e324d42f7895363f4f3e8575d79bb7ea97"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.1#4009e5593f13ba73f64f556011ee5ef47bc4ebf3"
 dependencies = [
  "env_logger 0.10.0",
  "gobuild",
@@ -2356,7 +2356,7 @@ dependencies = [
 [[package]]
 name = "mock"
 version = "0.12.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0#6a1f65a1f99429f3725ef4d6788f5643bb61aa6f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.2#6f7b46a3b1ccf9dc448735e8455e1ac6f9e30643"
 dependencies = [
  "eth-types 0.12.0",
  "ethers-core",
@@ -2371,7 +2371,7 @@ dependencies = [
 [[package]]
 name = "mock"
 version = "0.13.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.0#cf71a0e324d42f7895363f4f3e8575d79bb7ea97"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.1#4009e5593f13ba73f64f556011ee5ef47bc4ebf3"
 dependencies = [
  "eth-types 0.13.0",
  "ethers-core",
@@ -2386,7 +2386,7 @@ dependencies = [
 [[package]]
 name = "mpt-zktrie"
 version = "0.12.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0#6a1f65a1f99429f3725ef4d6788f5643bb61aa6f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.2#6f7b46a3b1ccf9dc448735e8455e1ac6f9e30643"
 dependencies = [
  "eth-types 0.12.0",
  "halo2curves",
@@ -2400,7 +2400,7 @@ dependencies = [
 [[package]]
 name = "mpt-zktrie"
 version = "0.13.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.0#cf71a0e324d42f7895363f4f3e8575d79bb7ea97"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.1#4009e5593f13ba73f64f556011ee5ef47bc4ebf3"
 dependencies = [
  "eth-types 0.13.0",
  "halo2curves",
@@ -2872,7 +2872,7 @@ dependencies = [
 [[package]]
 name = "prover"
 version = "0.12.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0#6a1f65a1f99429f3725ef4d6788f5643bb61aa6f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.2#6f7b46a3b1ccf9dc448735e8455e1ac6f9e30643"
 dependencies = [
  "aggregator 0.12.0",
  "anyhow",
@@ -2906,7 +2906,7 @@ dependencies = [
 [[package]]
 name = "prover"
 version = "0.13.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.0#cf71a0e324d42f7895363f4f3e8575d79bb7ea97"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.1#4009e5593f13ba73f64f556011ee5ef47bc4ebf3"
 dependencies = [
  "aggregator 0.13.0",
  "anyhow",
@@ -4543,7 +4543,7 @@ dependencies = [
 [[package]]
 name = "zkevm-circuits"
 version = "0.12.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.0#6a1f65a1f99429f3725ef4d6788f5643bb61aa6f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.12.2#6f7b46a3b1ccf9dc448735e8455e1ac6f9e30643"
 dependencies = [
  "array-init",
  "bus-mapping 0.12.0",
@@ -4585,7 +4585,7 @@ dependencies = [
 [[package]]
 name = "zkevm-circuits"
 version = "0.13.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.0#cf71a0e324d42f7895363f4f3e8575d79bb7ea97"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.13.1#4009e5593f13ba73f64f556011ee5ef47bc4ebf3"
 dependencies = [
  "array-init",
  "bus-mapping 0.13.0",

common/libzkp/impl/Cargo.toml

@@ -25,9 +25,9 @@ halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.
 snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop", default-features = false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
 
 # darwin
-prover_v4 = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.12.0", package = "prover", default-features = false, features = ["parallel_syn", "scroll"] }
+prover_v4 = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.12.2", package = "prover", default-features = false, features = ["parallel_syn", "scroll"] }
 # darwin_v2
-prover_v5 = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.13.0", package = "prover", default-features = false, features = ["parallel_syn", "scroll"] }
+prover_v5 = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.13.1", package = "prover", default-features = false, features = ["parallel_syn", "scroll"] }
 
 base64 = "0.13.0"
 env_logger = "0.9.0"

common/libzkp/impl/src/verifier.rs

@@ -4,8 +4,10 @@ mod darwin_v2;
 use anyhow::{bail, Result};
 use darwin::DarwinVerifier;
 use darwin_v2::DarwinV2Verifier;
+use halo2_proofs::{halo2curves::bn256::Bn256, poly::kzg::commitment::ParamsKZG};
+use prover_v4::utils::load_params;
 use serde::{Deserialize, Serialize};
-use std::{cell::OnceCell, rc::Rc};
+use std::{cell::OnceCell, collections::BTreeMap, rc::Rc};
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum TaskType {
@@ -37,10 +39,37 @@ struct VerifierPair(HardForkName, Rc<Box<dyn ProofVerifier>>);
 
 static mut VERIFIER_HIGH: OnceCell<VerifierPair> = OnceCell::new();
 static mut VERIFIER_LOW: OnceCell<VerifierPair> = OnceCell::new();
+static mut PARAMS_MAP: OnceCell<BTreeMap<u32, ParamsKZG<Bn256>>> = OnceCell::new();
 
 pub fn init(config: VerifierConfig) {
     let low_conf = config.low_version_circuit;
-    let verifier = DarwinVerifier::new(&low_conf.params_path, &low_conf.assets_path);
+
+    std::env::set_var("SCROLL_PROVER_ASSETS_DIR", &low_conf.assets_path);
+    let params_degrees = [
+        *prover_v4::config::LAYER2_DEGREE,
+        *prover_v4::config::LAYER4_DEGREE,
+    ];
+
+    // params should be shared between low and high
+    let mut params_map = BTreeMap::new();
+    for degree in params_degrees {
+        if let std::collections::btree_map::Entry::Vacant(e) = params_map.entry(degree) {
+            match load_params(&low_conf.params_path, degree, None) {
+                Ok(params) => {
+                    e.insert(params);
+                }
+                Err(e) => panic!(
+                    "failed to load params, degree {}, dir {}, err {}",
+                    degree, low_conf.params_path, e
+                ),
+            }
+        }
+    }
+    unsafe {
+        PARAMS_MAP.set(params_map).unwrap_unchecked();
+    }
+
+    let verifier = DarwinVerifier::new(unsafe { PARAMS_MAP.get().unwrap() }, &low_conf.assets_path);
 
     unsafe {
         VERIFIER_LOW
@@ -51,7 +80,8 @@ pub fn init(config: VerifierConfig) {
             .unwrap_unchecked();
     }
     let high_conf = config.high_version_circuit;
-    let verifier = DarwinV2Verifier::new(&high_conf.params_path, &high_conf.assets_path);
+    let verifier =
+        DarwinV2Verifier::new(unsafe { PARAMS_MAP.get().unwrap() }, &high_conf.assets_path);
     unsafe {
         VERIFIER_HIGH
             .set(VerifierPair(

common/libzkp/impl/src/verifier/darwin.rs

@@ -1,24 +1,24 @@
 use super::{ProofVerifier, TaskType};
 
 use anyhow::Result;
+use halo2_proofs::{halo2curves::bn256::Bn256, poly::kzg::commitment::ParamsKZG};
 
 use crate::utils::panic_catch;
 use prover_v4::{
     aggregator::Verifier as AggVerifier, zkevm::Verifier, BatchProof, BundleProof, ChunkProof,
 };
-use std::env;
+use std::{collections::BTreeMap, env};
 
-pub struct DarwinVerifier {
-    verifier: Verifier,
-    agg_verifier: AggVerifier,
+pub struct DarwinVerifier<'params> {
+    verifier: Verifier<'params>,
+    agg_verifier: AggVerifier<'params>,
 }
 
-impl DarwinVerifier {
-    pub fn new(params_dir: &str, assets_dir: &str) -> Self {
+impl<'params> DarwinVerifier<'params> {
+    pub fn new(params_map: &'params BTreeMap<u32, ParamsKZG<Bn256>>, assets_dir: &str) -> Self {
         env::set_var("SCROLL_PROVER_ASSETS_DIR", assets_dir);
-        let verifier = Verifier::from_dirs(params_dir, assets_dir);
-
-        let agg_verifier = AggVerifier::from_dirs(params_dir, assets_dir);
+        let verifier = Verifier::from_params_and_assets(params_map, assets_dir);
+        let agg_verifier = AggVerifier::from_params_and_assets(params_map, assets_dir);
 
         Self {
             verifier,
@@ -27,7 +27,7 @@ impl DarwinVerifier {
     }
 }
 
-impl ProofVerifier for DarwinVerifier {
+impl<'params> ProofVerifier for DarwinVerifier<'params> {
     fn verify(&self, task_type: super::TaskType, proof: Vec<u8>) -> Result<bool> {
         let result = panic_catch(|| match task_type {
             TaskType::Chunk => {

common/libzkp/impl/src/verifier/darwin_v2.rs

@@ -1,24 +1,24 @@
 use super::{ProofVerifier, TaskType};
 
 use anyhow::Result;
+use halo2_proofs::{halo2curves::bn256::Bn256, poly::kzg::commitment::ParamsKZG};
 
 use crate::utils::panic_catch;
 use prover_v5::{
     aggregator::Verifier as AggVerifier, zkevm::Verifier, BatchProof, BundleProof, ChunkProof,
 };
-use std::env;
+use std::{collections::BTreeMap, env};
 
-pub struct DarwinV2Verifier {
-    verifier: Verifier,
-    agg_verifier: AggVerifier,
+pub struct DarwinV2Verifier<'params> {
+    verifier: Verifier<'params>,
+    agg_verifier: AggVerifier<'params>,
 }
 
-impl DarwinV2Verifier {
-    pub fn new(params_dir: &str, assets_dir: &str) -> Self {
+impl<'params> DarwinV2Verifier<'params> {
+    pub fn new(params_map: &'params BTreeMap<u32, ParamsKZG<Bn256>>, assets_dir: &str) -> Self {
         env::set_var("SCROLL_PROVER_ASSETS_DIR", assets_dir);
-        let verifier = Verifier::from_dirs(params_dir, assets_dir);
-
-        let agg_verifier = AggVerifier::from_dirs(params_dir, assets_dir);
+        let verifier = Verifier::from_params_and_assets(params_map, assets_dir);
+        let agg_verifier = AggVerifier::from_params_and_assets(params_map, assets_dir);
 
         Self {
             verifier,
@@ -27,7 +27,7 @@ impl DarwinV2Verifier {
     }
 }
 
-impl ProofVerifier for DarwinV2Verifier {
+impl<'params> ProofVerifier for DarwinV2Verifier<'params> {
     fn verify(&self, task_type: super::TaskType, proof: Vec<u8>) -> Result<bool> {
         let result = panic_catch(|| match task_type {
             TaskType::Chunk => {

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v4.4.47"
+var tag = "v4.4.51"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

coordinator/internal/controller/api/controller.go

@@ -26,7 +26,7 @@ func InitController(cfg *config.Config, chainCfg *params.ChainConfig, db *gorm.D
 		panic("proof receiver new verifier failure")
 	}
 
-	log.Info("verifier created", "chunkVerifier", vf.ChunkVKMap, "batchVerifier", vf.BatchVKMap)
+	log.Info("verifier created", "chunkVerifier", vf.ChunkVKMap, "batchVerifier", vf.BatchVKMap, "bundleVerifier", vf.BundleVkMap)
 
 	Auth = NewAuthController(db, cfg, vf)
 	GetTask = NewGetTaskController(cfg, chainCfg, db, reg)

coordinator/internal/logic/verifier/verifier.go

@@ -72,10 +72,8 @@ func NewVerifier(cfg *config.VerifierConfig) (*Verifier, error) {
 	}
 
 	configStr := C.CString(string(configBytes))
-	assetsPathHiStr := C.CString(cfg.HighVersionCircuit.AssetsPath)
 	defer func() {
 		C.free(unsafe.Pointer(configStr))
-		C.free(unsafe.Pointer(assetsPathHiStr))
 	}()
 
 	C.init(configStr)

rollup/internal/controller/relayer/l1_relayer.go

@@ -290,5 +290,6 @@ func (r *Layer1Relayer) commitBatchReachTimeout() (bool, error) {
 		return false, err
 	}
 	// len(batches) == 0 probably shouldn't ever happen, but need to check this
-	return len(batches) == 0 || utils.NowUTC().Sub(*batches[0].CommittedAt) > time.Duration(r.cfg.GasOracleConfig.CheckCommittedBatchesWindowMinutes)*time.Minute, nil
+	// Also, we should check if it's a genesis batch. If so, skip the timeout check.
+	return len(batches) == 0 || (batches[0].Index != 0 && utils.NowUTC().Sub(*batches[0].CommittedAt) > time.Duration(r.cfg.GasOracleConfig.CheckCommittedBatchesWindowMinutes)*time.Minute), nil
 }

rollup/tests/gas_oracle_test.go

@@ -221,13 +221,21 @@ func testImportDefaultL1GasPriceDueToL1GasPriceSpike(t *testing.T) {
 			},
 		},
 	}
-	batch := &encoding.Batch{
+	batch0 := &encoding.Batch{
 		Index:                      0,
 		TotalL1MessagePoppedBefore: 0,
 		ParentBatchHash:            common.Hash{},
 		Chunks:                     []*encoding.Chunk{chunk},
 	}
+	batch := &encoding.Batch{
+		Index:                      1,
+		TotalL1MessagePoppedBefore: 0,
+		ParentBatchHash:            common.Hash{},
+		Chunks:                     []*encoding.Chunk{chunk},
+	}
 	batchOrm := orm.NewBatch(db)
+	_, err = batchOrm.InsertBatch(context.Background(), batch0, utils.CodecConfig{Version: encoding.CodecV0}, utils.BatchMetrics{})
+	assert.NoError(t, err)
 	dbBatch, err := batchOrm.InsertBatch(context.Background(), batch, utils.CodecConfig{Version: encoding.CodecV0}, utils.BatchMetrics{})
 	assert.NoError(t, err)
 	err = batchOrm.UpdateCommitTxHashAndRollupStatus(context.Background(), dbBatch.Hash, common.Hash{}.String(), types.RollupCommitted)