chore: Update fuel-vm to 0.61.1 (#3002)

Author: netrome

.changes/breaking/3002.md

@@ -0,0 +1 @@
+Update `fuel-vm` to `0.61.1`. In doing this, we've changed Receipts to use the `SubId` scalar type for sub asset IDs.

Cargo.lock

@@ -101,7 +101,7 @@ fuel-core-xtask = { version = "0.0.0", path = "./xtask" }
 fuel-gas-price-algorithm = { version = "0.43.1", path = "crates/fuel-gas-price-algorithm" }
 
 # Fuel dependencies
-fuel-vm-private = { version = "0.60.2", package = "fuel-vm", default-features = false }
+fuel-vm-private = { version = "0.61.1", package = "fuel-vm", default-features = false }
 
 # Common dependencies
 anyhow = "1.0"

Cargo.toml

@@ -94,6 +94,7 @@ use fuel_core_types::{
     },
     services::executor::TransactionExecutionResult,
 };
+use fuel_types::SubAssetId;
 use rand::SeedableRng;
 use utils::{
     make_u128,
@@ -332,7 +333,7 @@ fn service_with_many_contracts(
             .unwrap();
 
         let mut storage_key = primitive_types::U256::zero();
-        let mut sub_id = Bytes32::zeroed();
+        let mut sub_id = SubAssetId::zeroed();
         database
             .init_contract_balances(
                 contract_id,

benches/benches/block_target_gas.rs

@@ -108,7 +108,7 @@ impl BenchDb {
         )?;
 
         let mut storage_key = primitive_types::U256::zero();
-        let mut sub_id = Bytes32::zeroed();
+        let mut sub_id = SubAssetId::zeroed();
         database.init_contract_balances(
             contract_id,
             (0..state_size).map(|k| {

benches/benches/vm_set/blockchain.rs

@@ -1201,7 +1201,7 @@ type Receipt {
 	Set in the case of a Panic receipt to indicate a missing contract input id
 	"""
 	contractId: ContractId
-	subId: Bytes32
+	subId: SubId
 }
 
 enum ReceiptType {

crates/client/assets/schema.sdl

@@ -111,7 +111,7 @@ fuel_type_scalar!(BlockId, Bytes32);
 fuel_type_scalar!(AssetId, AssetId);
 fuel_type_scalar!(BlobId, BlobId);
 fuel_type_scalar!(ContractId, ContractId);
-fuel_type_scalar!(SubId, Bytes32);
+fuel_type_scalar!(SubId, SubAssetId);
 fuel_type_scalar!(Salt, Salt);
 fuel_type_scalar!(TransactionId, Bytes32);
 fuel_type_scalar!(RelayedTransactionId, Bytes32);

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

@@ -3,10 +3,13 @@ use crate::client::schema::{
     AssetId,
     Bytes32,
     ContractId,
-    ConversionError,
-    ConversionError::MissingField,
+    ConversionError::{
+        self,
+        MissingField,
+    },
     HexString,
     Nonce,
+    SubId,
     U64,
     schema,
 };
@@ -45,7 +48,7 @@ pub struct Receipt {
     pub recipient: Option<Address>,
     pub nonce: Option<Nonce>,
     pub contract_id: Option<ContractId>,
-    pub sub_id: Option<Bytes32>,
+    pub sub_id: Option<SubId>,
 }
 
 #[derive(cynic::Enum, Clone, Copy, Debug)]

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

@@ -1,13 +1,13 @@
 use crate::client::schema;
 use fuel_core_types::{
-    fuel_tx::Bytes32,
+    fuel_tx::SubAssetId,
     fuel_types::ContractId,
 };
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct AssetDetail {
     pub contract_id: ContractId,
-    pub sub_id: Bytes32,
+    pub sub_id: SubAssetId,
     pub total_supply: u128,
 }
 

crates/client/src/client/types/asset.rs

@@ -97,7 +97,7 @@ where
         receipt => {
             return Err(IndexationError::UnexpectedReceipt {
                 receipt: receipt.to_string(),
-            })
+            });
         }
     };
     Ok(new_supply)
@@ -110,10 +110,10 @@ mod tests {
         transactional::WriteTransaction,
     };
     use fuel_core_types::fuel_tx::{
-        Bytes32,
         ContractId,
         ContractIdExt,
         Receipt,
+        SubAssetId,
     };
 
     use crate::{
@@ -145,7 +145,7 @@ mod tests {
 
         const ASSET_METADATA_IS_ENABLED: bool = true;
 
-        let sub_id: Bytes32 = Bytes32::from([1u8; 32]);
+        let sub_id = SubAssetId::from([1u8; 32]);
         let contract_id: ContractId = ContractId::from([2u8; 32]);
         let contract_asset_id = contract_id.asset_id(&sub_id);
         const MINT_AMOUNT: u64 = 3;
@@ -189,7 +189,7 @@ mod tests {
 
         const ASSET_METADATA_IS_DISABLED: bool = false;
 
-        let sub_id: Bytes32 = Bytes32::from([1u8; 32]);
+        let sub_id = SubAssetId::from([1u8; 32]);
         let contract_id: ContractId = ContractId::from([2u8; 32]);
         let contract_asset_id = contract_id.asset_id(&sub_id);
         const MINT_AMOUNT: u64 = 3;