feat: use taikoAuth_lastCertainBlockIDByBatchID instead of taikoAuth_lastBlockIDByBatchID (#917)

* feat: use taikoAuth_lastCertainBlockIDByBatchID instead of taikoAuth_lastBlockIDByBatchID

* bump version

* Update shasta/src/l2/taiko.rs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: mikhailUshakoff

Cargo.lock

@@ -13,7 +13,7 @@ resolver = "2"
 default-members = ["node"]
 
 [workspace.package]
-version = "1.34.10"
+version = "1.34.11"
 edition = "2024"
 repository = "https://github.com/NethermindEth/Catalyst"
 license = "MIT"

Cargo.toml

@@ -56,16 +56,19 @@ impl L2Engine {
         Ok(Self { auth_rpc, config })
     }
 
-    pub async fn get_last_block_id_by_batch_id(&self, batch_id: u64) -> Result<Option<u64>, Error> {
+    pub async fn get_last_certain_block_id_by_batch_id(
+        &self,
+        batch_id: u64,
+    ) -> Result<Option<u64>, Error> {
         let hex_batch_id = format!("0x{:x}", batch_id);
         let params = vec![Value::String(hex_batch_id)];
         let result = self
             .auth_rpc
-            .call_method("taikoAuth_lastBlockIDByBatchID", params)
+            .call_method("taikoAuth_lastCertainBlockIDByBatchID", params)
             .await
             .map_err(|e| {
                 anyhow::anyhow!(
-                    "taikoAuth_lastBlockIDByBatchID failed: batch id {}: {}",
+                    "taikoAuth_lastCertainBlockIDByBatchID failed: batch id {}: {}",
                     batch_id,
                     e
                 )

common/src/l2/engine.rs

@@ -157,7 +157,9 @@ impl Taiko {
         {
             let start = std::time::Instant::now();
             let safe_block_id = self
-                .get_last_block_id_by_proposal_id(inbox_forced_inclusion_state.next_proposal_id - 1)
+                .get_last_certain_block_id_by_proposal_id(
+                    inbox_forced_inclusion_state.next_proposal_id - 1,
+                )
                 .await?;
             let unsafe_block_id = self.get_latest_l2_block_id().await?;
             for block_id in safe_block_id + 1..=unsafe_block_id {
@@ -180,15 +182,18 @@ impl Taiko {
         Ok(fi_head)
     }
 
-    pub async fn get_last_block_id_by_proposal_id(&self, proposal_id: u64) -> Result<u64, Error> {
+    pub async fn get_last_certain_block_id_by_proposal_id(
+        &self,
+        proposal_id: u64,
+    ) -> Result<u64, Error> {
         match self
             .l2_engine
-            .get_last_block_id_by_batch_id(proposal_id)
+            .get_last_certain_block_id_by_batch_id(proposal_id)
             .await?
         {
             Some(block_id) => Ok(block_id),
             None => Err(anyhow::anyhow!(
-                "last block id by proposal id {} is None",
+                "no last certain block id returned for proposal_id {} via get_last_certain_block_id_by_batch_id",
                 proposal_id
             )),
         }

shasta/src/l2/taiko.rs

@@ -102,7 +102,7 @@ impl LastSafeL2BlockFinder {
         // Fast path: try direct lookup via Taiko
         match self
             .taiko
-            .get_last_block_id_by_proposal_id(target_proposal_id)
+            .get_last_certain_block_id_by_proposal_id(target_proposal_id)
             .await
         {
             Ok(block_id) => {
@@ -113,7 +113,7 @@ impl LastSafeL2BlockFinder {
             }
             Err(err) => {
                 tracing::warn!(
-                    "LastSafeL2BlockFinder::find_last_block_for_proposal_id(): Failed to get last block id by proposal id: {}",
+                    "LastSafeL2BlockFinder::find_last_block_for_proposal_id(): Failed to get last certain block id by proposal id: {}",
                     err
                 );
             }