Merge pull request #1397 from AmbireTech/fix/eoa-batching-no-simulation

Fix/ EOA batching has no simulation

Author: PetromirDev

src/controllers/main/main.ts

@@ -63,7 +63,7 @@ import {
   getHumanReadableEstimationError
 } from '../../libs/errorHumanizer'
 import { insufficientPaymasterFunds } from '../../libs/errorHumanizer/errors'
-import { getEstimation, getEstimationSummary } from '../../libs/estimate/estimate'
+import { getEstimation } from '../../libs/estimate/estimate'
 import { GasRecommendation, getGasPriceRecommendations } from '../../libs/gasPrice/gasPrice'
 import { humanizeAccountOp } from '../../libs/humanizer'
 import { KeyIterator } from '../../libs/keyIterator/keyIterator'
@@ -767,8 +767,7 @@ export class MainController extends EventEmitter {
       const accountOpsForSimulation = getAccountOpsForSimulation(
         account,
         this.actions.visibleActionsQueue,
-        network,
-        accountOp
+        network
       )
       // update the portfolio only if new tokens were found through tracing
       if (learnedNewTokens || learnedNewNfts) {
@@ -1187,8 +1186,7 @@ export class MainController extends EventEmitter {
     const accountOpsToBeSimulatedByNetwork = getAccountOpsForSimulation(
       this.selectedAccount.account,
       this.actions.visibleActionsQueue,
-      networkData,
-      this.signAccountOp?.accountOp
+      networkData
     )
 
     await this.portfolio.updateSelectedAccount(
@@ -2316,8 +2314,7 @@ export class MainController extends EventEmitter {
     const accOpsForSimulation = getAccountOpsForSimulation(
       this.accounts.accounts.find((acc) => acc.addr === op.accountAddr)!,
       this.actions.visibleActionsQueue,
-      network,
-      op
+      network
     )
     return this.portfolio.updateSelectedAccount(
       op.accountAddr,

src/libs/main/main.ts

@@ -148,22 +148,17 @@ export const makeAccountOpAction = ({
 export const getAccountOpsForSimulation = (
   account: Account,
   visibleActionsQueue: Action[],
-  network?: Network,
-  op?: AccountOp | null
+  network?: Network
 ):
   | {
       [key: string]: AccountOp[]
     }
   | undefined => {
   const isSmart = isSmartAccount(account)
 
-  // if there's an op and the account is either smart or the network supports
-  // state override, we pass it along. We do not support simulation for
-  // EOAs on networks without state override (but it works for SA)
-  if (op && (isSmart || (network && !network.rpcNoStateOverride)))
-    return { [op.chainId.toString()]: [op] }
+  // Simulation isn't supported by EOAs if the network doesn't support state override
+  if (!isSmart && (!network || network.rpcNoStateOverride)) return undefined
 
-  if (isSmart) return getAccountOpsByNetwork(account.addr, visibleActionsQueue) || undefined
-
-  return undefined
+  // Simulate all account ops for the account
+  return getAccountOpsByNetwork(account.addr, visibleActionsQueue) || undefined
 }