Follow-up clean ups and fixed for the VM initialization

CHANGELOG.md

@@ -6,10 +6,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-- [#514](https://github.com/FuelLabs/fuel-vm/pull/514/): Add `ClientId` and `GasCosts` to `ConsensusParameters`. 
+### Changed
+
+#### Breaking
+
+- [#514](https://github.com/FuelLabs/fuel-vm/pull/514/): Add `ChainId` and `GasCosts` to `ConsensusParameters`. 
     Break down `ConsensusParameters` into sub-structs to match usage. Change signatures of functions to ask for
     necessary fields only.
 
+### Fixed
+
+#### Breaking
+
+- [#527](https://github.com/FuelLabs/fuel-vm/pull/527): The balances are empty during predicate estimation/verification.
+
 ## [Version 0.35.1]
 
 ### Added

fuel-tx/src/builder.rs

@@ -201,14 +201,11 @@ impl<Tx> TransactionBuilder<Tx> {
         let should_prepare_predicate = false;
         let sign_keys = HashMap::new();
 
-        // TODO: What is a default chain id?
-        let chain_id = ChainId::default();
-
         Self {
             tx,
             should_prepare_script,
             should_prepare_predicate,
-            params: ConsensusParameters::standard(chain_id),
+            params: ConsensusParameters::standard(),
             sign_keys,
         }
     }

fuel-tx/src/tests/offset.rs

@@ -469,8 +469,7 @@ fn iow_offset() {
             let bytes = tx.to_bytes();
 
             let mut tx_p = tx.clone();
-            let chain_id = ChainId::default();
-            tx_p.precompute(&chain_id)
+            tx_p.precompute(&ChainId::default())
                 .expect("Should be able to calculate cache");
 
             tx.inputs().iter().enumerate().for_each(|(x, i)| {

fuel-tx/src/tests/valid_cases/input.rs

@@ -156,10 +156,7 @@ fn coin_signed() {
 
     let block_height = rng.gen();
     let err = tx
-        .check(
-            block_height,
-            &ConsensusParameters::standard(Default::default()),
-        )
+        .check(block_height, &ConsensusParameters::standard())
         .expect_err("Expected failure");
 
     assert_eq!(CheckError::InputWitnessIndexBounds { index: 0 }, err);
@@ -212,8 +209,7 @@ fn coin_predicate() {
     let txhash: Bytes32 = rng.gen();
 
     let predicate = generate_nonempty_padded_bytes(rng);
-    let chain_id = ChainId::default();
-    let owner = Input::predicate_owner(&predicate, &chain_id);
+    let owner = Input::predicate_owner(&predicate, &ChainId::default());
 
     Input::coin_predicate(
         rng.gen(),
@@ -238,8 +234,7 @@ fn coin_predicate() {
     .unwrap();
 
     let predicate = vec![];
-    let chain_id = ChainId::default();
-    let owner = Input::predicate_owner(&predicate, &chain_id);
+    let owner = Input::predicate_owner(&predicate, &ChainId::default());
 
     let err = Input::coin_predicate(
         rng.gen(),
@@ -420,13 +415,12 @@ fn message_metadata() {
 
     let block_height = rng.gen();
     let err = tx
-        .check(block_height, &ConsensusParameters::standard(chain_id))
+        .check(block_height, &ConsensusParameters::standard())
         .expect_err("Expected failure");
 
     assert_eq!(CheckError::InputWitnessIndexBounds { index: 0 }, err,);
 
     let mut predicate = generate_nonempty_padded_bytes(rng);
-    let chain_id = ChainId::default();
     let recipient = Input::predicate_owner(&predicate, &chain_id);
     predicate[0] = predicate[0].wrapping_add(1);
 
@@ -588,14 +582,13 @@ fn message_message_coin() {
 
     let block_height = rng.gen();
     let err = tx
-        .check(block_height, &ConsensusParameters::standard(chain_id))
+        .check(block_height, &ConsensusParameters::standard())
         .expect_err("Expected failure");
 
     assert_eq!(CheckError::InputWitnessIndexBounds { index: 0 }, err,);
 
     let mut predicate = generate_nonempty_padded_bytes(rng);
-    let chain_id = ChainId::default();
-    let recipient = Input::predicate_owner(&predicate, &chain_id);
+    let recipient = Input::predicate_owner(&predicate, &ChainId::default());
     predicate[0] = predicate[0].wrapping_add(1);
 
     let err = Input::message_coin_predicate(
@@ -699,10 +692,7 @@ fn transaction_with_duplicate_coin_inputs_is_invalid() {
         .add_input(b)
         .add_witness(rng.gen())
         .finalize()
-        .check_without_signatures(
-            Default::default(),
-            &ConsensusParameters::standard(ChainId::default()),
-        )
+        .check_without_signatures(Default::default(), &ConsensusParameters::standard())
         .expect_err("Expected checkable failure");
 
     assert_eq!(err, CheckError::DuplicateInputUtxoId { utxo_id });
@@ -739,7 +729,7 @@ fn transaction_with_duplicate_message_inputs_is_invalid() {
         .finalize()
         .check_without_signatures(
             Default::default(),
-            &ConsensusParameters::standard(ChainId::default()),
+            &ConsensusParameters::standard(),
         )
         .expect_err("Expected checkable failure");
 
@@ -773,10 +763,7 @@ fn transaction_with_duplicate_contract_inputs_is_invalid() {
         .add_output(o)
         .add_output(p)
         .finalize()
-        .check_without_signatures(
-            Default::default(),
-            &ConsensusParameters::standard(ChainId::default()),
-        )
+        .check_without_signatures(Default::default(), &ConsensusParameters::standard())
         .expect_err("Expected checkable failure");
 
     assert_eq!(err, CheckError::DuplicateInputContractId { contract_id });
@@ -810,9 +797,6 @@ fn transaction_with_duplicate_contract_utxo_id_is_valid() {
         .add_output(p)
         .add_witness(rng.gen())
         .finalize()
-        .check_without_signatures(
-            Default::default(),
-            &ConsensusParameters::standard(ChainId::default()),
-        )
+        .check_without_signatures(Default::default(), &ConsensusParameters::standard())
         .expect("Duplicated UTXO id is valid for contract input");
 }

fuel-tx/src/transaction/consensus_parameters.rs

@@ -32,13 +32,26 @@ pub struct ConsensusParameters {
 
 impl Default for ConsensusParameters {
     fn default() -> Self {
-        Self::standard(ChainId::default())
+        Self::standard()
     }
 }
 
 impl ConsensusParameters {
-    /// Constructor for the `ConsensusParameters` with Standard values
-    pub fn standard(chain_id: ChainId) -> Self {
+    /// Constructor for the `ConsensusParameters` with Standard values.
+    pub fn standard() -> Self {
+        Self {
+            tx_params: TxParameters::DEFAULT,
+            predicate_params: PredicateParameters::DEFAULT,
+            script_params: ScriptParameters::DEFAULT,
+            contract_params: ContractParameters::DEFAULT,
+            fee_params: FeeParameters::DEFAULT,
+            chain_id: ChainId::default(),
+            gas_costs: GasCosts::default(),
+        }
+    }
+
+    /// Constructor for the `ConsensusParameters` with Standard values around `ChainId`.
+    pub fn standard_with_id(chain_id: ChainId) -> Self {
         Self {
             tx_params: TxParameters::DEFAULT,
             predicate_params: PredicateParameters::DEFAULT,

fuel-tx/src/transaction/types/create.rs

@@ -932,7 +932,7 @@ mod tests {
         tx.storage_slots.reverse();
 
         let err = tx
-            .check(0.into(), &ConsensusParameters::standard(ChainId::default()))
+            .check(0.into(), &ConsensusParameters::standard())
             .expect_err("Expected erroneous transaction");
 
         assert_eq!(CheckError::TransactionCreateStorageSlotOrder, err);
@@ -952,7 +952,7 @@ mod tests {
         )
         .add_random_fee_input()
         .finalize()
-        .check(0.into(), &ConsensusParameters::standard(ChainId::default()))
+        .check(0.into(), &ConsensusParameters::standard())
         .expect_err("Expected erroneous transaction");
 
         assert_eq!(CheckError::TransactionCreateStorageSlotOrder, err);

fuel-tx/src/transaction/types/script.rs

@@ -1,6 +1,7 @@
 use crate::{
     transaction::{
         compute_transaction_id,
+        consensus_parameters::TxParameters,
         field::{
             GasLimit,
             GasPrice,
@@ -42,7 +43,6 @@ use fuel_types::{
     Word,
 };
 
-use crate::transaction::consensus_parameters::TxParameters;
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
 #[cfg(feature = "std")]

fuel-tx/src/transaction/validity.rs

@@ -303,9 +303,7 @@ impl FormatValidityChecks for Transaction {
 pub(crate) fn check_common_part<T>(
     tx: &T,
     block_height: BlockHeight,
-    //
     tx_params: &TxParameters,
-    //
     predicate_params: &PredicateParameters,
 ) -> Result<(), CheckError>
 where