Crash recovery

bin/citrea/src/rollup/bitcoin.rs

@@ -135,11 +135,13 @@ impl RollupBlueprint for BitcoinRollup {
         prover_config: ProverConfig,
         _rollup_config: &FullNodeConfig<Self::DaConfig>,
         _da_service: &Arc<Self::DaService>,
+        ledger_db: LedgerDB,
     ) -> Self::ProverService {
         let vm = Risc0BonsaiHost::new(
             citrea_risc0::BITCOIN_DA_ELF,
             std::env::var("BONSAI_API_URL").unwrap_or("".to_string()),
             std::env::var("BONSAI_API_KEY").unwrap_or("".to_string()),
+            ledger_db.clone(),
         );
         let zk_stf = StfBlueprint::new();
         let zk_storage = ZkStorage::new();
@@ -155,6 +157,7 @@ impl RollupBlueprint for BitcoinRollup {
             da_verifier,
             prover_config,
             zk_storage,
+            ledger_db,
         )
         .expect("Should be able to instantiate prover service")
     }

bin/citrea/src/rollup/mock.rs

@@ -100,11 +100,13 @@ impl RollupBlueprint for MockDemoRollup {
         prover_config: ProverConfig,
         _rollup_config: &FullNodeConfig<Self::DaConfig>,
         _da_service: &Arc<Self::DaService>,
+        ledger_db: LedgerDB,
     ) -> Self::ProverService {
         let vm = Risc0BonsaiHost::new(
             citrea_risc0::MOCK_DA_ELF,
             std::env::var("BONSAI_API_URL").unwrap_or("".to_string()),
             std::env::var("BONSAI_API_KEY").unwrap_or("".to_string()),
+            ledger_db.clone(),
         );
         let zk_stf = StfBlueprint::new();
         let zk_storage = ZkStorage::new();
@@ -116,6 +118,7 @@ impl RollupBlueprint for MockDemoRollup {
             da_verifier,
             prover_config,
             zk_storage,
+            ledger_db,
         )
         .expect("Should be able to instantiate prover service")
     }

bin/citrea/src/rollup/mod.rs

@@ -230,15 +230,21 @@ pub trait CitreaRollupBlueprint: RollupBlueprint {
     {
         let da_service = self.create_da_service(&rollup_config).await?;
 
+        let ledger_db = self.create_ledger_db(&rollup_config);
+
         let prover_service = self
-            .create_prover_service(prover_config.clone(), &rollup_config, &da_service)
+            .create_prover_service(
+                prover_config.clone(),
+                &rollup_config,
+                &da_service,
+                ledger_db.clone(),
+            )
             .await;
 
         // TODO: Double check what kind of storage needed here.
         // Maybe whole "prev_root" can be initialized inside runner
         // Getting block here, so prover_service doesn't have to be `Send`
 
-        let ledger_db = self.create_ledger_db(&rollup_config);
         let genesis_config = self.create_genesis_config(runtime_genesis_paths, &rollup_config)?;
 
         let mut storage_manager = self.create_storage_manager(&rollup_config)?;

crates/prover/src/prover_service/parallel/mod.rs

@@ -7,6 +7,7 @@ use citrea_stf::verifier::StateTransitionVerifier;
 use prover::Prover;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
+use sov_db::ledger_db::{LedgerDB, ProvingServiceLedgerOps};
 use sov_rollup_interface::da::{DaData, DaSpec};
 use sov_rollup_interface::services::da::DaService;
 use sov_rollup_interface::stf::StateTransitionFunction;
@@ -34,6 +35,7 @@ where
 
     zk_storage: V::PreState,
     prover_state: Prover<StateRoot, Witness, Da>,
+    ledger_db: LedgerDB,
 }
 
 impl<StateRoot, Witness, Da, Vm, V> ParallelProverService<StateRoot, Witness, Da, Vm, V>
@@ -62,6 +64,7 @@ where
         config: ProverGuestRunConfig,
         zk_storage: V::PreState,
         num_threads: usize,
+        ledger_db: LedgerDB,
     ) -> anyhow::Result<Self> {
         let stf_verifier =
             StateTransitionVerifier::<V, Da::Verifier, Vm::Guest>::new(zk_stf, da_verifier);
@@ -96,6 +99,7 @@ where
             prover_config,
             prover_state: Prover::new(num_threads)?,
             zk_storage,
+            ledger_db,
         })
     }
 
@@ -106,6 +110,7 @@ where
         da_verifier: Da::Verifier,
         prover_config: ProverConfig,
         zk_storage: V::PreState,
+        ledger_db: LedgerDB,
     ) -> anyhow::Result<Self> {
         let num_cpus = num_cpus::get();
         assert!(num_cpus > 1, "Unable to create parallel prover service");
@@ -117,6 +122,7 @@ where
             prover_config.proving_mode,
             zk_storage,
             num_cpus - 1,
+            ledger_db,
         )
     }
 }
@@ -192,6 +198,7 @@ where
                         .send_transaction(da_data)
                         .await
                         .map_err(|e| anyhow::anyhow!(e))?;
+                    self.ledger_db.clear_pending_proving_sessions()?;
                     break Ok((tx_id, proof));
                 }
                 ProverStatus::ProvingInProgress => {
@@ -203,4 +210,27 @@ where
             }
         }
     }
+
+    async fn recover_proving_sessions_and_send_to_da(
+        &self,
+        da_service: &Arc<Self::DaService>,
+    ) -> Result<Vec<(<Da as DaService>::TransactionId, Proof)>, anyhow::Error> {
+        tracing::info!("Checking if ongoing bonsai session exists");
+
+        let vm = self.vm.clone();
+        let proofs = vm.recover_proving_sessions()?;
+
+        let mut results = Vec::new();
+
+        for proof in proofs.into_iter() {
+            let da_data = DaData::ZKProof(proof.clone());
+            let tx_id = da_service
+                .send_transaction(da_data)
+                .await
+                .map_err(|e| anyhow::anyhow!(e))?;
+            results.push((tx_id, proof));
+        }
+        self.ledger_db.clear_pending_proving_sessions()?;
+        Ok(results)
+    }
 }