feat!: read malleable fields from transaction status on subscription

FuelLabs · Aug 16, 2024 · 4617e15 · 4617e15
1 parent 5727b17
commit 4617e15
Show file tree

Hide file tree

Showing 16 changed files with 274 additions and 77 deletions.
diff --git a/.changeset/famous-pans-press.md b/.changeset/famous-pans-press.md
@@ -0,0 +1,5 @@
+---
+"@fuel-ts/account": minor
+---
+
+feat!: read malleable fields from transaction status on subscription
diff --git a/apps/docs-snippets/src/guide/provider/querying-the-chain.test.ts b/apps/docs-snippets/src/guide/provider/querying-the-chain.test.ts
@@ -237,11 +237,7 @@ describe('querying the chain', () => {
     const { nonce } = result.receipts[0] as TransactionResultMessageOutReceipt;
 
     // Retrieves the message proof for the transaction ID and nonce using the next block Id
-    const messageProof = await provider.getMessageProof(
-      result.gqlTransaction.id,
-      nonce,
-      latestBlock?.id
-    );
+    const messageProof = await provider.getMessageProof(result.id, nonce, latestBlock?.id);
     // #endregion Message-getMessageProof-blockId
 
     expect(messageProof?.amount.toNumber()).toEqual(100);
@@ -283,7 +279,7 @@ describe('querying the chain', () => {
 
     // Retrieves the message proof for the transaction ID and nonce using the block height
     const messageProof = await provider.getMessageProof(
-      result.gqlTransaction.id,
+      result.id,
       nonce,
       undefined,
       latestBlock?.height

diff --git a/apps/docs/src/guide/transactions/transaction-response.md b/apps/docs/src/guide/transactions/transaction-response.md
@@ -6,7 +6,6 @@ Once a transaction has been submitted, you may want to extract information regar
 - The status (submitted, success, squeezed out, or failure)
 - Receipts (return data, logs, mints/burns, transfers and panic/reverts)
 - Gas fees and usages
-- The raw payload of the transaction including inputs and outputs
 - Date and time of the transaction
 - The block the transaction was included in
 

diff --git a/packages/account/src/account.test.ts b/packages/account/src/account.test.ts
@@ -637,7 +637,7 @@ describe('Account', () => {
 
     const messageOutReceipt = <providersMod.TransactionResultMessageOutReceipt>result.receipts[0];
     const messageProof = await provider.getMessageProof(
-      result.gqlTransaction.id,
+      result.id,
       messageOutReceipt.nonce,
       nextBlock.blockId
     );
@@ -763,7 +763,7 @@ describe('Account', () => {
 
     const messageOutReceipt = <providersMod.TransactionResultMessageOutReceipt>result.receipts[0];
     expect(result.isStatusSuccess).toBeTruthy();
-    expect(result.gqlTransaction.id).toEqual(messageOutReceipt.sender);
+    expect(result.id).toEqual(messageOutReceipt.sender);
     expect(recipient.toHexString()).toEqual(messageOutReceipt.recipient);
     expect(amount.toString()).toEqual(messageOutReceipt.amount.toString());
   });

diff --git a/packages/account/src/providers/operations.graphql b/packages/account/src/providers/operations.graphql
@@ -61,10 +61,64 @@ fragment transactionStatusFragment on TransactionStatus {
   }
 }
 
+fragment malleableFieldsFragment on Transaction {
+  receiptsRoot
+  inputs {
+    type: __typename
+    ... on InputCoin {
+      txPointer
+    }
+    ... on InputContract {
+      txPointer
+    }
+  }
+  outputs {
+    type: __typename
+    ... on CoinOutput {
+      to
+      amount
+      assetId
+    }
+    ... on ContractOutput {
+      inputIndex
+      balanceRoot
+      stateRoot
+    }
+    ... on ChangeOutput {
+      to
+      amount
+      assetId
+    }
+    ... on VariableOutput {
+      to
+      amount
+      assetId
+    }
+    ... on ContractCreated {
+      contract
+      stateRoot
+    }
+  }
+}
+
 fragment transactionStatusSubscriptionFragment on TransactionStatus {
-  type: __typename
+  ... on SubmittedStatus {
+    ...SubmittedStatusFragment
+  }
+  ... on SuccessStatus {
+    ...SuccessStatusFragment
+    transaction {
+      ...malleableFieldsFragment
+    }
+  }
+  ... on FailureStatus {
+    ...FailureStatusFragment
+    transaction {
+      ...malleableFieldsFragment
+    }
+  }
   ... on SqueezedOutStatus {
-    reason
+    ...SqueezedOutStatusFragment
   }
 }
 

diff --git a/packages/account/src/providers/provider.ts b/packages/account/src/providers/provider.ts
@@ -757,7 +757,7 @@ Supported fuel-core version: ${supportedVersion}.`
     } = await this.operations.submit({ encodedTransaction });
     this.#cacheInputs(transactionRequest.inputs, transactionId);
 
-    return new TransactionResponse(transactionId, this, abis);
+    return new TransactionResponse(transactionRequest, this, abis);
   }
 
   /**