Merge pull request #1395 from AmbireTech/fix/declaring-estimation-errors

Declare estimation errors only if the account types say they are fatal

Author: Oxbobby

src/libs/account/BaseAccount.ts

@@ -26,7 +26,7 @@ export abstract class BaseAccount {
 
   // each implementation should declare when an estimation failure is critical
   // and we should display it to the user
-  abstract getEstimationCriticalError(estimation: FullEstimation): Error | null
+  abstract getEstimationCriticalError(estimation: FullEstimation, op: AccountOp): Error | null
 
   abstract supportsBundlerEstimation(): boolean
 

src/libs/account/EOA.ts

@@ -21,8 +21,14 @@ export class EOA extends BaseAccount {
 
   ambireEstimation?: AmbireEstimation | Error
 
-  getEstimationCriticalError(estimation: FullEstimation): Error | null {
-    if (estimation.provider instanceof Error) return estimation.provider
+  getEstimationCriticalError(estimation: FullEstimation, op: AccountOp): Error | null {
+    const numberOfCalls = op.calls.length
+    if (numberOfCalls === 1) {
+      if (estimation.provider instanceof Error) return estimation.provider
+    }
+    if (numberOfCalls > 1) {
+      if (estimation.ambire instanceof Error) return estimation.ambire
+    }
     return null
   }
 

src/libs/estimate/callGasUsedEstimation.ts

@@ -7,7 +7,6 @@ import { BundlerSwitcher } from '../../services/bundlers/bundlerSwitcher'
 import { AccountOp } from '../accountOp/accountOp'
 import { TokenResult } from '../portfolio'
 import { ambireEstimateGas } from './ambireEstimation'
-import { estimateEachCallSeparately } from './callGasUsedEstimation'
 import { bundlerEstimate } from './estimateBundler'
 import { estimateWithRetries } from './estimateWithRetries'
 import { FullEstimation, FullEstimationSummary } from './interfaces'
@@ -60,12 +59,11 @@ export async function getEstimation(
     network,
     feeTokens
   )
-  const perCallEstimation = estimateEachCallSeparately(baseAcc, op, network, provider)
 
   const estimations = await estimateWithRetries<
     [FullEstimation['ambire'], FullEstimation['bundler'], FullEstimation['provider']]
   >(
-    () => [ambireEstimation, bundlerEstimation, providerEstimation, perCallEstimation],
+    () => [ambireEstimation, bundlerEstimation, providerEstimation],
     'estimation-deployless',
     errorCallback,
     12000
@@ -83,7 +81,7 @@ export async function getEstimation(
     flags: {}
   }
 
-  const criticalError = baseAcc.getEstimationCriticalError(fullEstimation)
+  const criticalError = baseAcc.getEstimationCriticalError(fullEstimation, op)
   if (criticalError) return criticalError
 
   // TODO: if the bundler is the preferred method of estimation, re-estimate

src/libs/estimate/estimate.ts

@@ -98,9 +98,12 @@ async function estimate(
     'estimation-bundler',
     errorCallback
   )
+  const foundError = Array.isArray(estimation)
+    ? estimation.find((res) => res instanceof Error)
+    : null
   return {
     gasPrice,
-    estimation,
+    estimation: foundError ?? estimation,
     nonFatalErrors
   }
 }

src/libs/estimate/estimateBundler.ts

@@ -104,6 +104,9 @@ export async function estimateEOA(
     }
   ]
   if (result instanceof Error) return estimationErrorFormatted(result, { feePaymentOptions })
+  const foundError = Array.isArray(result) ? result.find((res) => res instanceof Error) : null
+  if (foundError instanceof Error)
+    return estimationErrorFormatted(foundError, { feePaymentOptions })
 
   let gasUsed = 0n
   if (!network.rpcNoStateOverride) {

src/libs/estimate/estimateEOA.ts

@@ -87,8 +87,6 @@ export async function estimateWithRetries<T>(
         counter + 1
       )
     }
-
-    return error
   }
 
   return result as T