refactor: rename idx to epoch

bin/strata-client/src/rpc_server.rs

@@ -589,7 +589,7 @@ impl<D: Database + Send + Sync + 'static> StrataApiServer for StrataRpcImpl<D> {
             Ok(client_state
                 .l1_view()
                 .last_finalized_checkpoint()
-                .map(|checkpoint| checkpoint.batch_info.idx()))
+                .map(|checkpoint| checkpoint.batch_info.epoch()))
         } else {
             // get latest checkpoint index from db
             let idx = self

crates/consensus-logic/src/csm/client_transition.rs

@@ -407,13 +407,13 @@ pub fn filter_verified_checkpoints(
     } else {
         last_finalized
     }
-    .map(|x| (x.batch_info.idx() + 1, Some(&x.batch_transition)))
+    .map(|x| (x.batch_info.epoch() + 1, Some(&x.batch_transition)))
     .unwrap_or((0, None)); // expect the first checkpoint
 
     let mut result_checkpoints = Vec::new();
 
     for checkpoint in checkpoints {
-        let curr_idx = checkpoint.batch_checkpoint.batch_info().idx;
+        let curr_idx = checkpoint.batch_checkpoint.batch_info().epoch;
         let proof_receipt: ProofReceipt = checkpoint.batch_checkpoint.get_proof_receipt();
         if curr_idx != expected_idx {
             warn!(%expected_idx, %curr_idx, "Received invalid checkpoint idx, ignoring.");

crates/consensus-logic/src/csm/worker.rs

@@ -310,7 +310,7 @@ fn apply_action<D: Database>(
         SyncAction::WriteCheckpoints(_height, checkpoints) => {
             for c in checkpoints.iter() {
                 let batch_ckp = &c.batch_checkpoint;
-                let idx = batch_ckp.batch_info().idx();
+                let idx = batch_ckp.batch_info().epoch();
                 let pstatus = CheckpointProvingStatus::ProofReady;
                 let cstatus = CheckpointConfStatus::Confirmed;
                 let entry = CheckpointEntry::new(
@@ -331,7 +331,7 @@ fn apply_action<D: Database>(
         SyncAction::FinalizeCheckpoints(_height, checkpoints) => {
             for c in checkpoints.iter() {
                 let batch_ckp = &c.batch_checkpoint;
-                let idx = batch_ckp.batch_info().idx();
+                let idx = batch_ckp.batch_info().epoch();
                 let pstatus = CheckpointProvingStatus::ProofReady;
                 let cstatus = CheckpointConfStatus::Finalized;
                 let entry = CheckpointEntry::new(

crates/consensus-logic/src/duty/extractor.rs

@@ -137,7 +137,7 @@ fn extract_batch_duties(
             let current_chain_state_root = current_chain_state.compute_state_root();
             let l2_transition = (prev_transition.l2_transition.1, current_chain_state_root);
 
-            let new_batch = BatchInfo::new(prev_batch_info.idx + 1, l1_range, l2_range, tip_id);
+            let new_batch = BatchInfo::new(prev_batch_info.epoch + 1, l1_range, l2_range, tip_id);
             let new_batch_transition =
                 BatchTransition::new(l1_transition, l2_transition, rollup_params_commitment);
 

crates/consensus-logic/src/duty/types.rs

@@ -108,7 +108,7 @@ impl BatchCheckpointDuty {
     }
 
     pub fn idx(&self) -> u64 {
-        self.batch_info.idx()
+        self.batch_info.epoch()
     }
 
     pub fn batch_info(&self) -> &BatchInfo {

crates/consensus-logic/src/duty/worker.rs

@@ -163,7 +163,7 @@ fn update_tracker(
     let latest_finalized_batch = state
         .l1_view()
         .last_finalized_checkpoint()
-        .map(|x| x.batch_info.idx());
+        .map(|x| x.batch_info.epoch());
 
     let tracker_update = types::StateUpdate::new(
         block_idx,

crates/consensus-logic/src/l1_handler.rs

@@ -186,7 +186,7 @@ pub fn verify_proof(
     rollup_params: &RollupParams,
 ) -> ZkVmResult<()> {
     let rollup_vk = rollup_params.rollup_vk;
-    let checkpoint_idx = checkpoint.batch_info().idx();
+    let checkpoint_idx = checkpoint.batch_info().epoch();
     info!(%checkpoint_idx, "verifying proof");
 
     // FIXME: we are accepting empty proofs for now (devnet) to reduce dependency on the prover

crates/rpc/types/src/types.rs

@@ -307,7 +307,7 @@ pub struct RpcCheckpointInfo {
 impl From<BatchInfo> for RpcCheckpointInfo {
     fn from(value: BatchInfo) -> Self {
         Self {
-            idx: value.idx,
+            idx: value.epoch,
             l1_range: value.l1_range,
             l2_range: value.l2_range,
             l2_blockid: value.l2_blockid,

crates/state/src/batch.rs

@@ -126,8 +126,8 @@ impl From<SignedBatchCheckpoint> for BatchCheckpoint {
     Clone, Debug, Eq, PartialEq, Arbitrary, BorshDeserialize, BorshSerialize, Deserialize, Serialize,
 )]
 pub struct BatchInfo {
-    /// The index of the checkpoint
-    pub idx: u64,
+    /// Checkpoint epoch
+    pub epoch: u64,
 
     /// L1 height range(inclusive) the checkpoint covers
     pub l1_range: (u64, u64),
@@ -200,15 +200,15 @@ impl BatchInfo {
         l2_blockid: L2BlockId,
     ) -> Self {
         Self {
-            idx: checkpoint_idx,
+            epoch: checkpoint_idx,
             l1_range,
             l2_range,
             l2_blockid,
         }
     }
 
-    pub fn idx(&self) -> u64 {
-        self.idx
+    pub fn epoch(&self) -> u64 {
+        self.epoch
     }
 
     pub fn l2_blockid(&self) -> &L2BlockId {

crates/state/src/operation.rs

@@ -237,7 +237,7 @@ pub fn apply_writes_to_state(
                         .last_finalized_checkpoint
                         .as_ref()
                         .is_none_or(|prev_chp| {
-                            checkpt.batch_info.idx() == prev_chp.batch_info.idx() + 1
+                            checkpt.batch_info.epoch() == prev_chp.batch_info.epoch() + 1
                         })
                     {
                         panic!("operation: mismatched indices of pending checkpoint");