refactor derive_l1_range to retrun error

Author: MdTeach

bin/prover-client/src/operators/cl_stf.rs

@@ -131,7 +131,7 @@ impl ProvingOp for ClStfOperator {
             end_block.slot()
         );
 
-        Ok(ProofContext::ClStf(*start.blkid(), *end.blkid()))
+        Ok(ProofContext::ClStf(*start_block, *end_block))
     }
 
     async fn fetch_input(
@@ -218,14 +218,19 @@ impl ProvingOp for ClStfOperator {
             &self.btc_blockspace_operator.btc_client,
             range,
         )
-        .await;
+        .await
+        .map_err(|e| ProvingTaskError::RpcError(e.to_string()))?;
 
-        let el_start_block_id = self.get_exec_id(*l2_range.0.blkid()).await?;
-        let el_end_block_id = self.get_exec_id(*l2_range.1.blkid()).await?;
+        let el_start_block_id = self.get_exec_commitment(*range.0.blkid()).await?;
+        let el_end_block_id = self.get_exec_commitment(*range.1.blkid()).await?;
 
         let mut tasks = self
             .evm_ee_operator
-            .create_task((el_start_block, el_end_block), task_tracker.clone(), db)
+            .create_task(
+                (el_start_block_id, el_end_block_id),
+                task_tracker.clone(),
+                db,
+            )
             .await?;
 
         if let Some(l1_range) = l1_range {

bin/prover-client/src/rpc_server.rs

@@ -210,30 +210,39 @@ pub async fn derive_l1_range(
     cl_client: &HttpClient,
     btc_client: &BitcoinClient,
     l2_range: (L2BlockCommitment, L2BlockCommitment),
-) -> Option<(L1BlockCommitment, L1BlockCommitment)> {
+) -> RpcResult<Option<(L1BlockCommitment, L1BlockCommitment)>> {
     // sanity check
     assert!(l2_range.1.slot() >= l2_range.0.slot(), "");
 
     let start_block_hash = *l2_range.0.blkid();
     let mut current_block_hash = *l2_range.1.blkid();
     loop {
-        let l2_block = cl_client
+        let l2_block = match cl_client
             .get_block_by_id(current_block_hash)
             .await
-            .expect("cannot find L2 block")
-            .expect("cannot find L2 block");
+            .map_err(to_jsonrpsee_error("failed to fetch l2 block"))?
+        {
+            Some(block) => block,
+            None => return Ok(None),
+        };
 
         let new_l1_manifests = l2_block.l1_segment().new_manifests();
         if !new_l1_manifests.is_empty() {
             let blkid = *new_l1_manifests.first().unwrap().blkid();
-            let height = btc_client.get_block_height(&blkid.into()).await.unwrap();
+            let height = btc_client
+                .get_block_height(&blkid.into())
+                .await
+                .map_err(to_jsonrpsee_error("failed to fetch l1 block"))?;
             let first_commitment = L1BlockCommitment::new(height, blkid);
 
             let blkid = *new_l1_manifests.last().unwrap().blkid();
-            let height = btc_client.get_block_height(&blkid.into()).await.unwrap();
+            let height = btc_client
+                .get_block_height(&blkid.into())
+                .await
+                .map_err(to_jsonrpsee_error("failed to fetch l1 block"))?;
             let last_commitment = L1BlockCommitment::new(height, blkid);
 
-            return Some((first_commitment, last_commitment));
+            return Ok(Some((first_commitment, last_commitment)));
         }
 
         let prev_l2_blkid = *l2_block.header().parent();
@@ -244,5 +253,6 @@ pub async fn derive_l1_range(
             current_block_hash = prev_l2_blkid;
         }
     }
-    None
+
+    Ok(None)
 }