feat: exit on block production error

dojoengine · Nov 4, 2024 · 57a865c · 57a865c
1 parent 131cd89
commit 57a865c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/crates/katana/core/src/service/block_producer.rs b/crates/katana/core/src/service/block_producer.rs
@@ -34,9 +34,6 @@ pub enum BlockProductionError {
     #[error(transparent)]
     Provider(#[from] ProviderError),
 
-    #[error("block mining task cancelled")]
-    BlockMiningTaskCancelled,
-
     #[error("transaction execution task cancelled")]
     ExecutionTaskCancelled,
 

diff --git a/crates/katana/core/src/service/mod.rs b/crates/katana/core/src/service/mod.rs
@@ -5,6 +5,7 @@ use std::future::Future;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
+use block_producer::BlockProductionError;
 use futures::channel::mpsc::Receiver;
 use futures::stream::{Fuse, Stream, StreamExt};
 use katana_executor::ExecutorFactory;
@@ -47,7 +48,7 @@ impl<EF: ExecutorFactory> BlockProductionTask<EF> {
 }
 
 impl<EF: ExecutorFactory> Future for BlockProductionTask<EF> {
-    type Output = ();
+    type Output = Result<(), BlockProductionError>;
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.get_mut();
@@ -68,6 +69,7 @@ impl<EF: ExecutorFactory> Future for BlockProductionTask<EF> {
 
                     Err(error) => {
                         error!(target: LOG_TARGET, %error, "Mining block.");
+                        return Poll::Ready(Err(error));
                     }
                 }
             }

diff --git a/crates/katana/pipeline/src/stage/sequencing.rs b/crates/katana/pipeline/src/stage/sequencing.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use anyhow::Result;
 use futures::future;
 use katana_core::backend::Backend;
-use katana_core::service::block_producer::BlockProducer;
+use katana_core::service::block_producer::{BlockProducer, BlockProductionError};
 use katana_core::service::messaging::{MessagingConfig, MessagingService, MessagingTask};
 use katana_core::service::{BlockProductionTask, TransactionMiner};
 use katana_executor::ExecutorFactory;
@@ -52,7 +52,7 @@ impl<EF: ExecutorFactory> Sequencing<EF> {
         }
     }
 
-    fn run_block_production(&self) -> TaskHandle<()> {
+    fn run_block_production(&self) -> TaskHandle<Result<(), BlockProductionError>> {
         let pool = self.pool.clone();
         let miner = TransactionMiner::new(pool.add_listener());
         let block_producer = self.block_producer.clone();

diff --git a/crates/katana/storage/db/src/mdbx/tx.rs b/crates/katana/storage/db/src/mdbx/tx.rs
@@ -118,7 +118,9 @@ impl DbTxMut for Tx<RW> {
     fn put<T: Table>(&self, key: T::Key, value: T::Value) -> Result<(), DatabaseError> {
         let key = key.encode();
         let value = value.compress();
-        self.inner.put(self.get_dbi::<T>()?, key, value, WriteFlags::UPSERT).unwrap();
+        self.inner.put(self.get_dbi::<T>()?, &key, value, WriteFlags::UPSERT).map_err(|error| {
+            DatabaseError::Write { error, table: T::NAME, key: Box::from(key.as_ref()) }
+        })?;
         Ok(())
     }