Merge pull request #2357 from AmbireTech/fix/hyper-evm-balance-changes

Fix/hyper evm balance changes

Author: Oxbobby

src/controllers/activity/activity.ts

@@ -37,6 +37,7 @@ import wait from '../../utils/wait'
 import EventEmitter from '../eventEmitter/eventEmitter'
 import { InternalSignedMessages, SignedMessage } from './types'
 
+import type { BalanceChangesReceipt } from '../../libs/accountOp/balanceChanges'
 export interface Pagination {
   fromPage: number
   itemsPerPage: number
@@ -616,7 +617,8 @@ export class ActivityController extends EventEmitter implements IActivityControl
         network,
         tokenAddrs,
         balanceChangeWindow.receiptBlockNumber,
-        balanceChangeWindow.prevBlockNumber
+        balanceChangeWindow.prevBlockNumber,
+        receipts
       )
     } catch (error: any) {
       console.log(error)
@@ -673,17 +675,19 @@ export class ActivityController extends EventEmitter implements IActivityControl
       tokenAddrs: string[]
       receiptBlockNumber: number
       prevBlockNumber?: number
+      receipts?: BalanceChangesReceipt[]
     }>
   ) {
     await Promise.all(
       balanceChangesTasks.map(
-        ({ accountOp, network, tokenAddrs, receiptBlockNumber, prevBlockNumber }) =>
+        ({ accountOp, network, tokenAddrs, receiptBlockNumber, prevBlockNumber, receipts }) =>
           this.updateAccountOpBalanceChanges(
             accountOp,
             network,
             tokenAddrs,
             receiptBlockNumber,
-            prevBlockNumber
+            prevBlockNumber,
+            receipts
           )
       )
     )
@@ -734,6 +738,7 @@ export class ActivityController extends EventEmitter implements IActivityControl
       tokenAddrs: string[]
       receiptBlockNumber: number
       prevBlockNumber?: number
+      receipts?: BalanceChangesReceipt[]
     }> = []
 
     // we should fetch Safe txns again upon failure
@@ -772,6 +777,7 @@ export class ActivityController extends EventEmitter implements IActivityControl
             let lastReceiptBlockNumber: number | undefined
             let shouldScheduleBalanceChangesTask = false
             const foundTokensForBalanceChanges = new Set<string>()
+            const receiptsForBalanceChanges: BalanceChangesReceipt[] = []
 
             if (newestOpTimestamp === undefined || newestOpTimestamp < accountOp.timestamp) {
               newestOpTimestamp = accountOp.timestamp
@@ -868,6 +874,13 @@ export class ActivityController extends EventEmitter implements IActivityControl
                     firstReceiptBlockNumber = receipt.blockNumber
                   }
                   lastReceiptBlockNumber = receipt.blockNumber
+                  receiptsForBalanceChanges.push({
+                    logs: receipt.logs,
+                    hash: receipt.hash,
+                    from: receipt.from,
+                    gasUsed: receipt.gasUsed,
+                    gasPrice: receipt.gasPrice
+                  })
 
                   // if this is an user op, we have to check the logs
                   let isSuccess: boolean | undefined
@@ -978,7 +991,8 @@ export class ActivityController extends EventEmitter implements IActivityControl
                   isIdentifiedByMultipleTxn(accountOp.identifiedBy) &&
                   typeof firstReceiptBlockNumber !== 'undefined'
                     ? getPreviousBlockNumber(firstReceiptBlockNumber)
-                    : undefined
+                    : undefined,
+                receipts: receiptsForBalanceChanges
               })
             }
           })
@@ -1011,7 +1025,8 @@ export class ActivityController extends EventEmitter implements IActivityControl
     network: Network,
     tokenAddrs: string[],
     receiptBlockNumber: number,
