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

@@ -9,15 +9,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 +34,7 @@ use fuel_core_interfaces::{
     },
 };
 use std::sync::Arc;
+use thiserror::Error;
 use tokio::{
     sync::{
         Mutex,
@@ -55,6 +47,27 @@ 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,
+    },
+}
+
+#[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) -> Result<DaBlockHeight>;
+}
+
 pub struct Producer {
     pub config: Config,
     pub db: Box<dyn BlockProducerDatabase>,
@@ -67,10 +80,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 +123,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 +196,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 +208,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 +223,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::{
+    block_producer::Relayer,
+    ports::TxPool,
+};
 use anyhow::Result;
 use fuel_core_interfaces::{
-    block_producer::Relayer,
     common::{
         fuel_storage::StorageInspect,
         fuel_tx::{

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/modules.rs

@@ -10,17 +10,20 @@ use anyhow::Result;
 use fuel_core_interfaces::p2p::P2pDb;
 use fuel_core_interfaces::{
     self,
-    block_producer::{
-        BlockProducer,
-        Relayer as BlockProducerRelayer,
+    common::{
+        fuel_tx::Receipt,
+        prelude::{
+            Transaction,
+            Word,
+        },
     },
-    common::fuel_tx::Receipt,
     executor::{
         Error,
         ExecutionBlock,
         ExecutionResult,
         Executor as ExecutorTrait,
     },
+    model::BlockHeight,
     relayer::RelayerDb,
     txpool::{
         Sender,
@@ -45,7 +48,7 @@ use tokio::{
 pub struct Modules {
     pub txpool: Arc<fuel_txpool::Service>,
     pub block_importer: Arc<fuel_block_importer::Service>,
-    pub block_producer: Arc<dyn BlockProducer>,
+    pub block_producer: Arc<fuel_block_producer::Producer>,
     pub coordinator: Arc<CoordinatorService>,
     pub sync: Arc<fuel_sync::Service>,
     #[cfg(feature = "relayer")]
@@ -202,15 +205,16 @@ pub async fn start_modules(config: &Config, database: &Database) -> Result<Modul
                 txpool_builder.tx_status_subscribe(),
                 txpool_builder.sender().clone(),
                 block_import_tx,
-                block_producer.clone(),
+                PoACoordinatorAdapter {
+                    block_producer: block_producer.clone(),
+                },
                 database.clone(),
             )
             .await;
         }
         CoordinatorService::Bft(bft) => {
             bft.start(
                 p2p_request_event_sender.clone(),
-                block_producer.clone(),
                 block_importer.sender().clone(),
                 block_importer.subscribe(),
             )
@@ -283,7 +287,7 @@ struct MaybeRelayerAdapter {
 }
 
 #[async_trait::async_trait]
-impl BlockProducerRelayer for MaybeRelayerAdapter {
+impl fuel_block_producer::block_producer::Relayer for MaybeRelayerAdapter {
     async fn get_best_finalized_da_height(
         &self,
     ) -> Result<fuel_core_interfaces::model::DaBlockHeight> {
@@ -301,3 +305,31 @@ impl BlockProducerRelayer for MaybeRelayerAdapter {
             .unwrap_or_default())
     }
 }
+
+struct PoACoordinatorAdapter {
+    block_producer: Arc<fuel_block_producer::Producer>,
+}
+
+#[async_trait::async_trait]
+impl fuel_poa_coordinator::service::BlockProducer for PoACoordinatorAdapter {
+    async fn produce_and_execute_block(
+        &self,
+        height: BlockHeight,
+        max_gas: Word,
+    ) -> anyhow::Result<ExecutionResult> {
+        self.block_producer
+            .produce_and_execute_block(height, max_gas)
+            .await
+    }
+
+    async fn dry_run(
+        &self,
+        transaction: Transaction,
+        height: Option<BlockHeight>,
+        utxo_validation: Option<bool>,
+    ) -> anyhow::Result<Vec<Receipt>> {
+        self.block_producer
+            .dry_run(transaction, height, utxo_validation)
+            .await
+    }
+}

fuel-poa-coordinator/Cargo.toml

@@ -11,6 +11,7 @@ description = "Fuel Core PoA Coordinator"
 
 [dependencies]
 anyhow = "1.0"
+async-trait = "0.1"
 fuel-core-interfaces = { path = "../fuel-core-interfaces", version = "0.14.1" }
 humantime-serde = "1.1.1"
 parking_lot = "0.12"
@@ -19,7 +20,6 @@ tokio = { version = "1.21", features = ["full"] }
 tracing = "0.1"
 
 [dev-dependencies]
-async-trait = "0.1"
 fuel-core-interfaces = { path = "../fuel-core-interfaces", features = ["test-helpers"] }
 mockall = "0.11"
 rand = "0.8"