Connect the block importer with outside world

.github/workflows/ci.yml

@@ -95,6 +95,8 @@ jobs:
         include:
           - command: clippy
             args: --all-targets --all-features
+          - command: check
+            args: --all-targets
           - command: make
             args: check --locked
           - command: test

crates/chain-config/src/config/state.rs

@@ -44,7 +44,7 @@ impl StateConfig {
             coins: db.get_coin_config()?,
             contracts: db.get_contract_config()?,
             messages: db.get_message_config()?,
-            height: db.get_block_height()?,
+            height: Some(db.get_block_height()?),
         })
     }
 }
@@ -57,5 +57,5 @@ pub trait ChainConfigDb {
     /// Returns *all* unspent message configs available in the database.
     fn get_message_config(&self) -> StorageResult<Option<Vec<MessageConfig>>>;
     /// Returns the last available block height.
-    fn get_block_height(&self) -> StorageResult<Option<BlockHeight>>;
+    fn get_block_height(&self) -> StorageResult<BlockHeight>;
 }

crates/fuel-core/Cargo.toml

@@ -22,6 +22,7 @@ clap = { version = "4.1", features = ["derive"] }
 derive_more = { version = "0.99" }
 enum-iterator = "1.2"
 fuel-core-chain-config = { path = "../chain-config", version = "0.15.1" }
+fuel-core-consensus-module = { path = "../../crates/services/consensus_module", version = "0.15.1" }
 fuel-core-database = { path = "../database", version = "0.15.1" }
 fuel-core-executor = { path = "../services/executor", version = "0.15.1" }
 fuel-core-importer = { path = "../services/importer", version = "0.15.1" }

crates/fuel-core/src/database.rs

@@ -13,33 +13,20 @@ use fuel_core_chain_config::{
     MessageConfig,
 };
 use fuel_core_executor::refs::ContractStorageTrait;
