feat: Support block and header versions gql

CHANGELOG.md

@@ -13,7 +13,11 @@ Description of the upcoming release here.
 ### Fixed
 
 - [#1844](https://github.com/FuelLabs/fuel-core/pull/1844): Fixed the publishing of the `fuel-core 0.25.1` release.
-- [1842](https://github.com/FuelLabs/fuel-core/pull/1842): Ignore RUSTSEC-2024-0336: `rustls::ConnectionCommon::complete_io` could fall into an infinite loop based on network
+- [#1842](https://github.com/FuelLabs/fuel-core/pull/1842): Ignore RUSTSEC-2024-0336: `rustls::ConnectionCommon::complete_io` could fall into an infinite loop based on network
+
+### Added
+
+- [#1848](https://github.com/FuelLabs/fuel-core/pull/1848): Added `version` field to the `Block` and `BlockHeader` GraphQL entities. Added corresponding `version` field to the `Block` and `BlockHeader` client types in `fuel-core-client`. 
 
 ## [Version 0.25.1]
 

crates/client/assets/schema.sdl

@@ -45,6 +45,7 @@ input BalanceFilterInput {
 }
 
 type Block {
+	version: BlockVersion!
 	id: BlockId!
 	height: U32!
 	header: Header!
@@ -83,6 +84,8 @@ type BlockEdge {
 
 scalar BlockId
 
+union BlockVersion = Version
+
 
 """
 Breakpoint, defined as a tuple of contract ID and relative PC offset inside it
@@ -467,6 +470,10 @@ type Genesis {
 }
 
 type Header {
+	"""
+	Version of the header
+	"""
+	version: HeaderVersion!
 	"""
 	Hash of the header
 	"""
@@ -521,6 +528,8 @@ type Header {
 	applicationHash: Bytes32!
 }
 
+union HeaderVersion = Version
+
 type HeavyOperation {
 	base: U64!
 	gasPerUnit: U64!

crates/client/src/client/schema.rs

@@ -328,3 +328,9 @@ impl From<TryFromSliceError> for ConversionError {
         ConversionError::BytesLength
     }
 }
+
+#[derive(cynic::QueryFragment, Clone, Debug, Eq, PartialEq)]
+#[cynic(schema_path = "./assets/schema.sdl")]
+pub struct Version {
+    pub value: U8,
+}

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

@@ -5,6 +5,7 @@ use crate::client::schema::{
     PageInfo,
     Signature,
     Tai64Timestamp,
+    Version,
     U32,
     U64,
 };
@@ -75,10 +76,19 @@ pub struct BlockEdge {
     pub node: Block,
 }
 
+#[derive(cynic::InlineFragments, Clone, Debug)]
+#[cynic(schema_path = "./assets/schema.sdl")]
+pub enum BlockVersion {
+    V1(Version),
+    #[cynic(fallback)]
+    Unknown,
+}
+
 /// Block with transactiuon ids
 #[derive(cynic::QueryFragment, Clone, Debug)]
 #[cynic(schema_path = "./assets/schema.sdl")]
 pub struct Block {
+    pub version: BlockVersion,
     pub id: BlockId,
     pub header: Header,
     pub consensus: Consensus,
@@ -114,9 +124,18 @@ pub struct BlockMutation {
     pub produce_blocks: U32,
 }
 
+#[derive(cynic::InlineFragments, Clone, Debug)]
+#[cynic(schema_path = "./assets/schema.sdl")]
+pub enum HeaderVersion {
+    V1(Version),
+    #[cynic(fallback)]
+    Unknown,
+}
+
 #[derive(cynic::QueryFragment, Clone, Debug)]
 #[cynic(schema_path = "./assets/schema.sdl")]
 pub struct Header {
+    pub version: HeaderVersion,
     pub id: BlockId,
     pub da_height: U64,
     pub consensus_parameters_version: U32,

crates/client/src/client/schema/chain.rs

@@ -4,18 +4,12 @@ use crate::client::schema::{
     Address,
     AssetId,
     ConversionError,
+    Version,
     U16,
     U32,
     U64,
-    U8,
 };
 
-#[derive(cynic::QueryFragment, Clone, Debug)]
-#[cynic(schema_path = "./assets/schema.sdl")]
-pub struct Version {
-    pub value: U8,
-}
-
 #[derive(cynic::QueryFragment, Clone, Debug)]
 #[cynic(schema_path = "./assets/schema.sdl")]
 pub struct ConsensusParameters {

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

@@ -4,8 +4,20 @@ expression: operation.query
 ---
 query($height: U32) {
   block(height: $height) {
+    version {
+      __typename
+      ... on Version {
+        value
+      }
+    }
     id
     header {
+      version {
+        __typename
+        ... on Version {
+          value
+        }
+      }
       id
       daHeight
       consensusParametersVersion

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

@@ -4,8 +4,20 @@ expression: operation.query
 ---
 query($id: BlockId) {
   block(id: $id) {
+    version {
+      __typename
+      ... on Version {
+        value
+      }
+    }
     id
     header {
+      version {
+        __typename
+        ... on Version {
+          value
+        }
+      }
       id
       daHeight
       consensusParametersVersion

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

@@ -7,8 +7,20 @@ query($after: String, $before: String, $first: Int, $last: Int) {
     edges {
       cursor
       node {
+        version {
+          __typename
+          ... on Version {
+            value
+          }
+        }
         id
         header {
+          version {
+            __typename
+            ... on Version {
+              value
+            }
+          }
           id
           daHeight
           consensusParametersVersion

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

@@ -7,8 +7,20 @@ query {
     daHeight
     name
     latestBlock {
+      version {
+        __typename
+        ... on Version {
+          value
+        }
+      }
       id
       header {
+        version {
+          __typename
+          ... on Version {
+            value
+          }
+        }
         id
         daHeight
         consensusParametersVersion

crates/fuel-core/src/schema.rs

@@ -9,6 +9,7 @@ use async_graphql::{
     },
     MergedObject,
     MergedSubscription,
+    Object,
     OutputType,
     Schema,
     SchemaBuilder,
@@ -35,6 +36,15 @@ pub mod tx;
 
 pub mod relayed_tx;
 
+pub struct Version(u8);
+
+#[Object]
+impl Version {
+    async fn value(&self) -> scalars::U8 {
+        self.0.into()
+    }
+}
+
 #[derive(MergedObject, Default)]
 pub struct Query(
     dap::DapQuery,

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

@@ -23,6 +23,7 @@ use crate::{
             U64,
         },
         tx::types::Transaction,
+        Version,
     },
 };
 use anyhow::anyhow;
@@ -86,8 +87,19 @@ pub struct PoAConsensus {
     signature: Signature,
 }
 
+#[derive(Union)]
+pub enum BlockVersion {
+    V1(Version),
+}
+
 #[Object]
 impl Block {
+    async fn version(&self) -> BlockVersion {
+        match self.0 {
+            CompressedBlock::V1(_) => BlockVersion::V1(Version(1)),
+        }
+    }
+
     async fn id(&self) -> BlockId {
         let bytes: fuel_types::Bytes32 = self.0.header().id().into();
         bytes.into()
@@ -131,8 +143,20 @@ impl Block {
     }
 }
 
+#[derive(Union)]
+pub enum HeaderVersion {
+    V1(Version),
+}
+
 #[Object]
 impl Header {
+    /// Version of the header
+    async fn version(&self) -> HeaderVersion {
+        match self.0 {
+            BlockHeader::V1(_) => HeaderVersion::V1(Version(1)),
+        }
+    }
+
     /// Hash of the header
     async fn id(&self) -> BlockId {
         let bytes: fuel_core_types::fuel_types::Bytes32 = self.0.id().into();

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

@@ -16,8 +16,8 @@ use crate::{
             U16,
             U32,
             U64,
-            U8,
         },
+        Version,
     },
 };
 use async_graphql::{
@@ -44,8 +44,6 @@ pub struct FeeParameters(fuel_tx::FeeParameters);
 
 pub struct GasCosts(fuel_tx::GasCosts);
 
-pub struct Version(u8);
-
 #[derive(Union)]
 pub enum GasCostsVersion {
     V1(Version),
@@ -114,13 +112,6 @@ impl From<fuel_tx::DependentCost> for DependentCost {
     }
 }
 
-#[Object]
-impl Version {
-    async fn value(&self) -> U8 {
-        self.0.into()
-    }
-}
-
 #[Object]
 impl ConsensusParameters {
     async fn version(&self) -> ConsensusParametersVersion {

crates/types/src/blockchain/block.rs

@@ -30,7 +30,6 @@ use crate::{
 /// Version-able block type
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[non_exhaustive]
 pub enum Block<TransactionRepresentation = Transaction> {
     /// V1 Block
     V1(BlockV1<TransactionRepresentation>),

crates/types/src/blockchain/header.rs

@@ -25,7 +25,6 @@ use tai64::Tai64;
 #[derive(Clone, Debug, derivative::Derivative)]
 #[derivative(PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[non_exhaustive]
 pub enum BlockHeader {
     /// V1 BlockHeader
     V1(BlockHeaderV1),
@@ -149,7 +148,7 @@ impl BlockHeader {
 #[derive(Copy, Clone, Debug)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(any(test, feature = "test-helpers"), derive(Default))]
-/// A partially complete fuel block header that doesn't not
+/// A partially complete fuel block header that does not
 /// have any generated fields because it has not been executed yet.
 pub struct PartialBlockHeader {
     /// The application header.