Merge pull request #2196 from AmbireTech/fix/v1-accounts-broadcast-options

add: limit v1 accounts to EOA broadcast only

Author: superKalo

src/consts/signAccountOp/errorHandling.ts

@@ -33,6 +33,10 @@ const WARNINGS: { [key: string]: Warning } = {
     text: 'The transaction you are about to sign will override the existing EIP-7702 delegation on your account. Are you sure you want to proceed?',
     promptBefore: ['one-click-sign', 'sign'],
     type: 'info3'
+  },
+  v1Acc: {
+    id: 'v1Acc',
+    title: 'You can only broadcast transactions for Ambire v1 accounts from an EOA'
   }
 }
 

src/controllers/signAccountOp/signAccountOp.ts

@@ -826,30 +826,41 @@ export class SignAccountOpController extends EventEmitter implements ISignAccoun
           }
         )
         if (isUnableToCoverWithAllOtherTokens) {
-          let skippedTokensCount = 0
-          const gasTokenNames = gasTankFeeTokens
-            .filter(({ chainId, hiddenOnError }) => {
-              if (chainId !== this.accountOp.chainId) return false
-
-              if (hiddenOnError) {
-                skippedTokensCount++
-                return false
-              }
-
-              return true
+          // v1 acc handle
+          const state =
+            this.#accounts.accountStates[this.account.addr]?.[this.#network.chainId.toString()]
+          const isV1 = this.account.creation && !state?.isV2
+          if (isV1) {
+            errors.push({
+              title:
+                'Broadcasting Ambire v1 transactions is possible only by using an ЕОА. Import or create one to broadcast your transactions.'
             })
-            .map(({ symbol }) => symbol.toUpperCase())
-            .join(', ')
+          } else {
+            let skippedTokensCount = 0
+            const gasTokenNames = gasTankFeeTokens
+              .filter(({ chainId, hiddenOnError }) => {
+                if (chainId !== this.accountOp.chainId) return false
+
+                if (hiddenOnError) {
+                  skippedTokensCount++
+                  return false
+                }
 
-          errors.push({
-            title: `${ERRORS.eoaInsufficientFunds}${
-              isSA
-                ? ` Available fee options: USDC in Gas Tank, ${gasTokenNames}${
-                    skippedTokensCount ? ' and others' : ''
-                  }`
-                : ''
-            }`
-          })
+                return true
+              })
+              .map(({ symbol }) => symbol.toUpperCase())
+              .join(', ')
+
+            errors.push({
+              title: `${ERRORS.eoaInsufficientFunds}${
+                isSA
+                  ? ` Available fee options: USDC in Gas Tank, ${gasTokenNames}${
+                      skippedTokensCount ? ' and others' : ''
+                    }`
+                  : ''
+              }`
+            })
+          }
         } else {
           errors.push({
             title: isSA
@@ -954,6 +965,11 @@ export class SignAccountOpController extends EventEmitter implements ISignAccoun
       warnings.push(WARNINGS.delegationDetected)
     }
 
+    const accountState =
+      this.#accounts.accountStates[this.account.addr]?.[this.#network.chainId.toString()]
+    if (this.account.creation && !accountState?.isV2 && WARNINGS.v1Acc)
+      warnings.push(WARNINGS.v1Acc)
+
     const estimationWarnings = this.estimation.calculateWarnings()
 
     this.warnings = warnings.concat(estimationWarnings)

src/libs/account/V1.ts

@@ -1,6 +1,7 @@
 /* eslint-disable class-methods-use-this */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { Interface } from 'ethers'
+import { Interface, ZeroAddress } from 'ethers'
+
 import AmbireAccount from '../../../contracts/compiled/AmbireAccount.json'
 import AmbireFactory from '../../../contracts/compiled/AmbireFactory.json'
 import { ARBITRUM_CHAIN_ID } from '../../consts/networks'
@@ -13,9 +14,8 @@ import { BROADCAST_OPTIONS } from '../broadcast/broadcast'
 import { FeePaymentOption, FullEstimation, FullEstimationSummary } from '../estimate/interfaces'
 import { getBroadcastGas } from '../gasPrice/gasPrice'
 import { TokenResult } from '../portfolio'
-import { isNative } from '../portfolio/helpers'
-import { BaseAccount } from './BaseAccount'
 import { getSpoof } from './account'
+import { BaseAccount } from './BaseAccount'
 
 // this class describes a plain EOA that cannot transition
 // to 7702 either because the network or the hardware wallet doesnt' support it
@@ -33,9 +33,21 @@ export class V1 extends BaseAccount {
     estimation: FullEstimationSummary,
     feePaymentOptions: FeePaymentOption[]
   ): FeePaymentOption[] {
-    return feePaymentOptions.filter(
-      (opt) => (isNative(opt.token) && opt.paidBy === this.account.addr) || opt.availableAmount > 0n
+    const options = feePaymentOptions.filter(
+      (opt) => opt.paidBy !== this.account.addr && opt.availableAmount > 0n
+    )
+    if (options.length) return options
+
+    // return the native only to display errors
+    const native = feePaymentOptions.find(
+      (opt) =>
+        opt.paidBy === this.account.addr &&
+        opt.token.address === ZeroAddress &&
+        !opt.token.flags.onGasTank
     )
+    if (!native) throw new Error('no native fee payment option, it should not happen')
+    native.availableAmount = 0n
+    return [native]
   }
 
   getGasUsed(