Merge branch 'master' into xunilrj/configurables-better-error-and-dca

Cargo.toml

@@ -34,22 +34,22 @@ exclude = [
 
 [workspace.dependencies]
 # Dependencies from the `fuel-core` repository:
-fuel-core-client = { version = "0.27.0", default-features = false }
-fuel-core-types = { version = "0.27.0", default-features = false }
+fuel-core-client = { version = "0.28.0", default-features = false }
+fuel-core-types = { version = "0.28.0", default-features = false }
 
 # Dependencies from the `fuel-vm` repository:
-fuel-asm = "0.50.0"
-fuel-crypto = "0.50.0"
-fuel-types = "0.50.0"
-fuel-tx = "0.50.0"
-fuel-vm = "0.50.0"
+fuel-asm = "0.52.0"
+fuel-crypto = "0.52.0"
+fuel-types = "0.52.0"
+fuel-tx = "0.52.0"
+fuel-vm = "0.52.0"
 
 # Dependencies from the `fuels-rs` repository:
-fuels-core = "0.63.0"
-fuels-accounts = "0.63.0"
+fuels-core = "0.64.0"
+fuels-accounts = "0.64.0"
 
 # Dependencies from the `forc-wallet` repository:
-forc-wallet = "0.8.0"
+forc-wallet = "0.8.1"
 
 # Dependencies from the `fuel-abi-types` repository:
 fuel-abi-types = "0.5.0"

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

@@ -8,7 +8,7 @@ use fuel_tx::{
 };
 use fuels_accounts::provider::Provider;
 use fuels_core::{
-    constants::DEFAULT_GAS_ESTIMATION_BLOCK_HORIZON, types::transaction_builders::DryRunner,
+    constants::DEFAULT_GAS_ESTIMATION_BLOCK_HORIZON, types::transaction::ScriptTransaction,
 };
 
 fn no_spendable_input<'a, I: IntoIterator<Item = &'a Input>>(inputs: I) -> bool {
@@ -47,15 +47,13 @@ pub(crate) async fn get_script_gas_used(mut tx: Script, provider: &Provider) ->
     let max_gas = tx.max_gas(consensus_params.gas_costs(), consensus_params.fee_params()) + 1;
     // Increase `script_gas_limit` to the maximum allowed value.
     tx.set_script_gas_limit(max_gas_per_tx - max_gas);
+    let script_tx = ScriptTransaction::from(tx);
 
-    get_gas_used(Transaction::Script(tx), provider).await
-}
-
-/// Returns gas_used for an arbitrary tx, by doing dry run with the provided `Provider`.
-pub(crate) async fn get_gas_used(tx: Transaction, provider: &Provider) -> Result<u64> {
     let tolerance = 0.1;
-    let gas_used = provider.dry_run_and_get_used_gas(tx, tolerance).await?;
-    Ok(gas_used)
+    let estimated_tx_cost = provider
+        .estimate_transaction_cost(script_tx, Some(tolerance), None)
+        .await?;
+    Ok(estimated_tx_cost.gas_used)
 }
 
 /// Returns an estimation for the max fee of `Create` transactions.
@@ -99,7 +97,7 @@ pub(crate) async fn get_estimated_max_fee(
     let tx = Transaction::from(tx);
 
     let tx_status = client
-        .dry_run_opt(&[tx], Some(false))
+        .dry_run(&[tx])
         .await
         .map(|mut status_vec| status_vec.remove(0))?;
     let total_fee = match tx_status.result {

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

@@ -146,8 +146,9 @@ impl<Tx: Buildable + field::Witnesses + Send> TransactionBuilderExt<Tx> for Tran
         let wallet = Wallet::from_address(Bech32Address::from(address), Some(provider));
 
         let amount = 1_000_000;
+        let filter = None;
         let inputs: Vec<_> = wallet
-            .get_spendable_resources(asset_id, amount)
+            .get_spendable_resources(asset_id, amount, filter)
             .await?
             .into_iter()
             .map(|coin_type| match coin_type {

forc-test/src/execute.rs

@@ -16,14 +16,14 @@ use rand::{Rng, SeedableRng};
 
 use tx::Receipt;
 
-use vm::interpreter::InterpreterParams;
+use vm::interpreter::{InterpreterParams, MemoryInstance};
 use vm::state::DebugEval;
 use vm::state::ProgramState;
 
 /// An interface for executing a test within a VM [Interpreter] instance.
 #[derive(Debug, Clone)]
 pub struct TestExecutor {
-    pub interpreter: Interpreter<MemoryStorage, tx::Script, NotSupportedEcal>,
+    pub interpreter: Interpreter<MemoryInstance, MemoryStorage, tx::Script, NotSupportedEcal>,
     pub tx: vm::checked_transaction::Ready<tx::Script>,
     pub test_entry: PkgTestEntry,
     pub name: String,
@@ -118,9 +118,11 @@ impl TestExecutor {
             .map_err(|e| anyhow::anyhow!("{e:?}"))?;
 
         let interpreter_params = InterpreterParams::new(gas_price, &consensus_params);
+        let memory_instance = MemoryInstance::new();
+        let interpreter = Interpreter::with_storage(memory_instance, storage, interpreter_params);
 
         Ok(TestExecutor {
-            interpreter: Interpreter::with_storage(storage, interpreter_params),
+            interpreter,
             tx,
             test_entry: test_entry.clone(),
             name,