fix: include witness data in estimation

e2e/Cargo.toml

@@ -15,6 +15,7 @@ build = "build.rs"
 [dev-dependencies]
 # used in test assertions
 chrono = { workspace = true }
+fuel-asm = { workspace = true }
 # TODO: [issue](https://github.com/FuelLabs/fuels-rs/issues/1375) needs to be removed, `ScriptTransaction` and `CreateTransaction` in `fuels` use `fuel_tx::Input` but don't reexport or convert it into a `fuels` owned type
 fuel-tx = { workspace = true }
 fuels = { workspace = true }

e2e/tests/providers.rs

@@ -1,6 +1,7 @@
 use std::{ops::Add, path::Path};
 
 use chrono::{DateTime, Duration, TimeZone, Utc};
+use fuel_tx::Witness;
 use fuels::{
     accounts::Account,
     client::{PageDirection, PaginationRequest},
@@ -1071,3 +1072,58 @@ async fn tx_respects_policies() -> Result<()> {
 
     Ok(())
 }
+
+#[tokio::test]
+async fn tx_with_witness_data() -> Result<()> {
+    use fuel_asm::{op, GTFArgs};
+
+    let wallet = launch_provider_and_get_wallet().await?;
+    let provider = wallet.try_provider()?;
+
+    let receiver = WalletUnlocked::new_random(Some(provider.clone()));
+
+    let inputs = wallet
+        .get_asset_inputs_for_amount(*provider.base_asset_id(), 10000, None)
+        .await?;
+    let outputs =
+        wallet.get_asset_outputs_for_amount(receiver.address(), *provider.base_asset_id(), 1);
+
+    let mut tb = ScriptTransactionBuilder::prepare_transfer(inputs, outputs, TxPolicies::default());
+    tb.add_signer(wallet.clone())?;
+
+    let script: Vec<u8> = vec![
+        op::gtf(0x10, 0x00, GTFArgs::ScriptWitnessAtIndex.into()),
+        op::ret(0x10),
+    ]
+    .into_iter()
+    .collect();
+    tb.script = script;
+
+    let expected_data = 15u64;
+    let witness = Witness::from(expected_data.to_be_bytes().to_vec());
+    tb.witnesses_mut().push(witness);
+
+    let tx = tb
+        .with_tx_policies(TxPolicies::default().with_witness_limit(1000))
+        .build(provider)
+        .await?;
+
+    let status = provider.send_transaction_and_await_commit(tx).await?;
+
+    match status {
+        TxStatus::Success { receipts } => {
+            let ret = receipts
+                .into_iter()
+                .find_map(|receipt| match receipt {
+                    Receipt::Return { val, .. } => Some(val),
+                    _ => None,
+                })
+                .expect("should have return value");
+
+            //assert_eq!(ret, expected_data as u64);
+        }
+        _ => panic!("expected success status"),
+    }
+
+    Ok(())
+}

packages/fuels-core/src/types/transaction_builders.rs

@@ -486,7 +486,8 @@ impl ScriptTransactionBuilder {
 
     async fn resolve_fuel_tx(self, dry_runner: impl DryRunner) -> Result<Script> {
         let num_resolved_witnesses = self.num_witnesses()?;
-        let mut script_dry_runner = self.script_dry_runner(num_resolved_witnesses, &dry_runner);
+        let predefined_witnesses = self.witnesses.clone();
+        let mut script_dry_runner = self.script_dry_runner(predefined_witnesses, &dry_runner);
 
         let mut tx = FuelTransaction::script(
             0, // default value - will be overwritten
@@ -566,13 +567,16 @@ impl ScriptTransactionBuilder {
         Ok(())
     }
 
-    fn script_dry_runner<D>(&self, num_resolved_witnesses: u16, dry_runner: D) -> ScriptDryRunner<D>
+    fn script_dry_runner<D>(
+        &self,
+        predefined_witnesses: Vec<Witness>,
+        dry_runner: D,
+    ) -> ScriptDryRunner<D>
     where
         D: DryRunner,
     {
-        let total_witnesses = self.unresolved_witness_indexes.owner_to_idx_offset.len()
-            + num_resolved_witnesses as usize;
-        ScriptDryRunner::new(dry_runner, total_witnesses)
+        let num_unresolved_witnesses = self.unresolved_witness_indexes.owner_to_idx_offset.len();
+        ScriptDryRunner::new(dry_runner, predefined_witnesses, num_unresolved_witnesses)
     }
 
     async fn add_variable_outputs(

packages/fuels-core/src/types/transaction_builders/script_dry_runner.rs

@@ -16,15 +16,21 @@
 
 pub(crate) struct ScriptDryRunner<R> {
     dry_runner: R,
-    num_total_witnesses: usize,
+    predifined_witnesses: Vec<Witness>,
+    num_unresolved_witnesses: usize,
     last_dry_run: Option<DryRun>,
 }
 
 impl<R> ScriptDryRunner<R> {
-    pub fn new(dry_runner: R, num_total_witnesses: usize) -> Self {
+    pub fn new(
+        dry_runner: R,
+        predifined_witnesses: Vec<Witness>,
+        num_unresolved_witnesses: usize,
+    ) -> Self {
         Self {
             dry_runner,
-            num_total_witnesses,
+            predifined_witnesses,
+            num_unresolved_witnesses,
             last_dry_run: None,
         }
     }
@@ -78,9 +84,13 @@
     // Using a `Signature` ensures that the calculated fee includes the fee generated by the witnesses.
     fn add_fake_witnesses(&mut self, tx: &mut fuel_tx::Script) {
         let witness: Witness = Signature::default().as_ref().into();
-        let dry_run_witnesses: Vec<_> = repeat(witness).take(self.num_total_witnesses).collect();
+        let dry_run_witnesses: Vec<_> = repeat(witness)
+            .take(self.num_unresolved_witnesses)
+            .collect();
 
-        *tx.witnesses_mut() = dry_run_witnesses;
+        let predifined_witnesses = std::mem::take(&mut self.predifined_witnesses);
+
+        *tx.witnesses_mut() = [predifined_witnesses, dry_run_witnesses].concat();
     }
 
     fn add_fake_coins(&mut self, tx: &mut fuel_tx::Script) {