-use fuel_core_poa::ports::BlockDb;
-use fuel_core_producer::ports::BlockProducerDatabase;
 use fuel_core_storage::{
-    not_found,
-    tables::{
-        FuelBlocks,
-        SealedBlockConsensus,
+    transactional::{
+        StorageTransaction,
+        Transactional,
     },
     Error as StorageError,
     Result as StorageResult,
-    StorageAsMut,
-    StorageAsRef,
-};
-use fuel_core_types::blockchain::{
-    block::CompressedBlock,
-    consensus::Consensus,
-    primitives::{
-        BlockHeight,
-        BlockId,
-    },
 };
+use fuel_core_types::blockchain::primitives::BlockHeight;
 use serde::{
     de::DeserializeOwned,
     Serialize,
 };
 use std::{
-    borrow::Cow,
     fmt::{
         self,
         Debug,
@@ -59,23 +46,6 @@ type DatabaseResult<T> = Result<T>;
 
 #[cfg(feature = "rocksdb")]
 use crate::state::rocks_db::RocksDb;
-use fuel_core_storage::tables::{
-    Coins,
-    ContractsRawCode,
-    Messages,
-};
-use fuel_core_txpool::ports::TxPoolDb;
-use fuel_core_types::{
-    entities::{
-        coin::CompressedCoin,
-        message::Message,
-    },
-    fuel_tx::UtxoId,
-    fuel_types::{
-        ContractId,
-        MessageId,
-    },
-};
 #[cfg(feature = "rocksdb")]
 use std::path::Path;
 #[cfg(feature = "rocksdb")]
@@ -98,6 +68,7 @@ mod state;
 
 pub mod balances;
 pub mod metadata;
+pub mod storage;
 // TODO: Rename in a separate PR into `transaction`
 pub mod transactional;
 pub mod transactions;
@@ -143,6 +114,8 @@ pub enum Column {
     OwnedMessageIds = 15,
     /// The column that stores the consensus metadata associated with a finalized fuel block
     FuelBlockConsensus = 16,
+    /// The column that stores the BMT MMR roots of the block headers
+    BlockHeaderMerkle = 17,
 }
 
 #[derive(Clone, Debug)]
@@ -286,6 +259,12 @@ impl Database {
     }
 }
 
+impl Transactional<Database> for Database {
+    fn transaction(&self) -> StorageTransaction<Database> {
+        StorageTransaction::new(self.transaction())
+    }
+}
+
 impl AsRef<Database> for Database {
     fn as_ref(&self) -> &Database {
         self
@@ -328,65 +307,6 @@ impl Default for Database {
     }
 }
 
-impl BlockDb for Database {
-    fn block_height(&self) -> anyhow::Result<BlockHeight> {
-        Ok(self.latest_height()?.unwrap_or_default())
-    }
-
-    fn seal_block(
-        &mut self,
-        block_id: BlockId,
-        consensus: Consensus,
-    ) -> anyhow::Result<()> {
-        self.storage::<SealedBlockConsensus>()
-            .insert(&block_id, &consensus)
-            .map(|_| ())
-            .map_err(Into::into)
-    }
-}
-
-impl TxPoolDb for Database {
-    fn utxo(&self, utxo_id: &UtxoId) -> StorageResult<Option<CompressedCoin>> {
-        self.storage::<Coins>()
-            .get(utxo_id)
-            .map(|t| t.map(|t| t.as_ref().clone()))
-    }
-
-    fn contract_exist(&self, contract_id: &ContractId) -> StorageResult<bool> {
-        self.storage::<ContractsRawCode>().contains_key(contract_id)
-    }
-
-    fn message(&self, message_id: &MessageId) -> StorageResult<Option<Message>> {
-        self.storage::<Messages>()
-            .get(message_id)
-            .map(|t| t.map(|t| t.as_ref().clone()))
-    }
-
-    fn current_block_height(&self) -> StorageResult<BlockHeight> {
-        self.latest_height()
-            .map(|h| h.unwrap_or_default())
-            .map_err(Into::into)
-    }
-}
-
-impl BlockProducerDatabase for Database {
-    fn get_block(
-        &self,
-        fuel_height: BlockHeight,
-    ) -> StorageResult<Option<Cow<CompressedBlock>>> {
-        let id = self
-            .get_block_id(fuel_height)?
-            .ok_or(not_found!("BlockId"))?;
-        self.storage::<FuelBlocks>().get(&id).map_err(Into::into)
-    }
-
-    fn current_block_height(&self) -> StorageResult<BlockHeight> {
-        self.latest_height()
-            .map(|h| h.unwrap_or_default())
-            .map_err(Into::into)
-    }
-}
-
 /// Implement `ChainConfigDb` so that `Database` can be passed to
 /// `StateConfig's` `generate_state_config()` method
 impl ChainConfigDb for Database {
@@ -402,7 +322,7 @@ impl ChainConfigDb for Database {
         Self::get_message_config(self).map_err(Into::into)
     }
 
-    fn get_block_height(&self) -> StorageResult<Option<BlockHeight>> {
-        Self::latest_height(self).map_err(Into::into)
+    fn get_block_height(&self) -> StorageResult<BlockHeight> {
+        Self::latest_height(self)
     }
 }

crates/fuel-core/src/database/block.rs

@@ -1,5 +1,6 @@
 use crate::{
     database::{
+        storage::ToDatabaseKey,
         Column,
         Database,
         Error as DatabaseError,
@@ -85,15 +86,10 @@ impl StorageMutate<FuelBlocks> for Database {
 }
 
 impl Database {
-    pub fn latest_height(&self) -> DatabaseResult<Option<BlockHeight>> {
-        let id = self.ids_of_latest_block()?;
-        // if no blocks, check if chain was configured with a base height
-        let id = match id {
-            Some((id, _)) => Some(id),
-            None => self.get_starting_chain_height()?,
-        };
-
-        Ok(id)
+    pub fn latest_height(&self) -> StorageResult<BlockHeight> {
+        self.ids_of_latest_block()?
+            .map(|(height, _)| height)
+            .ok_or(not_found!("BlockHeight"))
     }
 
     /// Get the current block at the head of the chain.
@@ -105,7 +101,7 @@ impl Database {
         }
     }
 
-    pub fn block_time(&self, height: BlockHeight) -> StorageResult<Tai64> {
+    pub fn block_time(&self, height: &BlockHeight) -> StorageResult<Tai64> {
         let id = self.get_block_id(height)?.unwrap_or_default();
         let block = self
             .storage::<FuelBlocks>()
@@ -114,8 +110,8 @@ impl Database {
         Ok(block.header().time().to_owned())
     }
 
-    pub fn get_block_id(&self, height: BlockHeight) -> StorageResult<Option<BlockId>> {
-        Database::get(self, &height.to_bytes()[..], Column::FuelBlockIds)
+    pub fn get_block_id(&self, height: &BlockHeight) -> StorageResult<Option<BlockId>> {
+        Database::get(self, height.database_key().as_ref(), Column::FuelBlockIds)
             .map_err(Into::into)
     }
 

crates/fuel-core/src/database/metadata.rs

@@ -5,11 +5,9 @@ use crate::database::{
     Result as DatabaseResult,
 };
 use fuel_core_chain_config::ChainConfig;
-use fuel_core_types::blockchain::primitives::BlockHeight;
 
 pub(crate) const DB_VERSION_KEY: &[u8] = b"version";
 pub(crate) const CHAIN_NAME_KEY: &[u8] = b"chain_name";
-pub(crate) const CHAIN_HEIGHT_KEY: &[u8] = b"chain_height";
 #[cfg(feature = "relayer")]
 pub(crate) const FINALIZED_DA_HEIGHT_KEY: &[u8] = b"finalized_da_height";
 
@@ -28,23 +26,11 @@ impl Database {
                 }
             })?;
 
-        let chain_height = config
-            .initial_state
-            .as_ref()
-            .and_then(|c| c.height)
-            .unwrap_or_default();
-
         let _: Option<u32> = self.insert(DB_VERSION_KEY, Column::Metadata, DB_VERSION)?;
-        let _: Option<BlockHeight> =
-            self.insert(CHAIN_HEIGHT_KEY, Column::Metadata, chain_height)?;
         Ok(())
     }
 
     pub fn get_chain_name(&self) -> DatabaseResult<Option<String>> {
         self.get(CHAIN_NAME_KEY, Column::Metadata)
     }
-
-    pub fn get_starting_chain_height(&self) -> DatabaseResult<Option<BlockHeight>> {
-        self.get(CHAIN_HEIGHT_KEY, Column::Metadata)
-    }
 }

crates/fuel-core/src/database/p2p.rs

@@ -11,7 +11,7 @@ use fuel_core_types::blockchain::{
 impl P2pDb for Database {
     async fn get_sealed_block(
         &self,
-        height: BlockHeight,
+        height: &BlockHeight,
     ) -> StorageResult<Option<SealedBlock>> {
         self.get_sealed_block_by_height(height)
     }

crates/fuel-core/src/database/sealed_block.rs

@@ -84,7 +84,7 @@ impl Database {
     /// Reusable across different trait implementations
     pub fn get_sealed_block_by_height(
         &self,
-        height: BlockHeight,
+        height: &BlockHeight,
     ) -> StorageResult<Option<SealedBlock>> {
         let block_id = self.get_block_id(height)?.ok_or(not_found!("BlockId"))?;
         self.get_sealed_block_by_id(&block_id)