Added consensus parameters version and state transition version to th…

…e `ApplicationHeader` (#1767)

It is a preparation of the public types for the next changes:

#1754
#1753

CHANGELOG.md

@@ -10,6 +10,7 @@ Description of the upcoming release here.
 
 ### Added
 
+- [#1767](https://github.com/FuelLabs/fuel-core/pull/1767): Added consensus parameters version and state transition version to the `ApplicationHeader` to describe what was used to produce this block.
 - [#1760](https://github.com/FuelLabs/fuel-core/pull/1760): Added tests to verify that the network operates with a custom chain id and base asset id.
 - [#1752](https://github.com/FuelLabs/fuel-core/pull/1752): Add `ProducerGasPrice` trait that the `Producer` depends on to get the gas price for the block.
 - [#1747](https://github.com/FuelLabs/fuel-core/pull/1747): The DA block height is now included in the genesis state.

crates/client/assets/schema.sdl

@@ -447,6 +447,14 @@ type Header {
 	"""
 	daHeight: U64!
 	"""
+	The version of the consensus parameters used to create this block.
+	"""
+	consensusParametersVersion: U32!
+	"""
+	The version of the state transition bytecode used to create this block.
+	"""
+	stateTransitionBytecodeVersion: U32!
+	"""
 	Number of transactions in this block.
 	"""
 	transactionsCount: U64!

crates/client/src/client/schema/block.rs

@@ -119,6 +119,8 @@ pub struct BlockMutation {
 pub struct Header {
     pub id: BlockId,
     pub da_height: U64,
+    pub consensus_parameters_version: U32,
+    pub state_transition_bytecode_version: U32,
     pub transactions_count: U64,
     pub message_receipt_count: U64,
     pub transactions_root: Bytes32,

crates/client/src/client/schema/snapshots/fuel_core_client__client__schema__block__tests__block_by_height_query_gql_output.snap

@@ -8,6 +8,8 @@ query($height: U32) {
     header {
       id
       daHeight
+      consensusParametersVersion
+      stateTransitionBytecodeVersion
       transactionsCount
       messageReceiptCount
       transactionsRoot
@@ -34,5 +36,3 @@ query($height: U32) {
     }
   }
 }
-
-

crates/client/src/client/schema/snapshots/fuel_core_client__client__schema__block__tests__block_by_id_query_gql_output.snap

@@ -8,6 +8,8 @@ query($id: BlockId) {
     header {
       id
       daHeight
+      consensusParametersVersion
+      stateTransitionBytecodeVersion
       transactionsCount
       messageReceiptCount
       transactionsRoot
@@ -34,5 +36,3 @@ query($id: BlockId) {
     }
   }
 }
-
-

crates/client/src/client/schema/snapshots/fuel_core_client__client__schema__block__tests__blocks_connection_query_gql_output.snap

@@ -11,6 +11,8 @@ query($after: String, $before: String, $first: Int, $last: Int) {
         header {
           id
           daHeight
+          consensusParametersVersion
+          stateTransitionBytecodeVersion
           transactionsCount
           messageReceiptCount
           transactionsRoot
@@ -45,5 +47,3 @@ query($after: String, $before: String, $first: Int, $last: Int) {
     }
   }
 }
-
-

crates/client/src/client/schema/snapshots/fuel_core_client__client__schema__chain__tests__chain_gql_query_output.snap

@@ -11,6 +11,8 @@ query {
       header {
         id
         daHeight
+        consensusParametersVersion
+        stateTransitionBytecodeVersion
         transactionsCount
         messageReceiptCount
         transactionsRoot

crates/client/src/client/types/block.rs

@@ -31,6 +31,8 @@ impl Block {
 pub struct Header {
     pub id: BlockId,
     pub da_height: u64,
+    pub consensus_parameters_version: u32,
+    pub state_transition_bytecode_version: u32,
     pub transactions_count: u64,
     pub message_receipt_count: u64,
     pub transactions_root: MerkleRoot,
@@ -68,6 +70,10 @@ impl From<schema::block::Header> for Header {
         Self {
             id: value.id.into(),
             da_height: value.da_height.into(),
+            consensus_parameters_version: value.consensus_parameters_version.into(),
+            state_transition_bytecode_version: value
+                .state_transition_bytecode_version
+                .into(),
             transactions_count: value.transactions_count.into(),
             message_receipt_count: value.message_receipt_count.into(),
             transactions_root: value.transactions_root.into(),

crates/fuel-core/src/query/message/test.rs

@@ -130,6 +130,8 @@ async fn can_build_message_proof() {
     let commit_block_header = PartialBlockHeader {
         application: ApplicationHeader {
             da_height: 0u64.into(),
+            consensus_parameters_version: Default::default(),
+            state_transition_bytecode_version: Default::default(),
             generated: Default::default(),
         },
         consensus: ConsensusHeader {
@@ -144,6 +146,8 @@ async fn can_build_message_proof() {
     let message_block_header = PartialBlockHeader {
         application: ApplicationHeader {
             da_height: 0u64.into(),
+            consensus_parameters_version: Default::default(),
+            state_transition_bytecode_version: Default::default(),
             generated: Default::default(),
         },
         consensus: ConsensusHeader {

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

@@ -138,6 +138,16 @@ impl Header {
         self.0.da_height.0.into()
     }
 
+    /// The version of the consensus parameters used to create this block.
+    async fn consensus_parameters_version(&self) -> U32 {
+        self.0.consensus_parameters_version.into()
+    }
+
+    /// The version of the state transition bytecode used to create this block.
+    async fn state_transition_bytecode_version(&self) -> U32 {
+        self.0.state_transition_bytecode_version.into()
+    }
+
     /// Number of transactions in this block.
     async fn transactions_count(&self) -> U64 {
         self.0.transactions_count.into()

crates/fuel-core/src/service/adapters/producer.rs

@@ -21,15 +21,27 @@ use fuel_core_producer::{
     ports::TxPool,
 };
 use fuel_core_storage::{
+    iter::{
+        IterDirection,
+        IteratorOverTable,
+    },
     not_found,
-    tables::FuelBlocks,
+    tables::{
+        ConsensusParametersVersions,
+        FuelBlocks,
+        StateTransitionBytecodeVersions,
+    },
     transactional::Changes,
     Result as StorageResult,
     StorageAsRef,
 };
 use fuel_core_types::{
     blockchain::{
         block::CompressedBlock,
+        header::{
+            ConsensusParametersVersion,
+            StateTransitionBytecodeVersion,
+        },
         primitives,
     },
     fuel_tx,
@@ -146,6 +158,28 @@ impl fuel_core_producer::ports::BlockProducerDatabase for Database {
     fn block_header_merkle_root(&self, height: &BlockHeight) -> StorageResult<Bytes32> {
         self.storage::<FuelBlocks>().root(height).map(Into::into)
     }
+
+    fn latest_consensus_parameters_version(
+        &self,
+    ) -> StorageResult<ConsensusParametersVersion> {
+        let (version, _) = self
+            .iter_all::<ConsensusParametersVersions>(Some(IterDirection::Reverse))
+            .next()
+            .ok_or(not_found!(ConsensusParametersVersions))??;
+
+        Ok(version)
+    }
+
+    fn latest_state_transition_bytecode_version(
+        &self,
+    ) -> StorageResult<StateTransitionBytecodeVersion> {
+        let (version, _) = self
+            .iter_all::<StateTransitionBytecodeVersions>(Some(IterDirection::Reverse))
+            .next()
+            .ok_or(not_found!(StateTransitionBytecodeVersions))??;
+
+        Ok(version)
+    }
 }
 
 impl GasPriceProvider for StaticGasPrice {

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

@@ -16,10 +16,12 @@ use fuel_core_chain_config::{
 use fuel_core_storage::{
     tables::{
         Coins,
+        ConsensusParametersVersions,
         ContractsInfo,
         ContractsLatestUtxo,
         ContractsRawCode,
         Messages,
+        StateTransitionBytecodeVersions,
     },
     transactional::{
         Changes,
@@ -38,7 +40,9 @@ use fuel_core_types::{
         header::{
             ApplicationHeader,
             ConsensusHeader,
+            ConsensusParametersVersion,
             PartialBlockHeader,
+            StateTransitionBytecodeVersion,
         },
         primitives::{
             DaBlockHeight,
@@ -87,6 +91,8 @@ pub async fn execute_genesis_block(
     import_chain_state(workers).await?;
 
     let genesis = Genesis {
+        // TODO: We can get the serialized consensus parameters from the database.
+        //  https://github.com/FuelLabs/fuel-core/issues/1570
         chain_config_hash: config.chain_config.root()?.into(),
         coins_root: original_database.genesis_coins_root()?.into(),
         messages_root: original_database.genesis_messages_root()?.into(),
@@ -101,6 +107,20 @@ pub async fn execute_genesis_block(
     };
 
     let mut database_transaction = original_database.read_transaction();
+    // TODO: The chain config should be part of the snapshot state.
+    //  https://github.com/FuelLabs/fuel-core/issues/1570
+    database_transaction
+        .storage_as_mut::<ConsensusParametersVersions>()
+        .insert(
+            &ConsensusParametersVersion::MIN,
+            &config.chain_config.consensus_parameters,
+        )?;
+    // TODO: The bytecode of the state transition function should be part of the snapshot state.
+    //  https://github.com/FuelLabs/fuel-core/issues/1570
+    database_transaction
+        .storage_as_mut::<StateTransitionBytecodeVersions>()
+        .insert(&ConsensusParametersVersion::MIN, &[])?;
+
     cleanup_genesis_progress(&mut database_transaction)?;
 
     let result = UncommittedImportResult::new(
@@ -146,6 +166,12 @@ pub fn create_genesis_block(config: &Config) -> Block {
         PartialBlockHeader {
             application: ApplicationHeader::<Empty> {
                 da_height: da_block_height,
+                // After regenesis, we don't need to support old consensus parameters,
+                // so we can start the versioning from the beginning.
+                consensus_parameters_version: ConsensusParametersVersion::MIN,
+                // After regenesis, we don't need to support old state transition functions,
+                // so we can start the versioning from the beginning.
+                state_transition_bytecode_version: StateTransitionBytecodeVersion::MIN,
                 generated: Empty,
             },
             consensus: ConsensusHeader::<Empty> {

crates/services/producer/src/block_producer.rs

@@ -300,11 +300,17 @@ where
         height: BlockHeight,
         block_time: Tai64,
     ) -> anyhow::Result<PartialBlockHeader> {
-        let previous_block_info = self.previous_block_info(height)?;
+        let view = self.view_provider.latest_view();
+        let previous_block_info = self.previous_block_info(height, &view)?;
+        let consensus_parameters_version = view.latest_consensus_parameters_version()?;
+        let state_transition_bytecode_version =
+            view.latest_state_transition_bytecode_version()?;
 
         Ok(PartialBlockHeader {
             application: ApplicationHeader {
                 da_height: previous_block_info.da_height,
+                consensus_parameters_version,
+                state_transition_bytecode_version,
                 generated: Default::default(),
             },
             consensus: ConsensusHeader {
@@ -319,6 +325,7 @@ where
     fn previous_block_info(
         &self,
         height: BlockHeight,
+        view: &ViewProvider::View,
     ) -> anyhow::Result<PreviousBlockInfo> {
         let latest_height = self
             .view_provider
@@ -332,7 +339,6 @@ where
             }
             .into())
         } else {
-            let view = self.view_provider.latest_view();
             // get info from previous block height
             let prev_height = height.pred().expect("We checked the height above");
             let previous_block = view.get_block(&prev_height)?;