V2 Coins with static witness predicates

.changes/added/960.md

@@ -0,0 +1 @@
+Add logic for handling coins in Script V2, including pointing at predicate code in the static witnesses

fuel-tx/src/builder.rs

@@ -37,6 +37,14 @@ use crate::{
         },
     },
 };
+#[cfg(all(feature = "da-compression", feature = "chargeable-tx-v2"))]
+use crate::{
+    BodyConstraints,
+    ChargeableTransaction,
+    field::ChargeableBody,
+};
+#[cfg(all(feature = "da-compression", feature = "chargeable-tx-v2"))]
+use fuel_types::canonical::Serialize;
 
 use crate::{
     Cacheable,
@@ -173,6 +181,13 @@ impl TransactionBuilder<ScriptV2> {
         };
         Self::with_tx(tx)
     }
+
+    pub fn add_static_witness(&mut self, witness: Witness) -> &mut Self {
+        if let Some(witnesses) = self.tx.static_witnesses_mut() {
+            witnesses.push(witness);
+        }
+        self
+    }
 }
 
 impl TransactionBuilder<Create> {
@@ -445,30 +460,6 @@ impl<Tx: Buildable> TransactionBuilder<Tx> {
         self
     }
 
-    pub fn add_unsigned_coin_input_v2(
-        &mut self,
-        secret: SecretKey,
-        utxo_id: crate::UtxoId,
-        amount: Word,
-        asset_id: fuel_types::AssetId,
-        tx_pointer: TxPointer,
-    ) -> &mut Self {
-        let pk = secret.public_key();
-
-        let witness_index = self.upsert_secret(secret);
-
-        self.tx.add_unsigned_coin_input(
-            utxo_id,
-            &pk,
-            amount,
-            asset_id,
-            tx_pointer,
-            witness_index,
-        );
-
-        self
-    }
-
     #[cfg(feature = "rand")]
     pub fn add_random_fee_input(&mut self, rng: &mut StdRng) -> &mut Self {
         self.add_unsigned_coin_input(
@@ -591,6 +582,64 @@ impl<Tx: Buildable> TransactionBuilder<Tx> {
     }
 }
 
+#[cfg(all(feature = "da-compression", feature = "chargeable-tx-v2"))]
+impl<B, M> TransactionBuilder<ChargeableTransaction<B, M>>
+where
+    B: BodyConstraints,
+    ChargeableTransaction<B, M>: Buildable + ChargeableBody<B> + Serialize,
+{
+    pub fn add_unsigned_coin_input_v2(
+        &mut self,
+        secret: SecretKey,
+        utxo_id: crate::UtxoId,
+        amount: Word,
+        asset_id: fuel_types::AssetId,
+        tx_pointer: TxPointer,
+    ) -> &mut Self {
+        let pk = secret.public_key();
+
+        let witness_index = self.upsert_secret(secret);
+
+        self.tx.add_unsigned_coin_input_v2(
+            utxo_id,
+            &pk,
+            amount,
+            asset_id,
+            tx_pointer,
+            witness_index,
+        );
+
+        self
+    }
+}
+
+#[cfg(feature = "chargeable-tx-v2")]
+impl TransactionBuilder<ScriptV2> {
+    pub fn add_unsigned_coin_input_v1(
+        &mut self,
+        secret: SecretKey,
+        utxo_id: crate::UtxoId,
+        amount: Word,
+        asset_id: fuel_types::AssetId,
+        tx_pointer: TxPointer,
+    ) -> &mut Self {
+        let pk = secret.public_key();
+
+        let witness_index = self.upsert_secret(secret);
+
+        self.tx.add_unsigned_coin_input_v1(
+            utxo_id,
+            &pk,
+            amount,
+            asset_id,
+            tx_pointer,
+            witness_index,
+        );
+
+        self
+    }
+}
+
 impl<Tx: field::Outputs> TransactionBuilder<Tx> {
     pub fn add_output(&mut self, output: Output) -> &mut Self {
         self.tx.outputs_mut().push(output);

fuel-tx/src/lib.rs

@@ -14,6 +14,9 @@
 #![deny(unused_crate_dependencies)]
 #![deny(unsafe_code)]
 
+#[cfg(feature = "typescript")]
+use serde_wasm_bindgen as _;
+
 // TODO: Add docs
 
 #[cfg(feature = "alloc")]
@@ -127,6 +130,9 @@ pub use transaction::{
     policies,
 };
 
+#[cfg(feature = "chargeable-tx-v2")]
+pub use transaction::ScriptV2;
+
 #[cfg(feature = "da-compression")]
 pub use transaction::{
     BodyConstraints,

fuel-tx/src/test_helper.rs

@@ -120,6 +120,7 @@ mod use_std {
                         Input::MessageCoinPredicate(_) => (),
                         Input::MessageDataSigned(_) => (),
                         Input::MessageDataPredicate(_) => (),
+                        #[cfg(feature = "chargeable-tx-v2")]
                         Input::InputV2(_) => {
                             todo!()
                         }

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

@@ -1,6 +1,6 @@
 #![allow(clippy::cast_possible_truncation)]
+#![allow(non_snake_case)]
 
-use super::PREDICATE_PARAMS;
 use crate::{
     ConsensusParameters,
     builder::TransactionBuilder,
@@ -28,6 +28,9 @@ use rand::{
     rngs::StdRng,
 };
 
+#[cfg(not(feature = "chargeable-tx-v2"))]
+use tests::valid_cases::PREDICATE_PARAMS;
+
 #[test]
 fn input_coin_message_signature() {
     fn test<Tx>(txs: &mut impl Iterator<Item = (Tx, Vec<SecretKey>)>)
@@ -45,6 +48,8 @@ fn input_coin_message_signature() {
             let txhash = tx.id(&chain_id);
             let outputs = tx.outputs();
             let witnesses = tx.witnesses();
+            #[cfg(feature = "chargeable-tx-v2")]
+            let static_witnesses = tx.static_witnesses();
 
             tx.inputs()
                 .iter()
@@ -57,6 +62,8 @@ fn input_coin_message_signature() {
                         &txhash,
                         outputs,
                         witnesses,
+                        #[cfg(feature = "chargeable-tx-v2")]
+                        static_witnesses,
                         &Default::default(),
                         &mut None,
                     ),
@@ -207,6 +214,7 @@ fn duplicate_secrets_reuse_witness() {
     )
 }
 
+#[cfg(not(feature = "chargeable-tx-v2"))]
 #[test]
 fn coin_predicate() {
     let rng = &mut StdRng::seed_from_u64(8586);
@@ -268,7 +276,82 @@ fn coin_predicate() {
 
     assert_eq!(ValidityError::InputPredicateOwner { index: 1 }, err);
 }
+#[cfg(feature = "chargeable-tx-v2")]
+#[test]
+fn coin_predicate_v2__check__correct_number_of_static_witnesses_passes() {
+    // given
+    let rng = &mut StdRng::seed_from_u64(8586);
+
+    let txhash: Bytes32 = rng.r#gen();
+
+    let predicate = generate_nonempty_padded_bytes(rng);
+    let owner = Input::predicate_owner(&predicate);
+    let static_witnesses = vec![Witness::default(); 2];
+    let predicate_index = 0;
+    let predicate_data_index = 1;
+
+    // when
+    let res = Input::coin_predicate_v2(
+        rng.r#gen(),
+        owner,
+        rng.r#gen(),
+        rng.r#gen(),
+        rng.r#gen(),
+        predicate_index,
+        predicate_data_index,
+    )
+    .check(
+        1,
+        &txhash,
+        &[],
+        &[],
+        &static_witnesses,
+        &Default::default(),
+        &mut None,
+    );
+
+    // then
+    assert!(res.is_ok(), "Expected check to pass");
+}
+
+#[cfg(feature = "chargeable-tx-v2")]
+#[test]
+fn coin_predicate_v2__check__incorrect_number_of_static_witnesses_fails() {
+    let rng = &mut StdRng::seed_from_u64(8586);
+
+    let txhash: Bytes32 = rng.r#gen();
+
+    let predicate = generate_nonempty_padded_bytes(rng);
+    let owner = Input::predicate_owner(&predicate);
+    let static_witnesses = vec![Witness::default(); 2];
+    let predicate_index = 2;
+    let predicate_data_index = 3;
+
+    let res = Input::coin_predicate_v2(
+        rng.r#gen(),
+        owner,
+        rng.r#gen(),
+        rng.r#gen(),
+        rng.r#gen(),
+        predicate_index,
+        predicate_data_index,
+    )
+    .check(
+        1,
+        &txhash,
+        &[],
+        &[],
+        &static_witnesses,
+        &Default::default(),
+        &mut None,
+    );
+
+    // then
+    let err = res.unwrap_err();
+    assert!(matches!(err, ValidityError::InputWitnessIndexBounds { .. }));
+}
 
+#[cfg(not(feature = "chargeable-tx-v2"))]
 #[test]
 fn contract() {
     let rng = &mut StdRng::seed_from_u64(8586);
@@ -355,6 +438,7 @@ fn contract() {
     );
 }
 
+#[cfg(not(feature = "chargeable-tx-v2"))]
 #[test]
 fn message_metadata() {
     let rng = &mut StdRng::seed_from_u64(8586);
@@ -491,6 +575,7 @@ fn message_metadata() {
     assert_eq!(ValidityError::InputPredicateDataLength { index: 1 }, err,);
 }
 
+#[cfg(not(feature = "chargeable-tx-v2"))]
 #[test]
 fn message_message_coin() {
     let rng = &mut StdRng::seed_from_u64(8586);