Remove proof_gen crate (#650)

0xPolygonZero · Sep 23, 2024 · 0dbbb6c · 0dbbb6c
1 parent 00a998c
commit 0dbbb6c
Show file tree

Hide file tree

Showing 28 changed files with 188 additions and 761 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -13,11 +13,6 @@
 - changed-files:
   - any-glob-to-any-file: trace_decoder/**
 
-# Add 'crate: proof_gen' label to any changes within 'proof_gen' folder.
-'crate: proof_gen':
-- changed-files:
-  - any-glob-to-any-file: proof_gen/**
-
 # Add 'crate: zero_bin' label to any changes within 'zero' folder.
 'crate: zero_bin':
 - changed-files:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -71,31 +71,6 @@ jobs:
       - name: test
         run: cargo test --release --manifest-path trace_decoder/Cargo.toml -- --nocapture
 
-  test_proof_gen:
-    name: Test proof_gen
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    if: ${{ ! contains(toJSON(github.event.commits.*.message), '[skip-ci]') }}
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Install nightly toolchain
-        uses: dtolnay/rust-toolchain@nightly
-
-      - name: Set up rust cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-
-      - name: Test in proof_gen subdirectory
-        run: cargo test --manifest-path proof_gen/Cargo.toml
-        env:
-          RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0
-          RUST_LOG: 1
-          CARGO_INCREMENTAL: 1
-          RUST_BACKTRACE: 1
-
   test_evm_arithmetization:
     name: Test evm_arithmetization
     runs-on: ubuntu-latest

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,6 @@ members = [
   "evm_arithmetization",
   "mpt_trie",
   "proc_macro",
-  "proof_gen",
   "smt_trie",
   "trace_decoder",
   "zero",
@@ -104,7 +103,6 @@ winnow = "0.6.13"
 # local dependencies
 evm_arithmetization = { path = "evm_arithmetization", version = "0.4.0", default-features = false }
 mpt_trie = { path = "mpt_trie", version = "0.4.1" }
-proof_gen = { path = "proof_gen", version = "0.4.0", default-features = false }
 smt_trie = { path = "smt_trie", version = "0.1.1" }
 trace_decoder = { path = "trace_decoder", version = "0.6.0", default-features = false }
 zk_evm_common = { path = "common", version = "0.1.0" }

diff --git a/README.md b/README.md
@@ -18,9 +18,7 @@ understood by the zkEVM prover.
 * [evm_arithmetization](./evm_arithmetization/README.md): Defines all the STARK constraints and recursive circuits to generate succinct proofs of EVM execution.
 It uses starky and plonky2 as proving backend: https://github.com/0xPolygonZero/plonky2.
 
-* [proof_gen](./proof_gen/README.md): A convenience library for generating proofs from inputs already in Intermediate Representation (IR) format.
-
-* [zero_bin](./zero_bin/README.md): A composition of [`paladin`](https://github.com/0xPolygonZero/paladin) and [`proof_gen`](./proof_gen/README.md) to generate
+* [zero_bin](./zero_bin/README.md): A composition of [`paladin`](https://github.com/0xPolygonZero/paladin) and [`evm_arithmetization`](./evm_arithmetization/README.md) to generate
 EVM block proofs.
 
 ## Dependency graph
@@ -44,18 +42,14 @@ flowchart LR
     B[mpt_trie]
     C[evm_arithmetization]
     D[trace_decoder]
-    E[proof_gen]
 
     B --> C
     B ---> D
     C ---> D
-    C --> E
-    D --> E
 
     F{zero-bin}
     C --> F
     D --> F
-    E --> F
     end
 ```
 

diff --git a/evm_arithmetization/src/fixed_recursive_verifier.rs b/evm_arithmetization/src/fixed_recursive_verifier.rs
@@ -2157,7 +2157,7 @@ where
     /// This method outputs a tuple of [`ProofWithPublicInputs<F, C, D>`] and
     /// its [`PublicValues`]. Only the proof with public inputs is necessary
     /// for a verifier to assert correctness of the computation.
-    pub fn prove_transaction_aggregation(
+    pub fn prove_batch_aggregation(
         &self,
         lhs_is_agg: bool,
         lhs_proof: &ProofWithPublicInputs<F, C, D>,

diff --git a/evm_arithmetization/tests/global_exit_root.rs b/evm_arithmetization/tests/global_exit_root.rs
@@ -13,7 +13,7 @@ use evm_arithmetization::testing_utils::{
     ADDRESS_SCALABLE_L2_ADDRESS_HASHED, GLOBAL_EXIT_ROOT_ACCOUNT, GLOBAL_EXIT_ROOT_ADDRESS_HASHED,
 };
 use evm_arithmetization::verifier::testing::verify_all_proofs;
-use evm_arithmetization::{AllStark, Node, StarkConfig};
+use evm_arithmetization::{AllStark, Node, StarkConfig, EMPTY_CONSOLIDATED_BLOCKHASH};
 use keccak_hash::keccak;
 use mpt_trie::partial_trie::{HashedPartialTrie, PartialTrie};
 use plonky2::field::goldilocks_field::GoldilocksField;

diff --git a/evm_arithmetization/tests/two_to_one_block.rs b/evm_arithmetization/tests/two_to_one_block.rs
@@ -124,7 +124,7 @@ fn get_test_block_proof(
     let dummy0_proof =
         all_circuits.prove_segment_aggregation(false, &dummy1_proof[0], false, &dummy1_proof[1])?;
 
-    let (agg_proof, pv) = all_circuits.prove_transaction_aggregation(
+    let (agg_proof, pv) = all_circuits.prove_batch_aggregation(
         false,
         &inputs0_proof.proof_with_pis,
         inputs0_proof.public_values,

diff --git a/proof_gen/Cargo.toml b/proof_gen/Cargo.toml
diff --git a/proof_gen/README.md b/proof_gen/README.md
diff --git a/proof_gen/src/constants.rs b/proof_gen/src/constants.rs