Merge pull request #2302 from AmbireTech/release/v2.92

Release / v2.92.0, v2.92.1 and v2.92.2

Author: superKalo

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.91.3",
+  "version": "2.92.2",
   "name": "ambire-common",
   "description": "Common ground for the Ambire apps",
   "scripts": {

src/consts/derivation.ts

@@ -19,11 +19,20 @@ export const BIP44_LEDGER_DERIVATION_TEMPLATE = "m/44'/60'/<account>'/0/0"
  */
 export const LEGACY_POPULAR_DERIVATION_TEMPLATE = "m/44'/60'/0'/<account>"
 
+/**
+ * BIP44 for Ethereum test networks (Sepolia, Holesky) as implemented by Trezor.
+ * Same structure as the standard BIP44 path, but uses the testnet coin_type (1')
+ * instead of Ethereum mainnet (60'):
+ *   m / purpose' / coin_type' / account' / change / address_index
+ */
+export const BIP44_STANDARD_TESTNET_DERIVATION_TEMPLATE = "m/44'/1'/0'/0/<account>"
+
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export type HD_PATH_TEMPLATE_TYPE =
   | typeof BIP44_STANDARD_DERIVATION_TEMPLATE
   | typeof BIP44_LEDGER_DERIVATION_TEMPLATE
   | typeof LEGACY_POPULAR_DERIVATION_TEMPLATE
+  | typeof BIP44_STANDARD_TESTNET_DERIVATION_TEMPLATE
 
 export interface DerivationOption {
   label: string
@@ -46,6 +55,12 @@ export const DERIVATION_OPTIONS: DerivationOption[] = [
     label: 'Ledger Legacy',
     value: LEGACY_POPULAR_DERIVATION_TEMPLATE,
     description: 'Ledger Legacy: HD path used by MEW / MyCrypto.'
+  },
+  {
+    label: 'Trezor Testnets',
+    value: BIP44_STANDARD_TESTNET_DERIVATION_TEMPLATE,
+    description:
+      "Trezor Testnets: BIP44 path using testnet coin type (1') for Ethereum test networks."
   }
 ]
 

src/controllers/accountPicker/accountPicker.ts

@@ -518,8 +518,15 @@ export class AccountPickerController extends EventEmitter implements IAccountPic
     this.emitUpdate()
   }
 
-  async setHDPathTemplate({ hdPathTemplate }: { hdPathTemplate: HD_PATH_TEMPLATE_TYPE }) {
-    if (this.hdPathTemplate === hdPathTemplate) return
+  async setHDPathTemplateAndPage({
+    hdPathTemplate,
+    page = this.page
+  }: {
+    hdPathTemplate: HD_PATH_TEMPLATE_TYPE
+    page: number
+  }) {
+    const arePropsUnchanged = this.hdPathTemplate === hdPathTemplate && page === this.page
+    if (arePropsUnchanged) return
 
     this.hdPathTemplate = hdPathTemplate
     // Reset the currently selected accounts, because for the keys of these
@@ -531,10 +538,10 @@ export class AccountPickerController extends EventEmitter implements IAccountPic
     this.emitUpdate()
 
     await this.setPage({
-      page: DEFAULT_PAGE,
+      page,
       shouldGetAccountsUsedOnNetworks: DEFAULT_SHOULD_GET_ACCOUNTS_USED_ON_NETWORKS,
       shouldSearchForLinkedAccounts: DEFAULT_SHOULD_SEARCH_FOR_LINKED_ACCOUNTS
-    }) // takes the user back on the first page
+    })
   }
 
   #getAccountKeys(account: Account, accountsOnPageWithThisAcc: AccountOnPage[]) {

src/controllers/requests/requests.ts

@@ -1823,7 +1823,11 @@ export class RequestsController extends EventEmitter implements IRequestsControl
         this.sendNewRequestMessage(existingUserRequest, 'queued')
         currentUserRequest = this.currentUserRequest || this.visibleUserRequests[0] || null
       }
