feat(l2): enable distributed proving and multi-batch verification

cmd/ethrex/l2/options.rs

@@ -215,6 +215,7 @@ impl TryFrom<SequencerOptions> for SequencerConfig {
                     .proof_coordinator_tdx_private_key,
                 qpl_tool_path: opts.proof_coordinator_opts.proof_coordinator_qpl_tool_path,
                 validium: opts.validium,
+                prover_timeout_ms: opts.proof_coordinator_opts.prover_timeout_ms,
             },
             based: BasedConfig {
                 enabled: opts.based,
@@ -775,6 +776,15 @@ pub struct ProofCoordinatorOptions {
         help_heading = "Proof coordinator options"
     )]
     pub proof_send_interval_ms: u64,
+    #[arg(
+        long = "proof-coordinator.prover-timeout",
+        default_value = "600000",
+        value_name = "UINT64",
+        env = "ETHREX_PROOF_COORDINATOR_PROVER_TIMEOUT",
+        help = "Timeout in milliseconds before a batch assignment to a prover is considered stale.",
+        help_heading = "Proof coordinator options"
+    )]
+    pub prover_timeout_ms: u64,
 }
 
 impl Default for ProofCoordinatorOptions {
@@ -794,6 +804,7 @@ impl Default for ProofCoordinatorOptions {
             proof_coordinator_qpl_tool_path: Some(
                 DEFAULT_PROOF_COORDINATOR_QPL_TOOL_PATH.to_string(),
             ),
+            prover_timeout_ms: 600_000,
         }
     }
 }

crates/blockchain/metrics/l2/metrics.rs

