Merge pull request #2282 from AmbireTech/release/v2.91

Release / v2.91.0

Author: superKalo

jest.config.js

@@ -3,6 +3,10 @@ module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   testTimeout: 25000,
+  moduleNameMapper: {
+    '^@/(.*)$': '<rootDir>/src/$1',
+    '^@test/(.*)$': '<rootDir>/test/$1'
+  },
   // For services/validate.ts https://stackoverflow.com/a/61785012/13840636
   transform: {
     'node_modules/validator/.+\\.(j|t)sx?$': 'ts-jest'

package.json

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

src/consts/gasTankFeeTokens.ts

@@ -337,6 +337,13 @@ export default [
     icon: 'https://assets.coingecko.com/coins/images/17266/small/amWETH_2x.png',
     hiddenOnError: true
   },
+  {
+    address: '0x6440f144b7e50D6a8439336510312d2F54beB01D',
+    symbol: 'BOLD',
+    chainId: 1n,
+    decimals: 18,
+    icon: 'https://assets.coingecko.com/coins/images/56069/standard/BOLD_logo.png?1748265087'
+  },
   {
     address: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
     symbol: 'wmatic',

src/consts/safe.ts

@@ -1,6 +1,6 @@
 /**
- * A non-exclusive list of networks that safe accounts are supported on.
- * We will use this list to know where to search for safe accounts
+ * A non-exclusive list of networks that Safe accounts are supported on.
+ * We will use this list to know where to search for Safe accounts
  * and in accordance with the enabled user networks
  */
 export const SAFE_NETWORKS = [
@@ -9,7 +9,7 @@ export const SAFE_NETWORKS = [
 ]
 
 /**
- * Information about safe contract addresses by their versions
+ * Information about Safe contract addresses by their versions
  */
 const vOneThree = {
   singleton: '0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552'
@@ -25,14 +25,14 @@ export const execTransactionAbi = [
   'function execTransaction(address to,uint256 value,bytes calldata data,uint8 operation,uint256 safeTxGas,uint256 baseGas,uint256 gasPrice,address gasToken,address payable refundReceiver,bytes memory signatures)'
 ]
 /**
- * In order to do batching, safe needs an extra contract helper called multisend
- * This is the latest contract and it's safe to use across versions
+ * In order to do batching, Safe needs an extra contract helper called multisend
+ * This is the latest contract and it's Safe to use across versions
  */
 export const multiSendAddr = '0x9641d764fc13c8B624c04430C7356C1C7C8102e2'
 
 /**
- * In order to do batching, safe needs an extra contract helper called multisend
- * This is the latest contract and it's safe to use across versions
+ * In order to do batching, Safe needs an extra contract helper called multisend
+ * This is the latest contract and it's Safe to use across versions
  */
 export const safeNullOwner = '0x0000000000000000000000000000000000000002'
 

src/controllers/activity/activity.ts

@@ -489,7 +489,7 @@ export class ActivityController extends EventEmitter implements IActivityControl
     const portfoliosToUpdate: PortfoliosToUpdate = {}
     const updatedAccountsOps: SubmittedAccountOp[] = []
 
-    // we should fetch safe txns again upon failure
+    // we should fetch Safe txns again upon failure
     let shouldFetchSafeTxns = false
 
     // Use this flag to make the auto-refresh slower with the passege of time.
@@ -632,7 +632,7 @@ export class ActivityController extends EventEmitter implements IActivityControl
                       this.#portfolio.addTokensToBeLearned(foundTokens, accountOp.chainId)
                     }
                   } else {
-                    // if the txn resulted in a failure, unresolve all safe txns
+                    // if the txn resulted in a failure, unresolve all Safe txns
                     // with the same nonce so that the user can retry
                     const acc = this.#accounts.accounts.find(
                       (a) => a.addr === accountOp.accountAddr

src/controllers/autoLogin/autoLogin.ts

@@ -296,7 +296,7 @@ export class AutoLoginController extends EventEmitter implements IAutoLoginContr
     accountKeys: Key[],
     account: Account
   ): 'no-policy' | 'expired' | 'valid-policy' | 'unsupported' {
-    // disable the auto login for safe accounts
+    // disable the auto login for Safe accounts
     if (account.safeCreation) return 'unsupported'
 
     const accountPolicies = this.getAccountPolicies(parsedSiwe.address)

src/controllers/continuousUpdates/continuousUpdates.ts

@@ -361,7 +361,7 @@ export class ContinuousUpdatesController extends EventEmitter {
     if (!this.#main.selectedAccount.account || !this.#main.selectedAccount.account.safeCreation)
       return
 
-    // do not make safe requests if the extension is locked
+    // do not make Safe requests if the extension is locked
     if (!this.#main.keystore.isUnlocked) return
 
     const pendingSafeTxns = this.#main.requests.userRequests
@@ -383,7 +383,7 @@ export class ContinuousUpdatesController extends EventEmitter {
     if (!pendingSafeTxns.length) return
 
     const confirmed = await this.#main.safe.fetchExecuted(pendingSafeTxns).catch((e) => {
-      console.log('failed to retrieve executed safe txns')
+      console.log('failed to retrieve executed Safe txns')
       return []
     })
     if (!confirmed.length) return
@@ -419,14 +419,14 @@ export class ContinuousUpdatesController extends EventEmitter {
             fromRequestId: userR.id
           })
           .catch((e: Error) => {
-            console.log('could not resolve safe global request')
+            console.log('could not resolve Safe Global request')
             console.log(e)
             return e
           })
         if (commonSuccessHandler instanceof Error) continue
 
         await this.#main.resolveAccountOpRequest(submittedAccountOp, userR.id, false).catch((e) => {
-          console.log('could not resolve safe global request')
+          console.log('could not resolve Safe Global request')
           console.log(e)
         })
 

src/controllers/eventEmitter/eventEmitter.ts

@@ -165,7 +165,10 @@ export default class EventEmitter {
     // simultaneous actions can lead to unintended side effects. The 'allowConcurrentActions' flag is provided to enable
     // concurrent execution at the main controller level. This is useful when multiple actions need to modify the state
     // of different sub-controllers simultaneously.
-    if ((someStatusIsLoading && !allowConcurrentActions) || this.statuses[callName] !== 'INITIAL') {
+    if (
+      (someStatusIsLoading && !allowConcurrentActions) ||
+      !['INITIAL', 'SUCCESS'].includes(this.statuses[callName] as any)
+    ) {
       this.emitError({
         level: errorLevel,
         message: `Please wait for the completion of the previous action before initiating another one.', ${callName}`,
@@ -177,6 +180,10 @@ export default class EventEmitter {
       return
     }
 
+    if (this.statuses[callName] === 'SUCCESS') {
+      await wait(2) // to let the INITIAL status be fired from the prev session
+    }
+
     this.statuses[callName] = 'LOADING'
     await this.forceEmitUpdate()
 

src/controllers/keystore/keystore.ts

@@ -1078,6 +1078,10 @@ export class KeystoreController extends EventEmitter implements IKeystoreControl
     return this.#keystoreSecrets.some((x) => x.id === 'password')
   }
 
+  get hasBiometricsSecret() {
+    return this.#keystoreSecrets.some((x) => x.id === 'biometrics')
+  }
+
   get hasKeystoreTempSeed() {
     return !!this.#tempSeed
   }
@@ -1192,6 +1196,7 @@ export class KeystoreController extends EventEmitter implements IKeystoreControl
       keys: this.keys,
       seeds: this.seeds,
       hasPasswordSecret: this.hasPasswordSecret,
+      hasBiometricsSecret: this.hasBiometricsSecret,
       hasKeystoreTempSeed: this.hasKeystoreTempSeed,
       hasTempSeed: this.hasTempSeed,
       isReadyToStoreKeys: this.isReadyToStoreKeys

src/controllers/main/main.test.ts

@@ -1,11 +1,11 @@
+import { DEFAULT_ACCOUNT_LABEL } from '@/consts/account'
+import { BIP44_STANDARD_DERIVATION_TEMPLATE } from '@/consts/derivation'
+import { AccountOpStatus } from '@/libs/accountOp/types'
+import { KeyIterator } from '@/libs/keyIterator/keyIterator'
+import wait from '@/utils/wait'
 import { describe, expect, jest, test } from '@jest/globals'
+import { makeMainController } from '@test/helpers/mainController'
 
-import { makeMainController } from '../../../test/helpers/mainController'
-import { DEFAULT_ACCOUNT_LABEL } from '../../consts/account'
-import { BIP44_STANDARD_DERIVATION_TEMPLATE } from '../../consts/derivation'
-import { AccountOpStatus } from '../../libs/accountOp/types'
-import { KeyIterator } from '../../libs/keyIterator/keyIterator'
-import wait from '../../utils/wait'
 import { MainController } from './main'
 
 describe('Main Controller ', () => {