From 6b285510001dbe6d7eb5618339e9d962b3bc6953 Mon Sep 17 00:00:00 2001 From: abishek Date: Fri, 27 Dec 2024 00:33:25 +0545 Subject: [PATCH] itegrate ckp runner with main --- .../src/checkpoint_runner/submit.rs | 4 +++- bin/prover-client/src/operators/checkpoint.rs | 1 + bin/prover-client/src/prover_manager.rs | 18 +++++++++--------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/bin/prover-client/src/checkpoint_runner/submit.rs b/bin/prover-client/src/checkpoint_runner/submit.rs index bb49b2942..9eacb1a7d 100644 --- a/bin/prover-client/src/checkpoint_runner/submit.rs +++ b/bin/prover-client/src/checkpoint_runner/submit.rs @@ -1,3 +1,5 @@ +use std::sync::Arc; + use jsonrpsee::{ core::{client::ClientT, params::ArrayParams}, http_client::HttpClient, @@ -13,7 +15,7 @@ pub async fn submit_checkpoint_proof( checkpoint_index: u64, sequencer_client: &HttpClient, proof_key: ProofKey, - proof_db: &ProofDb, + proof_db: Arc, ) -> anyhow::Result<()> { let proof = proof_db.get_proof(proof_key).unwrap().unwrap(); let proof_bytes = HexBytes::from(proof.proof().as_bytes()); diff --git a/bin/prover-client/src/operators/checkpoint.rs b/bin/prover-client/src/operators/checkpoint.rs index 3113c9c75..cc65aec49 100644 --- a/bin/prover-client/src/operators/checkpoint.rs +++ b/bin/prover-client/src/operators/checkpoint.rs @@ -69,6 +69,7 @@ impl CheckpointOperator { .ok_or(ProvingTaskError::WitnessNotFound) } + /// Returns a reference to the internal CL (Consensus Layer) `HttpClient`. pub fn cl_client(&self) -> &HttpClient { &self.cl_client } diff --git a/bin/prover-client/src/prover_manager.rs b/bin/prover-client/src/prover_manager.rs index 537a0c68b..65fd247aa 100644 --- a/bin/prover-client/src/prover_manager.rs +++ b/bin/prover-client/src/prover_manager.rs @@ -6,8 +6,8 @@ use tokio::{spawn, sync::Mutex, time::sleep}; use tracing::{error, info}; use crate::{ - errors::ProvingTaskError, operators::ProofOperator, status::ProvingTaskStatus, - task_tracker::TaskTracker, + checkpoint_runner::submit::submit_checkpoint_proof, errors::ProvingTaskError, + operators::ProofOperator, status::ProvingTaskStatus, task_tracker::TaskTracker, }; #[derive(Debug, Clone)] @@ -67,10 +67,14 @@ impl ProverManager { // Spawn a new task spawn(async move { - match make_proof(operator.clone(), task_tracker, task, db).await { + match make_proof(operator.clone(), task_tracker, task, db.clone()).await { Ok(_) => { - if let ProofContext::Checkpoint(ckp_id) = task.context() { - submit_checkpoint(*ckp_id, operator.clone()).await; + // If checkpoint proving; submit proof to sequencer + if let ProofContext::Checkpoint(checkpoint_index) = task.context() { + let cl_client = operator.checkpoint_operator().cl_client(); + let _ = + submit_checkpoint_proof(*checkpoint_index, cl_client, task, db) + .await; } } Err(err) => { @@ -86,10 +90,6 @@ impl ProverManager { } } -async fn submit_checkpoint(ckp_id: u64, operator: Arc) { - println!("submmiting the checkpint {:?}", ckp_id); -} - pub async fn make_proof( operator: Arc, task_tracker: Arc>,