-    prevBlockNumber?: number
+    prevBlockNumber?: number,
+    receipts?: BalanceChangesReceipt[]
   ) {
     await this.#initialLoadPromise
 
@@ -1028,7 +1043,15 @@ export class ActivityController extends EventEmitter implements IActivityControl
         tokenAddrs,
         receiptBlockNumber,
         getTokenBalancesOnBlock: this.#portfolio.getTokenBalancesOnBlock.bind(this.#portfolio),
-        prevBlockNumber
+        prevBlockNumber,
+        receipts,
+        debugTraceTransaction: (txnHash) =>
+          network.chainId === 999n
+            ? this.#providers.providers[network.chainId.toString()]!.send(
+                'debug_traceTransaction',
+                [txnHash, { tracer: 'callTracer' }]
+              )
+            : Promise.resolve(null)
       })
 
       await this.setAccountOpBalanceChanges(

src/controllers/providers/providers.ts

@@ -5,6 +5,7 @@ import { IEventEmitterRegistryController, Statuses } from '../../interfaces/even
 import { Network } from '../../interfaces/network'
 import { IProvidersController, RPCProvider, RPCProviders } from '../../interfaces/provider'
 import { IStorageController } from '../../interfaces/storage'
+import type { BalanceChangesReceipt } from '../../libs/accountOp/balanceChanges'
 import { getAccountOpBalanceChanges } from '../../libs/accountOp/balanceChanges'
 import { getProviderBatchMaxCount } from '../../libs/networks/networks'
 import { GetOptions, Portfolio, TokenResult } from '../../libs/portfolio'
@@ -374,13 +375,15 @@ export class ProvidersController extends EventEmitter implements IProvidersContr
       chainId,
       tokenAddrs,
       blockTag,
-      accountAddr
+      accountAddr,
+      receipts
     }: {
       accountId: string
       chainId: bigint
       tokenAddrs: string[]
       blockTag: number
       accountAddr?: string
+      receipts?: BalanceChangesReceipt[]
     },
     requestId: string
   ) {
@@ -414,7 +417,7 @@ export class ProvidersController extends EventEmitter implements IProvidersContr
         portfolioAccountId: string,
         _chainId: bigint,
         portfolioTokenAddrs: string[],
-        portfolioBlockTag: number,
+        portfolioBlockTag: GetOptions['blockTag'],
         portfolioAccountAddr?: string
       ) =>
         portfolio.getTokensByAddresses(
@@ -428,7 +431,12 @@ export class ProvidersController extends EventEmitter implements IProvidersContr
         chainId,
         tokenAddrs,
         receiptBlockNumber: blockTag,
-        getTokenBalancesOnBlock
+        getTokenBalancesOnBlock,
+        receipts,
+        debugTraceTransaction: (txnHash) =>
+          chainId === 999n
+            ? provider.send('debug_traceTransaction', [txnHash, { tracer: 'callTracer' }])
+            : Promise.resolve(null)
       })
 
       return this.#sendUiMessage({

src/controllers/storage/storage.ts

@@ -64,6 +64,7 @@ export class StorageController extends EventEmitter implements IStorageControlle
       await this.#removeLegacyPhishingDetection() // As of version 5.32.0
       await this.#removeLegacyPhishingDetectionV2() // As of version 5.34.0
       await this.#cleanUpEmailVaultStorage() // As of version 5.33.5
+      await this.#resetAccountOpBalanceChangesOneTimeForAmbireNextTesting() // One-time reset after balance changes recalculation fixes
     } catch (error) {
       console.error('Storage migration error: ', error)
     }
@@ -720,6 +721,34 @@ export class StorageController extends EventEmitter implements IStorageControlle
     ])
   }
 
+  async #resetAccountOpBalanceChangesOneTimeForAmbireNextTesting() {
+    const [passedMigrations, accountsOps] = await Promise.all([
+      this.#storage.get('passedMigrations', []),
+      this.#storage.get('accountsOps', {})
+    ])
+
+    if (passedMigrations.includes('resetAccountOpBalanceChangesOneTimeForAmbireNextTesting')) return
+
+    const migratedAccountsOps = Object.fromEntries(
+      Object.entries(accountsOps).map(([accountId, opsByChain]) => [
+        accountId,
+        Object.fromEntries(
+          Object.entries(opsByChain as Record<string, any[]>).map(([chainId, ops]) => [
+            chainId,
+            Array.isArray(ops)
+              ? ops.map(({ balanceChanges, balanceChangesFetchRetryCount, ...op }) => op)
+              : ops
+          ])
+        )
+      ])
+    )
+
+    await this.#storage.set('accountsOps', migratedAccountsOps)
+    await this.#storage.set('passedMigrations', [
+      ...new Set([...passedMigrations, 'resetAccountOpBalanceChangesOneTimeForAmbireNextTesting'])
+    ])
+  }
+
   toJSON() {
     return {
       ...this,