feat: Compressor optimizations

.dockerignore

@@ -25,6 +25,7 @@ keys/setup
 !contracts/
 !setup_2\^26.key
 !setup_2\^24.key
+!setup_compact.key
 # It's required to remove .git from contracts,
 # otherwise yarn tries to use .git parent directory that
 # doesn't exist.

.github/workflows/build-proof-fri-gpu-compressor-gar.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Download FFLONK key and setup data
         run: |
           gsutil -m rsync -r gs://matterlabs-setup-data-us/${{ inputs.setup_keys_id }} docker/proof-fri-gpu-compressor-gar
-          gsutil -m cp -r gs://matterlabs-setup-keys-us/setup-keys/setup_fflonk_compact.key docker/proof-fri-gpu-compressor-gar
+          gsutil -m cp -r gs://matterlabs-setup-keys-us/setup-keys/setup_compact.key docker/proof-fri-gpu-compressor-gar
 
       - name: Login to us-central1 GAR
         run: |

.gitignore

@@ -105,6 +105,8 @@ hyperchain-*.yml
 # Prover keys that should not be commited
 prover/crates/bin/vk_setup_data_generator_server_fri/data/setup_*
 prover/data/keys/setup_*
+prover/data/keys/fflonk_setup_snark_data.bin
+prover/data/keys/plonk_setup_snark_data.bin
 
 # ZK Stack CLI
 chains/era/configs/*

core/Cargo.toml

@@ -228,18 +228,19 @@ tokio-stream = "0.1.16"
 # We *always* pin the latest version of protocol to disallow accidental changes in the execution logic.
 # However, for the historical version of protocol crates, we have lax requirements. Otherwise,
 # Bumping a crypto dependency like `boojum` would require us to republish all the historical packages.
-circuit_encodings = "=0.150.19"
-circuit_sequencer_api = "=0.150.19"
-circuit_definitions = "=0.150.19"
-crypto_codegen = { package = "zksync_solidity_vk_codegen",version = "=0.30.12" }
-kzg = { package = "zksync_kzg", version = "=0.150.19" }
+circuit_encodings = "=0.150.20"
+circuit_sequencer_api = "=0.150.20"
+circuit_definitions = "=0.150.20"
+crypto_codegen = { package = "zksync_solidity_vk_codegen",version = "=0.30.13" }
+kzg = { package = "zksync_kzg", version = "=0.150.20" }
 zk_evm = { version = "=0.133.0" }
 zk_evm_1_3_1 = { package = "zk_evm", version = "0.131.0-rc.2" }
 zk_evm_1_3_3 = { package = "zk_evm", version = "0.133" }
 zk_evm_1_4_0 = { package = "zk_evm", version = "0.140" }
 zk_evm_1_4_1 = { package = "zk_evm", version = "0.141" }
-zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.19" }
-fflonk = "=0.30.12"
+zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.20" }
+fflonk = "=0.30.13"
+bellman = {package = "zksync_bellman", version = "=0.30.13"}
 
 # New VM; pinned to a specific commit because of instability
 zksync_vm2 = { git = "https://github.com/matter-labs/vm2.git", rev = "457d8a7eea9093af9440662e33e598c13ba41633" }

core/lib/prover_interface/Cargo.toml

@@ -18,6 +18,7 @@ zksync_types.workspace = true
 # We can use the newest api to send proofs to L1.
 circuit_definitions.workspace = true
 fflonk.workspace = true
+bellman.workspace = true
 circuit_sequencer_api.workspace = true
 
 serde.workspace = true

core/lib/prover_interface/src/outputs.rs

@@ -1,10 +1,12 @@
 use core::fmt;
 
+use bellman::plonk::better_better_cs::proof::Proof as PlonkProof;
 use circuit_definitions::{
     boojum::pairing::bn256::Bn256,
-    circuit_definitions::aux_layer::ZkSyncSnarkWrapperCircuitNoLookupCustomGate,
+    circuit_definitions::aux_layer::{
+        ZkSyncSnarkWrapperCircuit, ZkSyncSnarkWrapperCircuitNoLookupCustomGate,
+    },
 };
-use circuit_sequencer_api::proof::FinalProof;
 use fflonk::FflonkProof;
 use serde::{Deserialize, Serialize};
 use serde_with::{hex::Hex, serde_as};
@@ -45,7 +47,7 @@ pub struct FflonkL1BatchProofForL1 {
 #[derive(Clone, Serialize, Deserialize)]
 pub struct PlonkL1BatchProofForL1 {
     pub aggregation_result_coords: [[u8; 32]; 4],
-    pub scheduler_proof: FinalProof,
+    pub scheduler_proof: PlonkProof<Bn256, ZkSyncSnarkWrapperCircuit>,
     pub protocol_version: ProtocolSemanticVersion,
 }