From 72862cb6b7cdc873d985c746e111e20c4583ad82 Mon Sep 17 00:00:00 2001
From: Voxelot <brandonkite92@gmail.com>
Date: Tue, 21 Mar 2023 19:08:40 -0700
Subject: [PATCH 01/10] use chain id for predicate root

---
 fuel-tx/src/tests/valid_cases/input.rs        | 12 ++++----
 fuel-tx/src/tests/valid_cases/transaction.rs  | 12 ++++----
 fuel-tx/src/transaction.rs                    |  4 +--
 .../src/transaction/consensus_parameters.rs   | 30 +++++++++++++++++++
 fuel-tx/src/transaction/types/create.rs       |  4 +--
 fuel-tx/src/transaction/types/input.rs        | 18 +++++++----
 fuel-tx/src/transaction/types/mint.rs         |  2 +-
 fuel-tx/src/transaction/types/script.rs       |  4 +--
 fuel-tx/src/transaction/validity.rs           | 26 ++++++++++------
 fuel-vm/src/checked_transaction.rs            | 10 +++----
 fuel-vm/src/interpreter/executors/main.rs     |  2 +-
 fuel-vm/src/tests/metadata.rs                 |  4 +--
 fuel-vm/src/tests/predicate.rs                | 12 ++++----
 13 files changed, 92 insertions(+), 48 deletions(-)

diff --git a/fuel-tx/src/tests/valid_cases/input.rs b/fuel-tx/src/tests/valid_cases/input.rs
index 8c42ed7549..eaea1f05ef 100644
--- a/fuel-tx/src/tests/valid_cases/input.rs
+++ b/fuel-tx/src/tests/valid_cases/input.rs
@@ -108,7 +108,7 @@ fn coin_predicate() {
     let txhash: Bytes32 = rng.gen();
 
     let predicate = generate_nonempty_padded_bytes(rng);
-    let owner = (*Contract::root_from_code(&predicate)).into();
+    let owner = Input::predicate_owner(&predicate, &ConsensusParameters::DEFAULT);
 
     Input::coin_predicate(
         rng.gen(),
@@ -124,7 +124,7 @@ fn coin_predicate() {
     .unwrap();
 
     let predicate = vec![];
-    let owner = (*Contract::root_from_code(&predicate)).into();
+    let owner = Input::predicate_owner(&predicate, &ConsensusParameters::DEFAULT);
 
     let err = Input::coin_predicate(
         rng.gen(),
@@ -220,7 +220,7 @@ fn message_metadata() {
     let txhash: Bytes32 = rng.gen();
 
     let predicate = generate_nonempty_padded_bytes(rng);
-    let recipient = (*Contract::root_from_code(&predicate)).into();
+    let recipient = Input::predicate_owner(&predicate, &ConsensusParameters::DEFAULT);
 
     Input::message_data_predicate(
         rng.gen(),
@@ -248,7 +248,7 @@ fn message_metadata() {
     assert_eq!(CheckError::InputWitnessIndexBounds { index: 0 }, err,);
 
     let mut predicate = generate_nonempty_padded_bytes(rng);
-    let recipient = (*Contract::root_from_code(&predicate)).into();
+    let recipient = Input::predicate_owner(&predicate, &ConsensusParameters::DEFAULT);
     predicate[0] = predicate[0].wrapping_add(1);
 
     let err = Input::message_data_predicate(
@@ -327,7 +327,7 @@ fn message_message_coin() {
     let txhash: Bytes32 = rng.gen();
 
     let predicate = generate_nonempty_padded_bytes(rng);
-    let recipient = (*Contract::root_from_code(&predicate)).into();
+    let recipient = Input::predicate_owner(&predicate, &ConsensusParameters::DEFAULT);
 
     Input::message_coin_predicate(
         rng.gen(),
@@ -353,7 +353,7 @@ fn message_message_coin() {
     assert_eq!(CheckError::InputWitnessIndexBounds { index: 0 }, err,);
 
     let mut predicate = generate_nonempty_padded_bytes(rng);
-    let recipient = (*Contract::root_from_code(&predicate)).into();
+    let recipient = Input::predicate_owner(&predicate, &ConsensusParameters::DEFAULT);
     predicate[0] = predicate[0].wrapping_add(1);
 
     let err = Input::message_coin_predicate(
diff --git a/fuel-tx/src/tests/valid_cases/transaction.rs b/fuel-tx/src/tests/valid_cases/transaction.rs
index 859b017834..6f90e829ea 100644
--- a/fuel-tx/src/tests/valid_cases/transaction.rs
+++ b/fuel-tx/src/tests/valid_cases/transaction.rs
@@ -771,7 +771,7 @@ mod inputs {
 
         let predicate = (0..1000).map(|_| rng.gen()).collect_vec();
         // The predicate is an owner of the coin
-        let owner: Address = (*Contract::root_from_code(&predicate)).into();
+        let owner: Address = Input::predicate_owner(&predicate, &ConsensusParameters::DEFAULT);
 
         let tx = TransactionBuilder::create(generate_bytes(rng).into(), rng.gen(), vec![])
             .gas_limit(PARAMS.max_gas_per_tx)
@@ -789,7 +789,7 @@ mod inputs {
             ))
             .finalize();
 
-        assert!(tx.check_predicate_owners());
+        assert!(tx.check_predicate_owners(&ConsensusParameters::DEFAULT));
     }
 
     #[test]
@@ -814,7 +814,7 @@ mod inputs {
             ))
             .finalize();
 
-        assert!(!tx.check_predicate_owners());
+        assert!(!tx.check_predicate_owners(&ConsensusParameters::DEFAULT));
     }
 
     #[test]
@@ -823,7 +823,7 @@ mod inputs {
 
         let predicate = (0..1000).map(|_| rng.gen()).collect_vec();
         // The predicate is an recipient(owner) of the message
-        let recipient: Address = (*Contract::root_from_code(&predicate)).into();
+        let recipient: Address = Input::predicate_owner(&predicate, &ConsensusParameters::DEFAULT);
 
         let tx = TransactionBuilder::create(generate_bytes(rng).into(), rng.gen(), vec![])
             .gas_limit(PARAMS.max_gas_per_tx)
@@ -840,7 +840,7 @@ mod inputs {
             ))
             .finalize();
 
-        assert!(tx.check_predicate_owners());
+        assert!(tx.check_predicate_owners(&ConsensusParameters::DEFAULT));
     }
 
     #[test]
@@ -864,6 +864,6 @@ mod inputs {
             ))
             .finalize();
 
-        assert!(!tx.check_predicate_owners());
+        assert!(!tx.check_predicate_owners(&ConsensusParameters::DEFAULT));
     }
 }
diff --git a/fuel-tx/src/transaction.rs b/fuel-tx/src/transaction.rs
index 4a5947e7f4..4439f07567 100644
--- a/fuel-tx/src/transaction.rs
+++ b/fuel-tx/src/transaction.rs
@@ -254,7 +254,7 @@ pub trait Executable: field::Inputs + field::Outputs + field::Witnesses {
 
     /// Checks that all owners of inputs in the predicates are valid.
     #[cfg(feature = "std")]
-    fn check_predicate_owners(&self) -> bool {
+    fn check_predicate_owners(&self, parameters: &ConsensusParameters) -> bool {
         self.inputs()
             .iter()
             .filter_map(|i| match i {
@@ -265,7 +265,7 @@ pub trait Executable: field::Inputs + field::Outputs + field::Witnesses {
                 _ => None,
             })
             .fold(true, |result, (owner, predicate)| {
-                result && Input::is_predicate_owner_valid(owner, predicate)
+                result && Input::is_predicate_owner_valid(owner, predicate, parameters)
             })
     }
 
diff --git a/fuel-tx/src/transaction/consensus_parameters.rs b/fuel-tx/src/transaction/consensus_parameters.rs
index 0ed14131e1..962e3e9af6 100644
--- a/fuel-tx/src/transaction/consensus_parameters.rs
+++ b/fuel-tx/src/transaction/consensus_parameters.rs
@@ -32,6 +32,8 @@ pub struct ConsensusParameters {
     pub gas_per_byte: u64,
     /// Maximum length of message data, in bytes.
     pub max_message_data_length: u64,
+    /// The unique identifier of this chain
+    pub chain_id: u64,
 }
 
 impl ConsensusParameters {
@@ -50,6 +52,7 @@ impl ConsensusParameters {
         gas_price_factor: 1_000_000_000,
         gas_per_byte: 4,
         max_message_data_length: 1024 * 1024,
+        chain_id: 0,
     };
 
     /// Transaction memory offset in VM runtime
@@ -75,6 +78,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
             ..
         } = self;
 
@@ -92,6 +96,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
         }
     }
 
@@ -110,6 +115,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
             ..
         } = self;
 
@@ -127,6 +133,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
         }
     }
 
@@ -145,6 +152,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
             ..
         } = self;
 
@@ -162,6 +170,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
         }
     }
 
@@ -180,6 +189,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
             ..
         } = self;
 
@@ -197,6 +207,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
         }
     }
 
@@ -215,6 +226,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
             ..
         } = self;
 
@@ -232,6 +244,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
         }
     }
 
@@ -250,6 +263,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
             ..
         } = self;
 
@@ -267,6 +281,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
         }
     }
 
@@ -285,6 +300,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
             ..
         } = self;
 
@@ -302,6 +318,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
         }
     }
 
@@ -320,6 +337,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
             ..
         } = self;
 
@@ -337,6 +355,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
         }
     }
 
@@ -355,6 +374,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
             ..
         } = self;
 
@@ -372,6 +392,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
         }
     }
 
@@ -390,6 +411,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
             ..
         } = self;
 
@@ -407,6 +429,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
         }
     }
 
@@ -425,6 +448,7 @@ impl ConsensusParameters {
             max_predicate_data_length,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
             ..
         } = self;
 
@@ -442,6 +466,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
         }
     }
 
@@ -459,6 +484,7 @@ impl ConsensusParameters {
             max_predicate_data_length,
             gas_price_factor,
             max_message_data_length,
+            chain_id,
             ..
         } = self;
 
@@ -476,6 +502,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
         }
     }
 
@@ -494,6 +521,7 @@ impl ConsensusParameters {
             max_predicate_data_length,
             gas_price_factor,
             gas_per_byte,
+            chain_id,
             ..
         } = self;
 
@@ -511,6 +539,7 @@ impl ConsensusParameters {
             gas_price_factor,
             gas_per_byte,
             max_message_data_length,
+            chain_id,
         }
     }
 }
@@ -540,4 +569,5 @@ pub mod default_parameters {
     pub const GAS_PRICE_FACTOR: u64 = ConsensusParameters::DEFAULT.gas_price_factor;
     pub const GAS_PER_BYTE: u64 = ConsensusParameters::DEFAULT.gas_per_byte;
     pub const MAX_MESSAGE_DATA_LENGTH: u64 = ConsensusParameters::DEFAULT.max_message_data_length;
+    pub const CHAIN_ID: u64 = ConsensusParameters::DEFAULT.chain_id;
 }
