Make dry_run return transparent Receipt

Cargo.toml

@@ -21,6 +21,9 @@ members = [
   "xtask",
 ]
 
+[patch.crates-io]
+fuel-vm = { git = "https://github.com/FuelLabs/fuel-vm.git"}
+
 [profile.release]
 codegen-units = 1
 lto = "fat"

fuel-client/assets/schema.sdl

@@ -486,6 +486,7 @@ type Receipt {
 	sender: Address
 	recipient: Address
 	nonce: Bytes32
+	contractId: ContractId
 }
 
 enum ReceiptType {

fuel-client/src/client/schema/snapshots/fuel_gql_client__client__schema__tx__tests__dry_run_tx_gql_output.snap

@@ -1,12 +1,42 @@
 ---
 source: fuel-client/src/client/schema/tx.rs
-assertion_line: 324
+assertion_line: 339
 expression: query.query
-
 ---
 mutation Mutation($_0: HexString!, $_1: Boolean) {
   dryRun(tx: $_0, utxoValidation: $_1) {
-    rawPayload
+    param1
+    param2
+    amount
+    assetId
+    gas
+    digest
+    contract {
+      id
+    }
+    is
+    pc
+    ptr
+    ra
+    rb
+    rc
+    rd
+    reason
+    receiptType
+    to {
+      id
+    }
+    toAddress
+    val
+    len
+    result
+    gasUsed
+    data
+    messageId
+    sender
+    recipient
+    nonce
+    contractId
   }
 }
 

fuel-client/src/client/schema/snapshots/fuel_gql_client__client__schema__tx__tests__transparent_transaction_by_id_query_gql_output.snap

@@ -1,86 +1,14 @@
 ---
 source: fuel-client/src/client/schema/tx.rs
+assertion_line: 314
 expression: operation.query
 ---
 query Query($_0: TransactionId!) {
   transaction(id: $_0) {
-    gasLimit
-    gasPrice
-    id
-    inputAssetIds
-    inputContracts {
-      id
-    }
-    inputs {
-      __typename
-      ... on InputCoin {
-        utxoId
-        owner
-        amount
-        assetId
-        txPointer
-        witnessIndex
-        maturity
-        predicate
-        predicateData
-      }
-      ... on InputContract {
-        utxoId
-        balanceRoot
-        stateRoot
-        txPointer
-        contract {
-          id
-        }
-      }
-      ... on InputMessage {
-        messageId
-        sender
-        recipient
-        amount
-        nonce
-        witnessIndex
-        data
-        predicate
-        predicateData
-      }
-    }
-    isScript
-    outputs {
-      __typename
-      ... on CoinOutput {
-        to
-        amount
-        assetId
-      }
-      ... on ContractOutput {
-        inputIndex
-        balanceRoot
-        stateRoot
-      }
-      ... on MessageOutput {
-        recipient
-        amount
-      }
-      ... on ChangeOutput {
-        to
-        amount
-        assetId
-      }
-      ... on VariableOutput {
-        to
-        amount
-        assetId
-      }
-      ... on ContractCreated {
-        contract {
-          id
-        }
-        stateRoot
-      }
+    rawPayload
+    receipts {
+      rawPayload
     }
-    maturity
-    receiptsRoot
     status {
       __typename
       ... on SubmittedStatus {
@@ -108,46 +36,6 @@ query Query($_0: TransactionId!) {
         }
       }
     }
-    witnesses
-    receipts {
-      param1
-      param2
-      amount
-      assetId
-      gas
-      digest
-      contract {
-        id
-      }
-      is
-      pc
-      ptr
-      ra
-      rb
-      rc
-      rd
-      reason
-      receiptType
-      to {
-        id
-      }
-      toAddress
-      val
-      len
-      result
-      gasUsed
-      data
-      messageId
-      sender
-      recipient
-      nonce
-    }
-    script
-    scriptData
-    salt
-    storageSlots
-    bytecodeWitnessIndex
-    bytecodeLength
   }
 }
 

fuel-client/src/client/schema/tx.rs

@@ -23,6 +23,8 @@ use std::convert::{
     TryInto,
 };
 
+pub mod transparent_receipt;
+
 #[derive(cynic::FragmentArguments, Debug)]
 pub struct TxIdArgs {
     pub id: TransactionId,
@@ -260,7 +262,7 @@ pub struct DryRunArg {
 )]
 pub struct DryRun {
     #[arguments(tx = &args.tx, utxo_validation = &args.utxo_validation)]
-    pub dry_run: Vec<OpaqueReceipt>,
+    pub dry_run: Vec<transparent_receipt::Receipt>,
 }
 
 #[derive(cynic::QueryFragment, Debug)]
@@ -280,13 +282,10 @@ pub mod tests {
     use crate::client::schema::Bytes;
     use fuel_vm::fuel_types::bytes::SerializableVec;
 
-    pub mod transparent_receipt;
-    pub mod transparent_tx;
-
     #[test]
     fn transparent_transaction_by_id_query_gql_output() {
         use cynic::QueryBuilder;
-        let operation = transparent_tx::TransactionQuery::build(TxIdArgs {
+        let operation = TransactionQuery::build(TxIdArgs {
             id: TransactionId::default(),
         });
         insta::assert_snapshot!(operation.query)

fuel-client/src/client/schema/tx/tests/transparent_tx.rs

@@ -2,7 +2,6 @@ use crate::client::schema::{
     contract::ContractIdFragment,
     schema,
     tx::{
-        tests::transparent_receipt::Receipt,
         TransactionStatus,
         TxIdArgs,
     },
@@ -24,7 +23,10 @@ use core::convert::{
     TryFrom,
     TryInto,
 };
-use fuel_vm::fuel_tx::StorageSlot;
+use fuel_vm::{
+    fuel_tx::StorageSlot,
+    prelude::Receipt,
+};
 use itertools::Itertools;
 
 /// Retrieves the transaction in opaque form

fuel-client/src/client/schema/tx/tests/transparent_receipt.rs → fuel-client/src/client/schema/tx/transparent_receipt.rs

@@ -4,6 +4,7 @@ use crate::client::schema::{
     Address,
     AssetId,
     Bytes32,
+    ContractId,
     ConversionError,
     ConversionError::MissingField,
     HexString,
@@ -42,6 +43,7 @@ pub struct Receipt {
     pub sender: Option<Address>,
     pub recipient: Option<Address>,
     pub nonce: Option<Bytes32>,
+    pub contract_id: Option<ContractId>,
 }
 
 #[derive(cynic::Enum, Clone, Copy, Debug)]
@@ -173,6 +175,7 @@ impl TryFrom<Receipt> for fuel_vm::prelude::Receipt {
                     .is
                     .ok_or_else(|| MissingField("is".to_string()))?
                     .into(),
+                contract_id: schema.contract_id.map(Into::into),
             },
             ReceiptType::Revert => fuel_vm::prelude::Receipt::Revert {
                 id: schema

fuel-core/src/executor.rs

@@ -44,6 +44,7 @@ use fuel_core_interfaces::{
                 PredicateStorage,
             },
         },
+        state::StateTransition,
     },
     db::{
         Coins,
@@ -312,13 +313,13 @@ impl Executor {
                 sub_db_view.clone(),
                 self.config.chain_conf.transaction_parameters,
             );
-            let vm_result = vm
+            let vm_result: StateTransition = vm
                 .transact(checked_tx)
                 .map_err(|error| Error::VmExecution {
                     error,
                     transaction_id: tx_id,
                 })?
-                .into_owned();
+                .into();
 
             // only commit state changes if execution was a success
             if !vm_result.should_revert() {

fuel-core/src/schema/tx/receipt.rs

@@ -4,6 +4,7 @@ use crate::schema::{
         Address,
         AssetId,
         Bytes32,
+        ContractId,
         HexString,
         MessageId,
         U64,
@@ -141,6 +142,9 @@ impl Receipt {
     async fn nonce(&self) -> Option<Bytes32> {
         self.0.nonce().copied().map(Bytes32)
     }
+    async fn contract_id(&self) -> Option<ContractId> {
+        self.0.contract_id().map(|id| ContractId(*id))
+    }
 }
 
 impl From<&fuel_tx::Receipt> for Receipt {

fuel-tests/tests/tx/utxo_validation.rs

@@ -39,7 +39,7 @@ async fn submit_utxo_verified_tx_with_min_gas_price() {
                 Opcode::RET(REG_ONE).to_bytes().into_iter().collect(),
                 vec![],
             )
-            .gas_limit(100)
+            .gas_limit(10000)
             .gas_price(1)
             .add_unsigned_coin_input(
                 SecretKey::random(&mut rng),
@@ -143,7 +143,7 @@ async fn dry_run_override_utxo_validation() {
         Opcode::RET(REG_ONE).to_bytes().into_iter().collect(),
         vec![],
     )
-    .gas_limit(1000)
+    .gas_limit(10000)
     .add_input(Input::coin_signed(
         rng.gen(),
         rng.gen(),