Merge branch 'develop' into 'master'

Develop

See merge request papers/airgap/airgap-vault!537

Author: godenzim

package.json

@@ -17,6 +17,7 @@
     "build:analyze": "yarn build:stats && webpack-bundle-analyzer ./www/stats.json",
     "build:electron": "ng build --base-href=./",
     "build:electron:prod": "ng build --base-href=./ --configuration production",
+    "memory": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --port 4201",
     "test": "ng test",
     "test-ci": "node --max_old_space_size=8192 ./node_modules/@angular/cli/bin/ng test --code-coverage --watch=false",
     "lint": "ng lint",
@@ -36,51 +37,51 @@
     "apply-diagnostic-modules": "node apply-diagnostic-modules.js"
   },
   "resolutions": {
-    "@airgap/aeternity": "0.13.41",
-    "@airgap/acurast": "0.13.41",
-    "@airgap/astar": "0.13.41",
-    "@airgap/bitcoin": "0.13.41",
-    "@airgap/coinlib-core": "0.13.41",
-    "@airgap/coreum": "0.13.41",
-    "@airgap/cosmos": "0.13.41",
-    "@airgap/cosmos-core": "0.13.41",
-    "@airgap/crypto": "0.13.41",
-    "@airgap/ethereum": "0.13.41",
-    "@airgap/groestlcoin": "0.13.41",
-    "@airgap/icp": "0.13.41",
-    "@airgap/module-kit": "0.13.41",
-    "@airgap/moonbeam": "0.13.41",
-    "@airgap/optimism": "0.13.41",
-    "@airgap/polkadot": "0.13.41",
-    "@airgap/serializer": "0.13.41",
-    "@airgap/stellar": "0.13.41",
-    "@airgap/substrate": "0.13.41",
-    "@airgap/tezos": "0.13.41"
+    "@airgap/aeternity": "0.13.42",
+    "@airgap/acurast": "0.13.42",
+    "@airgap/astar": "0.13.42",
+    "@airgap/bitcoin": "0.13.42",
+    "@airgap/coinlib-core": "0.13.42",
+    "@airgap/coreum": "0.13.42",
+    "@airgap/cosmos": "0.13.42",
+    "@airgap/cosmos-core": "0.13.42",
+    "@airgap/crypto": "0.13.42",
+    "@airgap/ethereum": "0.13.42",
+    "@airgap/groestlcoin": "0.13.42",
+    "@airgap/icp": "0.13.42",
+    "@airgap/module-kit": "0.13.42",
+    "@airgap/moonbeam": "0.13.42",
+    "@airgap/optimism": "0.13.42",
+    "@airgap/polkadot": "0.13.42",
+    "@airgap/serializer": "0.13.42",
+    "@airgap/stellar": "0.13.42",
+    "@airgap/substrate": "0.13.42",
+    "@airgap/tezos": "0.13.42"
   },
   "dependencies": {
-    "@airgap/aeternity": "0.13.41",
-    "@airgap/acurast": "0.13.41",
-    "@airgap/angular-core": "0.0.57",
-    "@airgap/angular-ngrx": "0.0.57",
-    "@airgap/astar": "0.13.41",
-    "@airgap/bitcoin": "0.13.41",
-    "@airgap/coinlib-core": "0.13.41",
-    "@airgap/coreum": "0.13.41",
-    "@airgap/cosmos": "0.13.41",
-    "@airgap/cosmos-core": "0.13.41",
-    "@airgap/crypto": "0.13.41",
-    "@airgap/ethereum": "0.13.41",
-    "@airgap/groestlcoin": "0.13.41",
-    "@airgap/icp": "0.13.41",
-    "@airgap/module-kit": "0.13.41",
-    "@airgap/moonbeam": "0.13.41",
-    "@airgap/optimism": "0.13.41",
-    "@airgap/polkadot": "0.13.41",
+    "@airgap/aeternity": "0.13.42",
+    "@airgap/acurast": "0.13.42",
+    "@airgap/angular-core": "0.0.58",
+    "@airgap/angular-ngrx": "0.0.58",
+    "@airgap/astar": "0.13.42",
+    "@airgap/bitcoin": "0.13.42",
+    "@airgap/coinlib-core": "0.13.42",
+    "@airgap/coreum": "0.13.42",
+    "@airgap/cosmos": "0.13.42",
+    "@airgap/cosmos-core": "0.13.42",
+    "@airgap/crypto": "0.13.42",
+    "@airgap/ethereum": "0.13.42",
+    "@airgap/groestlcoin": "0.13.42",
+    "@airgap/icp": "0.13.42",
+    "@airgap/module-kit": "0.13.42",
+    "@airgap/moonbeam": "0.13.42",
+    "@airgap/optimism": "0.13.42",
+    "@airgap/polkadot": "0.13.42",
     "@airgap/sapling-wasm": "0.0.7",
-    "@airgap/serializer": "0.13.41",
-    "@airgap/stellar": "0.13.41",
-    "@airgap/substrate": "0.13.41",
-    "@airgap/tezos": "0.13.41",
+    "@airgap/serializer": "0.13.42",
+    "@airgap/stellar": "0.13.42",
+    "@airgap/substrate": "0.13.42",
+    "@airgap/tezos": "0.13.42",
     "@airgap-community/iso-rootstock": "1.0.0",
     "@angular/cdk": "^14.2.7",
     "@angular/common": "16.1.1",
@@ -125,7 +126,8 @@
     "angularx-qrcode": "^16.0.0",
     "axios": "^0.24.0",
     "bignumber.js": "^9.0.0",
-    "bip32": "^2.0.6",
+    "@bitcoinerlab/secp256k1": "1.2.0",
+    "bip32": "5.0.0-rc.0",
     "bip39": "^3.0.3",
     "browserify-zlib": "^0.2.0",
     "cordova-plugin-audioinput": "1.0.1",

src/app/models/BIP85.ts

@@ -1,4 +1,6 @@
-import { BIP32Interface, fromBase58, fromSeed } from 'bip32'
+import { BIP32Factory, BIP32Interface } from 'bip32'
+import * as ecc from '@bitcoinerlab/secp256k1'
+
 import { validateMnemonic, entropyToMnemonic, mnemonicToSeedSync } from 'bip39'
 import { BIP85Child } from './BIP85Child'
 
@@ -116,7 +118,7 @@ export class BIP85 {
 
   derive(path: string, bytesLength: number = 64): string {
     const childNode: BIP32Interface = this.node.derivePath(path)
-    const childPrivateKey: Buffer = childNode.privateKey! // Child derived from root key always has private key
+    const childPrivateKey = Buffer.from(childNode.privateKey!) // Child derived from root key always has private key
 
     const hash: Buffer = hmacSHA512(Buffer.from(BIP85_KEY), childPrivateKey)
     const truncatedHash: Buffer = hash.slice(0, bytesLength)
@@ -127,7 +129,9 @@ export class BIP85 {
   }
 
   static fromBase58(bip32seed: string): BIP85 {
-    const node: BIP32Interface = fromBase58(bip32seed)
+    const bip32 = BIP32Factory(ecc)
+
+    const node: BIP32Interface = bip32.fromBase58(bip32seed)
     if (node.depth !== 0) {
       throw new Error('Expected master, got child')
     }
@@ -136,7 +140,9 @@ export class BIP85 {
   }
 
   static fromSeed(bip32seed: Buffer): BIP85 {
-    const node: BIP32Interface = fromSeed(bip32seed)
+    const bip32 = BIP32Factory(ecc)
+
+    const node: BIP32Interface = bip32.fromSeed(new Uint8Array(bip32seed))
     if (node.depth !== 0) {
       throw new Error('Expected master, got child')
     }

src/app/models/BIP85Child.ts

@@ -1,9 +1,12 @@
 import { encode } from 'wif'
-import { fromPrivateKey } from 'bip32'
+import { BIP32Factory } from 'bip32'
+import * as ecc from '@bitcoinerlab/secp256k1'
 import { entropyToMnemonic } from 'bip39'
 import { BIP85_APPLICATIONS } from './BIP85'
 
 export class BIP85Child {
+  private readonly bip32 = BIP32Factory(ecc)
+
   constructor(private readonly entropy: string, private readonly type: BIP85_APPLICATIONS) {}
 
   toEntropy(): string {
@@ -40,6 +43,6 @@ export class BIP85Child {
     const chainCode = Buffer.from(this.entropy.slice(0, 64), 'hex')
     const privateKey = Buffer.from(this.entropy.slice(64, 128), 'hex')
 
-    return fromPrivateKey(privateKey, chainCode).toBase58()
+    return this.bip32.fromPrivateKey(new Uint8Array(privateKey), new Uint8Array(chainCode)).toBase58()
   }
 }

src/app/models/secret.ts

@@ -1,7 +1,7 @@
 import { AirGapWallet } from '@airgap/coinlib-core'
 import { UUID } from 'angular2-uuid'
-import { fromSeed } from 'bip32'
-
+import { BIP32Factory } from 'bip32'
+import * as ecc from '@bitcoinerlab/secp256k1'
 import { toBoolean } from '../utils/utils'
 
 import { BIPSigner } from './BIP39Signer'
@@ -64,6 +64,8 @@ export class MnemonicSecret extends Secret {
 
   public wallets: AirGapWallet[]
 
+  private readonly bip32 = BIP32Factory(ecc)
+
   private readonly twofactor: string
 
   constructor(seed: string | null, label: string = '', isParanoia: boolean = false, hasRecoveryKey: boolean = false) {
@@ -114,7 +116,7 @@ export class MnemonicSecret extends Secret {
     const mnemonic: string = this.getMnemonicFromEntropy(entropy)
     const seed: Buffer = signer.mnemonicToSeedSync(mnemonic)
 
-    return fromSeed(seed).fingerprint.toString('hex')
+    return Buffer.from(this.bip32.fromSeed(new Uint8Array(seed)).fingerprint).toString('hex')
   }
 
   private isMnemonic(data: string): boolean {

src/app/pages/account-address/account-address.page.ts

@@ -148,6 +148,9 @@ export class AccountAddressPage {
         case MainProtocolSymbols.BTC_SEGWIT:
           this.syncOptions = [airgapwallet, bluewallet, sparrowwallet, specterwallet, nunchukwallet]
           break
+        case MainProtocolSymbols.BTC_TAPROOT:
+          this.syncOptions = [airgapwallet, sparrowwallet]
+          break
         case MainProtocolSymbols.ETH:
         case MainProtocolSymbols.OPTIMISM:
           this.syncOptions = [airgapwallet]

src/app/pages/address-explorer/address-explorer.page.ts

@@ -1,7 +1,8 @@
 import { AirGapMarketWallet, MainProtocolSymbols } from '@airgap/coinlib-core'
 import { Component, OnInit } from '@angular/core'
 import { NavigationService } from 'src/app/services/navigation/navigation.service'
-import * as bip32 from 'bip32'
+import { BIP32Factory } from 'bip32'
+import * as ecc from '@bitcoinerlab/secp256k1'
 import * as bs58check from 'bs58check'
 
 // https://github.com/satoshilabs/slips/blob/master/slip-0132.md
@@ -41,6 +42,8 @@ interface AddressInfo {
   styleUrls: ['./address-explorer.page.scss']
 })
 export class AddressExplorerPage implements OnInit {
+  private readonly bip32 = BIP32Factory(ecc)
+
   public wallet: AirGapMarketWallet
   // public fingerprint: string = ''
   public selectedTab: string = 'external'
@@ -56,7 +59,7 @@ export class AddressExplorerPage implements OnInit {
   async ngOnInit() {
     if (this.wallet) {
       // this.fingerprint = this.wallet.masterFingerprint
-      this.xpub = bip32.fromBase58(new ExtendedPublicKey(this.wallet.publicKey).toXpub()).toBase58()
+      this.xpub = this.bip32.fromBase58(new ExtendedPublicKey(this.wallet.publicKey).toXpub()).toBase58()
       this.clearAddresses()
 
       if ((await this.wallet.protocol.getIdentifier()) === MainProtocolSymbols.ETH) {

src/app/pages/bip85-show/bip85-show.page.ts

@@ -1,5 +1,6 @@
 import { Component } from '@angular/core'
-import { BIP32Interface, fromSeed } from 'bip32'
+import { BIP32Factory, BIP32Interface } from 'bip32'
+import * as ecc from '@bitcoinerlab/secp256k1'
 import { mnemonicToSeed } from 'bip39'
 import { Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
@@ -22,6 +23,7 @@ export class Bip85ShowPage {
   private secret: MnemonicSecret
   public mnemonicLength: 12 | 18 | 24
   public index: number
+  private readonly bip32 = BIP32Factory(ecc)
 
   public childMnemonic: string | undefined
   public childFingerprint: string | undefined
@@ -99,8 +101,8 @@ export class Bip85ShowPage {
       this.childMnemonic = childEntropy.toMnemonic()
 
       const seed: Buffer = await mnemonicToSeed(this.childMnemonic)
-      const bip32Node: BIP32Interface = fromSeed(seed)
-      this.childFingerprint = bip32Node.fingerprint.toString('hex')
+      const bip32Node: BIP32Interface = this.bip32.fromSeed(new Uint8Array(seed))
+      this.childFingerprint = Buffer.from(bip32Node.fingerprint).toString('hex')
 
       this.lifehashData = await this.lifehashService.generateLifehash(this.childFingerprint)
     } catch (error) {

src/app/services/iac/iac.service.ts

@@ -155,11 +155,19 @@ export class IACService extends BaseIACService {
     // This can happen if we work with third party wallets that have a different format that doesn't include the public key.
 
     // BTC: First we try to find a wallet by matching the masterFingerprint
-    if (!correctWallet && signTransactionRequest.protocol === MainProtocolSymbols.BTC_SEGWIT) {
+    if (
+      !correctWallet &&
+      (signTransactionRequest.protocol === MainProtocolSymbols.BTC_SEGWIT ||
+        signTransactionRequest.protocol === MainProtocolSymbols.BTC_TAPROOT)
+    ) {
       const transaction: BitcoinSegwitTransactionSignRequest['transaction'] = unsignedTransaction.transaction
       const decodedPSBT = bitcoinJS.Psbt.fromHex(transaction.psbt)
+      const isTaproot = decodedPSBT.data.inputs.some((input) => input.tapBip32Derivation)
+
       for (const input of decodedPSBT.data.inputs) {
-        for (const derivation of input.bip32Derivation) {
+        const path = isTaproot ? input.tapBip32Derivation : input.bip32Derivation
+
+        for (const derivation of path) {
           const masterFingerprint = derivation.masterFingerprint.toString('hex')
 
           correctWallet = await this.secretsService.findWalletByFingerprintDerivationPathAndProtocolIdentifier(
@@ -184,7 +192,7 @@ export class IACService extends BaseIACService {
           // Start account selection
           const modal = await this.modalController.create({
             component: SelectAccountPage,
-            componentProps: { type: 'psbt', symbolFilter: MainProtocolSymbols.BTC_SEGWIT }
+            componentProps: { type: 'psbt', symbolFilter: signTransactionRequest.protocol }
           })
 
           modal

src/app/services/migration/migration.service.ts

@@ -1,6 +1,7 @@
 import { AirGapWallet, AirGapWalletStatus } from '@airgap/coinlib-core'
 import { Injectable } from '@angular/core'
-import { BIP32Interface, fromSeed } from 'bip32'
+import { BIP32Factory, BIP32Interface } from 'bip32'
+import * as ecc from '@bitcoinerlab/secp256k1'
 import { entropyToMnemonic, mnemonicToSeed } from 'bip39'
 
 import { MnemonicSecret } from '../../models/secret'
@@ -13,6 +14,7 @@ import { SecretsService } from '../secrets/secrets.service'
   providedIn: 'root'
 })
 export class MigrationService {
+  private readonly bip32 = BIP32Factory(ecc)
   constructor(private readonly secretsService: SecretsService, private readonly navigationService: NavigationService) {}
 
   public async runSecretsMigration(secrets: MnemonicSecret[]): Promise<void> {
@@ -74,21 +76,23 @@ export class MigrationService {
       return [secrets, true]
     }
 
-    const migratedSecrets: (MnemonicSecret | undefined)[] = await Promise.all(secrets.map(async (secret: MnemonicSecret) => {
-      if (!secret.fingerprint) {
-        return undefined
-      }
+    const migratedSecrets: (MnemonicSecret | undefined)[] = await Promise.all(
+      secrets.map(async (secret: MnemonicSecret) => {
+        if (!secret.fingerprint) {
+          return undefined
+        }
 
-      const [migratedWallets]: [AirGapWallet[], boolean] = this.filterMigratedWallets(secret.wallets)
-      if (migratedWallets.length === 0) {
-        return undefined
-      }
+        const [migratedWallets]: [AirGapWallet[], boolean] = this.filterMigratedWallets(secret.wallets)
+        if (migratedWallets.length === 0) {
+          return undefined
+        }
 
-      const newSecret: MnemonicSecret = MnemonicSecret.init(secret)
-      newSecret.wallets = migratedWallets
+        const newSecret: MnemonicSecret = MnemonicSecret.init(secret)
+        newSecret.wallets = migratedWallets
 
-      return newSecret
-    }))
+        return newSecret
+      })
+    )
 
     // create a new array of migrated secrets with filtered wallets
     return [migratedSecrets.filter((secret: MnemonicSecret | undefined) => secret !== undefined), false]
@@ -112,8 +116,8 @@ export class MigrationService {
       }
 
       const seed: Buffer = await mnemonicToSeed(mnemonic)
-      const bip32Node: BIP32Interface = fromSeed(seed)
-      const fingerprint: string = bip32Node.fingerprint.toString('hex')
+      const bip32Node: BIP32Interface = this.bip32.fromSeed(new Uint8Array(seed))
+      const fingerprint: string = Buffer.from(bip32Node.fingerprint).toString('hex')
 
       secret.fingerprint = fingerprint
     }
@@ -165,8 +169,8 @@ export class MigrationService {
     }
 
     const seed: Buffer = await mnemonicToSeed(mnemonic, resolvedOptions.bip39Passphrase)
-    const bip32Node: BIP32Interface = fromSeed(seed)
-    const fingerprint: string = bip32Node.fingerprint.toString('hex')
+    const bip32Node: BIP32Interface = this.bip32.fromSeed(new Uint8Array(seed))
+    const fingerprint: string = Buffer.from(bip32Node.fingerprint).toString('hex')
 
     wallet.masterFingerprint = fingerprint
     wallet.status = AirGapWalletStatus.ACTIVE