From 3567f5b62aa16c2221c5e48fe0b415ac42c6a859 Mon Sep 17 00:00:00 2001 From: Mengran Lan Date: Thu, 11 Jul 2024 15:06:24 +0800 Subject: [PATCH] feat(prover): upgrade zkevm-circuits version (#1424) --- prover/Cargo.lock | 20 ++++++++++---------- prover/src/zk_circuits_handler/darwin.rs | 6 ++---- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/prover/Cargo.lock b/prover/Cargo.lock index 23da0fdd13..5710f5b266 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -65,7 +65,7 @@ dependencies = [ [[package]] name = "aggregator" version = "0.11.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#a5337832455b1ed49bc1104a6ed4265dcdc27cdb" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#ca75c868815422da4844c968507215691a320b21" dependencies = [ "ark-std 0.3.0", "bitstream-io", @@ -662,7 +662,7 @@ dependencies = [ [[package]] name = "bus-mapping" version = "0.11.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#a5337832455b1ed49bc1104a6ed4265dcdc27cdb" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#ca75c868815422da4844c968507215691a320b21" dependencies = [ "eth-types 0.11.0 (git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion)", "ethers-core 2.0.7 (git+https://github.com/scroll-tech/ethers-rs.git?branch=v2.0.7)", @@ -1341,7 +1341,7 @@ dependencies = [ [[package]] name = "eth-types" version = "0.11.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#a5337832455b1ed49bc1104a6ed4265dcdc27cdb" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#ca75c868815422da4844c968507215691a320b21" dependencies = [ "base64 0.13.1", "ethers-core 2.0.7 (git+https://github.com/scroll-tech/ethers-rs.git?branch=v2.0.7)", @@ -1574,7 +1574,7 @@ dependencies = [ [[package]] name = "external-tracer" version = "0.11.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#a5337832455b1ed49bc1104a6ed4265dcdc27cdb" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#ca75c868815422da4844c968507215691a320b21" dependencies = [ "eth-types 0.11.0 (git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion)", "geth-utils 0.11.0 (git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion)", @@ -1803,7 +1803,7 @@ dependencies = [ [[package]] name = "gadgets" version = "0.11.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#a5337832455b1ed49bc1104a6ed4265dcdc27cdb" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#ca75c868815422da4844c968507215691a320b21" dependencies = [ "eth-types 0.11.0 (git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion)", "halo2_proofs", @@ -1836,7 +1836,7 @@ dependencies = [ [[package]] name = "geth-utils" version = "0.11.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#a5337832455b1ed49bc1104a6ed4265dcdc27cdb" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#ca75c868815422da4844c968507215691a320b21" dependencies = [ "env_logger 0.10.2", "gobuild", @@ -2691,7 +2691,7 @@ dependencies = [ [[package]] name = "mock" version = "0.11.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#a5337832455b1ed49bc1104a6ed4265dcdc27cdb" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#ca75c868815422da4844c968507215691a320b21" dependencies = [ "eth-types 0.11.0 (git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion)", "ethers-core 2.0.7 (git+https://github.com/scroll-tech/ethers-rs.git?branch=v2.0.7)", @@ -2720,7 +2720,7 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.11.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#a5337832455b1ed49bc1104a6ed4265dcdc27cdb" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#ca75c868815422da4844c968507215691a320b21" dependencies = [ "eth-types 0.11.0 (git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion)", "halo2curves", @@ -3346,7 +3346,7 @@ dependencies = [ [[package]] name = "prover" version = "0.11.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#a5337832455b1ed49bc1104a6ed4265dcdc27cdb" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#ca75c868815422da4844c968507215691a320b21" dependencies = [ "aggregator 0.11.0 (git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion)", "anyhow", @@ -5383,7 +5383,7 @@ dependencies = [ [[package]] name = "zkevm-circuits" version = "0.11.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#a5337832455b1ed49bc1104a6ed4265dcdc27cdb" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion#ca75c868815422da4844c968507215691a320b21" dependencies = [ "array-init", "bus-mapping 0.11.0 (git+https://github.com/scroll-tech/zkevm-circuits.git?branch=feat/agg_recursion)", diff --git a/prover/src/zk_circuits_handler/darwin.rs b/prover/src/zk_circuits_handler/darwin.rs index c58eb31a44..bbbd0251f1 100644 --- a/prover/src/zk_circuits_handler/darwin.rs +++ b/prover/src/zk_circuits_handler/darwin.rs @@ -11,9 +11,7 @@ use crate::types::{CommonHash, Task}; use std::{cell::RefCell, cmp::Ordering, env, rc::Rc}; use prover_darwin::{ - aggregator::{Prover as BatchProver, MAX_AGG_SNARKS}, - check_chunk_hashes, - zkevm::Prover as ChunkProver, + aggregator::Prover as BatchProver, check_chunk_hashes, zkevm::Prover as ChunkProver, BatchProof, BatchProvingTask, BlockTrace, BundleProof, BundleProvingTask, ChunkInfo, ChunkProof, ChunkProvingTask, }; @@ -107,7 +105,7 @@ impl DarwinHandler { bail!("non-match chunk protocol") } check_chunk_hashes("", &chunk_hashes_proofs).context("failed to check chunk info")?; - let batch_proof = prover.borrow_mut().gen_batch_proof::( + let batch_proof = prover.borrow_mut().gen_batch_proof( batch_task_detail.batch_proving_task, None, self.get_output_dir(),