Support pre fork1 input in generateInput (#1699)

chainwayxyz · Jan 13, 2025 · eb2e327 · eb2e327
1 parent 36b26da
commit eb2e327
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/crates/batch-prover/src/proving.rs b/crates/batch-prover/src/proving.rs
@@ -240,12 +240,15 @@ where
         .unwrap_or(vec![]);
 
     // Add each non-proven proof's data to ProverService
-    for (i, input) in inputs.into_iter().enumerate() {
+    for input in inputs {
         if !state_transition_already_proven::<StateRoot, Witness, Da, Tx>(&input, &submitted_proofs)
         {
-            let seq_com = sequencer_commitments.get(i).expect("Commitment exists");
-            let last_l2_height = seq_com.l2_end_block_number;
+            let range_end = input.sequencer_commitments_range.1;
 
+            let last_seq_com = sequencer_commitments
+                .get(range_end as usize)
+                .expect("Commitment does not exist");
+            let last_l2_height = last_seq_com.l2_end_block_number;
             let current_spec = fork_from_block_number(last_l2_height).spec_id;
 
             let elf = elfs_by_spec

diff --git a/crates/batch-prover/src/rpc.rs b/crates/batch-prover/src/rpc.rs
@@ -7,6 +7,7 @@ use std::sync::Arc;
 
 use borsh::{BorshDeserialize, BorshSerialize};
 use citrea_common::cache::L1BlockCache;
+use citrea_primitives::forks::fork_from_block_number;
 use jsonrpsee::core::RpcResult;
 use jsonrpsee::proc_macros::rpc;
 use jsonrpsee::types::error::{INTERNAL_ERROR_CODE, INTERNAL_ERROR_MSG};
@@ -16,7 +17,7 @@ use serde::{Deserialize, Serialize};
 use sov_db::ledger_db::BatchProverLedgerOps;
 use sov_modules_api::{SpecId, Zkvm};
 use sov_rollup_interface::services::da::DaService;
-use sov_rollup_interface::zk::ZkvmHost;
+use sov_rollup_interface::zk::{BatchProofCircuitInputV1, ZkvmHost};
 use sov_stf_runner::ProverService;
 use tokio::sync::Mutex;
 
@@ -162,7 +163,7 @@ where
                 )
             })?;
 
-        let (_, inputs) = data_to_prove::<Da, DB, StateRoot, Witness, Tx>(
+        let (sequencer_commitments, inputs) = data_to_prove::<Da, DB, StateRoot, Witness, Tx>(
             self.context.da_service.clone(),
             self.context.ledger.clone(),
             self.context.sequencer_pub_key.clone(),
@@ -185,7 +186,18 @@ where
         for input in inputs {
             let range_start = input.sequencer_commitments_range.0;
             let range_end = input.sequencer_commitments_range.1;
-            let serialized_circuit_input = serialize_batch_proof_circuit_input(input);
+
+            let last_seq_com = sequencer_commitments
+                .get(range_end as usize)
+                .expect("Commitment does not exist");
+            let last_l2_height = last_seq_com.l2_end_block_number;
+            let current_spec = fork_from_block_number(last_l2_height).spec_id;
+
+            let serialized_circuit_input = match current_spec {
+                SpecId::Genesis => borsh::to_vec(&BatchProofCircuitInputV1::from(input)),
+                _ => borsh::to_vec(&input),
+            }
+            .expect("Risc0 hint serialization is infallible");
 
             let response = ProverInputResponse {
                 commitment_range: (range_start, range_end),
@@ -257,10 +269,6 @@ where
     }
 }
 
-fn serialize_batch_proof_circuit_input<T: BorshSerialize>(item: T) -> Vec<u8> {
-    borsh::to_vec(&item).expect("Risc0 hint serialization is infallible")
-}
-
 pub fn create_rpc_module<C, Da, Ps, Vm, DB, StateRoot, Witness, Tx>(
     rpc_context: RpcContext<C, Da, Ps, Vm, DB, StateRoot, Witness, Tx>,
 ) -> jsonrpsee::RpcModule<BatchProverRpcServerImpl<C, Da, Ps, Vm, DB, StateRoot, Witness, Tx>>