Expose signature of the block, if any in GraphQL

Cargo.toml

@@ -19,6 +19,7 @@ members = [
   "fuel-tests",
   "fuel-txpool",
   "xtask",
+  "version-compatibility",
 ]
 
 [profile.release]

fuel-client/assets/schema.sdl

@@ -47,6 +47,7 @@ input BalanceFilterInput {
 type Block {
 	id: BlockId!
 	header: Header!
+	consensus: Consensus!
 	transactions: [Transaction!]!
 }
 
@@ -164,6 +165,8 @@ enum CoinStatus {
 	SPENT
 }
 
+union Consensus = PoAConsensus
+
 type ConsensusParameters {
 	contractMaxSize: U64!
 	maxInputs: U64!
@@ -462,6 +465,13 @@ type PageInfo {
 	endCursor: String
 }
 
+type PoAConsensus {
+	"""
+	Gets the signature of the block produced by `PoA` consensus.
+	"""
+	signature: Signature!
+}
+
 type ProgramState {
 	returnType: ReturnType!
 	data: HexString!

fuel-client/src/client/schema/block.rs

@@ -4,6 +4,7 @@ use crate::client::{
         BlockId,
         ConnectionArgs,
         PageInfo,
+        Signature,
         Tai64Timestamp,
         U64,
     },
@@ -72,6 +73,7 @@ pub struct BlockEdge {
 pub struct Block {
     pub id: BlockId,
     pub header: Header,
+    pub consensus: Consensus,
     pub transactions: Vec<TransactionIdFragment>,
 }
 
@@ -120,6 +122,32 @@ pub struct Header {
     pub application_hash: Bytes32,
 }
 
+#[derive(cynic::InlineFragments, Debug)]
+#[cynic(schema_path = "./assets/schema.sdl")]
+pub enum Consensus {
+    PoAConsensus(PoAConsensus),
+}
+
+#[derive(cynic::QueryFragment, Debug)]
+#[cynic(schema_path = "./assets/schema.sdl")]
+pub struct PoAConsensus {
+    pub signature: Signature,
+}
+
+impl Block {
+    /// Returns the block producer public key, if any.
+    pub fn block_producer(&self) -> Option<fuel_vm::fuel_crypto::PublicKey> {
+        let message = self.header.id.clone().into_message();
+        match &self.consensus {
+            Consensus::PoAConsensus(poa) => {
+                let signature = poa.signature.clone().into_signature();
+                let producer_pub_key = signature.recover(&message);
+                producer_pub_key.ok()
+            }
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

fuel-client/src/client/schema/primitives.rs

@@ -293,3 +293,19 @@ impl<'de> Deserialize<'de> for Tai64Timestamp {
         Ok(Self(Tai64(s.parse().map_err(D::Error::custom)?)))
     }
 }
+
+impl BlockId {
+    /// Converts the hash into a message having the same bytes.
+    pub fn into_message(self) -> fuel_vm::fuel_crypto::Message {
+        let bytes: fuel_vm::fuel_types::Bytes32 = self.into();
+        // This is safe because BlockId is a cryptographically secure hash.
+        unsafe { fuel_vm::fuel_crypto::Message::from_bytes_unchecked(bytes.into()) }
+    }
+}
+
+impl Signature {
+    pub fn into_signature(self) -> fuel_vm::fuel_crypto::Signature {
+        let bytes: fuel_vm::fuel_types::Bytes64 = self.into();
+        bytes.into()
+    }
+}

fuel-client/src/client/schema/snapshots/fuel_gql_client__client__schema__block__tests__block_by_id_query_gql_output.snap

@@ -17,6 +17,12 @@ query Query($_0: BlockId) {
       time
       applicationHash
     }
+    consensus {
+      __typename
+      ... on PoAConsensus {
+        signature
+      }
+    }
     transactions {
       id
     }

fuel-client/src/client/schema/snapshots/fuel_gql_client__client__schema__block__tests__blocks_connection_query_gql_output.snap

@@ -20,6 +20,12 @@ query Query($_0: Int, $_1: String, $_2: Int, $_3: String) {
           time
           applicationHash
         }
+        consensus {
+          __typename
+          ... on PoAConsensus {
+            signature
+          }
+        }
         transactions {
           id
         }

fuel-client/src/client/schema/snapshots/fuel_gql_client__client__schema__chain__tests__chain_gql_query_output.snap

@@ -21,6 +21,12 @@ query Query {
         time
         applicationHash
       }
+      consensus {
+        __typename
+        ... on PoAConsensus {
+          signature
+        }
+      }
       transactions {
         id
       }

fuel-core/src/schema/block.rs

@@ -4,7 +4,10 @@ use super::scalars::{
 };
 use crate::{
     database::{
-        storage::FuelBlocks,
+        storage::{
+            FuelBlocks,
+            SealedBlockConsensus,
+        },
         Database,
         KvStoreError,
     },
@@ -16,6 +19,7 @@ use crate::{
     schema::{
         scalars::{
             BlockId,
+            Signature,
             U64,
         },
         tx::types::Transaction,
@@ -34,6 +38,7 @@ use async_graphql::{
     Context,
     InputObject,
     Object,
+    Union,
 };
 use fuel_core_interfaces::{
     common::{
@@ -48,6 +53,7 @@ use fuel_core_interfaces::{
     },
     model::{
         FuelApplicationHeader,
+        FuelBlockConsensus,
         FuelBlockHeader,
         FuelConsensusHeader,
         PartialFuelBlock,
@@ -67,6 +73,15 @@ pub struct Block {
 
 pub struct Header(pub(crate) FuelBlockHeader);
 
+#[derive(Union)]
+pub enum Consensus {
+    PoA(PoAConsensus),
+}
+
+pub struct PoAConsensus {
+    signature: Signature,
+}
+
 #[Object]
 impl Block {
     async fn id(&self) -> BlockId {
@@ -79,6 +94,18 @@ impl Block {
         &self.header
     }
 
+    async fn consensus(&self, ctx: &Context<'_>) -> async_graphql::Result<Consensus> {
+        let db = ctx.data_unchecked::<Database>().clone();
+        let id = self.header.0.id().into();
+        let consensus = db
+            .storage::<SealedBlockConsensus>()
+            .get(&id)
+            .map(|c| c.map(|c| c.into_owned().into()))?
+            .ok_or(KvStoreError::NotFound)?;
+
+        Ok(consensus)
+    }
+
     async fn transactions(
         &self,
         ctx: &Context<'_>,
@@ -152,6 +179,14 @@ impl Header {
     }
 }
 
+#[Object]
+impl PoAConsensus {
+    /// Gets the signature of the block produced by `PoA` consensus.
+    async fn signature(&self) -> Signature {
+        self.signature
+    }
+}
+
 #[derive(Default)]
 pub struct BlockQuery;
 
@@ -477,3 +512,13 @@ impl From<FuelBlockDb> for Header {
         Header(block.header)
     }
 }
+
+impl From<FuelBlockConsensus> for Consensus {
+    fn from(consensus: FuelBlockConsensus) -> Self {
+        match consensus {
+            FuelBlockConsensus::PoA(poa) => Consensus::PoA(PoAConsensus {
+                signature: poa.signature.into(),
+            }),
+        }
+    }
+}

fuel-tests/tests/blocks.rs

@@ -1,6 +1,9 @@
 use fuel_core::{
     database::{
-        storage::FuelBlocks,
+        storage::{
+            FuelBlocks,
+            SealedBlockConsensus,
+        },
         Database,
     },
     model::{
@@ -18,9 +21,13 @@ use fuel_core_interfaces::{
         fuel_storage::StorageAsMut,
         fuel_tx,
         fuel_tx::UniqueIdentifier,
+        secrecy::ExposeSecret,
         tai64::Tai64,
     },
-    model::FuelConsensusHeader,
+    model::{
+        FuelBlockConsensus,
+        FuelConsensusHeader,
+    },
 };
 use fuel_gql_client::{
     client::{
@@ -40,6 +47,7 @@ use itertools::{
     Itertools,
 };
 use rstest::rstest;
+use std::ops::Deref;
 
 #[tokio::test]
 async fn block() {
@@ -50,6 +58,9 @@ async fn block() {
     db.storage::<FuelBlocks>()
         .insert(&id.into(), &block)
         .unwrap();
+    db.storage::<SealedBlockConsensus>()
+        .insert(&id.into(), &FuelBlockConsensus::PoA(Default::default()))
+        .unwrap();
 
     // setup server & client
     let srv = FuelService::from_database(db, Config::local_node())
@@ -74,7 +85,9 @@ async fn produce_block() {
 
     config.manual_blocks_enabled = true;
 
-    let srv = FuelService::from_database(db, config).await.unwrap();
+    let srv = FuelService::from_database(db, config.clone())
+        .await
+        .unwrap();
 
     let client = FuelClient::from(srv.bound_address);
 
@@ -93,17 +106,23 @@ async fn produce_block() {
     if let TransactionStatus::Success { block_id, .. } =
         transaction_response.unwrap().status
     {
-        let block_height: u64 = client
+        let block = client
             .block(block_id.to_string().as_str())
             .await
             .unwrap()
+            .unwrap();
+        let actual_pub_key = block.block_producer().unwrap();
+        let block_height: u64 = block.header.height.into();
+        let expected_pub_key = config
+            .consensus_key
             .unwrap()
-            .header
-            .height
-            .into();
+            .expose_secret()
+            .deref()
+            .public_key();
 
         // Block height is now 6 after being advance 5
         assert!(6 == block_height);
+        assert_eq!(actual_pub_key, expected_pub_key);
     } else {
         panic!("Wrong tx status");
     };
@@ -272,6 +291,9 @@ async fn block_connection_5(
         db.storage::<FuelBlocks>()
             .insert(&id.into(), &block)
             .unwrap();
+        db.storage::<SealedBlockConsensus>()
+            .insert(&id.into(), &FuelBlockConsensus::PoA(Default::default()))
+            .unwrap();
     }
 
     // setup server & client

fuel-tests/tests/chain.rs

@@ -2,13 +2,20 @@ use fuel_core::service::{
     Config,
     FuelService,
 };
-use fuel_gql_client::client::FuelClient;
+use fuel_gql_client::{
+    client::FuelClient,
+    fuel_tx::Transaction,
+};
 
 #[tokio::test]
 async fn chain_info() {
     let node_config = Config::local_node();
     let srv = FuelService::new_node(node_config.clone()).await.unwrap();
     let client = FuelClient::from(srv.bound_address);
+    client
+        .submit_and_await_commit(&Transaction::default())
+        .await
+        .unwrap();
 
     let chain_info = client.chain_info().await.unwrap();
 

version-compatibility/0.14.1-0.14.2/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "test_0_14_1-0_14_2"
+version = "0.0.0"
+edition = "2021"
+license = "BUSL-1.1"
+publish = false
+
+[lib]
+path = "dummy.rs"
+
+[dev-dependencies]
+fuel-core-0_14_1-client-0_14_2 = { path = "fuel-core:0.14.1-client:0.14.2" }
+fuel-core-0_14_2-client-0_14_1 = { path = "fuel-core:0.14.2-client:0.14.1" }

version-compatibility/0.14.1-0.14.2/dummy.rs

@@ -0,0 +1 @@
+

version-compatibility/0.14.1-0.14.2/fuel-core:0.14.1-client:0.14.2/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "fuel-core-0_14_1-client-0_14_2"
+version = "0.0.0"
+edition = "2021"
+license = "BUSL-1.1"
+publish = false
+
+[lib]
+path = "test.rs"
+
+[dependencies]
+fuel-core = { version = "0.14.1" }
+# TODO: Use `0.14.2` when it is released
+fuel-gql-client = { path = "../../../fuel-client", features = ["test-helpers"] }
+tokio = { version = "1.21", features = ["macros", "rt-multi-thread"] }