chore: upgrade fuels-rs sdk to 0.70

Cargo.toml

@@ -79,31 +79,31 @@ sway-ir-macros = { path = "sway-ir/sway-ir-macros", version = "0.66.6" }
 #
 
 # Dependencies from the `fuel-abi-types` repository:
-fuel-abi-types = "0.7"
+fuel-abi-types = "0.8"
 
 # Dependencies from the `fuel-core` repository:
 #
 # Although ALL verions 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.40.0", default-features = false }
-fuel-core-types = { version = "0.40", default-features = false }
+fuel-core-client = { version = "0.41.4", default-features = false }
+fuel-core-types = { version = "0.41", default-features = false }
 
 # Dependencies from the `fuels-rs` repository:
 
-fuels = "0.66.10"
-fuels-core = "0.66.10"
-fuels-accounts = "0.66.10"
+fuels = "0.70"
+fuels-core = "0.70"
+fuels-accounts = "0.70"
 
 # Dependencies from the `fuel-vm` repository:
-fuel-asm = "0.58"
-fuel-crypto = "0.58"
-fuel-types = "0.58"
-fuel-tx = "0.58"
-fuel-vm = "0.58"
+fuel-asm = "0.59"
+fuel-crypto = "0.59"
+fuel-types = "0.59"
+fuel-tx = "0.59"
+fuel-vm = "0.59"
 
 # Dependencies from the `forc-wallet` repository:
-forc-wallet = "0.11"
+forc-wallet = "0.12"
 
 #
 # External dependencies
@@ -129,7 +129,6 @@ comrak = "0.28"
 crossbeam-channel = "0.5"
 dap = "0.4.1-alpha"
 dashmap = "6.1"
-derivative = "2.2"
 devault = "0.2"
 dialoguer = "0.11"
 dirs = "5.0"

forc-plugins/forc-client/src/op/run/mod.rs

@@ -22,7 +22,7 @@ use fuels::{
         transaction_builders::{BuildableTransaction, VariableOutputPolicy},
     },
 };
-use fuels_accounts::{provider::Provider, Account};
+use fuels_accounts::{provider::Provider, Account, ViewOnlyAccount};
 use pkg::BuiltPackage;
 use std::time::Duration;
 use std::{path::PathBuf, str::FromStr};

forc-plugins/forc-client/src/util/account.rs

