refactor ClStfRange and integrate derive_l1_range

Author: MdTeach

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

@@ -17,7 +17,7 @@ use tracing::{error, info};
 use super::{cl_stf::ClStfOperator, ProvingOp};
 use crate::{
     checkpoint_runner::submit::submit_checkpoint_proof, errors::ProvingTaskError, hosts,
-    operators::cl_stf::ClStfRange, task_tracker::TaskTracker,
+    task_tracker::TaskTracker,
 };
 
 /// A struct that implements the [`ProvingOp`] for Checkpoint Proof.
@@ -75,12 +75,8 @@ impl CheckpointOperator {
         // Since the EVM EE STF will be the heaviest, the splitting can be done based on that
         //
         // For now, do everything on a single chunk
-        let cl_stf_params = ClStfRange {
-            l1_range: Some(checkpoint_info.l1_range),
-            l2_range: checkpoint_info.l2_range,
-        };
         self.cl_stf_operator
-            .create_task(cl_stf_params, task_tracker, db)
+            .create_task(checkpoint_info.l2_range, task_tracker, db)
             .await
     }
 

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

@@ -5,7 +5,6 @@ use strata_db::traits::ProofDatabase;
 use strata_primitives::{
     buf::Buf32,
     evm_exec::EvmEeBlockCommitment,
-    l1::L1BlockCommitment,
     l2::L2BlockCommitment,
     params::RollupParams,
     proof::{ProofContext, ProofKey},
@@ -19,7 +18,9 @@ use tokio::sync::Mutex;
 use tracing::error;
 
 use super::{btc::BtcBlockspaceOperator, evm_ee::EvmEeOperator, ProvingOp};
-use crate::{errors::ProvingTaskError, hosts, task_tracker::TaskTracker};
+use crate::{
+    errors::ProvingTaskError, hosts, rpc_server::derive_l1_range, task_tracker::TaskTracker,
+};
 
 /// A struct that implements the [`ProvingOp`] trait for Consensus Layer (CL) State Transition
 /// Function (STF) proof generation.
@@ -116,28 +117,21 @@ impl ClStfOperator {
     }
 }
 
-pub struct ClStfRange {
-    pub l2_range: (L2BlockCommitment, L2BlockCommitment),
-    pub l1_range: Option<(L1BlockCommitment, L1BlockCommitment)>,
-}
-
 impl ProvingOp for ClStfOperator {
     type Prover = ClStfProver;
-    type Params = ClStfRange;
+    type Params = (L2BlockCommitment, L2BlockCommitment);
 
     fn construct_proof_ctx(&self, range: &Self::Params) -> Result<ProofContext, ProvingTaskError> {
-        let ClStfRange { l2_range, .. } = range;
-
-        let (start, end) = l2_range;
+        let (start_block, end_block) = range;
         // Do some sanity checks
         assert!(
-            start.slot() <= end.slot(),
+            start_block.slot() <= end_block.slot(),
             "failed to construct CL STF proof context. start_slot: {} > end_slot {}",
-            start.slot(),
-            end.slot()
+            start_block.slot(),
+            end_block.slot()
         );
 
-        Ok(ProofContext::ClStf(*start, *end))
+        Ok(ProofContext::ClStf(*start.blkid(), *end.blkid()))
     }
 
     async fn fetch_input(
@@ -219,10 +213,15 @@ impl ProvingOp for ClStfOperator {
         db: &ProofDb,
         task_tracker: Arc<Mutex<TaskTracker>>,
     ) -> Result<Vec<ProofKey>, ProvingTaskError> {
-        let ClStfRange { l1_range, l2_range } = range;
-
-        let el_start_block = self.get_exec_commitment(*l2_range.0.blkid()).await?;
-        let el_end_block = self.get_exec_commitment(*l2_range.1.blkid()).await?;
+        let l1_range = derive_l1_range(
+            &self.cl_client,
+            &self.btc_blockspace_operator.btc_client,
+            range,
+        )
+        .await;
+
+        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 mut tasks = self
             .evm_ee_operator

bin/prover-client/src/rpc_server.rs

@@ -21,7 +21,7 @@ use tracing::{info, warn};
 use zkaleido::ProofReceipt;
 
 use crate::{
-    operators::{cl_stf::ClStfRange, ProofOperator, ProvingOp},
+    operators::{ProofOperator, ProvingOp},
     status::ProvingTaskStatus,
     task_tracker::TaskTracker,
 };
@@ -114,16 +114,9 @@ impl StrataProverClientApiServer for ProverClientRpc {
         &self,
         cl_block_range: (L2BlockCommitment, L2BlockCommitment),
     ) -> RpcResult<Vec<ProofKey>> {
-        let cl_client = &self.operator.cl_stf_operator().cl_client;
-        let btc_client = &self.operator.btc_operator().btc_client;
-        let l1_range = derive_l1_range(cl_client, btc_client, cl_block_range).await;
-        let cl_params = ClStfRange {
-            l2_range: cl_block_range,
-            l1_range,
-        };
         self.operator
             .cl_stf_operator()
-            .create_task(cl_params, self.task_tracker.clone(), &self.db)
+            .create_task(cl_block_range, self.task_tracker.clone(), &self.db)
             .await
             .map_err(to_jsonrpsee_error("failed to create task for cl block"))
     }
@@ -213,7 +206,7 @@ impl StrataProverClientApiServer for ProverClientRpc {
     }
 }
 
-async fn derive_l1_range(
+pub async fn derive_l1_range(
     cl_client: &HttpClient,
     btc_client: &BitcoinClient,
     l2_range: (L2BlockCommitment, L2BlockCommitment),