Blob tx support and fuel-vm 0.56.0

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
 ### Added
+- [#1988](https://github.com/FuelLabs/fuel-core/pull/1988): Updated `fuel-vm` to `0.55.0` ([release notes](https://github.com/FuelLabs/fuel-vm/releases/tag/v0.55.0)). Adds Blob transaction support.
 - [1983](https://github.com/FuelLabs/fuel-core/pull/1983): Add adapters for gas price service for accessing database values
 
 ## [Version 0.31.0]

Cargo.toml

@@ -139,3 +139,6 @@ itertools = { version = "0.12", default-features = false }
 insta = "1.8"
 tempfile = "3.4"
 tikv-jemallocator = "0.5"
+
+[patch.crates-io]
+fuel-vm-private = { git = "https://github.com/FuelLabs/fuel-vm", branch="dento/blob-tx", package = "fuel-vm" }

crates/client/assets/schema.sdl

@@ -44,6 +44,8 @@ input BalanceFilterInput {
 	owner: Address!
 }
 
+scalar BlobId
+
 type Block {
 	version: BlockVersion!
 	id: BlockId!
@@ -1143,6 +1145,7 @@ type Transaction {
 	isMint: Boolean!
 	isUpgrade: Boolean!
 	isUpload: Boolean!
+	isBlob: Boolean!
 	inputs: [Input!]
 	outputs: [Output!]!
 	outputContract: ContractOutput
@@ -1152,6 +1155,7 @@ type Transaction {
 	script: HexString
 	scriptData: HexString
 	bytecodeWitnessIndex: U16
+	blobId: BlobId
 	salt: Salt
 	storageSlots: [HexString!]
 	bytecodeRoot: Bytes32

crates/client/src/client/schema/primitives.rs

@@ -109,6 +109,7 @@ fuel_type_scalar!(Bytes32, Bytes32);
 fuel_type_scalar!(Address, Address);
 fuel_type_scalar!(BlockId, Bytes32);
 fuel_type_scalar!(AssetId, AssetId);
+fuel_type_scalar!(BlobId, BlobId);
 fuel_type_scalar!(ContractId, ContractId);
 fuel_type_scalar!(Salt, Salt);
 fuel_type_scalar!(TransactionId, Bytes32);

crates/client/src/client/schema/tx/transparent_tx.rs

@@ -6,6 +6,7 @@ use crate::client::schema::{
     },
     Address,
     AssetId,
+    BlobId,
     Bytes32,
     ConnectionArgs,
     ContractId,
@@ -26,12 +27,13 @@ use core::convert::{
     TryInto,
 };
 use fuel_core_types::{
-    fuel_tx,
     fuel_tx::{
+        self,
         field::ReceiptsRoot,
         input,
         output,
         policies::PolicyType,
+        BlobBody,
         StorageSlot,
         UploadBody,
     },
@@ -127,6 +129,11 @@ pub struct Transaction {
     /// The result of a `is_upload()` helper function is stored here.
     /// It is not an original field of the `Transaction`.
     pub is_upload: bool,
+    /// It is `true` for `Transaction::Blob`.
+    ///
+    /// The result of a `is_blob()` helper function is stored here.
+    /// It is not an original field of the `Transaction`.
+    pub is_blob: bool,
     /// The field of the `Transaction` type.
     pub outputs: Vec<Output>,
     /// The field of the `Transaction::Mint`.
@@ -165,6 +172,8 @@ pub struct Transaction {
     pub proof_set: Option<Vec<Bytes32>>,
     /// The field of the `Transaction::Upgrade`.
     pub upgrade_purpose: Option<UpgradePurpose>,
+    /// The field of the `Transaction::Blob`.
+    pub blob_id: Option<BlobId>,
 }
 
 impl TryFrom<Transaction> for fuel_tx::Transaction {
@@ -387,6 +396,43 @@ impl TryFrom<Transaction> for fuel_tx::Transaction {
                     .collect(),
             );
             tx.into()
+        } else if tx.is_blob {
+            let tx = fuel_tx::Transaction::blob(
+                BlobBody {
+                    id: tx
+                        .blob_id
+                        .ok_or_else(|| {
+                            ConversionError::MissingField("blob_id".to_string())
+                        })?
+                        .into(),
+                    witness_index: tx
+                        .bytecode_witness_index
+                        .ok_or_else(|| {
+                            ConversionError::MissingField("witness_index".to_string())
+                        })?
+                        .into(),
+                },
+                tx.policies
+                    .ok_or_else(|| ConversionError::MissingField("policies".to_string()))?
+                    .into(),
+                tx.inputs
+                    .ok_or_else(|| ConversionError::MissingField("inputs".to_string()))?
+                    .into_iter()
+                    .map(TryInto::try_into)
+                    .collect::<Result<Vec<fuel_tx::Input>, ConversionError>>()?,
+                tx.outputs
+                    .into_iter()
+                    .map(TryInto::try_into)
+                    .collect::<Result<Vec<fuel_tx::Output>, ConversionError>>()?,
+                tx.witnesses
+                    .ok_or_else(|| {
+                        ConversionError::MissingField("witnesses".to_string())
+                    })?
+                    .into_iter()
+                    .map(|w| w.0 .0.into())
+                    .collect(),
+            );
+            tx.into()
         } else {
             return Err(ConversionError::UnknownVariant("Transaction"));
         };
@@ -401,6 +447,7 @@ impl TryFrom<Transaction> for fuel_tx::Transaction {
             fuel_tx::Transaction::Mint(_) => {}
             fuel_tx::Transaction::Upgrade(_) => {}
             fuel_tx::Transaction::Upload(_) => {}
+            fuel_tx::Transaction::Blob(_) => {}
         };
 
         Ok(tx)

crates/fuel-core/src/graphql_api/worker_service.rs

@@ -256,6 +256,10 @@ where
                 inputs = tx.inputs().as_slice();
                 outputs = tx.outputs().as_slice();
             }
+            Transaction::Blob(tx) => {
+                inputs = tx.inputs().as_slice();
+                outputs = tx.outputs().as_slice();
+            }
         }
         persist_owners_index(
             block_height,
@@ -373,7 +377,8 @@ where
             Transaction::Script(_)
             | Transaction::Mint(_)
             | Transaction::Upgrade(_)
-            | Transaction::Upload(_) => {
+            | Transaction::Upload(_)
+            | Transaction::Blob(_) => {
                 // Do nothing
             }
         }

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

@@ -335,9 +335,10 @@ impl FeeParameters {
 impl GasCosts {
     async fn version(&self) -> GasCostsVersion {
         match self.0.deref() {
-            GasCostsValues::V1(_) | GasCostsValues::V2(_) | GasCostsValues::V3(_) => {
-                GasCostsVersion::V1
-            }
+            GasCostsValues::V1(_)
+            | GasCostsValues::V2(_)
+            | GasCostsValues::V3(_)
+            | GasCostsValues::V4(_) => GasCostsVersion::V1,
         }
     }
 

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

@@ -497,6 +497,9 @@ impl DapMutation {
             CheckedTransaction::Upload(_) => {
                 Err(async_graphql::Error::new("`Upload` is not supported"))
             }
+            CheckedTransaction::Blob(_) => {
+                Err(async_graphql::Error::new("`Upload` is not supported"))
+            }
         }
     }
 

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

@@ -295,6 +295,7 @@ fuel_type_scalar!("Bytes32", Bytes32, Bytes32, 32);
 fuel_type_scalar!("Address", Address, Address, 32);
 fuel_type_scalar!("BlockId", BlockId, Bytes32, 32);
 fuel_type_scalar!("AssetId", AssetId, AssetId, 32);
+fuel_type_scalar!("BlobId", BlobId, BlobId, 32);
 fuel_type_scalar!("ContractId", ContractId, ContractId, 32);
 fuel_type_scalar!("Salt", Salt, Salt, 32);
 fuel_type_scalar!("TransactionId", TransactionId, Bytes32, 32);