@@ -24,33 +24,14 @@ pub enum ForcClientAccount {
 
 #[async_trait]
 impl Account for ForcClientAccount {
-    async fn get_asset_inputs_for_amount(
-        &self,
-        asset_id: AssetId,
-        amount: u64,
-        excluded_coins: Option<Vec<CoinTypeId>>,
-    ) -> Result<Vec<Input>> {
-        match self {
-            ForcClientAccount::Wallet(wallet) => {
-                wallet
-                    .get_asset_inputs_for_amount(asset_id, amount, excluded_coins)
-                    .await
-            }
-            ForcClientAccount::KmsSigner(account) => {
-                account
-                    .get_asset_inputs_for_amount(asset_id, amount, excluded_coins)
-                    .await
-            }
-        }
-    }
-
     fn add_witnesses<Tb: TransactionBuilder>(&self, tb: &mut Tb) -> Result<()> {
         tb.add_signer(self.clone())?;
 
         Ok(())
     }
 }
 
+#[async_trait]
 impl ViewOnlyAccount for ForcClientAccount {
     fn address(&self) -> &Bech32Address {
         match self {
@@ -67,6 +48,26 @@ impl ViewOnlyAccount for ForcClientAccount {
             ForcClientAccount::KmsSigner(account) => Ok(account.provider()),
         }
     }
+
+    async fn get_asset_inputs_for_amount(
+        &self,
+        asset_id: AssetId,
+        amount: u64,
+        excluded_coins: Option<Vec<CoinTypeId>>,
+    ) -> Result<Vec<Input>> {
+        match self {
+            ForcClientAccount::Wallet(wallet) => {
+                wallet
+                    .get_asset_inputs_for_amount(asset_id, amount, excluded_coins)
+                    .await
+            }
+            ForcClientAccount::KmsSigner(account) => {
+                account
+                    .get_asset_inputs_for_amount(asset_id, amount, excluded_coins)
+                    .await
+            }
+        }
+    }
 }
 
 #[async_trait]

forc-plugins/forc-client/src/util/aws.rs

@@ -241,6 +241,7 @@ impl Signer for AwsSigner {
     }
 }
 
+#[async_trait]
 impl ViewOnlyAccount for AwsSigner {
     fn address(&self) -> &Bech32Address {
         &self.bech
@@ -249,10 +250,7 @@ impl ViewOnlyAccount for AwsSigner {
     fn try_provider(&self) -> Result<&Provider> {
         Ok(&self.provider)
     }
-}
 
-#[async_trait]
-impl Account for AwsSigner {
     async fn get_asset_inputs_for_amount(
         &self,
         asset_id: AssetId,
@@ -267,3 +265,6 @@ impl Account for AwsSigner {
             .collect::<Vec<Input>>())
     }
 }
+
+#[async_trait]
+impl Account for AwsSigner {}

forc-plugins/forc-client/src/util/tx.rs

@@ -188,12 +188,13 @@ pub(crate) async fn select_account(
             let wallet_path = default_wallet_path();
             let accounts = collect_user_accounts(&wallet_path, password)?;
             let account_balances = collect_account_balances(&accounts, provider).await?;
-            let base_asset_id = provider.base_asset_id();
+            let consensus_parameters = provider.consensus_parameters().await?;
+            let base_asset_id = consensus_parameters.base_asset_id();
 
             let total_balance = account_balances
                 .iter()
                 .flat_map(|account| account.values())
-                .sum::<u64>();
+                .sum::<u128>();
             if total_balance == 0 {
                 let first_account = accounts
                     .get(&0)

forc-plugins/forc-client/tests/deploy.rs

@@ -657,7 +657,8 @@ async fn test_non_owner_fails_to_set_target() {
         SecretKey::from_str(forc_client::constants::DEFAULT_PRIVATE_KEY).unwrap();
     let owner_wallet =
         WalletUnlocked::new_from_private_key(owner_secret_key, Some(provider.clone()));
-    let base_asset_id = provider.base_asset_id();
+    let consensus_parameters = provider.consensus_parameters().await.unwrap();
+    let base_asset_id = consensus_parameters.base_asset_id();
 
     // Fund attacker wallet so that it can try to make a set proxy target call.
     owner_wallet
@@ -1052,7 +1053,8 @@ async fn deployed_predicate_call() {
     ));
 
     let provider = Provider::connect(&node_url).await.unwrap();
-    let base_asset_id = *provider.base_asset_id();
+    let consensus_parameters = provider.consensus_parameters().await.unwrap();
+    let base_asset_id = consensus_parameters.base_asset_id();
     let secret_key = SecretKey::from_str(forc_client::constants::DEFAULT_PRIVATE_KEY).unwrap();
     let wallet_unlocked = WalletUnlocked::new_from_private_key(secret_key, Some(provider.clone()));
     let loader_path = tmp_dir.path().join("out/deployed_predicate-loader.bin");
@@ -1074,32 +1076,32 @@ async fn deployed_predicate_call() {
     wallet_unlocked
         .transfer(
             predicate.address(),
-            500,
-            base_asset_id,
+            2000,
+            *base_asset_id,
             TxPolicies::default(),
         )
         .await
         .unwrap();
 
     // Check predicate balance.
-    let balance = predicate.get_asset_balance(&base_asset_id).await.unwrap();
-    assert_eq!(balance, 500);
+    let balance = predicate.get_asset_balance(base_asset_id).await.unwrap();
+    assert_eq!(balance, 2000);
 
     // Try to spend it
     let amount_to_unlock = 300;
     predicate
         .transfer(
             wallet_unlocked.address(),
             amount_to_unlock,
-            base_asset_id,
+            *base_asset_id,
             TxPolicies::default(),
         )
         .await
         .unwrap();
 
     // Check predicate balance again.
-    let balance = predicate.get_asset_balance(&base_asset_id).await.unwrap();
-    assert_eq!(balance, 200);
+    let balance = predicate.get_asset_balance(base_asset_id).await.unwrap();
+    assert_eq!(balance, 828);
 
     node.kill().unwrap();
 }

forc-test/src/execute.rs

@@ -120,6 +120,7 @@ impl TestExecutor {
                 gas_price,
                 consensus_params.gas_costs(),
                 consensus_params.fee_params(),
+                None,
             )
             .map_err(|e| anyhow::anyhow!("{e:?}"))?;
 

forc-test/src/lib.rs

@@ -230,7 +230,7 @@ impl PackageWithDeploymentToTest {
             .map(|(contract_id, tx)| {
                 // Transact the deployment transaction constructed for this contract dependency.
                 let tx = tx
-                    .into_ready(gas_price, params.gas_costs(), params.fee_params())
+                    .into_ready(gas_price, params.gas_costs(), params.fee_params(), None)
                     .unwrap();
                 interpreter.transact(tx).map_err(anyhow::Error::msg)?;
                 Ok(contract_id)
@@ -247,7 +247,7 @@ impl PackageWithDeploymentToTest {
                 &params,
             );
             let root_contract_tx = root_contract_tx
-                .into_ready(gas_price, params.gas_costs(), params.fee_params())
+                .into_ready(gas_price, params.gas_costs(), params.fee_params(), None)
                 .unwrap();
             // Deploy the root contract.
             interpreter

sway-core/Cargo.toml

@@ -10,7 +10,6 @@ repository.workspace = true
 
 [dependencies]
 clap = { workspace = true, features = ["derive"] }
-derivative.workspace = true
 dirs.workspace = true
 either.workspace = true
 ethabi.workspace = true

sway-core/src/asm_generation/finalized_asm.rs

@@ -599,6 +599,8 @@ fn print_instruction(op: &Instruction) {
         Instruction::ECAL(x) => f("ECAL", x.unpack()),
         Instruction::BSIZ(x) => f("BSIZ", x.unpack()),
         Instruction::BLDD(x) => f("BLDD", x.unpack()),
+        Instruction::ECOP(x) => f("ECOP", x.unpack()),
+        Instruction::EPAR(x) => f("EPAR", x.unpack()),
     }
 }
 

test/src/e2e_vm_tests/harness.rs

@@ -203,7 +203,7 @@ pub(crate) fn runs_in_vm(
 
             let tx = tb
                 .finalize_checked(block_height)
-                .into_ready(gas_price, params.gas_costs(), params.fee_params())
+                .into_ready(gas_price, params.gas_costs(), params.fee_params(), None)
                 .map_err(|e| anyhow::anyhow!("{e:?}"))?;
 
             let mem_instance = MemoryInstance::new();