Merge pull request #2185 from AmbireTech/fix/wallet-get-calls-status-request-fixes

Record blockHash, gasUsed in activity

Author: Oxbobby

src/controllers/activity/activity.test.ts

@@ -493,7 +493,9 @@ describe('Activity Controller ', () => {
           {
             ...accountOp,
             status: 'success',
-            blockNumber: controller.accountsOps[sessionId]!.result.items[0]!.blockNumber
+            blockNumber: controller.accountsOps[sessionId]!.result.items[0]!.blockNumber,
+            blockHash: controller.accountsOps[sessionId]!.result.items[0]!.blockHash,
+            gasUsed: controller.accountsOps[sessionId]!.result.items[0]!.gasUsed
           }
         ], //  we expect success here
         itemsTotal: 1,
@@ -545,7 +547,9 @@ describe('Activity Controller ', () => {
           {
             ...accountOp,
             status: 'failure',
-            blockNumber: controller.accountsOps[sessionId]!.result.items[0]!.blockNumber
+            blockNumber: controller.accountsOps[sessionId]!.result.items[0]!.blockNumber,
+            blockHash: controller.accountsOps[sessionId]!.result.items[0]!.blockHash,
+            gasUsed: controller.accountsOps[sessionId]!.result.items[0]!.gasUsed
           }
         ], // we expect failure here
         itemsTotal: 1,

src/controllers/activity/activity.ts

@@ -1,3 +1,5 @@
+import { toBeHex } from 'ethers'
+
 import { Account, AccountId, IAccountsController } from '../../interfaces/account'
 import { IActivityController } from '../../interfaces/activity'
 import { Banner } from '../../interfaces/banner'
@@ -615,6 +617,12 @@ export class ActivityController extends EventEmitter implements IActivityControl
                   // eslint-disable-next-line no-param-reassign
                   accountOp.blockNumber = receipt.blockNumber
 
+                  // eslint-disable-next-line no-param-reassign
+                  accountOp.blockHash = receipt.blockHash
+
+                  // eslint-disable-next-line no-param-reassign
+                  accountOp.gasUsed = toBeHex(receipt.gasUsed)
+
                   // Add accounts that are recipients of the AccountOp
                   const accountOpRecipients = getAccountOpRecipients(
                     accountOp,

src/libs/accountOp/submittedAccountOp.ts

@@ -1,4 +1,4 @@
-import { Interface, isAddress, TransactionReceipt, ZeroAddress } from 'ethers'
+import { Interface, isAddress, toBeHex, TransactionReceipt, ZeroAddress } from 'ethers'
 
 import { BUNDLER } from '../../consts/bundlers'
 import { Hex } from '../../interfaces/hex'
@@ -55,6 +55,8 @@ export interface SubmittedAccountOp extends AccountOp {
   isSingletonDeploy?: boolean
   identifiedBy: AccountOpIdentifiedBy
   blockNumber?: number
+  blockHash?: string
+  gasUsed?: string
 }
 
 export function isIdentifiedByTxn(identifiedBy: AccountOpIdentifiedBy): boolean {
@@ -150,7 +152,7 @@ export async function fetchTxnId(
     const txnIds = identifiedBy.identifier.split('-')
     return {
       status: 'success',
-      txnId: txnIds[txnIds.length - 1]
+      txnId: txnIds[txnIds.length - 1]!
     }
   }
 
@@ -282,15 +284,27 @@ export function updateOpStatus(
   if (opReference.identifiedBy.type === 'MultipleTxns') {
     const callIndex = getMultipleBroadcastUnconfirmedCallOrLast(opReference).callIndex
     // eslint-disable-next-line no-param-reassign
-    opReference.calls[callIndex].status = status
+    opReference.calls[callIndex]!.status = status
 
     // if there's a receipt, add the fee
     if (receipt) {
       // eslint-disable-next-line no-param-reassign
-      opReference.calls[callIndex].fee = {
+      opReference.calls[callIndex]!.fee = {
         inToken: ZeroAddress,
         amount: receipt.fee
       }
+
+      // eslint-disable-next-line no-param-reassign
+      opReference.calls[callIndex]!.blockHash = receipt.blockHash
+
+      // eslint-disable-next-line no-param-reassign
+      opReference.calls[callIndex]!.blockNumber = receipt.blockNumber
+
+      // eslint-disable-next-line no-param-reassign
+      opReference.calls[callIndex]!.blockHash = receipt.blockHash
+
+      // eslint-disable-next-line no-param-reassign
+      opReference.calls[callIndex]!.gasUsed = toBeHex(receipt.gasUsed)
     }
 
     if (callIndex === opReference.calls.length - 1) {

src/libs/accountOp/types.ts

@@ -18,6 +18,9 @@ export interface Call {
   data: string
   txnId?: Hex
   status?: AccountOpStatus
+  blockNumber?: number
+  blockHash?: string
+  gasUsed?: string
   fee?: {
     inToken: string
     amount: bigint