-      await this.#setCurrentUserRequest(currentUserRequest)
+
+      // Otherwise we will reset the currentUserRequest when a new request is added to the batch
+      if (executionType !== 'queue') {
+        await this.#setCurrentUserRequest(currentUserRequest)
+      }
     } else {
       const account = this.#accounts.accounts.find((x) => x.addr === meta.accountAddr)!
       const accountStateBefore =

src/controllers/signAccountOp/signAccountOp.ts

@@ -912,7 +912,7 @@ export class SignAccountOpController extends EventEmitter implements ISignAccoun
           if (isV1) {
             errors.push({
               title:
-                'Broadcasting Ambire v1 transactions is possible only by using an ЕОА. Import or create one to broadcast your transactions.'
+                'Broadcasting Ambire v1 transactions is possible only by using an EOA. Import or create one to broadcast your transactions.'
             })
           } else {
             let skippedTokensCount = 0

src/controllers/swapAndBridge/swapAndBridge.ts

@@ -1,5 +1,8 @@
 import { formatUnits, getAddress, isAddress, parseUnits, ZeroAddress } from 'ethers'
 
+/* eslint-disable no-await-in-loop */
+import { getAccountNetworks } from '@/libs/networks/networks'
+
 import EmittableError from '../../classes/EmittableError'
 import { RecurringTimeout } from '../../classes/recurringTimeout/recurringTimeout'
 import SwapAndBridgeError from '../../classes/SwapAndBridgeError'
@@ -16,10 +19,8 @@ import { IPhishingController } from '../../interfaces/phishing'
 import { IPortfolioController } from '../../interfaces/portfolio'
 import { IProvidersController } from '../../interfaces/provider'
 import { ISelectedAccountController } from '../../interfaces/selectedAccount'
-/* eslint-disable no-await-in-loop */
 import { ISignAccountOpController, SignAccountOpError } from '../../interfaces/signAccountOp'
 import { IStorageController } from '../../interfaces/storage'
-import { IUiController, View } from '../../interfaces/ui'
 import {
   CachedSupportedChains,
   CachedTokenListKey,
@@ -33,6 +34,7 @@ import {
   SwapAndBridgeToToken,
   SwapProvider
 } from '../../interfaces/swapAndBridge'
+import { IUiController, View } from '../../interfaces/ui'
 import { CallsUserRequest, UserRequest } from '../../interfaces/userRequest'
 import { getBaseAccount } from '../../libs/account/getBaseAccount'
 import { AccountOp } from '../../libs/accountOp/accountOp'
@@ -1077,13 +1079,21 @@ export class SwapAndBridgeController extends EventEmitter implements ISwapAndBri
       !isSelectedTokenFalsyBeforeListUpdate &&
       shouldUpdateFromSelectedToken
     ) {
+      // get the networks that account is supported on and select
+      // one from that list, not only the providers lists of networks
+      const accNetworks = getAccountNetworks(
+        this.#networks.networks,
+        this.#accounts.accountStates,
+        this.#selectedAccount.account
+      ).map((n) => n.chainId)
       const nextFromSelectedToken =
         fromSelectedTokenInNextPortfolio ||
         // Select the first token in the portfolio that is not the same as the "to" token
         this.portfolioTokenList.find(
           (t) =>
             t.address !== this.toSelectedToken?.address &&
-            this.supportedChainIds.includes(t.chainId)
+            this.supportedChainIds.includes(t.chainId) &&
+            accNetworks.includes(t.chainId)
         ) ||
         null
 

src/libs/trezor/trezor.ts

@@ -3,9 +3,27 @@
  * human-readable messages. Although there is a message incoming from Trezor,
  * it's not self-explanatory and can be difficult for the end users to understand.
  */
-export const getMessageFromTrezorErrorCode = (errorCode?: string, errorMsg?: string): string => {
+export const getMessageFromTrezorErrorCode = (
+  errorCode?: string,
+  errorMsg?: string,
+  context?: {
+    isLedgerLiveSmartAccountForbiddenPath?: boolean
+    isHyperEvmForbiddenPath?: boolean
+  }
+): string => {
   if (!errorCode && !errorMsg) return 'Could not connect to your Trezor device. Please try again.'
 
+  if (context?.isHyperEvmForbiddenPath && errorMsg?.toLowerCase()?.includes('forbidden key path')) {
+    return 'Please set "Safety checks" to "Prompt" in Trezor Suite (Settings - Device) to use your Trezor on HyperEVM chain. This is flagged as non-standard and blocked otherwise.'
+  }
+
+  if (
+    context?.isLedgerLiveSmartAccountForbiddenPath &&
+    errorMsg?.toLowerCase()?.includes('forbidden key path')
+  ) {
+    return 'Please set "Safety checks" to "Prompt" in Trezor Suite (Settings - Device) to use your Trezor (with Ledger Live HD paths) as a key for your Ambire smart account. This is flagged as non-standard and blocked otherwise.'
+  }
+
   if (errorCode === 'Method_Interrupted')
     return 'Closing the Trezor popup interrupted the connection.'
 
@@ -37,3 +55,9 @@ export const normalizeTrezorMessage = (error?: string): string => {
 
   return error
 }
+
+// Temporarily, until Trezor makes their error types consistent
+export const getTrezorErrorMessageFromPayload = (trezorUnsuccessfulPayload: any): string => {
+  // Trezor SDK TS promises "error", but Trezor Suite the message comes as "message"
+  return trezorUnsuccessfulPayload?.error || trezorUnsuccessfulPayload?.message
+}