Merge branch 'master' into bvrooman/feat/versionable-merkle-metadata

CHANGELOG.md

@@ -10,7 +10,7 @@ Description of the upcoming release here.
 
 ### Changed
 
-- [#1600](https://github.com/FuelLabs/fuel-core/pull/1600): Upgrade to fuel-vm 0.44.0
+- [#1600](https://github.com/FuelLabs/fuel-core/pull/1640): Upgrade to fuel-vm 0.45.0
 - [#1633](https://github.com/FuelLabs/fuel-core/pull/1633): Notify services about importing of the genesis block.
 - [#1625](https://github.com/FuelLabs/fuel-core/pull/1625): Making relayer independent from the executor and preparation for the force transaction inclusion.
 - [#1613](https://github.com/FuelLabs/fuel-core/pull/1613): Add api endpoint to retrieve a message by its nonce.

Cargo.toml

@@ -77,7 +77,7 @@ fuel-core-tests = { version = "0.0.0", path = "./tests" }
 fuel-core-xtask = { version = "0.0.0", path = "./xtask" }
 
 # Fuel dependencies
-fuel-vm-private = { version = "0.44.0", package = "fuel-vm", default-features = false }
+fuel-vm-private = { version = "0.45.0", package = "fuel-vm", default-features = false }
 
 # Common dependencies
 anyhow = "1.0"

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

@@ -250,7 +250,7 @@ impl TryFrom<Transaction> for fuel_tx::Transaction {
                     .collect(),
             );
             create.into()
-        } else if tx.is_mint {
+        } else {
             let tx_pointer: fuel_tx::TxPointer = tx
                 .tx_pointer
                 .ok_or_else(|| ConversionError::MissingField("tx_pointer".to_string()))?
@@ -279,8 +279,16 @@ impl TryFrom<Transaction> for fuel_tx::Transaction {
                     .into(),
             );
             mint.into()
-        } else {
-            return Err(ConversionError::UnknownVariant("Transaction"));
+        };
+
+        // This `match` block is added here to enforce compilation error if a new variant
+        // is added into the `fuel_tx::Transaction` enum.
+        //
+        // If you face a compilation error, please update the code above and add a new variant below.
+        match tx {
+            fuel_tx::Transaction::Script(_) => {}
+            fuel_tx::Transaction::Create(_) => {}
+            fuel_tx::Transaction::Mint(_) => {}
         };
 
         Ok(tx)

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

@@ -102,7 +102,7 @@ where
                     inputs = tx.inputs().as_slice();
                     outputs = tx.outputs().as_slice();
                 }
-                _ => continue,
+                Transaction::Mint(_) => continue,
             }
             self.persist_owners_index(
                 block_height,
@@ -143,7 +143,6 @@ where
                     owners.push(to);
                 }
                 Output::Contract(_) | Output::ContractCreated { .. } => {}
-                _ => {}
             }
         }
 

crates/fuel-core/src/schema/tx/input.rs

@@ -298,7 +298,6 @@ impl From<&fuel_tx::Input> for Input {
                 predicate: HexString(predicate.clone()),
                 predicate_data: HexString(predicate_data.clone()),
             }),
-            input => todo!("No mapping for input {input:?}"),
         }
     }
 }

crates/fuel-core/src/schema/tx/output.rs

@@ -27,8 +27,6 @@ pub enum Output {
     ContractCreated(ContractCreated),
 }
 
-pub type OutputConversionError = String;
-
 pub struct CoinOutput {
     to: fuel_types::Address,
     amount: Word,
@@ -121,11 +119,9 @@ impl ContractCreated {
     }
 }
 
-impl TryFrom<&fuel_tx::Output> for Output {
-    type Error = OutputConversionError;
-
-    fn try_from(output: &fuel_tx::Output) -> Result<Self, Self::Error> {
-        let val = match output {
+impl From<&fuel_tx::Output> for Output {
+    fn from(output: &fuel_tx::Output) -> Self {
+        match output {
             fuel_tx::Output::Coin {
                 to,
                 amount,
@@ -161,9 +157,7 @@ impl TryFrom<&fuel_tx::Output> for Output {
                 contract_id: *contract_id,
                 state_root: *state_root,
             }),
-            _ => return Err(format!("Unsupported output type: {:?}", output)),
-        };
-        Ok(val)
+        }
     }
 }