Merge pull request #2309 from AmbireTech/release/v2.93

Release / v2.93.0, v2.93.1 and v2.93.2

Author: superKalo

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.92.2",
+  "version": "2.93.2",
   "name": "ambire-common",
   "description": "Common ground for the Ambire apps",
   "scripts": {
@@ -15,7 +15,6 @@
   },
   "dependencies": {
     "@ambire/signature-validator": "^1.5.0",
-    "@ensdomains/ethers-patch-v6": "^0.0.4",
     "@lifi/types": "^17.7.1",
     "@metamask/eth-sig-util": "^8.2.0",
     "@safe-global/api-kit": "^4.0.1",
@@ -31,10 +30,9 @@
     "siwe": "3.0.0",
     "tldts": "7.0.17",
     "uuid": "9.0.0",
-    "viem": "^2.33.3"
+    "viem": "2.45.2"
   },
   "peerDependencies": {
-    "@ensdomains/eth-ens-namehash": "^2.0.15",
     "@noble/hashes": "^1.8.0",
     "bip44-constants": "^128.0.0",
     "react": "^19.1.0",

package.json

@@ -3,5 +3,6 @@ import { ExternalKey } from '../interfaces/keystore'
 export const HARDWARE_WALLET_DEVICE_NAMES: { [key in ExternalKey['type']]: string } = {
   ledger: 'Ledger',
   trezor: 'Trezor',
-  lattice: 'GridPlus'
+  lattice: 'GridPlus',
+  qr: 'QR-based'
 }

src/consts/hardwareWallets.ts

@@ -21,6 +21,15 @@ const vOneFive = {
   singleton: '0xFf51A5898e281Db6DfC7855790607438dF2ca44b'
 }
 
+/**
+ * SimulateTxAccessor addresses by Safe version.
+ */
+export const safeSimulateTxAccessor = {
+  ['v1.3.0']: '0x59AD6735bCd8152B84860Cb256dD9e96b85F69Da',
+  ['v1.4.1']: '0x3d4BA2E0884aa488718476ca2FB8Efc291A46199',
+  ['v1.5.0']: '0x07EfA797c55B5DdE3698d876b277aBb6B893654C'
+}
+
 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)'
 ]

src/consts/safe.ts

@@ -870,15 +870,21 @@ export class AccountPickerController extends EventEmitter implements IAccountPic
       const deviceIds: { [key in ExternalKey['type']]: string } = {
         ledger: this.#externalSignerControllers.ledger?.deviceId || '',
         trezor: this.#externalSignerControllers.trezor?.deviceId || '',
-        lattice: this.#externalSignerControllers?.lattice?.deviceId || ''
+        lattice: this.#externalSignerControllers?.lattice?.deviceId || '',
+        qr: this.#externalSignerControllers.qr?.deviceId || ''
       }
 
       const deviceModels: { [key in ExternalKey['type']]: string } = {
         ledger: this.#externalSignerControllers.ledger?.deviceModel || '',
         trezor: this.#externalSignerControllers.trezor?.deviceModel || '',
-        lattice: this.#externalSignerControllers.lattice?.deviceModel || ''
+        lattice: this.#externalSignerControllers.lattice?.deviceModel || '',
+        qr: this.#externalSignerControllers.qr?.deviceModel || ''
       }
 
+      const masterFingerprint = this.#externalSignerControllers.qr?.masterFingerprint || ''
+
+      const hdPathTemplate = this.hdPathTemplate as HD_PATH_TEMPLATE_TYPE
+
       const readyToAddExternalKeys = this.selectedAccountsFromCurrentSession.flatMap(
         ({ account, accountKeys }) =>
           accountKeys.map(({ addr, index }, i) => ({
@@ -896,7 +902,12 @@ export class AccountPickerController extends EventEmitter implements IAccountPic
               deviceId: deviceIds[keyType],
               deviceModel: deviceModels[keyType],
               // always defined in the case of external keys
-              hdPathTemplate: this.hdPathTemplate as HD_PATH_TEMPLATE_TYPE,
+              hdPathTemplate,
+              ...(keyType === 'qr'
+                ? {
+                    masterFingerprint
+                  }
+                : {}),
               index,
               createdAt: new Date().getTime()
             }
@@ -1066,7 +1077,12 @@ export class AccountPickerController extends EventEmitter implements IAccountPic
     // (SMART_ACCOUNT_SIGNER_KEY_DERIVATION_OFFSET), and deriving smart
     // accounts out of the private key (with another approach - salt and
     // extra entropy) was creating confusion.
-    const shouldRetrieveSmartAccountIndices = this.keyIterator.subType !== 'private-key'
+    //
+    // + no smart accounts for QR wallets. Reasons:
+    // - some hws sign only if the signer is imported
+    // - we are generally moving in another direction
+    const shouldRetrieveSmartAccountIndices =
+      this.keyIterator.subType !== 'private-key' && this.type !== 'qr'
     if (shouldRetrieveSmartAccountIndices) {
       // Indices for the smart accounts.
       indicesToRetrieve.push({