feat: handle Unknown transactions, blocks and consensus parameters

Cargo.toml

@@ -90,7 +90,7 @@ fuel-vm-private = { version = "0.57.0", package = "fuel-vm", default-features =
 # Common dependencies
 anyhow = "1.0"
 async-trait = "0.1"
-cynic = { version = "2.2.1", features = ["http-reqwest"] }
+cynic = { version = "3.1.0", features = ["http-reqwest"] }
 clap = "4.4"
 derivative = { version = "2" }
 derive_more = { version = "0.99" }
@@ -117,7 +117,7 @@ serde_with = { version = "3.4", default-features = false }
 strum = { version = "0.25" }
 strum_macros = "0.25"
 # enable cookie store to support L7 sticky sessions
-reqwest = { version = "0.11.16", default-features = false, features = [
+reqwest = { version = "0.12.0", default-features = false, features = [
   "rustls-tls",
   "cookies",
 ] }

crates/client/src/client.rs

@@ -74,9 +74,17 @@ use schema::{
     balance::BalanceArgs,
     blob::BlobByIdArgs,
     block::BlockByIdArgs,
-    coins::CoinByIdArgs,
-    contract::ContractByIdArgs,
+    coins::{
+        CoinByIdArgs,
+        CoinsConnectionArgs,
+    },
+    contract::{
+        ContractBalancesConnectionArgs,
+        ContractByIdArgs,
+    },
+    gas_price::BlockHorizonArgs,
     tx::{
+        TransactionsByOwnerConnectionArgs,
         TxArg,
         TxIdArgs,
     },
@@ -366,7 +374,9 @@ impl FuelClient {
         &self,
         block_horizon: u32,
     ) -> io::Result<EstimateGasPrice> {
-        let query = schema::gas_price::QueryEstimateGasPrice::build(block_horizon.into());
+        let query = schema::gas_price::QueryEstimateGasPrice::build(BlockHorizonArgs {
+            block_horizon: Some(block_horizon.into()),
+        });
         self.query(query).await.map(|r| r.estimate_gas_price)
     }
 
@@ -750,7 +760,8 @@ impl FuelClient {
         &self,
         request: PaginationRequest<String>,
     ) -> io::Result<PaginatedResult<TransactionResponse, String>> {
-        let query = schema::tx::TransactionsQuery::build(request.into());
+        let query =
+            schema::tx::TransactionsQuery::build(schema::ConnectionArgs::from(request));
         let transactions = self.query(query).await?.transactions.try_into()?;
         Ok(transactions)
     }
@@ -762,7 +773,9 @@ impl FuelClient {
         request: PaginationRequest<String>,
     ) -> io::Result<PaginatedResult<TransactionResponse, String>> {
         let owner: schema::Address = (*owner).into();
-        let query = schema::tx::TransactionsByOwnerQuery::build((owner, request).into());
+        let query = schema::tx::TransactionsByOwnerQuery::build(
+            TransactionsByOwnerConnectionArgs::from((owner, request)),
+        );
 
         let transactions = self.query(query).await?.transactions_by_owner.try_into()?;
         Ok(transactions)
@@ -874,7 +887,8 @@ impl FuelClient {
         &self,
         request: PaginationRequest<String>,
     ) -> io::Result<PaginatedResult<types::Block, String>> {
-        let query = schema::block::BlocksQuery::build(request.into());
+        let query =
+            schema::block::BlocksQuery::build(schema::ConnectionArgs::from(request));
 
         let blocks = self.query(query).await?.blocks.try_into()?;
 
@@ -901,7 +915,9 @@ impl FuelClient {
             Some(asset_id) => (*asset_id).into(),
             None => schema::AssetId::default(),
         };
-        let query = schema::coins::CoinsQuery::build((owner, asset_id, request).into());
+        let query = schema::coins::CoinsQuery::build(CoinsConnectionArgs::from((
+            owner, asset_id, request,
+        )));
 
         let coins = self.query(query).await?.coins.into();
         Ok(coins)
@@ -937,7 +953,7 @@ impl FuelClient {
             )
             .map(Into::into);
         let query = schema::coins::CoinsToSpendQuery::build(
-            (owner, spend_query, excluded_ids).into(),
+            schema::coins::CoinsToSpendArgs::from((owner, spend_query, excluded_ids)),
         );
 
         let coins_per_asset = self
@@ -1001,7 +1017,9 @@ impl FuelClient {
         request: PaginationRequest<String>,
     ) -> io::Result<PaginatedResult<types::Balance, String>> {
         let owner: schema::Address = (*owner).into();
-        let query = schema::balance::BalancesQuery::build((owner, request).into());
+        let query = schema::balance::BalancesQuery::build(
+            schema::balance::BalancesConnectionArgs::from((owner, request)),
+        );
 
         let balances = self.query(query).await?.balances.into();
         Ok(balances)
@@ -1013,8 +1031,9 @@ impl FuelClient {
         request: PaginationRequest<String>,
     ) -> io::Result<PaginatedResult<types::ContractBalance, String>> {
         let contract_id: schema::ContractId = (*contract).into();
-        let query =
-            schema::contract::ContractBalancesQuery::build((contract_id, request).into());
+        let query = schema::contract::ContractBalancesQuery::build(
+            ContractBalancesConnectionArgs::from((contract_id, request)),
+        );
 
         let balances = self.query(query).await?.contract_balances.into();
 
@@ -1036,7 +1055,9 @@ impl FuelClient {
         request: PaginationRequest<String>,
     ) -> io::Result<PaginatedResult<types::Message, String>> {
         let owner: Option<schema::Address> = owner.map(|owner| (*owner).into());
-        let query = schema::message::OwnedMessageQuery::build((owner, request).into());
+        let query = schema::message::OwnedMessageQuery::build(
+            schema::message::OwnedMessagesConnectionArgs::from((owner, request)),
+        );
 
         let messages = self.query(query).await?.messages.into();
 
@@ -1106,7 +1127,7 @@ impl FuelClient {
     pub async fn transparent_transaction(
         &self,
         id: &TxId,
-    ) -> io::Result<Option<Transaction>> {
+    ) -> io::Result<Option<types::TransactionType>> {
         let query = schema::tx::TransactionQuery::build(TxIdArgs { id: (*id).into() });
 
         let transaction = self.query(query).await?.transaction;

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

@@ -2,7 +2,7 @@ use super::Bytes32;
 use crate::client::schema::{
     schema,
     BlockId,
-    ConnectionArgs,
+    ConnectionArgsFields,
     PageInfo,
     Signature,
     Tai64Timestamp,
@@ -226,7 +226,7 @@ mod tests {
     #[test]
     fn blocks_connection_query_gql_output() {
         use cynic::QueryBuilder;
-        let operation = BlocksQuery::build(ConnectionArgs {
+        let operation = BlocksQuery::build(crate::client::schema::ConnectionArgs {
             after: None,
             before: None,
             first: None,

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

@@ -30,6 +30,8 @@ pub struct ConsensusParameters {
 #[cynic(schema_path = "./assets/schema.sdl")]
 pub enum ConsensusParametersVersion {
     V1,
+    #[cynic(fallback)]
+    Unknown,
 }
 
 #[derive(cynic::QueryFragment, Clone, Debug)]
@@ -48,6 +50,8 @@ pub struct TxParameters {
 #[cynic(schema_path = "./assets/schema.sdl")]
 pub enum TxParametersVersion {
     V1,
+    #[cynic(fallback)]
+    Unknown,
 }
 
 impl TryFrom<TxParameters> for fuel_core_types::fuel_tx::TxParameters {
@@ -66,6 +70,7 @@ impl TryFrom<TxParameters> for fuel_core_types::fuel_tx::TxParameters {
                 }
                 .into(),
             ),
+            _ => Err(ConversionError::UnknownVariant("TxParametersVersion")),
         }
     }
 }
@@ -84,6 +89,8 @@ pub struct PredicateParameters {
 #[cynic(schema_path = "./assets/schema.sdl")]
 pub enum PredicateParametersVersion {
     V1,
+    #[cynic(fallback)]
+    Unknown,
 }
 
 impl TryFrom<PredicateParameters> for fuel_core_types::fuel_tx::PredicateParameters {
@@ -100,6 +107,9 @@ impl TryFrom<PredicateParameters> for fuel_core_types::fuel_tx::PredicateParamet
                 }
                 .into(),
             ),
+            _ => Err(ConversionError::UnknownVariant(
+                "PredicateParametersVersion",
+            )),
         }
     }
 }
@@ -116,6 +126,8 @@ pub struct ScriptParameters {
 #[cynic(schema_path = "./assets/schema.sdl")]
 pub enum ScriptParametersVersion {
     V1,
+    #[cynic(fallback)]
+    Unknown,
 }
 
 impl TryFrom<ScriptParameters> for fuel_core_types::fuel_tx::ScriptParameters {
@@ -130,6 +142,7 @@ impl TryFrom<ScriptParameters> for fuel_core_types::fuel_tx::ScriptParameters {
                 }
                 .into(),
             ),
+            _ => Err(ConversionError::UnknownVariant("ScriptParametersVersion")),
         }
     }
 }
@@ -146,6 +159,8 @@ pub struct ContractParameters {
 #[cynic(schema_path = "./assets/schema.sdl")]
 pub enum ContractParametersVersion {
     V1,
+    #[cynic(fallback)]
+    Unknown,
 }
 
 impl TryFrom<ContractParameters> for fuel_core_types::fuel_tx::ContractParameters {
@@ -160,6 +175,7 @@ impl TryFrom<ContractParameters> for fuel_core_types::fuel_tx::ContractParameter
                 }
                 .into(),
             ),
+            _ => Err(ConversionError::UnknownVariant("ContractParametersVersion")),
         }
     }
 }
@@ -176,6 +192,8 @@ pub struct FeeParameters {
 #[cynic(schema_path = "./assets/schema.sdl")]
 pub enum FeeParametersVersion {
     V1,
+    #[cynic(fallback)]
+    Unknown,
 }
 
 impl TryFrom<FeeParameters> for fuel_core_types::fuel_tx::FeeParameters {
@@ -190,6 +208,7 @@ impl TryFrom<FeeParameters> for fuel_core_types::fuel_tx::FeeParameters {
                 }
                 .into(),
             ),
+            _ => Err(ConversionError::UnknownVariant("FeeParametersVersion")),
         }
     }
 }
@@ -321,6 +340,8 @@ pub struct GasCosts {
 #[cynic(schema_path = "./assets/schema.sdl")]
 pub enum GasCostsVersion {
     V1,
+    #[cynic(fallback)]
+    Unknown,
 }
 
 impl TryFrom<GasCosts> for fuel_core_types::fuel_tx::GasCosts {
@@ -447,6 +468,7 @@ impl TryFrom<GasCosts> for fuel_core_types::fuel_tx::GasCosts {
                 }
                 .into(),
             )),
+            _ => Err(ConversionError::UnknownVariant("GasCostsVersion")),
         }
     }
 }
@@ -497,6 +519,9 @@ impl TryFrom<ConsensusParameters> for fuel_core_types::fuel_tx::ConsensusParamet
                 }
                 .into(),
             ),
+            _ => Err(ConversionError::UnknownVariant(
+                "ConsensusParametersVersion",
+            )),
         }
     }
 }

