Malleable Blocks Part 2 (#186)

addresses feedback from #180

fuel-client/tests/blocks.rs

@@ -1,8 +1,8 @@
 use chrono::{TimeZone, Utc};
 use fuel_core::database::Database;
-use fuel_core::model::fuel_block::FuelBlockHeaders;
+use fuel_core::model::fuel_block::FuelBlockHeader;
 use fuel_core::{
-    model::fuel_block::FuelBlockLight,
+    model::fuel_block::FuelBlockDb,
     schema::scalars::HexString256,
     service::{Config, FuelService},
 };
@@ -14,10 +14,10 @@ use itertools::{rev, Itertools};
 #[tokio::test]
 async fn block() {
     // setup test data in the node
-    let block = FuelBlockLight::default();
+    let block = FuelBlockDb::default();
     let id = block.id();
     let mut db = Database::default();
-    Storage::<Bytes32, FuelBlockLight>::insert(&mut db, &id, &block).unwrap();
+    Storage::<Bytes32, FuelBlockDb>::insert(&mut db, &id, &block).unwrap();
 
     // setup server & client
     let srv = FuelService::from_database(db, Config::local_node())
@@ -37,12 +37,15 @@ async fn block() {
 async fn block_connection_first_5() {
     // blocks
     let blocks = (0..10u32)
-        .map(|i| FuelBlockLight {
-            headers: FuelBlockHeaders {
-                fuel_height: i.into(),
+        .map(|i| FuelBlockDb {
+            headers: FuelBlockHeader {
+                height: i.into(),
+                number: Default::default(),
+                parent_hash: Default::default(),
                 time: Utc.timestamp(i.into(), 0),
                 producer: Default::default(),
-                transactions_commitment: Default::default(),
+                transactions_root: Default::default(),
+                prev_root: Default::default(),
             },
             transactions: vec![],
         })
@@ -52,7 +55,7 @@ async fn block_connection_first_5() {
     let mut db = Database::default();
     for block in blocks {
         let id = block.id();
-        Storage::<Bytes32, FuelBlockLight>::insert(&mut db, &id, &block).unwrap();
+        Storage::<Bytes32, FuelBlockDb>::insert(&mut db, &id, &block).unwrap();
     }
 
     // setup server & client
@@ -83,12 +86,15 @@ async fn block_connection_first_5() {
 async fn block_connection_last_5() {
     // blocks
     let blocks = (0..10u32)
-        .map(|i| FuelBlockLight {
-            headers: FuelBlockHeaders {
-                fuel_height: i.into(),
+        .map(|i| FuelBlockDb {
+            headers: FuelBlockHeader {
+                height: i.into(),
+                number: Default::default(),
+                parent_hash: Default::default(),
                 time: Utc.timestamp(i.into(), 0),
                 producer: Default::default(),
-                transactions_commitment: Default::default(),
+                transactions_root: Default::default(),
+                prev_root: Default::default(),
             },
             transactions: vec![],
         })
@@ -98,7 +104,7 @@ async fn block_connection_last_5() {
     let mut db = Database::default();
     for block in blocks {
         let id = block.id();
-        Storage::<Bytes32, FuelBlockLight>::insert(&mut db, &id, &block).unwrap();
+        Storage::<Bytes32, FuelBlockDb>::insert(&mut db, &id, &block).unwrap();
     }
 
     // setup server & client

fuel-client/tests/tx.rs

@@ -1,6 +1,6 @@
 use chrono::Utc;
 use fuel_core::executor::ExecutionMode;
-use fuel_core::model::fuel_block::{FuelBlockFull, FuelBlockHeaders};
+use fuel_core::model::fuel_block::{FuelBlock, FuelBlockHeader};
 use fuel_core::{
     database::Database,
     executor::Executor,
@@ -265,25 +265,31 @@ async fn get_transactions_from_manual_blocks() {
     let txs: Vec<Transaction> = (0..10).map(create_mock_tx).collect();
 
     // make 1st test block
-    let mut first_test_block = FuelBlockFull {
-        headers: FuelBlockHeaders {
-            fuel_height: 1u32.into(),
+    let mut first_test_block = FuelBlock {
+        header: FuelBlockHeader {
+            height: 1u32.into(),
+            number: Default::default(),
+            parent_hash: Default::default(),
             time: Utc::now(),
             producer: Default::default(),
-            transactions_commitment: Default::default(),
+            transactions_root: Default::default(),
+            prev_root: Default::default(),
         },
 
         // set the first 5 ids of the manually saved txs
         transactions: txs.iter().take(5).cloned().collect(),
     };
 
     // make 2nd test block
-    let mut second_test_block = FuelBlockFull {
-        headers: FuelBlockHeaders {
-            fuel_height: 2u32.into(),
+    let mut second_test_block = FuelBlock {
+        header: FuelBlockHeader {
+            height: 2u32.into(),
+            number: Default::default(),
+            parent_hash: Default::default(),
             time: Utc::now(),
             producer: Default::default(),
-            transactions_commitment: Default::default(),
+            transactions_root: Default::default(),
+            prev_root: Default::default(),
         },
         // set the last 5 ids of the manually saved txs
         transactions: txs.iter().skip(5).take(5).cloned().collect(),

fuel-core/Cargo.toml

@@ -30,6 +30,7 @@ dirs = "3.0"
 env_logger = "0.9"
 fuel-asm = { version = "0.1", features = ["serde-types"] }
 fuel-core-interfaces = { path = "../fuel-core-interfaces", version = "0.3.2" }
+fuel-merkle = "0.1"
 fuel-storage = { version = "0.1" }
 fuel-tx = { version = "0.5", features = ["serde-types"] }
 fuel-txpool = { path = "../fuel-txpool", version = "0.3.2" }

fuel-core/src/database.rs

@@ -1,7 +1,7 @@
 #[cfg(feature = "rocksdb")]
 use crate::database::columns::COLUMN_NUM;
 use crate::database::transactional::DatabaseTransaction;
-use crate::model::fuel_block::FuelBlockLight;
+use crate::model::fuel_block::FuelBlockDb;
 #[cfg(feature = "rocksdb")]
 use crate::state::rocks_db::RocksDb;
 use crate::state::{
@@ -174,7 +174,7 @@ impl InterpreterStorage for Database {
     fn coinbase(&self) -> Result<Address, Error> {
         let height = self.get_block_height()?.unwrap_or_default();
         let id = self.block_hash(height.into())?;
-        let block = Storage::<Bytes32, FuelBlockLight>::get(self, &id)?.unwrap_or_default();
+        let block = Storage::<Bytes32, FuelBlockDb>::get(self, &id)?.unwrap_or_default();
         Ok(block.headers.producer)
     }
 }

fuel-core/src/database/block.rs

@@ -1,35 +1,35 @@
 use crate::{
     database::{columns::BLOCKS, columns::BLOCK_IDS, Database, KvStoreError},
-    model::fuel_block::{BlockHeight, FuelBlockLight},
+    model::fuel_block::{BlockHeight, FuelBlockDb},
     state::{Error, IterDirection},
 };
 use fuel_storage::Storage;
 use fuel_tx::Bytes32;
 use std::borrow::Cow;
 use std::convert::{TryFrom, TryInto};
 
-impl Storage<Bytes32, FuelBlockLight> for Database {
+impl Storage<Bytes32, FuelBlockDb> for Database {
     type Error = KvStoreError;
 
     fn insert(
         &mut self,
         key: &Bytes32,
-        value: &FuelBlockLight,
-    ) -> Result<Option<FuelBlockLight>, KvStoreError> {
-        Database::insert(self, value.headers.fuel_height, BLOCK_IDS, *key)?;
+        value: &FuelBlockDb,
+    ) -> Result<Option<FuelBlockDb>, KvStoreError> {
+        Database::insert(self, value.headers.height, BLOCK_IDS, *key)?;
         Database::insert(self, key.as_ref(), BLOCKS, value.clone()).map_err(Into::into)
     }
 
-    fn remove(&mut self, key: &Bytes32) -> Result<Option<FuelBlockLight>, KvStoreError> {
-        let block: Option<FuelBlockLight> = Database::remove(self, key.as_ref(), BLOCKS)?;
+    fn remove(&mut self, key: &Bytes32) -> Result<Option<FuelBlockDb>, KvStoreError> {
+        let block: Option<FuelBlockDb> = Database::remove(self, key.as_ref(), BLOCKS)?;
         if let Some(block) = &block {
             let _: Option<Bytes32> =
-                Database::remove(self, &block.headers.fuel_height.to_bytes(), BLOCK_IDS)?;
+                Database::remove(self, &block.headers.height.to_bytes(), BLOCK_IDS)?;
         }
         Ok(block)
     }
 
-    fn get(&self, key: &Bytes32) -> Result<Option<Cow<FuelBlockLight>>, KvStoreError> {
+    fn get(&self, key: &Bytes32) -> Result<Option<Cow<FuelBlockDb>>, KvStoreError> {
         Database::get(self, key.as_ref(), BLOCKS).map_err(Into::into)
     }
 

fuel-core/src/database/contracts.rs

@@ -1,6 +1,8 @@
-use crate::database::columns::CONTRACT_UTXO_ID;
 use crate::{
-    database::{columns::CONTRACTS, Database},
+    database::{
+        columns::{CONTRACTS, CONTRACT_UTXO_ID},
+        Database,
+    },
     state::Error,
 };
 use fuel_tx::UtxoId;