diff --git a/fuel-tx/src/transaction/types/create.rs b/fuel-tx/src/transaction/types/create.rs
index 5593d51ff8..b027cfc17f 100644
--- a/fuel-tx/src/transaction/types/create.rs
+++ b/fuel-tx/src/transaction/types/create.rs
@@ -98,7 +98,7 @@ impl Chargeable for Create {
 
 impl FormatValidityChecks for Create {
     #[cfg(feature = "std")]
-    fn check_signatures(&self) -> Result<(), CheckError> {
+    fn check_signatures(&self, parameters: &ConsensusParameters) -> Result<(), CheckError> {
         use crate::UniqueIdentifier;
 
         let id = self.id();
@@ -106,7 +106,7 @@ impl FormatValidityChecks for Create {
         self.inputs()
             .iter()
             .enumerate()
-            .try_for_each(|(index, input)| input.check_signature(index, &id, &self.witnesses))?;
+            .try_for_each(|(index, input)| input.check_signature(index, &id, &self.witnesses, parameters))?;
 
         Ok(())
     }
diff --git a/fuel-tx/src/transaction/types/input.rs b/fuel-tx/src/transaction/types/input.rs
index d9ae8afd53..504e1fe145 100644
--- a/fuel-tx/src/transaction/types/input.rs
+++ b/fuel-tx/src/transaction/types/input.rs
@@ -1,9 +1,9 @@
-use crate::{TxPointer, UtxoId};
+use crate::{ConsensusParameters, TxPointer, UtxoId};
 use alloc::vec::Vec;
 use coin::*;
 use consts::*;
 use contract::*;
-use fuel_crypto::PublicKey;
+use fuel_crypto::{Hasher, PublicKey};
 use fuel_types::bytes::{SizedBytes, WORD_SIZE};
 use fuel_types::{bytes, Nonce};
 use fuel_types::{Address, AssetId, Bytes32, ContractId, MessageId, Word};
@@ -566,7 +566,7 @@ impl Input {
         compute_message_id(sender, recipient, nonce, amount, data)
     }
 
-    pub fn predicate_owner<P>(predicate: P) -> Address
+    pub fn predicate_owner<P>(predicate: P, params: &ConsensusParameters) -> Address
     where
         P: AsRef<[u8]>,
     {
@@ -574,15 +574,21 @@ impl Input {
 
         let root = Contract::root_from_code(predicate);
 
-        (*root).into()
+        let mut hasher = Hasher::default();
+
+        hasher.input(ContractId::SEED);
+        hasher.input(params.chain_id.to_be_bytes());
+        hasher.input(root);
+
+        (*hasher.digest()).into()
     }
 
     #[cfg(feature = "std")]
-    pub fn is_predicate_owner_valid<P>(owner: &Address, predicate: P) -> bool
+    pub fn is_predicate_owner_valid<P>(owner: &Address, predicate: P, params: &ConsensusParameters) -> bool
     where
         P: AsRef<[u8]>,
     {
-        owner == &Self::predicate_owner(predicate)
+        owner == &Self::predicate_owner(predicate, params)
     }
 
     /// Prepare the output for VM predicate execution
diff --git a/fuel-tx/src/transaction/types/mint.rs b/fuel-tx/src/transaction/types/mint.rs
index 3852977e79..00a763cdfe 100644
--- a/fuel-tx/src/transaction/types/mint.rs
+++ b/fuel-tx/src/transaction/types/mint.rs
@@ -100,7 +100,7 @@ impl crate::UniqueIdentifier for Mint {
 
 impl FormatValidityChecks for Mint {
     #[cfg(feature = "std")]
-    fn check_signatures(&self) -> Result<(), CheckError> {
+    fn check_signatures(&self, _: &ConsensusParameters) -> Result<(), CheckError> {
         Ok(())
     }
 
diff --git a/fuel-tx/src/transaction/types/script.rs b/fuel-tx/src/transaction/types/script.rs
index a867c4fc7b..18a710647a 100644
--- a/fuel-tx/src/transaction/types/script.rs
+++ b/fuel-tx/src/transaction/types/script.rs
@@ -126,7 +126,7 @@ impl Chargeable for Script {
 
 impl FormatValidityChecks for Script {
     #[cfg(feature = "std")]
-    fn check_signatures(&self) -> Result<(), CheckError> {
+    fn check_signatures(&self, parameters: &ConsensusParameters) -> Result<(), CheckError> {
         use crate::UniqueIdentifier;
 
         let id = self.id();
@@ -134,7 +134,7 @@ impl FormatValidityChecks for Script {
         self.inputs()
             .iter()
             .enumerate()
-            .try_for_each(|(index, input)| input.check_signature(index, &id, &self.witnesses))?;
+            .try_for_each(|(index, input)| input.check_signature(index, &id, &self.witnesses, parameters))?;
 
         Ok(())
     }
diff --git a/fuel-tx/src/transaction/validity.rs b/fuel-tx/src/transaction/validity.rs
index 544a58ac01..055f57b959 100644
--- a/fuel-tx/src/transaction/validity.rs
+++ b/fuel-tx/src/transaction/validity.rs
@@ -29,13 +29,19 @@ impl Input {
         parameters: &ConsensusParameters,
     ) -> Result<(), CheckError> {
         self.check_without_signature(index, outputs, witnesses, parameters)?;
-        self.check_signature(index, txhash, witnesses)?;
+        self.check_signature(index, txhash, witnesses, parameters)?;
 
         Ok(())
     }
 
     #[cfg(feature = "std")]
-    pub fn check_signature(&self, index: usize, txhash: &Bytes32, witnesses: &[Witness]) -> Result<(), CheckError> {
+    pub fn check_signature(
+        &self,
+        index: usize,
+        txhash: &Bytes32,
+        witnesses: &[Witness],
+        parameters: &ConsensusParameters,
+    ) -> Result<(), CheckError> {
         match self {
             Self::CoinSigned(CoinSigned {
                 witness_index, owner, ..
@@ -83,7 +89,9 @@ impl Input {
                 recipient: owner,
                 predicate,
                 ..
-            }) if !Input::is_predicate_owner_valid(owner, predicate) => Err(CheckError::InputPredicateOwner { index }),
+            }) if !Input::is_predicate_owner_valid(owner, predicate, parameters) => {
+                Err(CheckError::InputPredicateOwner { index })
+            }
 
             _ => Ok(()),
         }
@@ -183,14 +191,14 @@ pub trait FormatValidityChecks {
     /// of fields according to rules in the specification and validity of signatures.
     fn check(&self, block_height: Word, parameters: &ConsensusParameters) -> Result<(), CheckError> {
         self.check_without_signatures(block_height, parameters)?;
-        self.check_signatures()?;
+        self.check_signatures(parameters)?;
 
         Ok(())
     }
 
     #[cfg(feature = "std")]
     /// Validates that all required signatures are set in the transaction and that they are valid.
-    fn check_signatures(&self) -> Result<(), CheckError>;
+    fn check_signatures(&self, parameters: &ConsensusParameters) -> Result<(), CheckError>;
 
     /// Validates the transactions according to rules from the specification:
     /// https://github.com/FuelLabs/fuel-specs/blob/master/src/protocol/tx_format/transaction.md#transaction
@@ -199,11 +207,11 @@ pub trait FormatValidityChecks {
 
 impl FormatValidityChecks for Transaction {
     #[cfg(feature = "std")]
-    fn check_signatures(&self) -> Result<(), CheckError> {
+    fn check_signatures(&self, parameters: &ConsensusParameters) -> Result<(), CheckError> {
         match self {
-            Transaction::Script(script) => script.check_signatures(),
-            Transaction::Create(create) => create.check_signatures(),
-            Transaction::Mint(mint) => mint.check_signatures(),
+            Transaction::Script(script) => script.check_signatures(parameters),
+            Transaction::Create(create) => create.check_signatures(parameters),
+            Transaction::Mint(mint) => mint.check_signatures(parameters),
         }
     }
 
diff --git a/fuel-vm/src/checked_transaction.rs b/fuel-vm/src/checked_transaction.rs
index 51311a8798..42cd62b056 100644
--- a/fuel-vm/src/checked_transaction.rs
+++ b/fuel-vm/src/checked_transaction.rs
@@ -91,9 +91,9 @@ impl<Tx: IntoChecked> Checked<Tx> {
     }
 
     /// Performs check of signatures, if not yet done.
-    pub fn check_signatures(mut self) -> Result<Self, CheckError> {
+    pub fn check_signatures(mut self, parameters: &ConsensusParameters) -> Result<Self, CheckError> {
         if !self.checks_bitmask.contains(Checks::Signatures) {
-            self.transaction.check_signatures()?;
+            self.transaction.check_signatures(parameters)?;
             self.checks_bitmask.insert(Checks::Signatures);
         }
         Ok(self)
@@ -157,7 +157,7 @@ pub trait IntoChecked: FormatValidityChecks + Sized {
         Checked<Self>: CheckPredicates,
     {
         self.into_checked_basic(block_height, params)?
-            .check_signatures()?
+            .check_signatures(params)?
             .check_predicates(params, gas_costs)
     }
 
@@ -772,7 +772,7 @@ mod tests {
             .into_checked_basic(block_height, &params)
             .unwrap()
             // Sets Checks::Signatures
-            .check_signatures()
+            .check_signatures(&params)
             .unwrap();
 
         assert!(checked.checks().contains(Checks::Basic | Checks::Signatures));
@@ -851,7 +851,7 @@ mod tests {
     fn predicate_tx(rng: &mut StdRng, gas_price: u64, gas_limit: u64, fee_input_amount: u64) -> Script {
         let asset = AssetId::default();
         let predicate = vec![op::ret(1)].into_iter().collect::<Vec<u8>>();
-        let owner = Input::predicate_owner(&predicate);
+        let owner = Input::predicate_owner(&predicate, &ConsensusParameters::DEFAULT);
         TransactionBuilder::script(vec![], vec![])
             .gas_price(gas_price)
             .gas_limit(gas_limit)
diff --git a/fuel-vm/src/interpreter/executors/main.rs b/fuel-vm/src/interpreter/executors/main.rs
index 866ba5596f..ced4fb99a7 100644
--- a/fuel-vm/src/interpreter/executors/main.rs
+++ b/fuel-vm/src/interpreter/executors/main.rs
@@ -50,7 +50,7 @@ impl<T> Interpreter<PredicateStorage, T> {
         Tx: ExecutableTransaction,
         <Tx as IntoChecked>::Metadata: CheckedMetadata,
     {
-        if !checked.transaction().check_predicate_owners() {
+        if !checked.transaction().check_predicate_owners(&params) {
             return Err(PredicateVerificationFailed::InvalidOwner);
         }
 
diff --git a/fuel-vm/src/tests/metadata.rs b/fuel-vm/src/tests/metadata.rs
index 8379cee3f9..31ed053af3 100644
--- a/fuel-vm/src/tests/metadata.rs
+++ b/fuel-vm/src/tests/metadata.rs
@@ -207,7 +207,7 @@ fn get_transaction_fields() {
 
     rng.fill(predicate_data.as_mut_slice());
 
-    let owner = (*Contract::root_from_code(&predicate)).into();
+    let owner = Input::predicate_owner(&predicate, &ConsensusParameters::DEFAULT);
     let input_coin_predicate = Input::coin_predicate(
         rng.gen(),
         owner,
@@ -232,7 +232,7 @@ fn get_transaction_fields() {
     rng.fill(m_data.as_mut_slice());
     rng.fill(m_predicate_data.as_mut_slice());
 
-    let owner = Input::predicate_owner(&m_predicate);
+    let owner = Input::predicate_owner(&m_predicate, &params);
     let message_predicate = Input::message_data_predicate(
         rng.gen(),
         owner,
diff --git a/fuel-vm/src/tests/predicate.rs b/fuel-vm/src/tests/predicate.rs
index 108da18202..c2f20b104e 100644
--- a/fuel-vm/src/tests/predicate.rs
+++ b/fuel-vm/src/tests/predicate.rs
@@ -1,5 +1,5 @@
 use fuel_asm::{op, GMArgs, GTFArgs, Instruction, RegId};
-use fuel_tx::TransactionBuilder;
+use fuel_tx::{ConsensusParameters, TransactionBuilder};
 use rand::{rngs::StdRng, Rng, SeedableRng};
 
 use fuel_vm::prelude::*;
@@ -27,7 +27,7 @@ where
     let height = 0;
     let params = ConsensusParameters::default();
 
-    let owner = Input::predicate_owner(&predicate);
+    let owner = Input::predicate_owner(&predicate, &params);
     let input = Input::coin_predicate(
         utxo_id,
         owner,
@@ -133,7 +133,7 @@ fn execute_gas_metered_predicates(predicates: Vec<Vec<Instruction>>) -> Result<u
             .flat_map(|op| u32::from(op).to_be_bytes())
             .collect();
 
-        let owner = Input::predicate_owner(&predicate);
+        let owner = Input::predicate_owner(&predicate, &ConsensusParameters::DEFAULT);
         let input = Input::coin_predicate(
             rng.gen(),
             owner,
@@ -215,7 +215,7 @@ fn gas_used_by_predicates_is_deducted_from_script_gas() {
     .into_iter()
     .flat_map(|op| u32::from(op).to_be_bytes())
     .collect();
-    let owner = Input::predicate_owner(&predicate);
+    let owner = Input::predicate_owner(&predicate, &params);
     let input = Input::coin_predicate(
         rng.gen(),
         owner,
@@ -281,7 +281,7 @@ fn gas_used_by_predicates_causes_out_of_gas_during_script() {
         .into_iter()
         .flat_map(|op| u32::from(op).to_be_bytes())
         .collect();
-    let owner = Input::predicate_owner(&predicate);
+    let owner = Input::predicate_owner(&predicate, &params);
     let input = Input::coin_predicate(
         rng.gen(),
         owner,
@@ -353,7 +353,7 @@ fn gas_used_by_predicates_more_than_limit() {
     .into_iter()
     .flat_map(|op| u32::from(op).to_be_bytes())
     .collect();
-    let owner = Input::predicate_owner(&predicate);
+    let owner = Input::predicate_owner(&predicate, &params);
     let input = Input::coin_predicate(
         rng.gen(),
         owner,

From 2e8c29c2699e24ee2b0a7bd00a910f3d7f004998 Mon Sep 17 00:00:00 2001
From: Voxelot <brandonkite92@gmail.com>
Date: Tue, 21 Mar 2023 19:32:30 -0700
Subject: [PATCH 02/10] include chain id in tx id

---
 fuel-tx/src/builder.rs                        | 48 ++++++------
 fuel-tx/src/tests/bytes.rs                    |  4 +-
 fuel-tx/src/tests/offset.rs                   |  2 +-
 fuel-tx/src/tests/prepared_init.rs            |  2 +-
 fuel-tx/src/tests/valid_cases/input.rs        | 15 ++--
 fuel-tx/src/tests/valid_cases/transaction.rs  | 74 +++++++++----------
 fuel-tx/src/transaction/id.rs                 | 44 +++++++----
 fuel-tx/src/transaction/metadata.rs           | 15 ++--
 fuel-tx/src/transaction/types/create.rs       | 16 ++--
 .../transaction/types/input/snapshot_tests.rs | 14 ++--
 fuel-tx/src/transaction/types/mint.rs         | 18 +++--
 fuel-tx/src/transaction/types/script.rs       | 16 ++--
 fuel-tx/test-helpers/src/lib.rs               |  9 ++-
 fuel-vm/src/checked_transaction.rs            | 18 ++---
 fuel-vm/src/checked_transaction/builder.rs    |  4 +-
 fuel-vm/src/checked_transaction/types.rs      |  6 +-
 fuel-vm/src/interpreter/initialization.rs     |  2 +-
 fuel-vm/src/tests/blockchain.rs               |  2 +-
 18 files changed, 171 insertions(+), 138 deletions(-)

diff --git a/fuel-tx/src/builder.rs b/fuel-tx/src/builder.rs
index 0ab08f4b8d..fb5e4213b1 100644
--- a/fuel-tx/src/builder.rs
+++ b/fuel-tx/src/builder.rs
@@ -1,6 +1,6 @@
 use crate::transaction::field::{BytecodeLength, BytecodeWitnessIndex, Witnesses};
 use crate::transaction::{field, Chargeable, Create, Executable, Script};
-use crate::{Cacheable, Input, Mint, Output, StorageSlot, Transaction, TxPointer, Witness};
+use crate::{Cacheable, ConsensusParameters, Input, Mint, Output, StorageSlot, Transaction, TxPointer, Witness};
 
 #[cfg(feature = "std")]
 use crate::Signable;
@@ -276,25 +276,25 @@ impl<Tx: Buildable> TransactionBuilder<Tx> {
     }
 
     #[cfg(feature = "std")]
-    pub fn _finalize(&mut self) -> Tx {
+    pub fn _finalize(&mut self, parameters: &ConsensusParameters) -> Tx {
         self.prepare_finalize();
 
         let mut tx = core::mem::take(&mut self.tx);
 
-        self.sign_keys.iter().for_each(|k| tx.sign_inputs(k));
+        self.sign_keys.iter().for_each(|k| tx.sign_inputs(k, parameters));
 
-        tx.precompute();
+        tx.precompute(parameters);
 
         tx
     }
 
     #[cfg(feature = "std")]
-    pub fn _finalize_without_signature(&mut self) -> Tx {
+    pub fn _finalize_without_signature(&mut self, parameters: &ConsensusParameters) -> Tx {
         self.prepare_finalize();
 
         let mut tx = core::mem::take(&mut self.tx);
 
-        tx.precompute();
+        tx.precompute(parameters);
 
         tx
     }
@@ -308,43 +308,43 @@ impl<Tx: field::Outputs> TransactionBuilder<Tx> {
 }
 
 pub trait Finalizable<Tx> {
-    fn finalize(&mut self) -> Tx;
+    fn finalize(&mut self, parameters: &ConsensusParameters) -> Tx;
 
-    fn finalize_without_signature(&mut self) -> Tx;
+    fn finalize_without_signature(&mut self, parameters: &ConsensusParameters) -> Tx;
 }
 
 #[cfg(feature = "std")]
 impl Finalizable<Mint> for TransactionBuilder<Mint> {
-    fn finalize(&mut self) -> Mint {
+    fn finalize(&mut self, parameters: &ConsensusParameters) -> Mint {
         let mut tx = core::mem::take(&mut self.tx);
-        tx.precompute();
+        tx.precompute(parameters);
         tx
     }
 
-    fn finalize_without_signature(&mut self) -> Mint {
-        self.finalize()
+    fn finalize_without_signature(&mut self, parameters: &ConsensusParameters) -> Mint {
+        self.finalize(parameters)
     }
 }
 
 #[cfg(feature = "std")]
 impl Finalizable<Create> for TransactionBuilder<Create> {
-    fn finalize(&mut self) -> Create {
-        self._finalize()
+    fn finalize(&mut self, parameters: &ConsensusParameters) -> Create {
+        self._finalize(parameters)
     }
 
-    fn finalize_without_signature(&mut self) -> Create {
-        self._finalize_without_signature()
+    fn finalize_without_signature(&mut self, parameters: &ConsensusParameters) -> Create {
+        self._finalize_without_signature(parameters)
     }
 }
 
 #[cfg(feature = "std")]
 impl Finalizable<Script> for TransactionBuilder<Script> {
-    fn finalize(&mut self) -> Script {
-        self._finalize()
+    fn finalize(&mut self, parameters: &ConsensusParameters) -> Script {
+        self._finalize(parameters)
     }
 
-    fn finalize_without_signature(&mut self) -> Script {
-        self._finalize_without_signature()
+    fn finalize_without_signature(&mut self, parameters: &ConsensusParameters) -> Script {
+        self._finalize_without_signature(parameters)
     }
 }
 
@@ -354,12 +354,12 @@ where
     Transaction: From<Tx>,
 {
     #[cfg(feature = "std")]
-    pub fn finalize_as_transaction(&mut self) -> Transaction {
-        self.finalize().into()
+    pub fn finalize_as_transaction(&mut self, parameters: &ConsensusParameters) -> Transaction {
+        self.finalize(parameters).into()
     }
 
     #[cfg(feature = "std")]
-    pub fn finalize_without_signature_as_transaction(&mut self) -> Transaction {
-        self.finalize_without_signature().into()
+    pub fn finalize_without_signature_as_transaction(&mut self, parameters: &ConsensusParameters) -> Transaction {
+        self.finalize_without_signature(parameters).into()
     }
 }
diff --git a/fuel-tx/src/tests/bytes.rs b/fuel-tx/src/tests/bytes.rs
index cdaac38e54..9691c914d8 100644
--- a/fuel-tx/src/tests/bytes.rs
+++ b/fuel-tx/src/tests/bytes.rs
@@ -720,7 +720,7 @@ fn create_input_data_offset() {
                     );
 
                     let mut tx_p = tx.clone();
-                    tx_p.precompute();
+                    tx_p.precompute(&ConsensusParameters::DEFAULT);
 
                     buffer.iter_mut().for_each(|b| *b = 0x00);
                     let _ = tx.read(buffer.as_mut_slice()).expect("Failed to serialize input");
@@ -826,7 +826,7 @@ fn script_input_coin_data_offset() {
                         );
 
                         let mut tx_p = tx.clone();
-                        tx_p.precompute();
+                        tx_p.precompute(&ConsensusParameters::DEFAULT);
 
                         buffer.iter_mut().for_each(|b| *b = 0x00);
 
diff --git a/fuel-tx/src/tests/offset.rs b/fuel-tx/src/tests/offset.rs
index 98fe330c72..0ebac0de97 100644
--- a/fuel-tx/src/tests/offset.rs
+++ b/fuel-tx/src/tests/offset.rs
@@ -391,7 +391,7 @@ fn iow_offset() {
             let bytes = tx.to_bytes();
 
             let mut tx_p = tx.clone();
-            tx_p.precompute();
+            tx_p.precompute(&ConsensusParameters::DEFAULT);
 
             tx.inputs().iter().enumerate().for_each(|(x, i)| {
                 let offset = tx.inputs_offset_at(x).unwrap();
diff --git a/fuel-tx/src/tests/prepared_init.rs b/fuel-tx/src/tests/prepared_init.rs
index aa9b76fc4f..ec7cc83182 100644
--- a/fuel-tx/src/tests/prepared_init.rs
+++ b/fuel-tx/src/tests/prepared_init.rs
@@ -13,7 +13,7 @@ fn output_variable_prepare_init_zeroes_recipient_and_amount() {
     let tx = TransactionBuilder::script(vec![], vec![])
         .prepare_script(false)
         .add_output(variable)
-        .finalize();
+        .finalize(&ConsensusParameters::DEFAULT);
 
     let output = tx
         .clone()
diff --git a/fuel-tx/src/tests/valid_cases/input.rs b/fuel-tx/src/tests/valid_cases/input.rs
index eaea1f05ef..487fdebd44 100644
--- a/fuel-tx/src/tests/valid_cases/input.rs
+++ b/fuel-tx/src/tests/valid_cases/input.rs
@@ -12,7 +12,7 @@ fn input_coin_message_signature() {
         let rng = &mut StdRng::seed_from_u64(8586);
 
         fn check_inputs<Tx: Buildable>(tx: Tx) -> Result<(), CheckError> {
-            let txhash = tx.id();
+            let txhash = tx.id(&ConsensusParameters::DEFAULT);
             let outputs = tx.outputs();
             let witnesses = tx.witnesses();
 
@@ -42,8 +42,9 @@ fn input_coin_message_signature() {
 
             f(&mut tx, &public);
 
-            tx.sign_inputs(&secret);
-            keys.iter().for_each(|sk| tx.sign_inputs(sk));
+            tx.sign_inputs(&secret, &ConsensusParameters::DEFAULT);
+            keys.iter()
+                .for_each(|sk| tx.sign_inputs(sk, &ConsensusParameters::DEFAULT));
 
             check_inputs(tx)
         }
@@ -412,7 +413,7 @@ fn transaction_with_duplicate_coin_inputs_is_invalid() {
         .add_input(a)
         .add_input(b)
         .add_witness(rng.gen())
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check_without_signatures(0, &Default::default())
         .expect_err("Expected checkable failure");
 
@@ -430,7 +431,7 @@ fn transaction_with_duplicate_message_inputs_is_invalid() {
         // duplicate input
         .add_input(message_input)
         .add_witness(rng.gen())
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check_without_signatures(0, &Default::default())
         .expect_err("Expected checkable failure");
 
@@ -453,7 +454,7 @@ fn transaction_with_duplicate_contract_inputs_is_invalid() {
         .add_input(b)
         .add_output(o)
         .add_output(p)
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check_without_signatures(0, &Default::default())
         .expect_err("Expected checkable failure");
 
@@ -476,7 +477,7 @@ fn transaction_with_duplicate_contract_utxo_id_is_valid() {
         .add_input(b)
         .add_output(o)
         .add_output(p)
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check_without_signatures(0, &Default::default())
         .expect("Duplicated UTXO id is valid for contract input");
 }
diff --git a/fuel-tx/src/tests/valid_cases/transaction.rs b/fuel-tx/src/tests/valid_cases/transaction.rs
index 6f90e829ea..e2e9bb08c3 100644
--- a/fuel-tx/src/tests/valid_cases/transaction.rs
+++ b/fuel-tx/src/tests/valid_cases/transaction.rs
@@ -167,7 +167,7 @@ fn max_iow() {
     }
 
     builder
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect("Failed to validate transaction");
 
@@ -198,7 +198,7 @@ fn max_iow() {
     }
 
     builder
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect("Failed to validate transaction");
 
@@ -227,7 +227,7 @@ fn max_iow() {
     }
 
     let err = builder
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -258,7 +258,7 @@ fn max_iow() {
     }
 
     let err = builder
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -289,7 +289,7 @@ fn max_iow() {
     }
 
     let err = builder
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -317,7 +317,7 @@ fn output_change_asset_id() {
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), b, rng.gen(), rng.gen())
         .add_output(Output::change(rng.gen(), rng.next_u64(), a))
         .add_output(Output::change(rng.gen(), rng.next_u64(), b))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect("Failed to validate transaction");
 
@@ -329,7 +329,7 @@ fn output_change_asset_id() {
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), b, rng.gen(), rng.gen())
         .add_output(Output::change(rng.gen(), rng.next_u64(), a))
         .add_output(Output::change(rng.gen(), rng.next_u64(), a))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -343,7 +343,7 @@ fn output_change_asset_id() {
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), b, rng.gen(), rng.gen())
         .add_output(Output::change(rng.gen(), rng.next_u64(), a))
         .add_output(Output::change(rng.gen(), rng.next_u64(), c))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -360,7 +360,7 @@ fn output_change_asset_id() {
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), b, rng.gen(), rng.gen())
         .add_output(Output::coin(rng.gen(), rng.next_u64(), a))
         .add_output(Output::coin(rng.gen(), rng.next_u64(), c))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -389,7 +389,7 @@ fn script() {
     .maturity(maturity)
     .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), asset_id, rng.gen(), rng.gen())
     .add_output(Output::change(rng.gen(), rng.gen(), asset_id))
-    .finalize()
+    .finalize(&ConsensusParameters::DEFAULT)
     .check(block_height, &PARAMS)
     .expect("Failed to validate transaction");
 
@@ -402,7 +402,7 @@ fn script() {
     .maturity(maturity)
     .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), asset_id, rng.gen(), rng.gen())
     .add_output(Output::contract_created(rng.gen(), rng.gen()))
-    .finalize()
+    .finalize(&ConsensusParameters::DEFAULT)
     .check(block_height, &PARAMS)
     .expect_err("Expected erroneous transaction");
 
@@ -417,7 +417,7 @@ fn script() {
     .maturity(maturity)
     .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), asset_id, rng.gen(), rng.gen())
     .add_output(Output::contract_created(rng.gen(), rng.gen()))
-    .finalize()
+    .finalize(&ConsensusParameters::DEFAULT)
     .check(block_height, &PARAMS)
     .expect_err("Expected erroneous transaction");
 
@@ -432,7 +432,7 @@ fn script() {
     .maturity(maturity)
     .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), asset_id, rng.gen(), rng.gen())
     .add_output(Output::contract_created(rng.gen(), rng.gen()))
-    .finalize()
+    .finalize(&ConsensusParameters::DEFAULT)
     .check(block_height, &PARAMS)
     .expect_err("Expected erroneous transaction");
 
@@ -454,7 +454,7 @@ fn create() {
         .gas_price(rng.gen())
         .maturity(maturity)
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), rng.gen(), rng.gen(), maturity)
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect("Failed to validate tx");
 
@@ -464,7 +464,7 @@ fn create() {
         .maturity(maturity)
         .add_input(Input::contract(rng.gen(), rng.gen(), rng.gen(), rng.gen(), rng.gen()))
         .add_output(Output::contract(0, rng.gen(), rng.gen()))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -476,7 +476,7 @@ fn create() {
         .gas_price(rng.gen())
         .maturity(maturity)
         .add_unsigned_message_input(secret, rng.gen(), rng.gen(), rng.gen(), not_empty_data)
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -488,7 +488,7 @@ fn create() {
         .maturity(maturity)
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), rng.gen(), rng.gen(), maturity)
         .add_output(Output::variable(rng.gen(), rng.gen(), rng.gen()))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -502,7 +502,7 @@ fn create() {
         .add_unsigned_coin_input(secret_b, rng.gen(), rng.gen(), rng.gen(), rng.gen(), maturity)
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::BASE))
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::BASE))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -518,7 +518,7 @@ fn create() {
         .add_unsigned_coin_input(secret_b, rng.gen(), rng.gen(), asset_id, rng.gen(), maturity)
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
         .add_output(Output::change(rng.gen(), rng.gen(), asset_id))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -532,7 +532,7 @@ fn create() {
         .add_unsigned_coin_input(secret_b, rng.gen(), rng.gen(), rng.gen(), rng.gen(), maturity)
         .add_output(Output::contract_created(rng.gen(), rng.gen()))
         .add_output(Output::contract_created(rng.gen(), rng.gen()))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -551,7 +551,7 @@ fn create() {
     .maturity(maturity)
     .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), AssetId::default(), rng.gen(), maturity)
     .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
-    .finalize()
+    .finalize(&ConsensusParameters::DEFAULT)
     .check(block_height, &PARAMS)
     .expect("Failed to validate the transaction");
 
@@ -565,7 +565,7 @@ fn create() {
     .maturity(maturity)
     .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), AssetId::default(), rng.gen(), maturity)
     .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
-    .finalize()
+    .finalize(&ConsensusParameters::DEFAULT)
     .check(block_height, &PARAMS)
     .expect_err("Expected erroneous transaction");
 
@@ -593,7 +593,7 @@ fn create() {
         .maturity(maturity)
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), AssetId::default(), rng.gen(), maturity)
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect("Failed to validate the transaction");
 
@@ -615,7 +615,7 @@ fn create() {
         .maturity(maturity)
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), AssetId::default(), rng.gen(), maturity)
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect("Failed to validate the transaction");
 
@@ -631,7 +631,7 @@ fn create() {
         .maturity(maturity)
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), AssetId::default(), rng.gen(), maturity)
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -648,7 +648,7 @@ fn create() {
         .maturity(maturity)
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), AssetId::default(), rng.gen(), maturity)
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -664,13 +664,13 @@ fn mint() {
     TransactionBuilder::mint(block_height, rng.gen())
         .add_output(Output::coin(rng.gen(), rng.next_u64(), rng.gen()))
         .add_output(Output::coin(rng.gen(), rng.next_u64(), rng.gen()))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height as Word, &PARAMS)
         .expect("Failed to validate tx");
 
     let err = TransactionBuilder::mint(block_height, rng.gen())
         .add_output(Output::contract(0, rng.gen(), rng.gen()))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height as Word, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -679,7 +679,7 @@ fn mint() {
     let err = TransactionBuilder::mint(block_height, rng.gen())
         .add_output(Output::coin(rng.gen(), rng.next_u64(), AssetId::BASE))
         .add_output(Output::coin(rng.gen(), rng.next_u64(), AssetId::BASE))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height as Word, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -688,7 +688,7 @@ fn mint() {
     let err = TransactionBuilder::mint(block_height, rng.gen())
         .add_output(Output::coin(rng.gen(), rng.next_u64(), AssetId::BASE))
         .add_output(Output::coin(rng.gen(), rng.next_u64(), AssetId::BASE))
-        .finalize()
+        .finalize(&ConsensusParameters::DEFAULT)
         .check(block_height as Word + 1, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -743,9 +743,9 @@ fn tx_id_bytecode_len() {
         vec![w_c],
     );
 
-    let id_a = tx_a.id();
-    let id_b = tx_b.id();
-    let id_c = tx_c.id();
+    let id_a = tx_a.id(&PARAMS);
+    let id_b = tx_b.id(&PARAMS);
+    let id_c = tx_c.id(&PARAMS);
 
     // bytecode with different length should produce different id
     assert_ne!(id_a, id_b);
@@ -787,7 +787,7 @@ mod inputs {
                 predicate,
                 vec![],
             ))
-            .finalize();
+            .finalize(&PARAMS);
 
         assert!(tx.check_predicate_owners(&ConsensusParameters::DEFAULT));
     }
@@ -812,7 +812,7 @@ mod inputs {
                 predicate,
                 vec![],
             ))
-            .finalize();
+            .finalize(&PARAMS);
 
         assert!(!tx.check_predicate_owners(&ConsensusParameters::DEFAULT));
     }
@@ -838,7 +838,7 @@ mod inputs {
                 predicate,
                 vec![],
             ))
-            .finalize();
+            .finalize(&PARAMS);
 
         assert!(tx.check_predicate_owners(&ConsensusParameters::DEFAULT));
     }
@@ -862,7 +862,7 @@ mod inputs {
                 predicate,
                 vec![],
             ))
-            .finalize();
+            .finalize(&PARAMS);
 
         assert!(!tx.check_predicate_owners(&ConsensusParameters::DEFAULT));
     }
diff --git a/fuel-tx/src/transaction/id.rs b/fuel-tx/src/transaction/id.rs
index f75964091d..9fe58710cd 100644
--- a/fuel-tx/src/transaction/id.rs
+++ b/fuel-tx/src/transaction/id.rs
@@ -1,21 +1,21 @@
 use crate::input::coin::CoinSigned;
 use crate::input::message::{MessageCoinSigned, MessageDataSigned};
-use crate::{field, Input, Transaction};
+use crate::{field, ConsensusParameters, Input, Transaction};
 use fuel_crypto::{Message, PublicKey, SecretKey, Signature};
 use fuel_types::Bytes32;
 
 /// Means that transaction has a unique identifier.
 pub trait UniqueIdentifier {
     /// The unique identifier of the transaction is based on its content.
-    fn id(&self) -> Bytes32;
+    fn id(&self, params: &ConsensusParameters) -> Bytes32;
 }
 
 impl UniqueIdentifier for Transaction {
-    fn id(&self) -> Bytes32 {
+    fn id(&self, params: &ConsensusParameters) -> Bytes32 {
         match self {
-            Transaction::Script(script) => script.id(),
-            Transaction::Create(create) => create.id(),
-            Self::Mint(mint) => mint.id(),
+            Transaction::Script(script) => script.id(params),
+            Transaction::Create(create) => create.id(params),
+            Self::Mint(mint) => mint.id(params),
         }
     }
 }
@@ -25,7 +25,7 @@ impl UniqueIdentifier for Transaction {
 /// # Note: Autogenerated transactions are not signable.
 pub trait Signable: UniqueIdentifier {
     /// Signs inputs of the transaction.
-    fn sign_inputs(&mut self, secret: &SecretKey);
+    fn sign_inputs(&mut self, secret: &SecretKey, parameters: &ConsensusParameters);
 }
 
 impl<T> Signable for T
@@ -34,12 +34,12 @@ where
 {
     /// For all inputs of type `coin` or `message`, check if its `owner` equals the public
     /// counterpart of the provided key. Sign all matches.
-    fn sign_inputs(&mut self, secret: &SecretKey) {
+    fn sign_inputs(&mut self, secret: &SecretKey, parameters: &ConsensusParameters) {
         use itertools::Itertools;
 
         let pk = PublicKey::from(secret);
         let pk = Input::owner(&pk);
-        let id = self.id();
+        let id = self.id(parameters);
 
         let message = Message::from_bytes_ref(&id);
 
@@ -141,12 +141,18 @@ mod tests {
         let mut tx_p = tx.clone();
 
         let mut tx_q = tx.clone();
-        tx_q.precompute();
+        tx_q.precompute(&ConsensusParameters::DEFAULT);
 
         f(&mut tx_p);
 
-        assert_eq!(tx.id(), tx_p.id());
-        assert_eq!(tx.id(), tx_q.id());
+        assert_eq!(
+            tx.id(&ConsensusParameters::DEFAULT),
+            tx_p.id(&ConsensusParameters::DEFAULT)
+        );
+        assert_eq!(
+            tx.id(&ConsensusParameters::DEFAULT),
+            tx_q.id(&ConsensusParameters::DEFAULT)
+        );
     }
 
     fn assert_id_ne<Tx: Buildable, F>(tx: &Tx, mut f: F)
@@ -158,10 +164,16 @@ mod tests {
         f(&mut tx_p);
 
         let mut tx_q = tx_p.clone();
-        tx_q.precompute();
-
-        assert_ne!(tx.id(), tx_p.id());
-        assert_ne!(tx.id(), tx_q.id());
+        tx_q.precompute(&ConsensusParameters::DEFAULT);
+
+        assert_ne!(
+            tx.id(&ConsensusParameters::DEFAULT),
+            tx_p.id(&ConsensusParameters::DEFAULT)
+        );
+        assert_ne!(
+            tx.id(&ConsensusParameters::DEFAULT),
+            tx_q.id(&ConsensusParameters::DEFAULT)
+        );
     }
 
     macro_rules! assert_io_ne {
diff --git a/fuel-tx/src/transaction/metadata.rs b/fuel-tx/src/transaction/metadata.rs
index 78951fa49a..d9f4d1688b 100644
--- a/fuel-tx/src/transaction/metadata.rs
+++ b/fuel-tx/src/transaction/metadata.rs
@@ -1,6 +1,7 @@
 use alloc::vec::Vec;
 use fuel_types::Bytes32;
 
+use crate::ConsensusParameters;
 #[cfg(feature = "std")]
 use crate::{field, UniqueIdentifier};
 
@@ -12,7 +13,7 @@ pub trait Cacheable {
     fn is_computed(&self) -> bool;
 
     /// Computes the cache for the entity.
-    fn precompute(&mut self);
+    fn precompute(&mut self, parameters: &ConsensusParameters);
 }
 
 #[cfg(feature = "std")]
@@ -25,11 +26,11 @@ impl Cacheable for super::Transaction {
         }
     }
 
-    fn precompute(&mut self) {
+    fn precompute(&mut self, parameters: &ConsensusParameters) {
         match self {
-            Self::Script(script) => script.precompute(),
-            Self::Create(create) => create.precompute(),
-            Self::Mint(mint) => mint.precompute(),
+            Self::Script(script) => script.precompute(parameters),
+            Self::Create(create) => create.precompute(parameters),
+            Self::Mint(mint) => mint.precompute(parameters),
         }
     }
 }
@@ -50,7 +51,7 @@ pub(crate) struct CommonMetadata {
 #[cfg(feature = "std")]
 impl CommonMetadata {
     /// Computes the `Metadata` for the `tx` transaction.
-    pub fn compute<Tx>(tx: &Tx) -> Self
+    pub fn compute<Tx>(tx: &Tx, params: &ConsensusParameters) -> Self
     where
         Tx: UniqueIdentifier,
         Tx: field::Inputs,
@@ -61,7 +62,7 @@ impl CommonMetadata {
         use fuel_types::bytes::SizedBytes;
         use itertools::Itertools;
 
-        let id = tx.id();
+        let id = tx.id(params);
 
         let inputs_predicate_offset_at = tx
             .inputs()
diff --git a/fuel-tx/src/transaction/types/create.rs b/fuel-tx/src/transaction/types/create.rs
index b027cfc17f..6c6bf2ac9d 100644
--- a/fuel-tx/src/transaction/types/create.rs
+++ b/fuel-tx/src/transaction/types/create.rs
@@ -19,6 +19,7 @@ use std::io;
 
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
+use fuel_crypto::Hasher;
 
 #[cfg(feature = "std")]
 use fuel_types::bytes::SerializableVec;
@@ -62,7 +63,7 @@ mem_layout!(
 
 #[cfg(feature = "std")]
 impl crate::UniqueIdentifier for Create {
-    fn id(&self) -> fuel_types::Bytes32 {
+    fn id(&self, params: &ConsensusParameters) -> fuel_types::Bytes32 {
         if let Some(CommonMetadata { id, .. }) = self.metadata {
             return id;
         }
@@ -74,7 +75,12 @@ impl crate::UniqueIdentifier for Create {
         clone.outputs_mut().iter_mut().for_each(Output::prepare_sign);
         clone.witnesses_mut().clear();
 
-        fuel_crypto::Hasher::hash(clone.to_bytes().as_slice())
+        let mut hasher = Hasher::default();
+        // chain ID
+        hasher.input(params.chain_id.to_be_bytes());
+        // transaction bytes
+        hasher.input(clone.to_bytes().as_slice());
+        hasher.finalize()
     }
 }
 
@@ -101,7 +107,7 @@ impl FormatValidityChecks for Create {
     fn check_signatures(&self, parameters: &ConsensusParameters) -> Result<(), CheckError> {
         use crate::UniqueIdentifier;
 
-        let id = self.id();
+        let id = self.id(parameters);
 
         self.inputs()
             .iter()
@@ -186,9 +192,9 @@ impl crate::Cacheable for Create {
         self.metadata.is_some()
     }
 
-    fn precompute(&mut self) {
+    fn precompute(&mut self, parameters: &ConsensusParameters) {
         self.metadata = None;
-        self.metadata = Some(CommonMetadata::compute(self));
+        self.metadata = Some(CommonMetadata::compute(self, parameters));
     }
 }
 
diff --git a/fuel-tx/src/transaction/types/input/snapshot_tests.rs b/fuel-tx/src/transaction/types/input/snapshot_tests.rs
index 6a4fc6450d..32897a0b2f 100644
--- a/fuel-tx/src/transaction/types/input/snapshot_tests.rs
+++ b/fuel-tx/src/transaction/types/input/snapshot_tests.rs
@@ -18,7 +18,7 @@ fn tx_with_signed_coin_snapshot() {
             predicate: (),
             predicate_data: (),
         }))
-        .finalize_as_transaction();
+        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
@@ -39,7 +39,7 @@ fn tx_with_predicate_coin_snapshot() {
             predicate: vec![3u8; 10],
             predicate_data: vec![4u8; 12],
         }))
-        .finalize_as_transaction();
+        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
@@ -56,7 +56,7 @@ fn tx_with_contract_snapshot() {
             tx_pointer: TxPointer::new(46, 5),
             contract_id: [5u8; 32].into(),
         }))
-        .finalize_as_transaction();
+        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
@@ -76,7 +76,7 @@ fn tx_with_signed_message_coin() {
             predicate: (),
             predicate_data: (),
         }))
-        .finalize_as_transaction();
+        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
@@ -96,7 +96,7 @@ fn tx_with_predicate_message_coin() {
             predicate: vec![7u8; 11],
             predicate_data: vec![8u8; 12],
         }))
-        .finalize_as_transaction();
+        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
@@ -116,7 +116,7 @@ fn tx_with_signed_message_data() {
             predicate: (),
             predicate_data: (),
         }))
-        .finalize_as_transaction();
+        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
@@ -136,7 +136,7 @@ fn tx_with_predicate_message_data() {
             predicate: vec![7u8; 11],
             predicate_data: vec![8u8; 12],
         }))
-        .finalize_as_transaction();
+        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
diff --git a/fuel-tx/src/transaction/types/mint.rs b/fuel-tx/src/transaction/types/mint.rs
index 00a763cdfe..b06f83f9a4 100644
--- a/fuel-tx/src/transaction/types/mint.rs
+++ b/fuel-tx/src/transaction/types/mint.rs
@@ -15,6 +15,7 @@ use std::io;
 
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
+use fuel_crypto::Hasher;
 
 #[cfg(feature = "std")]
 use fuel_types::bytes::{self, Deserializable, SerializableVec};
@@ -28,7 +29,7 @@ pub(crate) struct MintMetadata {
 
 #[cfg(feature = "std")]
 impl MintMetadata {
-    fn compute<Tx>(tx: &Tx) -> Self
+    fn compute<Tx>(tx: &Tx, parameters: &ConsensusParameters) -> Self
     where
         Tx: crate::UniqueIdentifier,
         Tx: Outputs,
@@ -36,7 +37,7 @@ impl MintMetadata {
     {
         use itertools::Itertools;
 
-        let id = tx.id();
+        let id = tx.id(parameters);
 
         let mut offset = tx.outputs_offset();
 
@@ -88,13 +89,18 @@ mem_layout!(
 
 #[cfg(feature = "std")]
 impl crate::UniqueIdentifier for Mint {
-    fn id(&self) -> Bytes32 {
+    fn id(&self, params: &ConsensusParameters) -> Bytes32 {
         if let Some(MintMetadata { id, .. }) = self.metadata {
             return id;
         }
 
         let mut clone = self.clone();
-        fuel_crypto::Hasher::hash(clone.to_bytes().as_slice())
+        let mut hasher = Hasher::default();
+        // chain ID
+        hasher.input(params.chain_id.to_be_bytes());
+        // transaction bytes
+        hasher.input(clone.to_bytes().as_slice());
+        hasher.finalize()
     }
 }
 
@@ -135,9 +141,9 @@ impl crate::Cacheable for Mint {
         self.metadata.is_some()
     }
 
-    fn precompute(&mut self) {
+    fn precompute(&mut self, parameters: &ConsensusParameters) {
         self.metadata = None;
-        self.metadata = Some(MintMetadata::compute(self));
+        self.metadata = Some(MintMetadata::compute(self, parameters));
     }
 }
 
diff --git a/fuel-tx/src/transaction/types/script.rs b/fuel-tx/src/transaction/types/script.rs
index 18a710647a..8275d29fac 100644
--- a/fuel-tx/src/transaction/types/script.rs
+++ b/fuel-tx/src/transaction/types/script.rs
@@ -19,6 +19,7 @@ use std::io;
 
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
+use fuel_crypto::Hasher;
 
 #[cfg(feature = "std")]
 use fuel_types::bytes::SerializableVec;
@@ -85,7 +86,7 @@ impl Default for Script {
 
 #[cfg(feature = "std")]
 impl crate::UniqueIdentifier for Script {
-    fn id(&self) -> Bytes32 {
+    fn id(&self, params: &ConsensusParameters) -> Bytes32 {
         if let Some(ScriptMetadata {
             common: CommonMetadata { id, .. },
             ..
@@ -102,7 +103,12 @@ impl crate::UniqueIdentifier for Script {
         clone.outputs_mut().iter_mut().for_each(Output::prepare_sign);
         clone.witnesses_mut().clear();
 
-        fuel_crypto::Hasher::hash(clone.to_bytes().as_slice())
+        let mut hasher = Hasher::default();
+        // chain ID
+        hasher.input(params.chain_id.to_be_bytes());
+        // transaction bytes
+        hasher.input(clone.to_bytes().as_slice());
+        hasher.finalize()
     }
 }
 
@@ -129,7 +135,7 @@ impl FormatValidityChecks for Script {
     fn check_signatures(&self, parameters: &ConsensusParameters) -> Result<(), CheckError> {
         use crate::UniqueIdentifier;
 
-        let id = self.id();
+        let id = self.id(parameters);
 
         self.inputs()
             .iter()
@@ -168,10 +174,10 @@ impl crate::Cacheable for Script {
         self.metadata.is_some()
     }
 
-    fn precompute(&mut self) {
+    fn precompute(&mut self, parameters: &ConsensusParameters) {
         self.metadata = None;
         self.metadata = Some(ScriptMetadata {
-            common: CommonMetadata::compute(self),
+            common: CommonMetadata::compute(self, parameters),
             script_data_offset: self.script_data_offset(),
         });
     }
diff --git a/fuel-tx/test-helpers/src/lib.rs b/fuel-tx/test-helpers/src/lib.rs
index 14812fc236..6a155823d7 100644
--- a/fuel-tx/test-helpers/src/lib.rs
+++ b/fuel-tx/test-helpers/src/lib.rs
@@ -39,7 +39,8 @@ where
 mod use_std {
     use fuel_crypto::SecretKey;
     use fuel_tx::{
-        field, Buildable, Contract, Create, Finalizable, Input, Mint, Output, Script, Transaction, TransactionBuilder,
+        field, Buildable, ConsensusParameters, Contract, Create, Finalizable, Input, Mint, Output, Script, Transaction,
+        TransactionBuilder,
     };
     use fuel_types::bytes::Deserializable;
     use rand::distributions::{Distribution, Uniform};
@@ -308,7 +309,7 @@ mod use_std {
             );
 
             let keys = self.fill_transaction(&mut builder);
-            (builder.finalize(), keys)
+            (builder.finalize(&ConsensusParameters::DEFAULT), keys)
         }
     }
 
@@ -325,7 +326,7 @@ mod use_std {
                 TransactionBuilder::<Script>::script(generate_bytes(&mut self.rng), generate_bytes(&mut self.rng));
 
             let keys = self.fill_transaction(&mut builder);
-            (builder.finalize(), keys)
+            (builder.finalize(&ConsensusParameters::DEFAULT), keys)
         }
     }
 
@@ -337,7 +338,7 @@ mod use_std {
             let mut builder = TransactionBuilder::<Mint>::mint(self.rng.gen(), self.rng.gen());
 
             self.fill_outputs(&mut builder);
-            builder.finalize()
+            builder.finalize(&ConsensusParameters::DEFAULT)
         }
     }
 
diff --git a/fuel-vm/src/checked_transaction.rs b/fuel-vm/src/checked_transaction.rs
index 42cd62b056..f7bd63267f 100644
--- a/fuel-vm/src/checked_transaction.rs
+++ b/fuel-vm/src/checked_transaction.rs
@@ -434,7 +434,7 @@ mod tests {
             .gas_price(gas_price)
             .gas_limit(gas_limit)
             .add_unsigned_message_input(rng.gen(), rng.gen(), rng.gen(), input_amount, vec![0xff; 10])
-            .finalize();
+            .finalize(&ConsensusParameters::DEFAULT);
 
         let err = tx
             .into_checked(0, &ConsensusParameters::DEFAULT, &Default::default())
@@ -469,7 +469,7 @@ mod tests {
                 vec![0xaa; 10],
                 vec![0xbb; 10],
             ))
-            .finalize();
+            .finalize(&ConsensusParameters::DEFAULT);
 
         let err = tx
             .into_checked(0, &ConsensusParameters::DEFAULT, &Default::default())
@@ -618,7 +618,7 @@ mod tests {
             .add_output(Output::coin(rng.gen(), 10, asset))
             .add_output(Output::change(rng.gen(), 0, asset))
             .add_witness(Default::default())
-            .finalize();
+            .finalize(&ConsensusParameters::DEFAULT);
 
         let checked = tx
             .into_checked(0, &ConsensusParameters::DEFAULT, &Default::default())
@@ -733,7 +733,7 @@ mod tests {
             .add_unsigned_coin_input(secret, rng.gen(), input_amount, any_asset, rng.gen(), 0)
             .add_output(Output::coin(rng.gen(), input_amount + 1, any_asset))
             .add_output(Output::change(rng.gen(), 0, any_asset))
-            .finalize();
+            .finalize(&ConsensusParameters::DEFAULT);
 
         let checked = tx
             .into_checked(0, &ConsensusParameters::DEFAULT, &Default::default())
@@ -844,7 +844,7 @@ mod tests {
             .add_output(Output::contract(1, rng.gen(), rng.gen()))
             .add_output(Output::coin(rng.gen(), output_amount, asset))
             .add_output(Output::change(rng.gen(), 0, asset))
-            .finalize()
+            .finalize(&ConsensusParameters::DEFAULT)
     }
 
     // used when proptesting to avoid expensive crypto signatures
@@ -866,7 +866,7 @@ mod tests {
                 vec![],
             ))
             .add_output(Output::change(rng.gen(), 0, asset))
-            .finalize()
+            .finalize(&ConsensusParameters::DEFAULT)
     }
 
     // used to verify message inputs can cover fees
@@ -875,7 +875,7 @@ mod tests {
             .gas_price(gas_price)
             .gas_limit(gas_limit)
             .add_unsigned_message_input(rng.gen(), rng.gen(), rng.gen(), input_amount, vec![])
-            .finalize()
+            .finalize(&ConsensusParameters::DEFAULT)
     }
 
     fn predicate_message_coin_tx(rng: &mut StdRng, gas_price: u64, gas_limit: u64, input_amount: u64) -> Script {
@@ -890,7 +890,7 @@ mod tests {
                 vec![],
                 vec![],
             ))
-            .finalize()
+            .finalize(&ConsensusParameters::DEFAULT)
     }
 
     fn base_asset_tx(rng: &mut StdRng, input_amount: u64, gas_price: u64, gas_limit: u64) -> Script {
@@ -899,6 +899,6 @@ mod tests {
             .gas_limit(gas_limit)
             .add_unsigned_coin_input(rng.gen(), rng.gen(), input_amount, AssetId::default(), rng.gen(), 0)
             .add_output(Output::change(rng.gen(), 0, AssetId::default()))
-            .finalize()
+            .finalize(&ConsensusParameters::DEFAULT)
     }
 }
diff --git a/fuel-vm/src/checked_transaction/builder.rs b/fuel-vm/src/checked_transaction/builder.rs
index 7025bdd8fa..4d16417bd0 100644
--- a/fuel-vm/src/checked_transaction/builder.rs
+++ b/fuel-vm/src/checked_transaction/builder.rs
@@ -23,13 +23,13 @@ where
     Checked<Tx>: CheckPredicates,
 {
     fn finalize_checked(&mut self, height: Word, params: &ConsensusParameters, gas_costs: &GasCosts) -> Checked<Tx> {
-        self.finalize()
+        self.finalize(params)
             .into_checked(height, params, gas_costs)
             .expect("failed to check tx")
     }
 
     fn finalize_checked_basic(&mut self, height: Word, params: &ConsensusParameters) -> Checked<Tx> {
-        self.finalize()
+        self.finalize(params)
             .into_checked_basic(height, params)
             .expect("failed to check tx")
     }
diff --git a/fuel-vm/src/checked_transaction/types.rs b/fuel-vm/src/checked_transaction/types.rs
index 49378cc161..3b25ab13ef 100644
--- a/fuel-vm/src/checked_transaction/types.rs
+++ b/fuel-vm/src/checked_transaction/types.rs
@@ -77,7 +77,7 @@ pub mod create {
             block_height: Word,
             params: &ConsensusParameters,
         ) -> Result<Checked<Self>, CheckError> {
-            self.precompute();
+            self.precompute(params);
             self.check_without_signatures(block_height, params)?;
 
             // validate fees and compute free balances
@@ -117,7 +117,7 @@ pub mod mint {
             block_height: Word,
             params: &ConsensusParameters,
         ) -> Result<Checked<Self>, CheckError> {
-            self.precompute();
+            self.precompute(params);
             self.check_without_signatures(block_height, params)?;
 
             Ok(Checked::basic(self, ()))
@@ -159,7 +159,7 @@ pub mod script {
             block_height: Word,
             params: &ConsensusParameters,
         ) -> Result<Checked<Self>, CheckError> {
-            self.precompute();
+            self.precompute(params);
             self.check_without_signatures(block_height, params)?;
 
             // validate fees and compute free balances
diff --git a/fuel-vm/src/interpreter/initialization.rs b/fuel-vm/src/interpreter/initialization.rs
index 0428ffe8c0..ed93fa4749 100644
--- a/fuel-vm/src/interpreter/initialization.rs
+++ b/fuel-vm/src/interpreter/initialization.rs
@@ -38,7 +38,7 @@ where
         // Set heap area
         self.registers[RegId::HP] = VM_MAX_RAM;
 
-        self.push_stack(self.transaction().id().as_ref())
+        self.push_stack(self.transaction().id(&self.params).as_ref())
             .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
 
         RuntimeBalances::try_from(initial_balances)?.to_vm(self);
diff --git a/fuel-vm/src/tests/blockchain.rs b/fuel-vm/src/tests/blockchain.rs
index a1a27e92ad..48f4c797bb 100644
--- a/fuel-vm/src/tests/blockchain.rs
+++ b/fuel-vm/src/tests/blockchain.rs
@@ -1349,7 +1349,7 @@ fn smo_instruction_works() {
         let non_retryable_free_balance = tx.metadata().non_retryable_balances[&AssetId::BASE];
         let retryable_balance: u64 = tx.metadata().retryable_balance.into();
 
-        let txid = tx.transaction().id();
+        let txid = tx.transaction().id(params);
         let receipts = client.transact(tx);
 
         let success = receipts.iter().any(|r| {

From fec8898230f9f2bd2746b9269b970577349c524a Mon Sep 17 00:00:00 2001
From: Brandon Kite <brandonkite92@gmail.com>
Date: Mon, 27 Mar 2023 16:08:50 -0700
Subject: [PATCH 03/10] add consensus params to tx builder

---
 fuel-tx/src/builder.rs                       | 58 +++++++++++--------
 fuel-tx/src/tests/prepared_init.rs           |  2 +-
 fuel-tx/src/tests/valid_cases/input.rs       |  8 +--
 fuel-tx/src/tests/valid_cases/transaction.rs | 60 ++++++++++----------
 fuel-tx/test-helpers/src/lib.rs              |  6 +-
 fuel-vm/src/checked_transaction.rs           | 18 +++---
 fuel-vm/src/checked_transaction/builder.rs   | 17 +++---
 fuel-vm/src/interpreter/internal/tests.rs    |  2 +-
 fuel-vm/src/predicate.rs                     |  3 +-
 fuel-vm/src/tests/blockchain.rs              |  6 +-
 fuel-vm/src/tests/code_coverage.rs           |  3 +-
 fuel-vm/src/tests/crypto.rs                  |  9 ++-
 fuel-vm/src/tests/metadata.rs                |  9 ++-
 fuel-vm/src/tests/predicate.rs               | 17 +++---
 fuel-vm/src/tests/profile_gas.rs             |  3 +-
 fuel-vm/src/tests/validation.rs              |  3 +-
 fuel-vm/src/util.rs                          |  8 ++-
 17 files changed, 129 insertions(+), 103 deletions(-)

diff --git a/fuel-tx/src/builder.rs b/fuel-tx/src/builder.rs
index fb5e4213b1..e3231bffcb 100644
--- a/fuel-tx/src/builder.rs
+++ b/fuel-tx/src/builder.rs
@@ -88,6 +88,7 @@ pub struct TransactionBuilder<Tx> {
 
     should_prepare_script: bool,
     should_prepare_predicate: bool,
+    parameters: ConsensusParameters,
 
     // We take the key by reference so this lib won't have the responsibility to properly zeroize
     // the keys
@@ -165,8 +166,18 @@ impl<Tx> TransactionBuilder<Tx> {
             should_prepare_script,
             should_prepare_predicate,
             sign_keys,
+            parameters: ConsensusParameters::DEFAULT,
         }
     }
+
+    pub fn get_params(&self) -> &ConsensusParameters {
+        &self.parameters
+    }
+
+    pub fn with_params(&mut self, parameters: ConsensusParameters) -> &mut Self {
+        self.parameters = parameters;
+        self
+    }
 }
 
 impl<Tx: Buildable> TransactionBuilder<Tx> {
@@ -264,6 +275,7 @@ impl<Tx: Buildable> TransactionBuilder<Tx> {
 
         self
     }
+
     #[cfg(feature = "std")]
     fn prepare_finalize(&mut self) {
         if self.should_prepare_predicate {
@@ -276,25 +288,25 @@ impl<Tx: Buildable> TransactionBuilder<Tx> {
     }
 
     #[cfg(feature = "std")]
-    pub fn _finalize(&mut self, parameters: &ConsensusParameters) -> Tx {
+    pub fn _finalize(&mut self) -> Tx {
         self.prepare_finalize();
 
         let mut tx = core::mem::take(&mut self.tx);
 
-        self.sign_keys.iter().for_each(|k| tx.sign_inputs(k, parameters));
+        self.sign_keys.iter().for_each(|k| tx.sign_inputs(k, &self.parameters));
 
-        tx.precompute(parameters);
+        tx.precompute(&self.parameters);
 
         tx
     }
 
     #[cfg(feature = "std")]
-    pub fn _finalize_without_signature(&mut self, parameters: &ConsensusParameters) -> Tx {
+    pub fn _finalize_without_signature(&mut self) -> Tx {
         self.prepare_finalize();
 
         let mut tx = core::mem::take(&mut self.tx);
 
-        tx.precompute(parameters);
+        tx.precompute(&self.parameters);
 
         tx
     }
@@ -308,43 +320,43 @@ impl<Tx: field::Outputs> TransactionBuilder<Tx> {
 }
 
 pub trait Finalizable<Tx> {
-    fn finalize(&mut self, parameters: &ConsensusParameters) -> Tx;
+    fn finalize(&mut self) -> Tx;
 
-    fn finalize_without_signature(&mut self, parameters: &ConsensusParameters) -> Tx;
+    fn finalize_without_signature(&mut self) -> Tx;
 }
 
 #[cfg(feature = "std")]
 impl Finalizable<Mint> for TransactionBuilder<Mint> {
-    fn finalize(&mut self, parameters: &ConsensusParameters) -> Mint {
+    fn finalize(&mut self) -> Mint {
         let mut tx = core::mem::take(&mut self.tx);
-        tx.precompute(parameters);
+        tx.precompute(&self.parameters);
         tx
     }
 
-    fn finalize_without_signature(&mut self, parameters: &ConsensusParameters) -> Mint {
-        self.finalize(parameters)
+    fn finalize_without_signature(&mut self) -> Mint {
+        self.finalize()
     }
 }
 
 #[cfg(feature = "std")]
 impl Finalizable<Create> for TransactionBuilder<Create> {
-    fn finalize(&mut self, parameters: &ConsensusParameters) -> Create {
-        self._finalize(parameters)
+    fn finalize(&mut self) -> Create {
+        self._finalize()
     }
 
-    fn finalize_without_signature(&mut self, parameters: &ConsensusParameters) -> Create {
-        self._finalize_without_signature(parameters)
+    fn finalize_without_signature(&mut self) -> Create {
+        self._finalize_without_signature()
     }
 }
 
 #[cfg(feature = "std")]
 impl Finalizable<Script> for TransactionBuilder<Script> {
-    fn finalize(&mut self, parameters: &ConsensusParameters) -> Script {
-        self._finalize(parameters)
+    fn finalize(&mut self) -> Script {
+        self._finalize()
     }
 
-    fn finalize_without_signature(&mut self, parameters: &ConsensusParameters) -> Script {
-        self._finalize_without_signature(parameters)
+    fn finalize_without_signature(&mut self) -> Script {
+        self._finalize_without_signature()
     }
 }
 
@@ -354,12 +366,12 @@ where
     Transaction: From<Tx>,
 {
     #[cfg(feature = "std")]
-    pub fn finalize_as_transaction(&mut self, parameters: &ConsensusParameters) -> Transaction {
-        self.finalize(parameters).into()
+    pub fn finalize_as_transaction(&mut self) -> Transaction {
+        self.finalize().into()
     }
 
     #[cfg(feature = "std")]
-    pub fn finalize_without_signature_as_transaction(&mut self, parameters: &ConsensusParameters) -> Transaction {
-        self.finalize_without_signature(parameters).into()
+    pub fn finalize_without_signature_as_transaction(&mut self) -> Transaction {
+        self.finalize_without_signature().into()
     }
 }
diff --git a/fuel-tx/src/tests/prepared_init.rs b/fuel-tx/src/tests/prepared_init.rs
index ec7cc83182..aa9b76fc4f 100644
--- a/fuel-tx/src/tests/prepared_init.rs
+++ b/fuel-tx/src/tests/prepared_init.rs
@@ -13,7 +13,7 @@ fn output_variable_prepare_init_zeroes_recipient_and_amount() {
     let tx = TransactionBuilder::script(vec![], vec![])
         .prepare_script(false)
         .add_output(variable)
-        .finalize(&ConsensusParameters::DEFAULT);
+        .finalize();
 
     let output = tx
         .clone()
diff --git a/fuel-tx/src/tests/valid_cases/input.rs b/fuel-tx/src/tests/valid_cases/input.rs
index 487fdebd44..c8f5dae2d4 100644
--- a/fuel-tx/src/tests/valid_cases/input.rs
+++ b/fuel-tx/src/tests/valid_cases/input.rs
@@ -413,7 +413,7 @@ fn transaction_with_duplicate_coin_inputs_is_invalid() {
         .add_input(a)
         .add_input(b)
         .add_witness(rng.gen())
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check_without_signatures(0, &Default::default())
         .expect_err("Expected checkable failure");
 
@@ -431,7 +431,7 @@ fn transaction_with_duplicate_message_inputs_is_invalid() {
         // duplicate input
         .add_input(message_input)
         .add_witness(rng.gen())
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check_without_signatures(0, &Default::default())
         .expect_err("Expected checkable failure");
 
@@ -454,7 +454,7 @@ fn transaction_with_duplicate_contract_inputs_is_invalid() {
         .add_input(b)
         .add_output(o)
         .add_output(p)
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check_without_signatures(0, &Default::default())
         .expect_err("Expected checkable failure");
 
@@ -477,7 +477,7 @@ fn transaction_with_duplicate_contract_utxo_id_is_valid() {
         .add_input(b)
         .add_output(o)
         .add_output(p)
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check_without_signatures(0, &Default::default())
         .expect("Duplicated UTXO id is valid for contract input");
 }
diff --git a/fuel-tx/src/tests/valid_cases/transaction.rs b/fuel-tx/src/tests/valid_cases/transaction.rs
index e2e9bb08c3..aa0dac345c 100644
--- a/fuel-tx/src/tests/valid_cases/transaction.rs
+++ b/fuel-tx/src/tests/valid_cases/transaction.rs
@@ -167,7 +167,7 @@ fn max_iow() {
     }
 
     builder
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect("Failed to validate transaction");
 
@@ -198,7 +198,7 @@ fn max_iow() {
     }
 
     builder
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect("Failed to validate transaction");
 
@@ -227,7 +227,7 @@ fn max_iow() {
     }
 
     let err = builder
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -258,7 +258,7 @@ fn max_iow() {
     }
 
     let err = builder
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -289,7 +289,7 @@ fn max_iow() {
     }
 
     let err = builder
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -317,7 +317,7 @@ fn output_change_asset_id() {
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), b, rng.gen(), rng.gen())
         .add_output(Output::change(rng.gen(), rng.next_u64(), a))
         .add_output(Output::change(rng.gen(), rng.next_u64(), b))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect("Failed to validate transaction");
 
@@ -329,7 +329,7 @@ fn output_change_asset_id() {
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), b, rng.gen(), rng.gen())
         .add_output(Output::change(rng.gen(), rng.next_u64(), a))
         .add_output(Output::change(rng.gen(), rng.next_u64(), a))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -343,7 +343,7 @@ fn output_change_asset_id() {
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), b, rng.gen(), rng.gen())
         .add_output(Output::change(rng.gen(), rng.next_u64(), a))
         .add_output(Output::change(rng.gen(), rng.next_u64(), c))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -360,7 +360,7 @@ fn output_change_asset_id() {
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), b, rng.gen(), rng.gen())
         .add_output(Output::coin(rng.gen(), rng.next_u64(), a))
         .add_output(Output::coin(rng.gen(), rng.next_u64(), c))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -389,7 +389,7 @@ fn script() {
     .maturity(maturity)
     .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), asset_id, rng.gen(), rng.gen())
     .add_output(Output::change(rng.gen(), rng.gen(), asset_id))
-    .finalize(&ConsensusParameters::DEFAULT)
+    .finalize()
     .check(block_height, &PARAMS)
     .expect("Failed to validate transaction");
 
@@ -402,7 +402,7 @@ fn script() {
     .maturity(maturity)
     .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), asset_id, rng.gen(), rng.gen())
     .add_output(Output::contract_created(rng.gen(), rng.gen()))
-    .finalize(&ConsensusParameters::DEFAULT)
+    .finalize()
     .check(block_height, &PARAMS)
     .expect_err("Expected erroneous transaction");
 
@@ -417,7 +417,7 @@ fn script() {
     .maturity(maturity)
     .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), asset_id, rng.gen(), rng.gen())
     .add_output(Output::contract_created(rng.gen(), rng.gen()))
-    .finalize(&ConsensusParameters::DEFAULT)
+    .finalize()
     .check(block_height, &PARAMS)
     .expect_err("Expected erroneous transaction");
 
@@ -432,7 +432,7 @@ fn script() {
     .maturity(maturity)
     .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), asset_id, rng.gen(), rng.gen())
     .add_output(Output::contract_created(rng.gen(), rng.gen()))
-    .finalize(&ConsensusParameters::DEFAULT)
+    .finalize()
     .check(block_height, &PARAMS)
     .expect_err("Expected erroneous transaction");
 
@@ -454,7 +454,7 @@ fn create() {
         .gas_price(rng.gen())
         .maturity(maturity)
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), rng.gen(), rng.gen(), maturity)
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect("Failed to validate tx");
 
@@ -464,7 +464,7 @@ fn create() {
         .maturity(maturity)
         .add_input(Input::contract(rng.gen(), rng.gen(), rng.gen(), rng.gen(), rng.gen()))
         .add_output(Output::contract(0, rng.gen(), rng.gen()))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -476,7 +476,7 @@ fn create() {
         .gas_price(rng.gen())
         .maturity(maturity)
         .add_unsigned_message_input(secret, rng.gen(), rng.gen(), rng.gen(), not_empty_data)
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -488,7 +488,7 @@ fn create() {
         .maturity(maturity)
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), rng.gen(), rng.gen(), maturity)
         .add_output(Output::variable(rng.gen(), rng.gen(), rng.gen()))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -502,7 +502,7 @@ fn create() {
         .add_unsigned_coin_input(secret_b, rng.gen(), rng.gen(), rng.gen(), rng.gen(), maturity)
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::BASE))
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::BASE))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -518,7 +518,7 @@ fn create() {
         .add_unsigned_coin_input(secret_b, rng.gen(), rng.gen(), asset_id, rng.gen(), maturity)
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
         .add_output(Output::change(rng.gen(), rng.gen(), asset_id))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -532,7 +532,7 @@ fn create() {
         .add_unsigned_coin_input(secret_b, rng.gen(), rng.gen(), rng.gen(), rng.gen(), maturity)
         .add_output(Output::contract_created(rng.gen(), rng.gen()))
         .add_output(Output::contract_created(rng.gen(), rng.gen()))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -551,7 +551,7 @@ fn create() {
     .maturity(maturity)
     .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), AssetId::default(), rng.gen(), maturity)
     .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
-    .finalize(&ConsensusParameters::DEFAULT)
+    .finalize()
     .check(block_height, &PARAMS)
     .expect("Failed to validate the transaction");
 
@@ -565,7 +565,7 @@ fn create() {
     .maturity(maturity)
     .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), AssetId::default(), rng.gen(), maturity)
     .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
-    .finalize(&ConsensusParameters::DEFAULT)
+    .finalize()
     .check(block_height, &PARAMS)
     .expect_err("Expected erroneous transaction");
 
@@ -593,7 +593,7 @@ fn create() {
         .maturity(maturity)
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), AssetId::default(), rng.gen(), maturity)
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect("Failed to validate the transaction");
 
@@ -615,7 +615,7 @@ fn create() {
         .maturity(maturity)
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), AssetId::default(), rng.gen(), maturity)
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect("Failed to validate the transaction");
 
@@ -631,7 +631,7 @@ fn create() {
         .maturity(maturity)
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), AssetId::default(), rng.gen(), maturity)
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -648,7 +648,7 @@ fn create() {
         .maturity(maturity)
         .add_unsigned_coin_input(secret, rng.gen(), rng.gen(), AssetId::default(), rng.gen(), maturity)
         .add_output(Output::change(rng.gen(), rng.gen(), AssetId::default()))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -664,13 +664,13 @@ fn mint() {
     TransactionBuilder::mint(block_height, rng.gen())
         .add_output(Output::coin(rng.gen(), rng.next_u64(), rng.gen()))
         .add_output(Output::coin(rng.gen(), rng.next_u64(), rng.gen()))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height as Word, &PARAMS)
         .expect("Failed to validate tx");
 
     let err = TransactionBuilder::mint(block_height, rng.gen())
         .add_output(Output::contract(0, rng.gen(), rng.gen()))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height as Word, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -679,7 +679,7 @@ fn mint() {
     let err = TransactionBuilder::mint(block_height, rng.gen())
         .add_output(Output::coin(rng.gen(), rng.next_u64(), AssetId::BASE))
         .add_output(Output::coin(rng.gen(), rng.next_u64(), AssetId::BASE))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height as Word, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
@@ -688,7 +688,7 @@ fn mint() {
     let err = TransactionBuilder::mint(block_height, rng.gen())
         .add_output(Output::coin(rng.gen(), rng.next_u64(), AssetId::BASE))
         .add_output(Output::coin(rng.gen(), rng.next_u64(), AssetId::BASE))
-        .finalize(&ConsensusParameters::DEFAULT)
+        .finalize()
         .check(block_height as Word + 1, &PARAMS)
         .expect_err("Expected erroneous transaction");
 
diff --git a/fuel-tx/test-helpers/src/lib.rs b/fuel-tx/test-helpers/src/lib.rs
index 6a155823d7..00e18fa573 100644
--- a/fuel-tx/test-helpers/src/lib.rs
+++ b/fuel-tx/test-helpers/src/lib.rs
@@ -309,7 +309,7 @@ mod use_std {
             );
 
             let keys = self.fill_transaction(&mut builder);
-            (builder.finalize(&ConsensusParameters::DEFAULT), keys)
+            (builder.finalize(), keys)
         }
     }
 
@@ -326,7 +326,7 @@ mod use_std {
                 TransactionBuilder::<Script>::script(generate_bytes(&mut self.rng), generate_bytes(&mut self.rng));
 
             let keys = self.fill_transaction(&mut builder);
-            (builder.finalize(&ConsensusParameters::DEFAULT), keys)
+            (builder.finalize(), keys)
         }
     }
 
@@ -338,7 +338,7 @@ mod use_std {
             let mut builder = TransactionBuilder::<Mint>::mint(self.rng.gen(), self.rng.gen());
 
             self.fill_outputs(&mut builder);
-            builder.finalize(&ConsensusParameters::DEFAULT)
+            builder.finalize()
         }
     }
 
diff --git a/fuel-vm/src/checked_transaction.rs b/fuel-vm/src/checked_transaction.rs
index f7bd63267f..42cd62b056 100644
--- a/fuel-vm/src/checked_transaction.rs
+++ b/fuel-vm/src/checked_transaction.rs
@@ -434,7 +434,7 @@ mod tests {
             .gas_price(gas_price)
             .gas_limit(gas_limit)
             .add_unsigned_message_input(rng.gen(), rng.gen(), rng.gen(), input_amount, vec![0xff; 10])
-            .finalize(&ConsensusParameters::DEFAULT);
+            .finalize();
 
         let err = tx
             .into_checked(0, &ConsensusParameters::DEFAULT, &Default::default())
@@ -469,7 +469,7 @@ mod tests {
                 vec![0xaa; 10],
                 vec![0xbb; 10],
             ))
-            .finalize(&ConsensusParameters::DEFAULT);
+            .finalize();
 
         let err = tx
             .into_checked(0, &ConsensusParameters::DEFAULT, &Default::default())
@@ -618,7 +618,7 @@ mod tests {
             .add_output(Output::coin(rng.gen(), 10, asset))
             .add_output(Output::change(rng.gen(), 0, asset))
             .add_witness(Default::default())
-            .finalize(&ConsensusParameters::DEFAULT);
+            .finalize();
 
         let checked = tx
             .into_checked(0, &ConsensusParameters::DEFAULT, &Default::default())
@@ -733,7 +733,7 @@ mod tests {
             .add_unsigned_coin_input(secret, rng.gen(), input_amount, any_asset, rng.gen(), 0)
             .add_output(Output::coin(rng.gen(), input_amount + 1, any_asset))
             .add_output(Output::change(rng.gen(), 0, any_asset))
-            .finalize(&ConsensusParameters::DEFAULT);
+            .finalize();
 
         let checked = tx
             .into_checked(0, &ConsensusParameters::DEFAULT, &Default::default())
@@ -844,7 +844,7 @@ mod tests {
             .add_output(Output::contract(1, rng.gen(), rng.gen()))
             .add_output(Output::coin(rng.gen(), output_amount, asset))
             .add_output(Output::change(rng.gen(), 0, asset))
-            .finalize(&ConsensusParameters::DEFAULT)
+            .finalize()
     }
 
     // used when proptesting to avoid expensive crypto signatures
@@ -866,7 +866,7 @@ mod tests {
                 vec![],
             ))
             .add_output(Output::change(rng.gen(), 0, asset))
-            .finalize(&ConsensusParameters::DEFAULT)
+            .finalize()
     }
 
     // used to verify message inputs can cover fees
@@ -875,7 +875,7 @@ mod tests {
             .gas_price(gas_price)
             .gas_limit(gas_limit)
             .add_unsigned_message_input(rng.gen(), rng.gen(), rng.gen(), input_amount, vec![])
-            .finalize(&ConsensusParameters::DEFAULT)
+            .finalize()
     }
 
     fn predicate_message_coin_tx(rng: &mut StdRng, gas_price: u64, gas_limit: u64, input_amount: u64) -> Script {
@@ -890,7 +890,7 @@ mod tests {
                 vec![],
                 vec![],
             ))
-            .finalize(&ConsensusParameters::DEFAULT)
+            .finalize()
     }
 
     fn base_asset_tx(rng: &mut StdRng, input_amount: u64, gas_price: u64, gas_limit: u64) -> Script {
@@ -899,6 +899,6 @@ mod tests {
             .gas_limit(gas_limit)
             .add_unsigned_coin_input(rng.gen(), rng.gen(), input_amount, AssetId::default(), rng.gen(), 0)
             .add_output(Output::change(rng.gen(), 0, AssetId::default()))
-            .finalize(&ConsensusParameters::DEFAULT)
+            .finalize()
     }
 }
diff --git a/fuel-vm/src/checked_transaction/builder.rs b/fuel-vm/src/checked_transaction/builder.rs
index 4d16417bd0..e90d553346 100644
--- a/fuel-vm/src/checked_transaction/builder.rs
+++ b/fuel-vm/src/checked_transaction/builder.rs
@@ -3,7 +3,6 @@
 use super::{Checked, IntoChecked};
 use crate::checked_transaction::CheckPredicates;
 use crate::prelude::*;
-use fuel_tx::ConsensusParameters;
 
 /// Extension trait for [`fuel_tx::TransactionBuilder`] adding finalization methods
 pub trait TransactionBuilderExt<Tx>
@@ -11,10 +10,10 @@ where
     Tx: IntoChecked,
 {
     /// Finalize the builder into a [`Checked<Tx>`] of the correct type
-    fn finalize_checked(&mut self, height: Word, params: &ConsensusParameters, gas_costs: &GasCosts) -> Checked<Tx>;
+    fn finalize_checked(&mut self, height: Word, gas_costs: &GasCosts) -> Checked<Tx>;
 
     /// Finalize the builder into a [`Checked<Tx>`] of the correct type, with basic checks only
-    fn finalize_checked_basic(&mut self, height: Word, params: &ConsensusParameters) -> Checked<Tx>;
+    fn finalize_checked_basic(&mut self, height: Word) -> Checked<Tx>;
 }
 
 impl<Tx: ExecutableTransaction> TransactionBuilderExt<Tx> for TransactionBuilder<Tx>
@@ -22,15 +21,15 @@ where
     Self: Finalizable<Tx>,
     Checked<Tx>: CheckPredicates,
 {
-    fn finalize_checked(&mut self, height: Word, params: &ConsensusParameters, gas_costs: &GasCosts) -> Checked<Tx> {
-        self.finalize(params)
-            .into_checked(height, params, gas_costs)
+    fn finalize_checked(&mut self, height: Word, gas_costs: &GasCosts) -> Checked<Tx> {
+        self.finalize()
+            .into_checked(height, self.get_params(), gas_costs)
             .expect("failed to check tx")
     }
 
-    fn finalize_checked_basic(&mut self, height: Word, params: &ConsensusParameters) -> Checked<Tx> {
-        self.finalize(params)
-            .into_checked_basic(height, params)
+    fn finalize_checked_basic(&mut self, height: Word) -> Checked<Tx> {
+        self.finalize()
+            .into_checked_basic(height, self.get_params())
             .expect("failed to check tx")
     }
 }
diff --git a/fuel-vm/src/interpreter/internal/tests.rs b/fuel-vm/src/interpreter/internal/tests.rs
index 9f36e9d826..6eb0aac722 100644
--- a/fuel-vm/src/interpreter/internal/tests.rs
+++ b/fuel-vm/src/interpreter/internal/tests.rs
@@ -35,7 +35,7 @@ fn external_balance() {
         .gas_limit(gas_limit)
         .gas_limit(100)
         .maturity(maturity)
-        .finalize_checked(height as Word, &Default::default(), &Default::default());
+        .finalize_checked(height as Word, &Default::default());
 
     vm.init_script(tx).expect("Failed to init VM!");
 
diff --git a/fuel-vm/src/predicate.rs b/fuel-vm/src/predicate.rs
index ad18714a81..fe89daa18c 100644
--- a/fuel-vm/src/predicate.rs
+++ b/fuel-vm/src/predicate.rs
@@ -98,8 +98,9 @@ fn from_tx_works() {
 
     for i in inputs {
         let tx = TransactionBuilder::script(vec![], vec![])
+            .with_params(params)
             .add_input(i)
-            .finalize_checked_basic(height, &params);
+            .finalize_checked_basic(height);
 
         // assert invalid idx wont panic
         let idx = 1;
diff --git a/fuel-vm/src/tests/blockchain.rs b/fuel-vm/src/tests/blockchain.rs
index 6c1270e311..fcc7f44933 100644
--- a/fuel-vm/src/tests/blockchain.rs
+++ b/fuel-vm/src/tests/blockchain.rs
@@ -1352,7 +1352,8 @@ fn smo_instruction_works() {
                 amount: 0,
                 asset_id: Default::default(),
             })
-            .finalize_checked(block_height, params, client.gas_costs());
+            .with_params(*params)
+            .finalize_checked(block_height, client.gas_costs());
 
         let non_retryable_free_balance = tx.metadata().non_retryable_balances[&AssetId::BASE];
         let retryable_balance: u64 = tx.metadata().retryable_balance.into();
@@ -1473,7 +1474,8 @@ fn timestamp_works() {
             .gas_price(gas_price)
             .gas_limit(gas_limit)
             .maturity(maturity)
-            .finalize_checked(block_height, &params, client.gas_costs());
+            .with_params(params)
+            .finalize_checked(block_height, client.gas_costs());
 
         let receipts = client.transact(tx);
         let result = receipts.iter().any(|r| {
diff --git a/fuel-vm/src/tests/code_coverage.rs b/fuel-vm/src/tests/code_coverage.rs
index 85c41e51c6..5d0facc664 100644
--- a/fuel-vm/src/tests/code_coverage.rs
+++ b/fuel-vm/src/tests/code_coverage.rs
@@ -36,7 +36,8 @@ fn code_coverage() {
         .gas_price(gas_price)
         .gas_limit(gas_limit)
         .maturity(maturity)
-        .finalize_checked(height, &params, &GasCosts::default());
+        .with_params(params)
+        .finalize_checked(height, &GasCosts::default());
 
     #[derive(Clone, Default)]
     struct ProfilingOutput {
diff --git a/fuel-vm/src/tests/crypto.rs b/fuel-vm/src/tests/crypto.rs
index 2365100c2b..226b51d05c 100644
--- a/fuel-vm/src/tests/crypto.rs
+++ b/fuel-vm/src/tests/crypto.rs
@@ -56,7 +56,8 @@ fn ecrecover() {
         .gas_price(gas_price)
         .gas_limit(gas_limit)
         .maturity(maturity)
-        .finalize_checked(height, &params, &gas_costs);
+        .with_params(params)
+        .finalize_checked(height, &gas_costs);
 
     let receipts = client.transact(tx);
     let success = receipts.iter().any(|r| matches!(r, Receipt::Log{ ra, .. } if *ra == 1));
@@ -173,7 +174,8 @@ fn sha256() {
         .gas_price(gas_price)
         .gas_limit(gas_limit)
         .maturity(maturity)
-        .finalize_checked(height, &params, &gas_costs);
+        .with_params(params)
+        .finalize_checked(height, &gas_costs);
 
     let receipts = client.transact(tx);
     let success = receipts.iter().any(|r| matches!(r, Receipt::Log{ ra, .. } if *ra == 1));
@@ -265,7 +267,8 @@ fn keccak256() {
         .gas_price(gas_price)
         .gas_limit(gas_limit)
         .maturity(maturity)
-        .finalize_checked(height, &params, client.gas_costs());
+        .with_params(params)
+        .finalize_checked(height, client.gas_costs());
 
     let receipts = client.transact(tx);
     let success = receipts.iter().any(|r| matches!(r, Receipt::Log{ ra, .. } if *ra == 1));
diff --git a/fuel-vm/src/tests/metadata.rs b/fuel-vm/src/tests/metadata.rs
index 31ed053af3..2b722d96a6 100644
--- a/fuel-vm/src/tests/metadata.rs
+++ b/fuel-vm/src/tests/metadata.rs
@@ -198,7 +198,8 @@ fn get_transaction_fields() {
 
     let tx = TransactionBuilder::create(contract, salt, storage_slots)
         .add_output(Output::contract_created(contract_id, state_root))
-        .finalize_checked(height, &params, client.gas_costs());
+        .with_params(params)
+        .finalize_checked(height, client.gas_costs());
 
     client.deploy(tx);
 
@@ -267,7 +268,8 @@ fn get_transaction_fields() {
         .add_input(message_predicate)
         .add_unsigned_coin_input(rng.gen(), rng.gen(), asset_amt, asset, rng.gen(), maturity)
         .add_output(Output::coin(rng.gen(), asset_amt, asset))
-        .finalize_checked(height, &params, client.gas_costs());
+        .with_params(params)
+        .finalize_checked(height, client.gas_costs());
 
     let inputs = tx.as_ref().inputs();
     let outputs = tx.as_ref().outputs();
@@ -725,7 +727,8 @@ fn get_transaction_fields() {
         .maturity(maturity)
         .gas_price(gas_price)
         .gas_limit(gas_limit)
-        .finalize_checked_basic(height, &params);
+        .with_params(params)
+        .finalize_checked_basic(height);
 
     let receipts = client.transact(tx);
     let success = receipts.iter().any(|r| matches!(r, Receipt::Log{ ra, .. } if ra == &1));
diff --git a/fuel-vm/src/tests/predicate.rs b/fuel-vm/src/tests/predicate.rs
index c2f20b104e..8fdcc78fbb 100644
--- a/fuel-vm/src/tests/predicate.rs
+++ b/fuel-vm/src/tests/predicate.rs
@@ -54,7 +54,7 @@ where
 
     builder.add_input(input);
 
-    let tx = builder.finalize_checked_basic(height, &params);
+    let tx = builder.with_params(params).finalize_checked_basic(height);
     Interpreter::<PredicateStorage>::check_predicates(tx, Default::default(), Default::default()).is_ok()
 }
 
@@ -148,7 +148,7 @@ fn execute_gas_metered_predicates(predicates: Vec<Vec<Instruction>>) -> Result<u
         builder.add_input(input);
     }
 
-    let tx = builder.finalize_checked_basic(0, &ConsensusParameters::default());
+    let tx = builder.finalize_checked_basic(0);
     Interpreter::<PredicateStorage>::check_predicates(tx, Default::default(), Default::default())
         .map(|r| r.gas_used())
         .map_err(|_| ())
@@ -200,7 +200,8 @@ fn gas_used_by_predicates_is_deducted_from_script_gas() {
     builder.add_unsigned_coin_input(rng.gen(), rng.gen(), coin_amount, AssetId::default(), rng.gen(), 0);
 
     let tx_without_predicate = builder
-        .finalize_checked_basic(0, &params)
+        .with_params(params)
+        .finalize_checked_basic(0)
         .check_predicates(&params, &GasCosts::default())
         .expect("Predicate check failed even if we don't have any predicates");
 
@@ -230,7 +231,7 @@ fn gas_used_by_predicates_is_deducted_from_script_gas() {
     builder.add_input(input);
 
     let tx_with_predicate = builder
-        .finalize_checked_basic(0, &ConsensusParameters::default())
+        .finalize_checked_basic(0)
         .check_predicates(&params, &GasCosts::default())
         .expect("Predicate check failed");
 
@@ -263,7 +264,7 @@ fn gas_used_by_predicates_causes_out_of_gas_during_script() {
     builder.add_unsigned_coin_input(rng.gen(), rng.gen(), coin_amount, AssetId::default(), rng.gen(), 0);
 
     let tx_without_predicate = builder
-        .finalize_checked_basic(0, &ConsensusParameters::default())
+        .finalize_checked_basic(0)
         .check_predicates(&params, &GasCosts::default())
         .expect("Predicate check failed even if we don't have any predicates");
 
@@ -296,7 +297,7 @@ fn gas_used_by_predicates_causes_out_of_gas_during_script() {
     builder.add_input(input);
 
     let tx_with_predicate = builder
-        .finalize_checked_basic(0, &ConsensusParameters::default())
+        .finalize_checked_basic(0)
         .check_predicates(&params, &GasCosts::default())
         .expect("Predicate check failed");
 
@@ -329,7 +330,7 @@ fn gas_used_by_predicates_more_than_limit() {
     builder.add_unsigned_coin_input(rng.gen(), rng.gen(), coin_amount, AssetId::default(), rng.gen(), 0);
 
     let tx_without_predicate = builder
-        .finalize_checked_basic(0, &ConsensusParameters::default())
+        .finalize_checked_basic(0)
         .check_predicates(&params, &GasCosts::default())
         .expect("Predicate check failed even if we don't have any predicates");
 
@@ -368,7 +369,7 @@ fn gas_used_by_predicates_more_than_limit() {
     builder.add_input(input);
 
     let tx_with_predicate = builder
-        .finalize_checked_basic(0, &ConsensusParameters::default())
+        .finalize_checked_basic(0)
         .check_predicates(&params, &GasCosts::default());
 
     assert_eq!(tx_with_predicate.unwrap_err(), CheckError::PredicateExhaustedGas);
diff --git a/fuel-vm/src/tests/profile_gas.rs b/fuel-vm/src/tests/profile_gas.rs
index b19bf76e74..46b507b879 100644
--- a/fuel-vm/src/tests/profile_gas.rs
+++ b/fuel-vm/src/tests/profile_gas.rs
@@ -33,7 +33,8 @@ fn profile_gas() {
             .gas_limit(gas_limit)
             .gas_price(gas_price)
             .maturity(maturity)
-            .finalize_checked(height, &params, &GasCosts::default());
+            .with_params(params)
+            .finalize_checked(height, &GasCosts::default());
 
         let output = GasProfiler::default();
 
diff --git a/fuel-vm/src/tests/validation.rs b/fuel-vm/src/tests/validation.rs
index b61cbcc750..8217d20b7d 100644
--- a/fuel-vm/src/tests/validation.rs
+++ b/fuel-vm/src/tests/validation.rs
@@ -17,7 +17,8 @@ fn transaction_can_be_executed_after_maturity() {
         .add_unsigned_coin_input(rng.gen(), rng.gen(), 1, Default::default(), rng.gen(), 0)
         .gas_limit(100)
         .maturity(MATURITY)
-        .finalize_checked(BLOCK_HEIGHT as Word, &params, &gas_costs);
+        .with_params(params)
+        .finalize_checked(BLOCK_HEIGHT as Word, &gas_costs);
 
     let result = TestBuilder::new(2322u64).block_height(BLOCK_HEIGHT).execute_tx(tx);
     assert!(result.is_ok());
diff --git a/fuel-vm/src/util.rs b/fuel-vm/src/util.rs
index e3782f8266..890349a5d4 100644
--- a/fuel-vm/src/util.rs
+++ b/fuel-vm/src/util.rs
@@ -226,7 +226,7 @@ pub mod test_helpers {
 
         pub fn build(&mut self) -> Checked<Script> {
             self.builder
-                .finalize_checked(self.block_height as Word, &self.params, &self.gas_costs)
+                .finalize_checked(self.block_height as Word, &self.gas_costs)
         }
 
         pub fn build_get_balance_tx(
@@ -401,8 +401,9 @@ pub mod test_helpers {
         let contract_id = Contract::from(contract.as_ref()).id(&salt, &code_root, &state_root);
 
         let contract_deployer = TransactionBuilder::create(contract, salt, storage_slots)
+            .with_params(params)
             .add_output(Output::contract_created(contract_id, state_root))
-            .finalize_checked(height, &params, client.gas_costs());
+            .finalize_checked(height, client.gas_costs());
 
         client.deploy(contract_deployer).expect("valid contract deployment");
 
@@ -426,6 +427,7 @@ pub mod test_helpers {
             .gas_price(gas_price)
             .gas_limit(gas_limit)
             .maturity(maturity)
+            .with_params(params)
             .add_input(Input::contract(
                 Default::default(),
                 Default::default(),
@@ -434,7 +436,7 @@ pub mod test_helpers {
                 contract_id,
             ))
             .add_output(Output::contract(0, Default::default(), Default::default()))
-            .finalize_checked(height, &params, client.gas_costs());
+            .finalize_checked(height, client.gas_costs());
 
         check_reason_for_transaction(client, tx_deploy_loader, expected_reason);
     }

From 12efd79770b036a3cefb8e6197310dde2404311f Mon Sep 17 00:00:00 2001
From: Brandon Kite <brandonkite92@gmail.com>
Date: Mon, 27 Mar 2023 18:30:28 -0700
Subject: [PATCH 04/10] add chain id to gm

---
 fuel-asm/src/args.rs                      |  6 ++++
 fuel-vm/src/interpreter/metadata.rs       | 12 ++++++--
 fuel-vm/src/interpreter/metadata/tests.rs | 30 ++++++++++++++++++-
 fuel-vm/src/tests/metadata.rs             | 36 ++++++++++++++++++++++-
 4 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/fuel-asm/src/args.rs b/fuel-asm/src/args.rs
index c81843341b..b189b39a63 100644
--- a/fuel-asm/src/args.rs
+++ b/fuel-asm/src/args.rs
@@ -5,6 +5,7 @@ use fuel_types::{Immediate12, Immediate18};
 const GM_IS_CALLER_EXTERNAL: u8 = 0x01;
 const GM_GET_CALLER: u8 = 0x02;
 const GM_GET_VERIFYING_PREDICATE: u8 = 0x03;
+const GM_GET_CHAIN_ID: u8 = 0x04;
 
 /// Argument list for GM (get metadata) instruction
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, strum::EnumIter)]
@@ -22,6 +23,9 @@ pub enum GMArgs {
 
     /// Get index of current predicate.
     GetVerifyingPredicate = GM_GET_VERIFYING_PREDICATE,
+
+    /// Get the Chain ID this VM is operating within
+    GetChainId = GM_GET_CHAIN_ID,
 }
 
 impl TryFrom<Immediate18> for GMArgs {
@@ -32,6 +36,7 @@ impl TryFrom<Immediate18> for GMArgs {
             GM_IS_CALLER_EXTERNAL => Ok(Self::IsCallerExternal),
             GM_GET_CALLER => Ok(Self::GetCaller),
             GM_GET_VERIFYING_PREDICATE => Ok(Self::GetVerifyingPredicate),
+            GM_GET_CHAIN_ID => Ok(Self::GetChainId),
             _ => Err(PanicReason::InvalidMetadataIdentifier),
         }
     }
@@ -428,6 +433,7 @@ fn encode_gm_args() {
         GMArgs::IsCallerExternal,
         GMArgs::GetCaller,
         GMArgs::GetVerifyingPredicate,
+        GMArgs::GetChainId,
     ];
 
     args.into_iter().for_each(|a| {
diff --git a/fuel-vm/src/interpreter/metadata.rs b/fuel-vm/src/interpreter/metadata.rs
index 5ce529048f..7c3cfd8261 100644
--- a/fuel-vm/src/interpreter/metadata.rs
+++ b/fuel-vm/src/interpreter/metadata.rs
@@ -10,7 +10,7 @@ use fuel_asm::{GMArgs, GTFArgs, PanicReason, RegId};
 use fuel_tx::field::{
     BytecodeLength, BytecodeWitnessIndex, ReceiptsRoot, Salt, Script as ScriptField, ScriptData, StorageSlots,
 };
-use fuel_tx::{Input, InputRepr, Output, OutputRepr, UtxoId};
+use fuel_tx::{ConsensusParameters, Input, InputRepr, Output, OutputRepr, UtxoId};
 use fuel_types::{Immediate12, Immediate18, RegisterId, Word};
 
 #[cfg(test)]
@@ -23,7 +23,7 @@ where
     pub(crate) fn metadata(&mut self, ra: RegisterId, imm: Immediate18) -> Result<(), RuntimeError> {
         let (SystemRegisters { pc, .. }, mut w) = split_registers(&mut self.registers);
         let result = &mut w[WriteRegKey::try_from(ra)?];
-        metadata(&self.context, &self.frames, pc, result, imm)
+        metadata(&self.context, &self.params, &self.frames, pc, result, imm)
     }
 
     pub(crate) fn get_transaction_field(
@@ -45,6 +45,7 @@ where
 
 pub(crate) fn metadata(
     context: &Context,
+    params: &ConsensusParameters,
     frames: &[CallFrame],
     pc: RegMut<PC>,
     result: &mut Word,
@@ -62,6 +63,10 @@ pub(crate) fn metadata(
                     .ok_or(PanicReason::TransactionValidity)?;
             }
 
+            GMArgs::GetChainId => {
+                *result = params.chain_id;
+            }
+
             _ => return Err(PanicReason::ExpectedInternalContext.into()),
         }
     } else {
@@ -79,6 +84,9 @@ pub(crate) fn metadata(
                 *result = parent;
             }
 
+            GMArgs::GetChainId => {
+                *result = params.chain_id;
+            }
             _ => return Err(PanicReason::ExpectedInternalContext.into()),
         }
     }
diff --git a/fuel-vm/src/interpreter/metadata/tests.rs b/fuel-vm/src/interpreter/metadata/tests.rs
index 302ea1f924..719bca1c08 100644
--- a/fuel-vm/src/interpreter/metadata/tests.rs
+++ b/fuel-vm/src/interpreter/metadata/tests.rs
@@ -1,4 +1,5 @@
 use fuel_tx::Script;
+use test_case::test_case;
 
 use super::*;
 
@@ -11,7 +12,15 @@ fn test_metadata() {
     let mut pc = 4;
     let mut result = 1;
     let imm = 0x03;
-    metadata(&context, &frames, RegMut::new(&mut pc), &mut result, imm).unwrap();
+    metadata(
+        &context,
+        &ConsensusParameters::DEFAULT,
+        &frames,
+        RegMut::new(&mut pc),
+        &mut result,
+        imm,
+    )
+    .unwrap();
     assert_eq!(pc, 8);
     assert_eq!(result, 0);
 }
@@ -31,3 +40,22 @@ fn test_get_transaction_field() {
     assert_eq!(pc, 8);
     assert_eq!(result, 0);
 }
+
+#[test_case(Context::Predicate { program: Default::default() }, 2 => (); "can fetch inside predicate")]
+#[test_case(Context::Script { block_height: 0 }, 3 => (); "can fetch inside script")]
+#[test_case(Context::Call { block_height: 0 }, 4 => (); "can fetch inside call")]
+fn get_chain_id(context: Context, chain_id: u64) {
+    let mut frames = vec![];
+    let mut pc = 4;
+    let mut result = 1;
+    let imm = GMArgs::GetChainId as Immediate18;
+    let mut params = ConsensusParameters::DEFAULT;
+    params.chain_id = chain_id;
+
+    if context.is_internal() {
+        frames.push(CallFrame::default());
+    }
+    metadata(&context, &params, &frames, RegMut::new(&mut pc), &mut result, imm).unwrap();
+
+    assert_eq!(result, chain_id);
+}
diff --git a/fuel-vm/src/tests/metadata.rs b/fuel-vm/src/tests/metadata.rs
index 2b722d96a6..fe2dfbae0e 100644
--- a/fuel-vm/src/tests/metadata.rs
+++ b/fuel-vm/src/tests/metadata.rs
@@ -2,7 +2,7 @@ use fuel_asm::{op, GMArgs, GTFArgs, RegId};
 use fuel_crypto::Hasher;
 use fuel_tx::{
     field::{Inputs, Outputs, ReceiptsRoot, Script as ScriptField, Witnesses},
-    Script, TransactionBuilder,
+    Finalizable, Receipt, Script, TransactionBuilder,
 };
 use fuel_types::bytes;
 use fuel_vm::consts::*;
@@ -175,6 +175,40 @@ fn metadata() {
     assert_eq!(&contract_call, digest);
 }
 
+#[test]
+fn get_metadata_chain_id() {
+    let rng = &mut StdRng::seed_from_u64(2322u64);
+    let gas_limit = 1_000_000;
+    let height = 0;
+    let params = ConsensusParameters {
+        chain_id: rng.gen(),
+        ..Default::default()
+    };
+    let gas_costs = GasCosts::default();
+
+    let mut client = MemoryClient::new(Default::default(), params, gas_costs.clone());
+
+    #[rustfmt::skip]
+        let get_chain_id = vec![
+        op::gm_args(0x10, GMArgs::GetChainId),
+        op::ret(0x10),
+    ];
+
+    let script = TransactionBuilder::script(get_chain_id.into_iter().collect(), vec![])
+        .gas_limit(gas_limit)
+        .finalize()
+        .into_checked(height, &params, &gas_costs)
+        .unwrap();
+
+    let receipts = client.transact(script);
+
+    if let Receipt::Return { val, .. } = receipts[0].clone() {
+        assert_eq!(val, params.chain_id);
+    } else {
+        panic!("expected return receipt, instead of {:?}", receipts[0])
+    }
+}
+
 #[test]
 fn get_transaction_fields() {
     let rng = &mut StdRng::seed_from_u64(2322u64);

From 391c29e9338f9f24879758c333b40ec98c00ad6f Mon Sep 17 00:00:00 2001
From: Brandon Kite <brandonkite92@gmail.com>
Date: Mon, 27 Mar 2023 18:50:00 -0700
Subject: [PATCH 05/10] merge master

---
 fuel-vm/src/checked_transaction/builder.rs | 14 ++++----------
 fuel-vm/src/interpreter/metadata/tests.rs  |  5 +++--
 fuel-vm/src/tests/metadata.rs              |  4 ++--
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/fuel-vm/src/checked_transaction/builder.rs b/fuel-vm/src/checked_transaction/builder.rs
index 6dc2a90f66..07b5d8ca7b 100644
--- a/fuel-vm/src/checked_transaction/builder.rs
+++ b/fuel-vm/src/checked_transaction/builder.rs
@@ -3,7 +3,6 @@
 use super::{Checked, IntoChecked};
 use crate::checked_transaction::CheckPredicates;
 use crate::prelude::*;
-use fuel_tx::ConsensusParameters;
 use fuel_types::BlockHeight;
 
 /// Extension trait for [`fuel_tx::TransactionBuilder`] adding finalization methods
@@ -12,15 +11,10 @@ where
     Tx: IntoChecked,
 {
     /// Finalize the builder into a [`Checked<Tx>`] of the correct type
-    fn finalize_checked(
-        &mut self,
-        height: BlockHeight,
-        params: &ConsensusParameters,
-        gas_costs: &GasCosts,
-    ) -> Checked<Tx>;
+    fn finalize_checked(&mut self, height: BlockHeight, gas_costs: &GasCosts) -> Checked<Tx>;
 
     /// Finalize the builder into a [`Checked<Tx>`] of the correct type, with basic checks only
-    fn finalize_checked_basic(&mut self, height: BlockHeight, params: &ConsensusParameters) -> Checked<Tx>;
+    fn finalize_checked_basic(&mut self, height: BlockHeight) -> Checked<Tx>;
 }
 
 impl<Tx: ExecutableTransaction> TransactionBuilderExt<Tx> for TransactionBuilder<Tx>
@@ -28,13 +22,13 @@ where
     Self: Finalizable<Tx>,
     Checked<Tx>: CheckPredicates,
 {
-    fn finalize_checked(&mut self, height: Word, gas_costs: &GasCosts) -> Checked<Tx> {
+    fn finalize_checked(&mut self, height: BlockHeight, gas_costs: &GasCosts) -> Checked<Tx> {
         self.finalize()
             .into_checked(height, self.get_params(), gas_costs)
             .expect("failed to check tx")
     }
 
-    fn finalize_checked_basic(&mut self, height: Word) -> Checked<Tx> {
+    fn finalize_checked_basic(&mut self, height: BlockHeight) -> Checked<Tx> {
         self.finalize()
             .into_checked_basic(height, self.get_params())
             .expect("failed to check tx")
diff --git a/fuel-vm/src/interpreter/metadata/tests.rs b/fuel-vm/src/interpreter/metadata/tests.rs
index 719bca1c08..2ba7b4171e 100644
--- a/fuel-vm/src/interpreter/metadata/tests.rs
+++ b/fuel-vm/src/interpreter/metadata/tests.rs
@@ -1,4 +1,5 @@
 use fuel_tx::Script;
+use fuel_types::BlockHeight;
 use test_case::test_case;
 
 use super::*;
@@ -42,8 +43,8 @@ fn test_get_transaction_field() {
 }
 
 #[test_case(Context::Predicate { program: Default::default() }, 2 => (); "can fetch inside predicate")]
-#[test_case(Context::Script { block_height: 0 }, 3 => (); "can fetch inside script")]
-#[test_case(Context::Call { block_height: 0 }, 4 => (); "can fetch inside call")]
+#[test_case(Context::Script { block_height: BlockHeight::default() }, 3 => (); "can fetch inside script")]
+#[test_case(Context::Call { block_height: BlockHeight::default() }, 4 => (); "can fetch inside call")]
 fn get_chain_id(context: Context, chain_id: u64) {
     let mut frames = vec![];
     let mut pc = 4;
diff --git a/fuel-vm/src/tests/metadata.rs b/fuel-vm/src/tests/metadata.rs
index 22405d68e4..c6a2a08a60 100644
--- a/fuel-vm/src/tests/metadata.rs
+++ b/fuel-vm/src/tests/metadata.rs
@@ -4,7 +4,7 @@ use fuel_tx::{
     field::{Inputs, Outputs, ReceiptsRoot, Script as ScriptField, Witnesses},
     Finalizable, Receipt, Script, TransactionBuilder,
 };
-use fuel_types::bytes;
+use fuel_types::{bytes, BlockHeight};
 use fuel_vm::consts::*;
 use rand::{rngs::StdRng, Rng, SeedableRng};
 
@@ -179,7 +179,7 @@ fn metadata() {
 fn get_metadata_chain_id() {
     let rng = &mut StdRng::seed_from_u64(2322u64);
     let gas_limit = 1_000_000;
-    let height = 0;
+    let height = BlockHeight::default();
     let params = ConsensusParameters {
         chain_id: rng.gen(),
         ..Default::default()

From 7c3cb7697d37b2f8cb291b20ec5fd5c4b9dcf709 Mon Sep 17 00:00:00 2001
From: Brandon Kite <brandonkite92@gmail.com>
Date: Mon, 27 Mar 2023 19:00:56 -0700
Subject: [PATCH 06/10] update rust to 1.67.1

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index efd13b3423..92af7ea2c3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ concurrency:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: 1.67.0
+  RUST_VERSION: 1.67.1
 
 jobs:
   cargo:

From ca098dec4e7bb7032d4551218f58fa98853c2018 Mon Sep 17 00:00:00 2001
From: Brandon Kite <brandonkite92@gmail.com>
Date: Mon, 27 Mar 2023 19:19:19 -0700
Subject: [PATCH 07/10] deal with merge conflicts

---
 fuel-tx/src/tests/valid_cases/transaction.rs       | 12 ++++++++----
 .../src/transaction/types/input/snapshot_tests.rs  | 14 +++++++-------
 fuel-tx/test-helpers/src/lib.rs                    |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/fuel-tx/src/tests/valid_cases/transaction.rs b/fuel-tx/src/tests/valid_cases/transaction.rs
index bb827cb40f..cf6a65015e 100644
--- a/fuel-tx/src/tests/valid_cases/transaction.rs
+++ b/fuel-tx/src/tests/valid_cases/transaction.rs
@@ -787,7 +787,8 @@ mod inputs {
                 predicate,
                 vec![],
             ))
-            .finalize(&PARAMS);
+            .with_params(PARAMS)
+            .finalize();
 
         assert!(tx.check_predicate_owners(&ConsensusParameters::DEFAULT));
     }
@@ -812,7 +813,8 @@ mod inputs {
                 predicate,
                 vec![],
             ))
-            .finalize(&PARAMS);
+            .with_params(PARAMS)
+            .finalize();
 
         assert!(!tx.check_predicate_owners(&ConsensusParameters::DEFAULT));
     }
@@ -838,7 +840,8 @@ mod inputs {
                 predicate,
                 vec![],
             ))
-            .finalize(&PARAMS);
+            .with_params(PARAMS)
+            .finalize();
 
         assert!(tx.check_predicate_owners(&ConsensusParameters::DEFAULT));
     }
@@ -862,7 +865,8 @@ mod inputs {
                 predicate,
                 vec![],
             ))
-            .finalize(&PARAMS);
+            .with_params(PARAMS)
+            .finalize();
 
         assert!(!tx.check_predicate_owners(&ConsensusParameters::DEFAULT));
     }
diff --git a/fuel-tx/src/transaction/types/input/snapshot_tests.rs b/fuel-tx/src/transaction/types/input/snapshot_tests.rs
index 9714e6d8b3..6465da4325 100644
--- a/fuel-tx/src/transaction/types/input/snapshot_tests.rs
+++ b/fuel-tx/src/transaction/types/input/snapshot_tests.rs
@@ -18,7 +18,7 @@ fn tx_with_signed_coin_snapshot() {
             predicate: (),
             predicate_data: (),
         }))
-        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
+        .finalize_as_transaction();
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
@@ -39,7 +39,7 @@ fn tx_with_predicate_coin_snapshot() {
             predicate: vec![3u8; 10],
             predicate_data: vec![4u8; 12],
         }))
-        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
+        .finalize_as_transaction();
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
@@ -56,7 +56,7 @@ fn tx_with_contract_snapshot() {
             tx_pointer: TxPointer::new(46.into(), 5),
             contract_id: [5u8; 32].into(),
         }))
-        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
+        .finalize_as_transaction();
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
@@ -76,7 +76,7 @@ fn tx_with_signed_message_coin() {
             predicate: (),
             predicate_data: (),
         }))
-        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
+        .finalize_as_transaction();
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
@@ -96,7 +96,7 @@ fn tx_with_predicate_message_coin() {
             predicate: vec![7u8; 11],
             predicate_data: vec![8u8; 12],
         }))
-        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
+        .finalize_as_transaction();
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
@@ -116,7 +116,7 @@ fn tx_with_signed_message_data() {
             predicate: (),
             predicate_data: (),
         }))
-        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
+        .finalize_as_transaction();
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
@@ -136,7 +136,7 @@ fn tx_with_predicate_message_data() {
             predicate: vec![7u8; 11],
             predicate_data: vec![8u8; 12],
         }))
-        .finalize_as_transaction(&ConsensusParameters::DEFAULT);
+        .finalize_as_transaction();
 
     let bytes = tx.to_bytes();
     let hex = hex::encode(&bytes);
diff --git a/fuel-tx/test-helpers/src/lib.rs b/fuel-tx/test-helpers/src/lib.rs
index ec7ecec511..3beae51045 100644
--- a/fuel-tx/test-helpers/src/lib.rs
+++ b/fuel-tx/test-helpers/src/lib.rs
@@ -39,7 +39,7 @@ where
 mod use_std {
     use fuel_crypto::SecretKey;
     use fuel_tx::{
-        field, Buildable, ConsensusParameters, Contract, Create, Finalizable, Input, Mint, Output, Script, Transaction,
+        field, Buildable, Contract, Create, Finalizable, Input, Mint, Output, Script, Transaction,
         TransactionBuilder,
     };
     use fuel_types::bytes::Deserializable;

From c39581055a5a5094407c0c7f437a6679c828cb28 Mon Sep 17 00:00:00 2001
From: Brandon Kite <brandonkite92@gmail.com>
Date: Mon, 27 Mar 2023 19:23:22 -0700
Subject: [PATCH 08/10] fmt

---
 fuel-tx/test-helpers/src/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fuel-tx/test-helpers/src/lib.rs b/fuel-tx/test-helpers/src/lib.rs
index 3beae51045..3074754702 100644
--- a/fuel-tx/test-helpers/src/lib.rs
+++ b/fuel-tx/test-helpers/src/lib.rs
@@ -39,8 +39,7 @@ where
 mod use_std {
     use fuel_crypto::SecretKey;
     use fuel_tx::{
-        field, Buildable, Contract, Create, Finalizable, Input, Mint, Output, Script, Transaction,
-        TransactionBuilder,
+        field, Buildable, Contract, Create, Finalizable, Input, Mint, Output, Script, Transaction, TransactionBuilder,
     };
     use fuel_types::bytes::Deserializable;
     use rand::distributions::{Distribution, Uniform};

From 0c56e75c73fe888159a77afb3cb06fc775e5b28d Mon Sep 17 00:00:00 2001
From: Brandon Kite <brandonkite92@gmail.com>
Date: Mon, 27 Mar 2023 19:58:26 -0700
Subject: [PATCH 09/10] fix missing 'with_params'

---
 fuel-vm/src/util.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fuel-vm/src/util.rs b/fuel-vm/src/util.rs
index 42fea9cbe7..c408315af2 100644
--- a/fuel-vm/src/util.rs
+++ b/fuel-vm/src/util.rs
@@ -231,6 +231,7 @@ pub mod test_helpers {
         }
 
         pub fn build(&mut self) -> Checked<Script> {
+            self.builder.with_params(self.params);
             self.builder.finalize_checked(self.block_height, &self.gas_costs)
         }
 

From 806a5c09c89de1dbd03bd78d4722627d06d22fee Mon Sep 17 00:00:00 2001
From: Brandon Kite <brandonkite92@gmail.com>
Date: Tue, 28 Mar 2023 11:29:39 -0700
Subject: [PATCH 10/10] refactor tx calculation into common function

---
 fuel-tx/src/transaction/types.rs                     | 12 ++++++++++++
 fuel-tx/src/transaction/types/create.rs              | 12 ++----------
 fuel-tx/src/transaction/types/create/ser_de_tests.rs |  1 +
 fuel-tx/src/transaction/types/mint.rs                | 11 +++--------
 fuel-tx/src/transaction/types/script.rs              | 12 ++----------
 5 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/fuel-tx/src/transaction/types.rs b/fuel-tx/src/transaction/types.rs
index 5c4d335f1a..d38ab29fa7 100644
--- a/fuel-tx/src/transaction/types.rs
+++ b/fuel-tx/src/transaction/types.rs
@@ -7,10 +7,22 @@ mod storage;
 mod utxo_id;
 mod witness;
 
+use crate::{ConsensusParameters, TxId};
 pub use create::Create;
+use fuel_crypto::Hasher;
+use fuel_types::bytes::SerializableVec;
 pub use mint::Mint;
 pub use output::{Output, OutputRepr};
 pub use script::Script;
 pub use storage::StorageSlot;
 pub use utxo_id::UtxoId;
 pub use witness::Witness;
+
+pub fn compute_transaction_id<T: SerializableVec + Clone>(params: &ConsensusParameters, tx: &mut T) -> TxId {
+    let mut hasher = Hasher::default();
+    // chain ID
+    hasher.input(params.chain_id.to_be_bytes());
+    // transaction bytes
+    hasher.input(tx.to_bytes().as_slice());
+    hasher.finalize()
+}
diff --git a/fuel-tx/src/transaction/types/create.rs b/fuel-tx/src/transaction/types/create.rs
index 585388f0f9..74a55bf542 100644
--- a/fuel-tx/src/transaction/types/create.rs
+++ b/fuel-tx/src/transaction/types/create.rs
@@ -1,4 +1,5 @@
 use crate::transaction::{
+    compute_transaction_id,
     field::{
         BytecodeLength, BytecodeWitnessIndex, GasLimit, GasPrice, Inputs, Maturity, Outputs, Salt as SaltField,
         StorageSlots, Witnesses,
@@ -19,10 +20,6 @@ use std::io;
 
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
-use fuel_crypto::Hasher;
-
-#[cfg(feature = "std")]
-use fuel_types::bytes::SerializableVec;
 
 #[cfg(all(test, feature = "std"))]
 mod ser_de_tests;
@@ -75,12 +72,7 @@ impl crate::UniqueIdentifier for Create {
         clone.outputs_mut().iter_mut().for_each(Output::prepare_sign);
         clone.witnesses_mut().clear();
 
-        let mut hasher = Hasher::default();
-        // chain ID
-        hasher.input(params.chain_id.to_be_bytes());
-        // transaction bytes
-        hasher.input(clone.to_bytes().as_slice());
-        hasher.finalize()
+        compute_transaction_id(params, &mut clone)
     }
 }
 
diff --git a/fuel-tx/src/transaction/types/create/ser_de_tests.rs b/fuel-tx/src/transaction/types/create/ser_de_tests.rs
index 523c9a4dbc..b6065f7ba3 100644
--- a/fuel-tx/src/transaction/types/create/ser_de_tests.rs
+++ b/fuel-tx/src/transaction/types/create/ser_de_tests.rs
@@ -1,4 +1,5 @@
 use fuel_types::bytes::Deserializable;
+use fuel_types::bytes::SerializableVec;
 use fuel_types::Bytes32;
 
 use super::*;
diff --git a/fuel-tx/src/transaction/types/mint.rs b/fuel-tx/src/transaction/types/mint.rs
index 4bd25e104e..93bdd468b7 100644
--- a/fuel-tx/src/transaction/types/mint.rs
+++ b/fuel-tx/src/transaction/types/mint.rs
@@ -1,4 +1,5 @@
 use crate::transaction::{
+    compute_transaction_id,
     field::{Outputs, TxPointer as TxPointerField},
     validity::FormatValidityChecks,
 };
@@ -15,10 +16,9 @@ use std::io;
 
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
-use fuel_crypto::Hasher;
 
 #[cfg(feature = "std")]
-use fuel_types::bytes::{self, Deserializable, SerializableVec};
+use fuel_types::bytes::{self, Deserializable};
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub(crate) struct MintMetadata {
@@ -95,12 +95,7 @@ impl crate::UniqueIdentifier for Mint {
         }
 
         let mut clone = self.clone();
-        let mut hasher = Hasher::default();
-        // chain ID
-        hasher.input(params.chain_id.to_be_bytes());
-        // transaction bytes
-        hasher.input(clone.to_bytes().as_slice());
-        hasher.finalize()
+        compute_transaction_id(params, &mut clone)
     }
 }
 
diff --git a/fuel-tx/src/transaction/types/script.rs b/fuel-tx/src/transaction/types/script.rs
index f61359b47d..75df6bac64 100644
--- a/fuel-tx/src/transaction/types/script.rs
+++ b/fuel-tx/src/transaction/types/script.rs
@@ -1,4 +1,5 @@
 use crate::transaction::{
+    compute_transaction_id,
     field::{
         GasLimit, GasPrice, Inputs, Maturity, Outputs, ReceiptsRoot, Script as ScriptField, ScriptData, Witnesses,
     },
@@ -19,10 +20,6 @@ use std::io;
 
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
-use fuel_crypto::Hasher;
-
-#[cfg(feature = "std")]
-use fuel_types::bytes::SerializableVec;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub(crate) struct ScriptMetadata {
@@ -103,12 +100,7 @@ impl crate::UniqueIdentifier for Script {
         clone.outputs_mut().iter_mut().for_each(Output::prepare_sign);
         clone.witnesses_mut().clear();
 
-        let mut hasher = Hasher::default();
-        // chain ID
-        hasher.input(params.chain_id.to_be_bytes());
-        // transaction bytes
-        hasher.input(clone.to_bytes().as_slice());
-        hasher.finalize()
+        compute_transaction_id(params, &mut clone)
     }
 }