Bump fuel deps (#7228)

## Description

Bumps fuel-vm, fuel-core fuels-rs and forc-wallet to latest versions.
Upgrades Rust to 2021 edition.

## Checklist

- [x] I have linked to any relevant issues.
- [x] I have commented my code, particularly in hard-to-understand
areas.
- [x] I have updated the documentation where relevant (API docs, the
reference, and the Sway book).
- [x] If my change requires substantial documentation changes, I have
[requested support from the DevRel
team](https://github.com/FuelLabs/devrel-requests/issues/new/choose)
- [x] I have added tests that prove my fix is effective or that my
feature works.
- [ ] I have added (or requested a maintainer to add) the necessary
`Breaking*` or `New Feature` labels where relevant.
- I believe this is non-breaking from user code perspective but I'm not
too sure about that
- [x] I have done my best to ensure that my PR adheres to [the Fuel Labs
Code Review
Standards](https://github.com/FuelLabs/rfcs/blob/master/text/code-standards/external-contributors.md).
- [x] I have requested a review from the relevant team or maintainers.

---------

Co-authored-by: z <zees-dev@users.noreply.github.com>
Co-authored-by: zees-dev <63374656+zees-dev@users.noreply.github.com>
Co-authored-by: JoshuaBatty <joshpbatty@gmail.com>
Co-authored-by: IGI-111 <igi-111@protonmail.com>

Author: 4 people

Cargo.lock

@@ -89,24 +89,24 @@ fuel-abi-types = "0.12"
 # Although ALL versions are "X.Y", we need the complete semver for
 # fuel-core-client as the GitHub Actions workflow parses this value to pull down
 # the correct tarball.
-fuel-core-client = { version = "0.43.2", default-features = false }
-fuel-core-types = { version = "0.43", default-features = false }
+fuel-core-client = { version = "0.44.0", default-features = false }
+fuel-core-types = { version = "0.44", default-features = false }
 
 # Dependencies from the `fuels-rs` repository:
 
-fuels = "0.73"
-fuels-core = "0.73"
-fuels-accounts = "0.73"
+fuels = "0.74"
+fuels-core = "0.74"
+fuels-accounts = "0.74"
 
 # Dependencies from the `fuel-vm` repository:
-fuel-asm = "0.60"
-fuel-crypto = "0.60"
-fuel-types = "0.60"
-fuel-tx = "0.60"
-fuel-vm = "0.60"
+fuel-asm = "0.62"
+fuel-crypto = "0.62"
+fuel-types = "0.62"
+fuel-tx = "0.62"
+fuel-vm = "0.62"
 
 # Dependencies from the `forc-wallet` repository:
-forc-wallet = "0.14"
+forc-wallet = "0.15"
 
 #
 # External dependencies

Cargo.toml

@@ -8,6 +8,9 @@ homepage.workspace = true
 license.workspace = true
 repository.workspace = true
 
+[target.'cfg(not(target_os = "macos"))'.dependencies]
+sysinfo.workspace = true
+
 [dependencies]
 ansiterm.workspace = true
 anyhow.workspace = true
@@ -47,6 +50,3 @@ walkdir.workspace = true
 [dev-dependencies]
 regex.workspace = true
 tempfile.workspace = true
-
-[target.'cfg(not(target_os = "macos"))'.dependencies]
-sysinfo.workspace = true

forc-pkg/Cargo.toml

@@ -8,6 +8,25 @@ homepage.workspace = true
 license.workspace = true
 repository.workspace = true
 
+[lib]
+path = "src/lib.rs"
+
+[[bin]]
+name = "forc-deploy"
+path = "src/bin/deploy.rs"
+
+[[bin]]
+name = "forc-run"
+path = "src/bin/run.rs"
+
+[[bin]]
+name = "forc-submit"
+path = "src/bin/submit.rs"
+
+[[bin]]
+name = "forc-call"
+path = "src/bin/call.rs"
+
 [dependencies]
 ansiterm.workspace = true
 anyhow.workspace = true
@@ -59,29 +78,10 @@ toml_edit.workspace = true
 tracing.workspace = true
 url.workspace = true
 
+[build-dependencies]
+regex.workspace = true
+
 [dev-dependencies]
 portpicker.workspace = true
 pretty_assertions.workspace = true
 rexpect.workspace = true
-
-[build-dependencies]
-regex.workspace = true
-
-[[bin]]
-name = "forc-deploy"
-path = "src/bin/deploy.rs"
-
-[[bin]]
-name = "forc-run"
-path = "src/bin/run.rs"
-
-[[bin]]
-name = "forc-submit"
-path = "src/bin/submit.rs"
-
-[[bin]]
-name = "forc-call"
-path = "src/bin/call.rs"
-
-[lib]
-path = "src/lib.rs"

forc-plugins/forc-client/Cargo.toml

@@ -346,7 +346,7 @@ impl Command {
                 return Err("Direct transfers are only supported in live mode".to_string());
             }
             return Ok(Operation::DirectTransfer {
-                recipient: (*self.address).into(),
+                recipient: self.address,
                 amount: self.call_parameters.amount,
                 asset_id: self.call_parameters.asset_id,
             });

forc-plugins/forc-client/src/cmd/call.rs

@@ -23,7 +23,6 @@ use fuels_core::{
         EncoderConfig, ErrorDetails, LogDecoder,
     },
     types::{
-        bech32::Bech32ContractId,
         param_types::ParamType,
         transaction::Transaction,
         transaction_builders::{BuildableTransaction, ScriptBuildStrategy, VariableOutputPolicy},
@@ -70,7 +69,7 @@ pub async fn call_function(
 
     // Create the contract call
     let call = ContractCall {
-        contract_id: contract_id.into(),
+        contract_id,
         encoded_selector: encode_fn_selector(&selector),
         encoded_args: Ok(encoded_data),
         call_parameters: call_parameters.clone().into(),
@@ -110,10 +109,7 @@ pub async fn call_function(
 
     // Get external contracts (either provided or auto-detected)
     let external_contracts = match external_contracts {
-        Some(external_contracts) => external_contracts
-            .iter()
-            .map(|addr| Bech32ContractId::from(*addr))
-            .collect(),
+        Some(external_contracts) => external_contracts,
         None => {
             // Automatically retrieve missing contract addresses from the call
             let external_contracts = determine_missing_contracts(
@@ -130,7 +126,7 @@ pub async fn call_function(
                     "Automatically provided external contract addresses with call (max 10):",
                 );
                 external_contracts.iter().for_each(|addr| {
-                    forc_tracing::println_warning(&format!("- 0x{}", ContractId::from(addr)));
+                    forc_tracing::println_warning(&format!("- 0x{}", addr));
                 });
             }
             external_contracts
@@ -175,7 +171,7 @@ pub async fn call_function(
         cmd::call::ExecutionMode::Live => {
             forc_tracing::println_action_green(
                 "Sending transaction with wallet",
-                &format!("0x{}", wallet.address().hash()),
+                &format!("0x{}", wallet.address()),
             );
             let tx = call
                 .build_tx(tb, &wallet)
@@ -242,7 +238,7 @@ pub async fn call_function(
         }
         cmd::call::OutputFormat::Raw => {
             let token = receipt_parser
-                .parse_call(&Bech32ContractId::from(contract_id), &output_param)
+                .parse_call(contract_id, &output_param)
                 .map_err(|e| anyhow!("Failed to parse call data: {e}"))?;
             token_to_string(&token)
                 .map_err(|e| anyhow!("Failed to convert token to string: {e}"))?
@@ -386,9 +382,9 @@ pub mod tests {
         .unwrap()
         .contract_id;
 
-        let instance = TestContract::new(id.clone(), wallet.clone());
+        let instance = TestContract::new(id, wallet.clone());
 
-        (instance, id.into(), provider, secret_key)
+        (instance, id, provider, secret_key)
     }
 
     #[tokio::test]
@@ -775,15 +771,15 @@ pub mod tests {
 
         let consensus_parameters = provider.consensus_parameters().await.unwrap();
         let base_asset_id = consensus_parameters.base_asset_id();
-        let get_recipient_balance = |addr: Bech32Address, provider: Provider| async move {
+        let get_recipient_balance = |addr: Address, provider: Provider| async move {
             provider
-                .get_asset_balance(&addr, *base_asset_id)
+                .get_asset_balance(&addr, base_asset_id)
                 .await
                 .unwrap()
         };
         let get_contract_balance = |id: ContractId, provider: Provider| async move {
             provider
-                .get_contract_asset_balance(&Bech32ContractId::from(id), *base_asset_id)
+                .get_contract_asset_balance(&id, base_asset_id)
                 .await
                 .unwrap()
         };
@@ -828,7 +824,7 @@ pub mod tests {
         let (amount, asset_id, recipient) = (
             "2",
             &format!("{{0x{}}}", base_asset_id),
-            &format!("(Address:{{0x{}}})", random_wallet.address().hash()),
+            &format!("(Address:{{0x{}}})", random_wallet.address()),
         );
         let mut cmd = get_contract_call_cmd(
             id,
@@ -846,7 +842,7 @@ pub mod tests {
         let operation = cmd.validate_and_get_operation().unwrap();
         assert_eq!(call(operation, cmd).await.unwrap().result.unwrap(), "()");
         assert_eq!(
-            get_recipient_balance(random_wallet.address().clone(), provider.clone()).await,
+            get_recipient_balance(random_wallet.address(), provider.clone()).await,
             2
         );
         assert_eq!(get_contract_balance(id, provider.clone()).await, 1);
@@ -858,7 +854,7 @@ pub mod tests {
         let (amount, asset_id, recipient) = (
             "5",
             &format!("{{0x{}}}", base_asset_id),
-            &format!("(Address:{{0x{}}})", random_wallet.address().hash()),
+            &format!("(Address:{{0x{}}})", random_wallet.address()),
         );
         let mut cmd = get_contract_call_cmd(
             id,
@@ -887,7 +883,7 @@ pub mod tests {
         let (amount, asset_id, recipient) = (
             "3",
             &format!("{{0x{}}}", base_asset_id),
-            &format!("(Address:{{0x{}}})", random_wallet.address().hash()),
+            &format!("(Address:{{0x{}}})", random_wallet.address()),
         );
         let mut cmd = get_contract_call_cmd(
             id,
@@ -905,7 +901,7 @@ pub mod tests {
         let operation = cmd.validate_and_get_operation().unwrap();
         assert_eq!(call(operation, cmd).await.unwrap().result.unwrap(), "()");
         assert_eq!(
-            get_recipient_balance(random_wallet.address().clone(), provider.clone()).await,
+            get_recipient_balance(random_wallet.address(), provider.clone()).await,
             3
         );
         assert_eq!(get_contract_balance(id, provider.clone()).await, 6); // extra amount (5) is forwarded to the contract

forc-plugins/forc-client/src/op/call/call_function.rs

@@ -1,4 +1,5 @@
 use anyhow::{bail, Result};
+use fuel_tx::ContractId;
 use fuels::programs::calls::{
     traits::TransactionTuner, utils::find_ids_of_missing_contracts, ContractCall,
 };
@@ -7,9 +8,7 @@ use fuels_accounts::{
     signers::private_key::PrivateKeySigner,
     wallet::{Unlocked, Wallet},
 };
-use fuels_core::types::{
-    bech32::Bech32ContractId, transaction::TxPolicies, transaction_builders::VariableOutputPolicy,
-};
+use fuels_core::types::{transaction::TxPolicies, transaction_builders::VariableOutputPolicy};
 
 /// Get the missing contracts from a contract call by dry-running the transaction
 /// to find contracts that are not explicitly listed in the call's `external_contracts` field.
@@ -21,7 +20,7 @@ pub async fn determine_missing_contracts(
     variable_output_policy: &VariableOutputPolicy,
     log_decoder: &fuels_core::codec::LogDecoder,
     account: &Wallet<Unlocked<PrivateKeySigner>>,
-) -> Result<Vec<Bech32ContractId>> {
+) -> Result<Vec<ContractId>> {
     let tb = call
         .transaction_builder(*tx_policies, *variable_output_policy, account)
         .await

forc-plugins/forc-client/src/op/call/missing_contracts.rs

@@ -165,7 +165,7 @@ async fn get_wallet(
             let wallet = Wallet::new(signer, provider);
             forc_tracing::println_warning(&format!(
                 "No signing key or wallet flag provided. Using default signer: 0x{}",
-                wallet.address().hash()
+                wallet.address()
             ));
             Ok(wallet)
         }
@@ -174,7 +174,7 @@ async fn get_wallet(
             let wallet = Wallet::new(signer, provider);
             forc_tracing::println_warning(&format!(
                 "Using account {} derived from signing key...",
-                wallet.address().hash()
+                wallet.address()
             ));
             Ok(wallet)
         }
@@ -369,8 +369,8 @@ pub(crate) mod tests {
         .unwrap()
         .contract_id;
 
-        let instance = TestContract::new(id.clone(), wallet.clone());
+        let instance = TestContract::new(id, wallet.clone());
 
-        (instance, id.into(), provider, secret_key)
+        (instance, id, provider, secret_key)
     }
 }