Reset xpubKeys cache when discovering accounts

vacuumlabs · Jan 14, 2021 · ddaa312 · ddaa312
1 parent 3f8ae6c
commit ddaa312
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 15 deletions.
diff --git a/app/frontend/wallet/account-manager.ts b/app/frontend/wallet/account-manager.ts
@@ -33,7 +33,8 @@ const AccountManager = ({config, cryptoProvider, blockchainExplorer}) => {
   }
 
   async function discoverAccounts() {
-    // TODO: remove rejected promises from pubkey cache
+    // remove rejected promises from pubkey cache
+    cryptoProvider.cleanXpubCache()
     async function _discoverNewAccount(accountIndex: number) {
       const newAccount = accounts[accountIndex] || discoverNewAccount()
       const isAccountUsed = await newAccount.isAccountUsed()
@@ -47,7 +48,8 @@ const AccountManager = ({config, cryptoProvider, blockchainExplorer}) => {
   }
 
   async function exploreNewAccount() {
-    // TODO: remove rejected promises from pubkey cache
+    // remove rejected promises from pubkey cache
+    cryptoProvider.cleanXpubCache()
     const newAccount = discoverNewAccount()
     await addNewAccount(newAccount)
     return newAccount

diff --git a/app/frontend/wallet/byron/cardano-ledger-crypto-provider.ts b/app/frontend/wallet/byron/cardano-ledger-crypto-provider.ts
@@ -28,11 +28,15 @@ const CardanoLedgerCryptoProvider = async ({config}) => {
   const isHwWallet = () => true
   const getHwWalletName = () => 'Ledger'
 
-  const deriveXpub = CachedDeriveXpubFactory(derivationScheme, false, async (absDerivationPath) => {
-    const response = await ledger.getExtendedPublicKeys(absDerivationPath)
-    const xpubHex = response.publicKeyHex + response.chainCodeHex
-    return Buffer.from(xpubHex, 'hex')
-  })
+  const {deriveXpub, cleanXpubCache} = CachedDeriveXpubFactory(
+    derivationScheme,
+    false,
+    async (absDerivationPath) => {
+      const response = await ledger.getExtendedPublicKeys(absDerivationPath)
+      const xpubHex = response.publicKeyHex + response.chainCodeHex
+      return Buffer.from(xpubHex, 'hex')
+    }
+  )
 
   function deriveHdNode(childIndex) {
     throw NamedError('UnsupportedOperationError', {
@@ -137,6 +141,7 @@ const CardanoLedgerCryptoProvider = async ({config}) => {
     getHwWalletName,
     _sign: sign,
     _deriveHdNode: deriveHdNode,
+    cleanXpubCache,
   }
 }
 

diff --git a/app/frontend/wallet/byron/cardano-wallet-secret-crypto-provider.ts b/app/frontend/wallet/byron/cardano-wallet-secret-crypto-provider.ts
@@ -28,9 +28,13 @@ const CardanoWalletSecretCryptoProvider = ({
     return derivationScheme
   }
 
-  const deriveXpub = CachedDeriveXpubFactory(derivationScheme, false, (derivationPaths) => {
-    return derivationPaths.map((path) => deriveHdNode(path).extendedPublicKey)
-  })
+  const {deriveXpub, cleanXpubCache} = CachedDeriveXpubFactory(
+    derivationScheme,
+    false,
+    (derivationPaths) => {
+      return derivationPaths.map((path) => deriveHdNode(path).extendedPublicKey)
+    }
+  )
 
   function getHdPassphrase() {
     return xpubToHdPassphrase(masterHdNode.extendedPublicKey)
@@ -124,6 +128,7 @@ const CardanoWalletSecretCryptoProvider = ({
     _deriveChildHdNode: deriveChildHdNode,
     _signTxGetStructured: signTxGetStructured,
     network,
+    cleanXpubCache,
   }
 }
 

diff --git a/app/frontend/wallet/helpers/CachedDeriveXpubFactory.ts b/app/frontend/wallet/helpers/CachedDeriveXpubFactory.ts
@@ -7,7 +7,7 @@ const BYRON_V2_PATH = [HARDENED_THRESHOLD + 44, HARDENED_THRESHOLD + 1815, HARDE
 type BIP32Path = number[]
 
 function CachedDeriveXpubFactory(derivationScheme, shouldExportPubKeyBulk, deriveXpubFn) {
-  const derivedXpubs = {}
+  let derivedXpubs = {}
 
   async function deriveXpub(absDerivationPath: BIP32Path) {
     const memoKey = JSON.stringify(absDerivationPath)
@@ -68,12 +68,24 @@ function CachedDeriveXpubFactory(derivationScheme, shouldExportPubKeyBulk, deriv
     const _derivedXpubs = {}
     xPubBulk.forEach((xpub: Buffer, i: number) => {
       const memoKey = JSON.stringify(paths[i])
-      _derivedXpubs[memoKey] = xpub
+      _derivedXpubs[memoKey] = Promise.resolve(xpub)
     })
     return _derivedXpubs
   }
 
-  return deriveXpub
+  function cleanXpubCache() {
+    const _derivedXpubs = {}
+    Object.entries(derivedXpubs).map(([key, xpubPromise]: [string, Promise<Buffer>]) => {
+      xpubPromise
+        .then((xpub) => {
+          _derivedXpubs[key] = Promise.resolve(xpub)
+        })
+        .catch((e) => null)
+    })
+    derivedXpubs = _derivedXpubs
+  }
+
+  return {deriveXpub, cleanXpubCache}
 }
 
 export default CachedDeriveXpubFactory
diff --git a/app/frontend/wallet/shelley/shelley-js-crypto-provider.ts b/app/frontend/wallet/shelley/shelley-js-crypto-provider.ts
@@ -36,7 +36,7 @@ const ShelleyJsCryptoProvider = ({
 
   const getDerivationScheme = () => derivationScheme
 
-  const deriveXpub = CachedDeriveXpubFactory(
+  const {deriveXpub, cleanXpubCache} = CachedDeriveXpubFactory(
     derivationScheme,
     config.shouldExportPubKeyBulk,
     (derivationPaths) => {
@@ -146,6 +146,7 @@ const ShelleyJsCryptoProvider = ({
     _deriveHdNodeFromRoot: deriveHdNode,
     _deriveChildHdNode: deriveChildHdNode,
     checkVersion,
+    cleanXpubCache,
   }
 }
 

diff --git a/app/frontend/wallet/shelley/shelley-ledger-crypto-provider.ts b/app/frontend/wallet/shelley/shelley-ledger-crypto-provider.ts
@@ -79,7 +79,7 @@ const ShelleyLedgerCryptoProvider = async ({network, config, forceWebUsb}) => {
     return response
   }
 
-  const deriveXpub = CachedDeriveXpubFactory(
+  const {deriveXpub, cleanXpubCache} = CachedDeriveXpubFactory(
     derivationScheme,
     config.shouldExportPubKeyBulk,
     async (derivationPaths) => {
@@ -295,6 +295,7 @@ const ShelleyLedgerCryptoProvider = async ({network, config, forceWebUsb}) => {
     _sign: sign,
     _deriveHdNode: deriveHdNode,
     checkVersion,
+    cleanXpubCache,
   }
 }