crates/client/src/client/schema/gas_price.rs

@@ -62,7 +62,9 @@ mod tests {
     fn estimate_gas_price_query_gql_output() {
         use cynic::QueryBuilder;
         let arbitrary_horizon = 10;
-        let operation = QueryEstimateGasPrice::build(arbitrary_horizon.into());
+        let operation = QueryEstimateGasPrice::build(BlockHorizonArgs {
+            block_horizon: Some(arbitrary_horizon.into()),
+        });
         insta::assert_snapshot!(operation.query)
     }
 }

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

@@ -2,12 +2,10 @@
 source: crates/client/src/client/schema/balance.rs
 expression: operation.query
 ---
-query($owner: Address!, $assetId: AssetId!) {
+query BalanceQuery($owner: Address!, $assetId: AssetId!) {
   balance(owner: $owner, assetId: $assetId) {
     owner
     amount
     assetId
   }
 }
-
-

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

@@ -2,7 +2,7 @@
 source: crates/client/src/client/schema/balance.rs
 expression: operation.query
 ---
-query($filter: BalanceFilterInput!, $after: String, $before: String, $first: Int, $last: Int) {
+query BalancesQuery($filter: BalanceFilterInput!, $after: String, $before: String, $first: Int, $last: Int) {
   balances(filter: $filter, after: $after, before: $before, first: $first, last: $last) {
     edges {
       cursor
@@ -20,5 +20,3 @@ query($filter: BalanceFilterInput!, $after: String, $before: String, $first: Int
     }
   }
 }
-
-

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

@@ -2,7 +2,7 @@
 source: crates/client/src/client/schema/block.rs
 expression: operation.query
 ---
-query($height: U32) {
+query BlockByHeightQuery($height: U32) {
   block(height: $height) {
     version
     id

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

@@ -2,7 +2,7 @@
 source: crates/client/src/client/schema/block.rs
 expression: operation.query
 ---
-query($id: BlockId) {
+query BlockByIdQuery($id: BlockId) {
   block(id: $id) {
     version
     id

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

@@ -2,8 +2,6 @@
 source: crates/client/src/client/schema/block.rs
 expression: operation.query
 ---
-mutation($startTimestamp: Tai64Timestamp, $blocksToProduce: U32!) {
+mutation BlockMutation($startTimestamp: Tai64Timestamp, $blocksToProduce: U32!) {
   produceBlocks(blocksToProduce: $blocksToProduce, startTimestamp: $startTimestamp)
 }
-
-

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

@@ -2,7 +2,7 @@
 source: crates/client/src/client/schema/block.rs
 expression: operation.query
 ---
-query($after: String, $before: String, $first: Int, $last: Int) {
+query BlocksQuery($after: String, $before: String, $first: Int, $last: Int) {
   blocks(after: $after, before: $before, first: $first, last: $last) {
     edges {
       cursor

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

@@ -2,7 +2,7 @@
 source: crates/client/src/client/schema/chain.rs
 expression: operation.query
 ---
-query {
+query ChainQuery {
   chain {
     daHeight
     name

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

@@ -2,7 +2,7 @@
 source: crates/client/src/client/schema/coins.rs
 expression: operation.query
 ---
-query($utxoId: UtxoId!) {
+query CoinByIdQuery($utxoId: UtxoId!) {
   coin(utxoId: $utxoId) {
     amount
     blockCreated

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

@@ -2,7 +2,7 @@
 source: crates/client/src/client/schema/coins.rs
 expression: operation.query
 ---
-query($filter: CoinFilterInput!, $after: String, $before: String, $first: Int, $last: Int) {
+query CoinsQuery($filter: CoinFilterInput!, $after: String, $before: String, $first: Int, $last: Int) {
   coins(filter: $filter, after: $after, before: $before, first: $first, last: $last) {
     edges {
       cursor