Allow producer to produce predefined blocks

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
 ### Added
+- [2081](https://github.com/FuelLabs/fuel-core/pull/2081): Enable producer to include predefined blocks.
 - [2079](https://github.com/FuelLabs/fuel-core/pull/2079): Open unknown columns in the RocksDB for forward compatibility.
 
 ### Changed

crates/fuel-core/src/service/adapters/consensus_module/poa.rs

@@ -24,6 +24,7 @@ use fuel_core_poa::{
 use fuel_core_services::stream::BoxStream;
 use fuel_core_storage::transactional::Changes;
 use fuel_core_types::{
+    blockchain::block::Block,
     fuel_tx::TxId,
     fuel_types::BlockHeight,
     services::{
@@ -120,6 +121,15 @@ impl fuel_core_poa::ports::BlockProducer for BlockProducerAdapter {
             }
         }
     }
+
+    async fn produce_predefined_block(
+        &self,
+        block: &Block,
+    ) -> anyhow::Result<UncommittedResult<Changes>> {
+        self.block_producer
+            .produce_and_execute_predefined(block)
+            .await
+    }
 }
 
 #[async_trait::async_trait]

crates/fuel-core/src/service/config.rs

@@ -204,6 +204,11 @@ impl From<&Config> for fuel_core_poa::Config {
             metrics: false,
             min_connected_reserved_peers: config.min_connected_reserved_peers,
             time_until_synced: config.time_until_synced,
+            chain_id: config
+                .snapshot_reader
+                .chain_config()
+                .consensus_parameters
+                .chain_id(),
         }
     }
 }

crates/fuel-core/src/service/sub_services.rs

@@ -42,7 +42,10 @@ use fuel_core_gas_price_service::fuel_gas_price_updater::{
     UpdaterMetadata,
     V0Metadata,
 };
-use fuel_core_poa::Trigger;
+use fuel_core_poa::{
+    ports::InMemoryPredefinedBlocks,
+    Trigger,
+};
 use fuel_core_services::{
     RunnableService,
     ServiceRunner,
@@ -53,13 +56,20 @@ use fuel_core_storage::{
 };
 #[cfg(feature = "relayer")]
 use fuel_core_types::blockchain::primitives::DaBlockHeight;
-use std::sync::Arc;
+use std::{
+    collections::HashMap,
+    sync::Arc,
+};
 use tokio::sync::Mutex;
 
 mod algorithm_updater;
 
-pub type PoAService =
-    fuel_core_poa::Service<TxPoolAdapter, BlockProducerAdapter, BlockImporterAdapter>;
+pub type PoAService = fuel_core_poa::Service<
+    TxPoolAdapter,
+    BlockProducerAdapter,
+    BlockImporterAdapter,
+    InMemoryPredefinedBlocks,
+>;
 #[cfg(feature = "p2p")]
 pub type P2PService = fuel_core_p2p::service::Service<Database>;
 pub type TxPoolSharedState = fuel_core_txpool::service::SharedState<
@@ -235,6 +245,7 @@ pub fn init_sub_services(
         tracing::info!("Enabled manual block production because of `debug` flag");
     }
 
+    let predefined_blocks: InMemoryPredefinedBlocks = HashMap::new().into();
     let poa = (production_enabled).then(|| {
         fuel_core_poa::new_service(
             &last_block_header,
@@ -243,6 +254,7 @@ pub fn init_sub_services(
             producer_adapter.clone(),
             importer_adapter.clone(),
             p2p_adapter.clone(),
+            predefined_blocks,
         )
     });
     let poa_adapter = PoAAdapter::new(poa.as_ref().map(|service| service.shared.clone()));

crates/services/consensus_module/poa/Cargo.toml

@@ -16,12 +16,15 @@ fuel-core-chain-config = { workspace = true }
 fuel-core-services = { workspace = true }
 fuel-core-storage = { workspace = true }
 fuel-core-types = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 tokio-stream = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
 fuel-core-poa = { path = ".", features = ["test-helpers"] }
+fuel-core-services = { workspace = true, features = ["test-helpers"] }
 fuel-core-storage = { path = "./../../../storage", features = ["test-helpers"] }
 fuel-core-types = { path = "./../../../types", features = ["test-helpers"] }
 mockall = { workspace = true }

crates/services/consensus_module/poa/src/config.rs

@@ -1,5 +1,6 @@
 use fuel_core_types::{
     blockchain::primitives::SecretKeyWrapper,
+    fuel_types::ChainId,
     secrecy::Secret,
 };
 use tokio::time::Duration;
@@ -11,6 +12,7 @@ pub struct Config {
     pub metrics: bool,
     pub min_connected_reserved_peers: usize,
     pub time_until_synced: Duration,
+    pub chain_id: ChainId,
 }
 
 #[cfg(feature = "test-helpers")]
@@ -22,6 +24,7 @@ impl Default for Config {
             metrics: false,
             min_connected_reserved_peers: 0,
             time_until_synced: Duration::ZERO,
+            chain_id: ChainId::default(),
         }
     }
 }

crates/services/consensus_module/poa/src/ports.rs

@@ -5,6 +5,7 @@ use fuel_core_storage::{
 };
 use fuel_core_types::{
     blockchain::{
+        block::Block,
         header::BlockHeader,
         primitives::DaBlockHeight,
     },
@@ -29,6 +30,7 @@ use fuel_core_types::{
     },
     tai64::Tai64,
 };
+use std::collections::HashMap;
 
 #[cfg_attr(test, mockall::automock)]
 pub trait TransactionPool: Send + Sync {
@@ -59,6 +61,11 @@ pub trait BlockProducer: Send + Sync {
         block_time: Tai64,
         source: TransactionsSource,
     ) -> anyhow::Result<UncommittedExecutionResult<Changes>>;
+
+    async fn produce_predefined_block(
+        &self,
+        block: &Block,
+    ) -> anyhow::Result<UncommittedExecutionResult<Changes>>;
 }
 
 #[cfg_attr(test, mockall::automock)]
@@ -108,3 +115,29 @@ pub trait SyncPort: Send + Sync {
     /// await synchronization with the peers
     async fn sync_with_peers(&mut self) -> anyhow::Result<()>;
 }
+
+pub trait PredefinedBlocks: Send + Sync {
+    fn get_block(&self, height: &BlockHeight) -> Option<Block>;
+}
+
+pub struct InMemoryPredefinedBlocks {
+    blocks: HashMap<BlockHeight, Block>,
+}
+
+impl From<HashMap<BlockHeight, Block>> for InMemoryPredefinedBlocks {
+    fn from(blocks: HashMap<BlockHeight, Block>) -> Self {
+        Self::new(blocks)
+    }
+}
+
+impl InMemoryPredefinedBlocks {
+    pub fn new(blocks: HashMap<BlockHeight, Block>) -> Self {
+        Self { blocks }
+    }
+}
+
+impl PredefinedBlocks for InMemoryPredefinedBlocks {
+    fn get_block(&self, height: &BlockHeight) -> Option<Block> {
+        self.blocks.get(height).cloned()
+    }
+}