From 002f05650f4e0c4e46b9b26a6dce03c2d87cc4ff Mon Sep 17 00:00:00 2001
From: MujkicA <ahmedmujkic2@gmail.com>
Date: Thu, 13 Jun 2024 20:09:09 +0200
Subject: [PATCH 1/8] include witness data

---
 e2e/Cargo.toml                                |  1 +
 e2e/tests/providers.rs                        | 56 +++++++++++++++++++
 .../src/types/transaction_builders.rs         | 14 +++--
 .../transaction_builders/script_dry_runner.rs | 20 +++++--
 4 files changed, 81 insertions(+), 10 deletions(-)

diff --git a/e2e/Cargo.toml b/e2e/Cargo.toml
index 88376aaabf..3ba0245722 100644
--- a/e2e/Cargo.toml
+++ b/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 }
diff --git a/e2e/tests/providers.rs b/e2e/tests/providers.rs
index bfcf8633b8..3a0dfc3343 100644
--- a/e2e/tests/providers.rs
+++ b/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(())
+}
diff --git a/packages/fuels-core/src/types/transaction_builders.rs b/packages/fuels-core/src/types/transaction_builders.rs
index d8be7505d0..3bf04710be 100644
--- a/packages/fuels-core/src/types/transaction_builders.rs
+++ b/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(
diff --git a/packages/fuels-core/src/types/transaction_builders/script_dry_runner.rs b/packages/fuels-core/src/types/transaction_builders/script_dry_runner.rs
index 28a4954130..806f5d1a0d 100644
--- a/packages/fuels-core/src/types/transaction_builders/script_dry_runner.rs
+++ b/packages/fuels-core/src/types/transaction_builders/script_dry_runner.rs
@@ -16,15 +16,21 @@ use crate::{
 
 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 @@ impl<R: DryRunner> ScriptDryRunner<R> {
     // 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) {

From 39c6c8d505815044e0a8c8ba59acee623acfb302 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <12615679+Br1ght0ne@users.noreply.github.com>
Date: Fri, 14 Jun 2024 11:12:00 +0100
Subject: [PATCH 2/8] Apply suggestions from code review

Co-authored-by: Brandon Kite <brandonkite92@gmail.com>
---
 .../src/types/transaction_builders/script_dry_runner.rs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/fuels-core/src/types/transaction_builders/script_dry_runner.rs b/packages/fuels-core/src/types/transaction_builders/script_dry_runner.rs
index 806f5d1a0d..b8bf2a2c5c 100644
--- a/packages/fuels-core/src/types/transaction_builders/script_dry_runner.rs
+++ b/packages/fuels-core/src/types/transaction_builders/script_dry_runner.rs
@@ -16,7 +16,7 @@ use crate::{
 
 pub(crate) struct ScriptDryRunner<R> {
     dry_runner: R,
-    predifined_witnesses: Vec<Witness>,
+    predefined_witnesses: Vec<Witness>,
     num_unresolved_witnesses: usize,
     last_dry_run: Option<DryRun>,
 }
@@ -24,7 +24,7 @@ pub(crate) struct ScriptDryRunner<R> {
 impl<R> ScriptDryRunner<R> {
     pub fn new(
         dry_runner: R,
-        predifined_witnesses: Vec<Witness>,
+        predefined_witnesses: Vec<Witness>,
         num_unresolved_witnesses: usize,
     ) -> Self {
         Self {
@@ -88,7 +88,7 @@ impl<R: DryRunner> ScriptDryRunner<R> {
             .take(self.num_unresolved_witnesses)
             .collect();
 
-        let predifined_witnesses = std::mem::take(&mut self.predifined_witnesses);
+        let predefined_witnesses = std::mem::take(&mut self.predefined_witnesses);
 
         *tx.witnesses_mut() = [predifined_witnesses, dry_run_witnesses].concat();
     }

From b431d791e17bb67a36deff584bd8a54c018306dd Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <12615679+Br1ght0ne@users.noreply.github.com>
Date: Fri, 14 Jun 2024 11:50:06 +0100
Subject: [PATCH 3/8] fix: typos

---
 .../src/types/transaction_builders/script_dry_runner.rs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/fuels-core/src/types/transaction_builders/script_dry_runner.rs b/packages/fuels-core/src/types/transaction_builders/script_dry_runner.rs
index b8bf2a2c5c..0f88bc6523 100644
--- a/packages/fuels-core/src/types/transaction_builders/script_dry_runner.rs
+++ b/packages/fuels-core/src/types/transaction_builders/script_dry_runner.rs
@@ -29,7 +29,7 @@ impl<R> ScriptDryRunner<R> {
     ) -> Self {
         Self {
             dry_runner,
-            predifined_witnesses,
+            predefined_witnesses,
             num_unresolved_witnesses,
             last_dry_run: None,
         }
@@ -90,7 +90,7 @@ impl<R: DryRunner> ScriptDryRunner<R> {
 
         let predefined_witnesses = std::mem::take(&mut self.predefined_witnesses);
 
-        *tx.witnesses_mut() = [predifined_witnesses, dry_run_witnesses].concat();
+        *tx.witnesses_mut() = [predefined_witnesses, dry_run_witnesses].concat();
     }
 
     fn add_fake_coins(&mut self, tx: &mut fuel_tx::Script) {

From 0c9fa080925a046bc868aeb6738eebbc7aa4bcbb Mon Sep 17 00:00:00 2001
From: MujkicA <ahmedmujkic2@gmail.com>
Date: Fri, 14 Jun 2024 20:34:01 +0200
Subject: [PATCH 4/8] fix witness test

---
 e2e/tests/providers.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/e2e/tests/providers.rs b/e2e/tests/providers.rs
index 3a0dfc3343..5397c15d6d 100644
--- a/e2e/tests/providers.rs
+++ b/e2e/tests/providers.rs
@@ -1092,7 +1092,8 @@ async fn tx_with_witness_data() -> Result<()> {
     tb.add_signer(wallet.clone())?;
 
     let script: Vec<u8> = vec![
-        op::gtf(0x10, 0x00, GTFArgs::ScriptWitnessAtIndex.into()),
+        op::gtf(0x10, 0x00, GTFArgs::WitnessData.into()),
+        op::lw(0x10, 0x10, 0x00),
         op::ret(0x10),
     ]
     .into_iter()
@@ -1120,7 +1121,7 @@ async fn tx_with_witness_data() -> Result<()> {
                 })
                 .expect("should have return value");
 
-            //assert_eq!(ret, expected_data as u64);
+            assert_eq!(ret, expected_data as u64);
         }
         _ => panic!("expected success status"),
     }

From 54ec29a63d13b8d7cb7090b97eeddd942d0d75b3 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <12615679+Br1ght0ne@users.noreply.github.com>
Date: Fri, 14 Jun 2024 20:01:09 +0100
Subject: [PATCH 5/8] silencio clippy

---
 e2e/tests/providers.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e2e/tests/providers.rs b/e2e/tests/providers.rs
index 5397c15d6d..d23637d088 100644
--- a/e2e/tests/providers.rs
+++ b/e2e/tests/providers.rs
@@ -1113,7 +1113,7 @@ async fn tx_with_witness_data() -> Result<()> {
 
     match status {
         TxStatus::Success { receipts } => {
-            let ret = receipts
+            let ret: u64 = receipts
                 .into_iter()
                 .find_map(|receipt| match receipt {
                     Receipt::Return { val, .. } => Some(val),
@@ -1121,7 +1121,7 @@ async fn tx_with_witness_data() -> Result<()> {
                 })
                 .expect("should have return value");
 
-            assert_eq!(ret, expected_data as u64);
+            assert_eq!(ret, expected_data);
         }
         _ => panic!("expected success status"),
     }

From 84e4cdf811acb9d467f7633eaa7d16d7945587a0 Mon Sep 17 00:00:00 2001
From: MujkicA <ahmedmujkic2@gmail.com>
Date: Fri, 14 Jun 2024 21:08:44 +0200
Subject: [PATCH 6/8] make script revert if witness data is not read correctly

---
 e2e/tests/providers.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/e2e/tests/providers.rs b/e2e/tests/providers.rs
index 5397c15d6d..a47c41012a 100644
--- a/e2e/tests/providers.rs
+++ b/e2e/tests/providers.rs
@@ -1,6 +1,7 @@
 use std::{ops::Add, path::Path};
 
 use chrono::{DateTime, Duration, TimeZone, Utc};
+use fuel_asm::RegId;
 use fuel_tx::Witness;
 use fuels::{
     accounts::Account,
@@ -1092,9 +1093,18 @@ async fn tx_with_witness_data() -> Result<()> {
     tb.add_signer(wallet.clone())?;
 
     let script: Vec<u8> = vec![
+        // load witness data into register 0x10
         op::gtf(0x10, 0x00, GTFArgs::WitnessData.into()),
         op::lw(0x10, 0x10, 0x00),
+        // load expected value into register 0x11
+        op::movi(0x11, 0x0a),
+        // load the offset of the revert instruction into register 0x12
+        op::movi(0x12, 0x06),
+        // compare the two values and jump to the revert instruction if they are not equal
+        op::jne(0x10, 0x11, 0x12),
+        // return the witness data
         op::ret(0x10),
+        op::rvrt(RegId::ZERO),
     ]
     .into_iter()
     .collect();
@@ -1111,6 +1121,7 @@ async fn tx_with_witness_data() -> Result<()> {
 
     let status = provider.send_transaction_and_await_commit(tx).await?;
 
+    dbg!(&status);
     match status {
         TxStatus::Success { receipts } => {
             let ret = receipts

From 072475b1c15845820460204e0869e3efc4604aa0 Mon Sep 17 00:00:00 2001
From: MujkicA <ahmedmujkic2@gmail.com>
Date: Fri, 14 Jun 2024 21:09:04 +0200
Subject: [PATCH 7/8] make witness data match

---
 e2e/tests/providers.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/tests/providers.rs b/e2e/tests/providers.rs
index a47c41012a..3d2e9245df 100644
--- a/e2e/tests/providers.rs
+++ b/e2e/tests/providers.rs
@@ -1097,7 +1097,7 @@ async fn tx_with_witness_data() -> Result<()> {
         op::gtf(0x10, 0x00, GTFArgs::WitnessData.into()),
         op::lw(0x10, 0x10, 0x00),
         // load expected value into register 0x11
-        op::movi(0x11, 0x0a),
+        op::movi(0x11, 0x0f),
         // load the offset of the revert instruction into register 0x12
         op::movi(0x12, 0x06),
         // compare the two values and jump to the revert instruction if they are not equal

From 4053164bbd82629a2baf3086e1d72a903f491538 Mon Sep 17 00:00:00 2001
From: MujkicA <ahmedmujkic2@gmail.com>
Date: Fri, 14 Jun 2024 21:30:44 +0200
Subject: [PATCH 8/8] improve test

---
 e2e/tests/providers.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/e2e/tests/providers.rs b/e2e/tests/providers.rs
index b04f0bf39c..3a7375a5c7 100644
--- a/e2e/tests/providers.rs
+++ b/e2e/tests/providers.rs
@@ -1092,6 +1092,9 @@ async fn tx_with_witness_data() -> Result<()> {
     let mut tb = ScriptTransactionBuilder::prepare_transfer(inputs, outputs, TxPolicies::default());
     tb.add_signer(wallet.clone())?;
 
+    // we test that the witness data wasn't tempered with during the build (gas estimation) process
+    // if the witness data is tempered with, the estimation will be off and the transaction
+    // will error out with `OutOfGas`
     let script: Vec<u8> = vec![
         // load witness data into register 0x10
         op::gtf(0x10, 0x00, GTFArgs::WitnessData.into()),
@@ -1099,9 +1102,14 @@ async fn tx_with_witness_data() -> Result<()> {
         // load expected value into register 0x11
         op::movi(0x11, 0x0f),
         // load the offset of the revert instruction into register 0x12
-        op::movi(0x12, 0x06),
+        op::movi(0x12, 0x08),
         // compare the two values and jump to the revert instruction if they are not equal
         op::jne(0x10, 0x11, 0x12),
+        // do some expensive operation so gas estimation is higher if comparison passes
+        op::gtf(0x13, 0x01, GTFArgs::WitnessData.into()),
+        op::gtf(0x14, 0x01, GTFArgs::WitnessDataLength.into()),
+        op::aloc(0x14),
+        op::eck1(RegId::HP, 0x13, 0x13),
         // return the witness data
         op::ret(0x10),
         op::rvrt(RegId::ZERO),
@@ -1121,7 +1129,6 @@ async fn tx_with_witness_data() -> Result<()> {
 
     let status = provider.send_transaction_and_await_commit(tx).await?;
 
-    dbg!(&status);
     match status {
         TxStatus::Success { receipts } => {
             let ret: u64 = receipts