@@ -79,9 +79,9 @@ impl Metrics {
             batch_verification_gas: IntGaugeVec::new(
                 Opts::new(
                     "batch_verification_gas",
-                    "Batch verification gas cost in L1, labeled by batch number",
+                    "Batch verification gas cost in L1, labeled by batch number and tx hash",
                 ),
-                &["batch_number"],
+                &["batch_number", "tx_hash"],
             )
             .unwrap(),
             batch_commitment_gas: IntGaugeVec::new(
@@ -193,10 +193,11 @@ impl Metrics {
         &self,
         batch_number: u64,
         verification_gas: i64,
+        tx_hash: &str,
     ) -> Result<(), MetricsError> {
         let builder = self
             .batch_verification_gas
-            .get_metric_with_label_values(&[&batch_number.to_string()])
+            .get_metric_with_label_values(&[&batch_number.to_string(), tx_hash])
             .map_err(|e| MetricsError::PrometheusErr(e.to_string()))?;
         builder.set(verification_gas);
         Ok(())

crates/l2/based/README.md

@@ -37,7 +37,7 @@
   - is **elected through a Round-Robin** election in L1,
   - **produces** L2 blocks,
   - **posts** L2 batches to L1 during their allowed period.
-- `OnChainProposer`’s `verifyBatch` method is **callable by anyone**. **Only one valid proof is needed** to advance the network.
+- `OnChainProposer`'s `verifyBatches` method is **callable by anyone**. **Only one valid proof is needed** to advance the network.
 - `OnChainProposer`’s `commitBatch` method is **callable by the lead Sequencer**.
 
 ### Milestone 2: P2P

crates/l2/common/src/prover.rs

@@ -179,7 +179,11 @@ pub enum ProofData {
     /// The Client initiates the connection with a BatchRequest.
     /// Asking for the ProverInputData the prover_server considers/needs.
     /// The commit hash is used to ensure the client and server are compatible.
-    BatchRequest { commit_hash: String },
+    /// The prover type indicates what kind of proof this prover produces.
+    BatchRequest {
+        commit_hash: String,
+        prover_type: ProverType,
+    },
 
     /// 4.
     /// The Server responds with a NoBatchForVersion if the code version is not the same as the one
@@ -224,8 +228,11 @@ impl ProofData {
     }
 
     /// Builder function for creating a BatchRequest
-    pub fn batch_request(commit_hash: String) -> Self {
-        ProofData::BatchRequest { commit_hash }
+    pub fn batch_request(commit_hash: String, prover_type: ProverType) -> Self {
+        ProofData::BatchRequest {
+            commit_hash,
+            prover_type,
+        }
     }
 
     /// Builder function for creating a NoBatchForVersion

crates/l2/contracts/src/l1/OnChainProposer.sol

@@ -354,26 +354,13 @@ contract OnChainProposer is
         lastCommittedBatch = batchNumber;
     }
 
-    /// @inheritdoc IOnChainProposer
-    /// @notice The first `require` checks that the batch number is the subsequent block.
-    /// @notice The second `require` checks if the batch has been committed.
-    /// @notice The order of these `require` statements is important.
-    /// Ordering Reason: After the verification process, we delete the `batchCommitments` for `batchNumber - 1`. This means that when checking the batch,
-    /// we might get an error indicating that the batch hasn’t been committed, even though it was committed but deleted. Therefore, it has already been verified.
-    function verifyBatch(
+    /// @notice Internal batch verification logic used by verifyBatches.
+    function _verifyBatchInternal(
         uint256 batchNumber,
-        //risc0
         bytes memory risc0BlockProof,
-        //sp1
         bytes memory sp1ProofBytes,
-        //tdx
         bytes memory tdxSignature
-    ) external override onlyOwner whenNotPaused {
-        require(
-            !ALIGNED_MODE,
-            "008" // Batch verification should be done via Aligned Layer. Call verifyBatchesAligned() instead.
-        );
-
+    ) internal {
         require(
             batchNumber == lastVerifiedBatch + 1,
             "009" // OnChainProposer: batch already verified
@@ -417,6 +404,7 @@ contract OnChainProposer is
         }
 
         // Reconstruct public inputs from commitments
+        // MUST be BEFORE updating lastVerifiedBatch
         bytes memory publicInputs = _getPublicInputsFromCommitment(batchNumber);
 
         if (REQUIRE_RISC0_PROOF) {
@@ -471,6 +459,7 @@ contract OnChainProposer is
             batchCommitments[batchNumber].balanceDiffs
         );
 
+        // MUST be AFTER _getPublicInputsFromCommitment
         lastVerifiedBatch = batchNumber;
 
         // Remove previous batch commitment as it is no longer needed.
@@ -479,6 +468,33 @@ contract OnChainProposer is
         emit BatchVerified(lastVerifiedBatch);
     }
 
+    /// @inheritdoc IOnChainProposer
+    function verifyBatches(
+        uint256 firstBatchNumber,
+        bytes[] calldata risc0BlockProofs,
+        bytes[] calldata sp1ProofsBytes,
+        bytes[] calldata tdxSignatures
+    ) external override onlyOwner whenNotPaused {
+        require(
+            !ALIGNED_MODE,
+            "008" // Batch verification should be done via Aligned Layer. Call verifyBatchesAligned() instead.
+        );
+        uint256 batchCount = risc0BlockProofs.length;
+        require(batchCount > 0, "OnChainProposer: empty batch array");
+        require(
+            sp1ProofsBytes.length == batchCount && tdxSignatures.length == batchCount,
+            "OnChainProposer: array length mismatch"
+        );
+        for (uint256 i = 0; i < batchCount; i++) {
+            _verifyBatchInternal(
+                firstBatchNumber + i,
+                risc0BlockProofs[i],
+                sp1ProofsBytes[i],
+                tdxSignatures[i]
+            );
+        }
+    }
+
     /// @inheritdoc IOnChainProposer
     function verifyBatchesAligned(
         uint256 firstBatchNumber,
@@ -488,7 +504,7 @@ contract OnChainProposer is
     ) external override onlyOwner whenNotPaused {
         require(
             ALIGNED_MODE,
-            "00h" // Batch verification should be done via smart contract verifiers. Call verifyBatch() instead.
+            "00h" // Batch verification should be done via smart contract verifiers. Call verifyBatches() instead.
         );
         require(
             firstBatchNumber == lastVerifiedBatch + 1,

crates/l2/contracts/src/l1/Timelock.sol

@@ -108,17 +108,17 @@ contract Timelock is TimelockControllerUpgradeable, UUPSUpgradeable, ITimelock {
     }
 
     /// @custom:access Restricted to accounts with the `SEQUENCER` role.
-    function verifyBatch(
-        uint256 batchNumber,
-        bytes memory risc0BlockProof,
-        bytes memory sp1ProofBytes,
-        bytes memory tdxSignature
+    function verifyBatches(
+        uint256 firstBatchNumber,
+        bytes[] calldata risc0BlockProofs,
+        bytes[] calldata sp1ProofsBytes,
+        bytes[] calldata tdxSignatures
     ) external onlyRole(SEQUENCER) {
-        onChainProposer.verifyBatch(
-            batchNumber,
-            risc0BlockProof,
-            sp1ProofBytes,
-            tdxSignature
+        onChainProposer.verifyBatches(
+            firstBatchNumber,
+            risc0BlockProofs,
+            sp1ProofsBytes,
+            tdxSignatures
         );
     }
 

crates/l2/contracts/src/l1/based/OnChainProposer.sol

@@ -332,26 +332,17 @@ contract OnChainProposer is
         );
     }
 
-    /// @inheritdoc IOnChainProposer
-    /// @notice The first `require` checks that the batch number is the subsequent block.
-    /// @notice The second `require` checks if the batch has been committed.
-    /// @notice The order of these `require` statements is important.
-    /// Ordering Reason: After the verification process, we delete the `batchCommitments` for `batchNumber - 1`. This means that when checking the batch,
-    /// we might get an error indicating that the batch hasn’t been committed, even though it was committed but deleted. Therefore, it has already been verified.
-    function verifyBatch(
+    /// @notice Internal batch verification logic used by verifyBatches.
+    function _verifyBatchInternal(
         uint256 batchNumber,
-        //risc0
         bytes memory risc0BlockProof,
-        //sp1
         bytes memory sp1ProofBytes,
-        //tdx
         bytes memory tdxSignature
-    ) external {
+    ) internal {
         require(
-            !ALIGNED_MODE,
-            "Batch verification should be done via Aligned Layer. Call verifyBatchesAligned() instead."
+            batchNumber == lastVerifiedBatch + 1,
+            "OnChainProposer: batch already verified"
         );
-
         require(
             batchCommitments[batchNumber].newStateRoot != bytes32(0),
             "OnChainProposer: cannot verify an uncommitted batch"
@@ -380,6 +371,7 @@ contract OnChainProposer is
         }
 
         // Reconstruct public inputs from commitments
+        // MUST be BEFORE updating lastVerifiedBatch
         bytes memory publicInputs = _getPublicInputsFromCommitment(batchNumber);
 
         if (REQUIRE_RISC0_PROOF) {
@@ -429,6 +421,7 @@ contract OnChainProposer is
             }
         }
 
+        // MUST be AFTER _getPublicInputsFromCommitment
         lastVerifiedBatch = batchNumber;
 
         // Remove previous batch commitment as it is no longer needed.
@@ -437,6 +430,35 @@ contract OnChainProposer is
         emit BatchVerified(lastVerifiedBatch);
     }
 
+    /// @inheritdoc IOnChainProposer
+    /// @notice Callable by anyone (no access control) so that any party can
+    ///         advance verification once proofs are available.
+    function verifyBatches(
+        uint256 firstBatchNumber,
+        bytes[] calldata risc0BlockProofs,
+        bytes[] calldata sp1ProofsBytes,
+        bytes[] calldata tdxSignatures
+    ) external {
+        require(
+            !ALIGNED_MODE,
+            "Batch verification should be done via Aligned Layer. Call verifyBatchesAligned() instead."
+        );
+        uint256 batchCount = risc0BlockProofs.length;
+        require(batchCount > 0, "OnChainProposer: empty batch array");
+        require(
+            sp1ProofsBytes.length == batchCount && tdxSignatures.length == batchCount,
+            "OnChainProposer: array length mismatch"
+        );
+        for (uint256 i = 0; i < batchCount; i++) {
+            _verifyBatchInternal(
+                firstBatchNumber + i,
+                risc0BlockProofs[i],
+                sp1ProofsBytes[i],
+                tdxSignatures[i]
+            );
+        }
+    }
+
     /// @inheritdoc IOnChainProposer
     function verifyBatchesAligned(
         uint256 firstBatchNumber,
@@ -446,7 +468,7 @@ contract OnChainProposer is
     ) external override {
         require(
             ALIGNED_MODE,
-            "Batch verification should be done via smart contract verifiers. Call verifyBatch() instead."
+            "Batch verification should be done via smart contract verifiers. Call verifyBatches() instead."
         );
         require(
             firstBatchNumber == lastVerifiedBatch + 1,

crates/l2/contracts/src/l1/based/interfaces/IOnChainProposer.sol

@@ -74,24 +74,16 @@ interface IOnChainProposer {
         bytes[] calldata _rlpEncodedBlocks
     ) external;
 
-    /// @notice Method used to verify a batch of L2 blocks.
-    /// @dev This method is used by the operator when a batch is ready to be
-    /// verified (this is after proved).
-    /// @param batchNumber is the number of the batch to be verified.
-    /// ----------------------------------------------------------------------
-    /// @param risc0BlockProof is the proof of the batch to be verified.
-    /// ----------------------------------------------------------------------
-    /// @param sp1ProofBytes Groth16 proof
-    /// ----------------------------------------------------------------------
-    /// @param tdxSignature TDX signature
-    function verifyBatch(
-        uint256 batchNumber,
-        //risc0
-        bytes memory risc0BlockProof,
-        //sp1
-        bytes memory sp1ProofBytes,
-        //tdx
-        bytes memory tdxSignature
+    /// @notice Method used to verify one or more consecutive L2 batches in a single transaction.
+    /// @param firstBatchNumber The batch number of the first batch to verify. Must be `lastVerifiedBatch + 1`.
+    /// @param risc0BlockProofs An array of RISC0 proofs, one per batch.
+    /// @param sp1ProofsBytes An array of SP1 proofs, one per batch.
+    /// @param tdxSignatures An array of TDX signatures, one per batch.
+    function verifyBatches(
+        uint256 firstBatchNumber,
+        bytes[] memory risc0BlockProofs,
+        bytes[] memory sp1ProofsBytes,
+        bytes[] memory tdxSignatures
     ) external;
 
     // TODO: imageid, programvkey and riscvvkey should be constants

crates/l2/contracts/src/l1/interfaces/IOnChainProposer.sol

@@ -82,24 +82,16 @@ interface IOnChainProposer {
         ICommonBridge.L2MessageRollingHash[] calldata l2MessageRollingHashes
     ) external;
 
-    /// @notice Method used to verify a batch of L2 blocks.
-    /// @dev This method is used by the operator when a batch is ready to be
-    /// verified (this is after proved).
-    /// @param batchNumber is the number of the batch to be verified.
-    /// ----------------------------------------------------------------------
-    /// @param risc0BlockProof is the proof of the batch to be verified.
-    /// ----------------------------------------------------------------------
-    /// @param sp1ProofBytes Groth16 proof
-    /// ----------------------------------------------------------------------
-    /// @param tdxSignature TDX signature
-    function verifyBatch(
-        uint256 batchNumber,
-        //risc0
-        bytes memory risc0BlockProof,
-        //sp1
-        bytes memory sp1ProofBytes,
-        //tdx
-        bytes memory tdxSignature
+    /// @notice Method used to verify one or more consecutive L2 batches in a single transaction.
+    /// @param firstBatchNumber The batch number of the first batch to verify. Must be `lastVerifiedBatch + 1`.
+    /// @param risc0BlockProofs An array of RISC0 proofs, one per batch.
+    /// @param sp1ProofsBytes An array of SP1 proofs, one per batch.
+    /// @param tdxSignatures An array of TDX signatures, one per batch.
+    function verifyBatches(
+        uint256 firstBatchNumber,
+        bytes[] calldata risc0BlockProofs,
+        bytes[] calldata sp1ProofsBytes,
+        bytes[] calldata tdxSignatures
     ) external;
 
     // TODO: imageid, programvkey and riscvvkey should be constants

crates/l2/contracts/src/l1/interfaces/ITimelock.sol

@@ -54,12 +54,12 @@ interface ITimelock {
         ICommonBridge.L2MessageRollingHash[] calldata l2MessageRollingHashes
     ) external;
 
-    /// @notice Verifies a single batch through the timelock.
-    function verifyBatch(
-        uint256 batchNumber,
-        bytes memory risc0BlockProof,
-        bytes memory sp1ProofBytes,
-        bytes memory tdxSignature
+    /// @notice Verifies one or more consecutive batches through the timelock.
+    function verifyBatches(
+        uint256 firstBatchNumber,
+        bytes[] calldata risc0BlockProofs,
+        bytes[] calldata sp1ProofsBytes,
+        bytes[] calldata tdxSignatures
     ) external;
 
     /// @notice Verifies multiple batches through the timelock using aligned proofs.