Move block producer requirements into corresponding crates

fuel-block-producer/Cargo.toml

@@ -14,6 +14,7 @@ anyhow = "1.0"
 async-trait = "0.1"
 fuel-core-interfaces = { path = "../fuel-core-interfaces", version = "0.14.1" }
 parking_lot = "0.12"
+thiserror = "1.0"
 tokio = { version = "1.21", features = ["full"] }
 tracing = { version = "0.1" }
 

fuel-block-producer/src/block_producer.rs

@@ -1,6 +1,9 @@
 use crate::{
     db::BlockProducerDatabase,
-    ports::TxPool,
+    ports::{
+        Relayer,
+        TxPool,
+    },
     Config,
 };
 use anyhow::{
@@ -9,15 +12,6 @@ use anyhow::{
     Result,
 };
 use fuel_core_interfaces::{
-    block_producer::{
-        BlockProducer as Trait,
-        Error::{
-            GenesisBlock,
-            InvalidDaFinalizationState,
-            MissingBlock,
-        },
-        Relayer,
-    },
     common::{
         crypto::ephemeral_merkle_root,
         fuel_tx::{
@@ -43,6 +37,7 @@ use fuel_core_interfaces::{
     },
 };
 use std::sync::Arc;
+use thiserror::Error;
 use tokio::{
     sync::{
         Mutex,
@@ -55,6 +50,21 @@ use tracing::debug;
 #[cfg(test)]
 mod tests;
 
+#[derive(Error, Debug)]
+pub enum Error {
+    #[error(
+        "0 is an invalid block height for production. It is reserved for genesis data."
+    )]
+    GenesisBlock,
+    #[error("Previous block height {0} doesn't exist")]
+    MissingBlock(BlockHeight),
+    #[error("Best finalized da_height {best} is behind previous block da_height {previous_block}")]
+    InvalidDaFinalizationState {
+        best: DaBlockHeight,
+        previous_block: DaBlockHeight,
+    },
+}
+
 pub struct Producer {
     pub config: Config,
     pub db: Box<dyn BlockProducerDatabase>,
@@ -67,10 +77,9 @@ pub struct Producer {
     pub dry_run_semaphore: Semaphore,
 }
 
-#[async_trait::async_trait]
-impl Trait for Producer {
+impl Producer {
     /// Produces and execute block for the specified height
-    async fn produce_and_execute_block(
+    pub async fn produce_and_execute_block(
         &self,
         height: BlockHeight,
         max_gas: Word,
@@ -111,10 +120,10 @@ impl Trait for Producer {
         Ok(result)
     }
 
-    // simulate a transaction without altering any state. Does not aquire the production lock
-    // since it is basically a "read only" operation and shouldn't get in the way of normal
-    // production.
-    async fn dry_run(
+    /// Simulate a transaction without altering any state. Does not aquire the production lock
+    /// since it is basically a "read only" operation and shouldn't get in the way of normal
+    /// production.
+    pub async fn dry_run(
         &self,
         transaction: Transaction,
         height: Option<BlockHeight>,
@@ -184,7 +193,7 @@ impl Producer {
         if best_height < previous_da_height {
             // If this happens, it could mean a block was erroneously imported
             // without waiting for our relayer's da_height to catch up to imported da_height.
-            return Err(InvalidDaFinalizationState {
+            return Err(Error::InvalidDaFinalizationState {
                 best: best_height,
                 previous_block: previous_da_height,
             }
@@ -196,7 +205,7 @@ impl Producer {
     fn previous_block_info(&self, height: BlockHeight) -> Result<PreviousBlockInfo> {
         // block 0 is reserved for genesis
         if height == 0u32.into() {
-            Err(GenesisBlock.into())
+            Err(Error::GenesisBlock.into())
         }
         // if this is the first block, fill in base metadata from genesis
         else if height == 1u32.into() {
@@ -211,7 +220,7 @@ impl Producer {
             let previous_block = self
                 .db
                 .get_block(prev_height)?
-                .ok_or(MissingBlock(prev_height))?;
+                .ok_or(Error::MissingBlock(prev_height))?;
             // TODO: this should use a proper BMT MMR
             let hash = previous_block.id();
             let prev_root = ephemeral_merkle_root(

fuel-block-producer/src/block_producer/tests.rs

@@ -1,4 +1,5 @@
 use crate::{
+    block_producer::Error,
     mocks::{
         FailingMockExecutor,
         MockDb,
@@ -10,10 +11,6 @@ use crate::{
     Producer,
 };
 use fuel_core_interfaces::{
-    block_producer::{
-        BlockProducer,
-        Error,
-    },
     executor::Executor,
     model::{
         FuelApplicationHeader,

fuel-block-producer/src/mocks.rs

@@ -1,8 +1,10 @@
 use super::db::BlockProducerDatabase;
-use crate::ports::TxPool;
+use crate::ports::{
+    Relayer,
+    TxPool,
+};
 use anyhow::Result;
 use fuel_core_interfaces::{
-    block_producer::Relayer,
     common::{
         fuel_storage::StorageInspect,
         fuel_tx::{

fuel-block-producer/src/ports.rs

@@ -1,8 +1,8 @@
-use anyhow::Result;
 use async_trait::async_trait;
 use fuel_core_interfaces::model::{
     ArcPoolTx,
     BlockHeight,
+    DaBlockHeight,
 };
 
 #[async_trait]
@@ -13,5 +13,11 @@ pub trait TxPool: Sync + Send {
         block_height: BlockHeight,
         // The upper limit for the total amount of gas of these txs
         max_gas: u64,
-    ) -> Result<Vec<ArcPoolTx>>;
+    ) -> anyhow::Result<Vec<ArcPoolTx>>;
+}
+
+#[async_trait::async_trait]
+pub trait Relayer: Sync + Send {
+    /// Get the best finalized height from the DA layer
+    async fn get_best_finalized_da_height(&self) -> anyhow::Result<DaBlockHeight>;
 }

fuel-block-producer/tests/integration.rs

@@ -10,7 +10,6 @@ use fuel_block_producer::{
 };
 use fuel_core_interfaces::{
     block_importer::ImportBlockBroadcast,
-    block_producer::BlockProducer as Trait,
     common::{
         fuel_asm::Opcode,
         fuel_crypto::{

fuel-core-bft/src/service.rs

@@ -5,11 +5,9 @@ use fuel_core_interfaces::{
         ImportBlockBroadcast,
         ImportBlockMpsc,
     },
-    block_producer::BlockProducer,
     p2p::P2pRequestEvent,
 };
 use parking_lot::Mutex;
-use std::sync::Arc;
 use tokio::{
     sync::{
         broadcast,
@@ -35,7 +33,6 @@ impl Service {
     pub async fn start(
         &self,
         _p2p_consensus: mpsc::Sender<P2pRequestEvent>,
-        _block_producer: Arc<dyn BlockProducer>,
         _block_importer_sender: mpsc::Sender<ImportBlockMpsc>,
         _block_importer_broadcast: broadcast::Receiver<ImportBlockBroadcast>,
     ) {

fuel-core-interfaces/src/lib.rs

@@ -1,6 +1,5 @@
 pub mod bft;
 pub mod block_importer;
-pub mod block_producer;
 pub mod db;
 pub mod executor;
 pub mod model;

fuel-core/src/schema/tx.rs

@@ -31,7 +31,6 @@ use async_graphql::{
     Subscription,
 };
 use fuel_core_interfaces::{
-    block_producer::BlockProducer,
     common::{
         fuel_storage::StorageAsRef,
         fuel_tx::{
@@ -335,7 +334,7 @@ impl TxMutation {
         // for read-only calls.
         utxo_validation: Option<bool>,
     ) -> async_graphql::Result<Vec<receipt::Receipt>> {
-        let block_producer = ctx.data_unchecked::<Arc<dyn BlockProducer>>();
+        let block_producer = ctx.data_unchecked::<Arc<fuel_block_producer::Producer>>();
 
         let mut tx = FuelTx::from_bytes(&tx.0)?;
         tx.precompute();

fuel-core/src/service.rs

@@ -18,6 +18,7 @@ pub use config::{
     VMConfig,
 };
 
+pub mod adapters;
 pub mod config;
 pub(crate) mod genesis;
 pub mod graph_api;