@bitpay-labs/bitcore-wallet-service 11.11.0 → 11.11.2

package/src/lib/server.ts

@@ -27,7 +27,6 @@ import { SardineService } from '../externalservices/sardine';
 import { SimplexService } from '../externalservices/simplex';
 import { ThorswapService } from '../externalservices/thorswap';
 import { TransakService } from '../externalservices/transak';
-import { WyreService } from '../externalservices/wyre';
 import { serverMessages } from '../serverMessages';
 import { BCHAddressTranslator } from './bchaddresstranslator';
 import { BlockChainExplorer } from './blockchainexplorer';
@@ -160,7 +159,6 @@ export class WalletService implements IWalletService {
     simplex: SimplexService;
     thorswap: ThorswapService;
     transak: TransakService;
-    wyre: WyreService;
     coinGecko: CoinGeckoService;
   };
 
@@ -190,7 +188,6 @@ export class WalletService implements IWalletService {
       simplex: new SimplexService(),
       thorswap: new ThorswapService(),
       transak: new TransakService(),
-      wyre: new WyreService(),
       coinGecko: new CoinGeckoService(this.storage),
     };
   }
@@ -876,26 +873,29 @@ export class WalletService implements IWalletService {
       pendingTxps?: ITxProposal[];
       preferences?: boolean;
     } = {};
-    async.parallel(
-      [
-        next => {
-          this.getWallet({}, (err, wallet: Partial<Wallet>) => {
-            if (err) return next(err);
-            if (this._upgradeNeeded(UPGRADES.SOL_bwc_$lt_10_10_12, wallet)) {
-              return next(Errors.UPGRADE_NEEDED);
-            }
+    this.getWallet({}, (err, fetchedWallet: Wallet) => {
+      if (err) return cb(err);
 
+      // Read the wallet once, and give each step its own copy, the same as reading it again: the steps change their
+      // wallet in place (this one strips copayer data, the balance code sets tokenAddress on it), and the balance step
+      // can store its copy whole.
+      const copyOfWallet = () => Wallet.fromObj(fetchedWallet.toObject());
+      const omit = (obj, keys: string[]): any => Object.fromEntries(Object.entries(obj).filter(([key]) => !keys.includes(key)));
+      async.parallel(
+        [
+          next => {
+            let wallet: Partial<Wallet> = copyOfWallet();
             const walletExtendedKeys = ['publicKeyRing', 'pubKey', 'addressManager'];
             const copayerExtendedKeys = ['xPubKey', 'requestPubKey', 'signature', 'addressManager', 'customData'];
 
             wallet.copayers = (wallet.copayers || []).map(copayer => {
               if (copayer.id == this.copayerId) return copayer;
-              return _.omit(copayer, 'customData');
+              return omit(copayer, ['customData']);
             });
             if (!opts.includeExtendedInfo) {
-              wallet = _.omit(wallet, walletExtendedKeys);
+              wallet = omit(wallet, walletExtendedKeys);
               wallet.copayers = (wallet.copayers || []).map(copayer => {
-                return _.omit(copayer, copayerExtendedKeys);
+                return omit(copayer, copayerExtendedKeys);
               }) as Copayer[];
             }
             status.wallet = wallet;
@@ -906,46 +906,45 @@ export class WalletService implements IWalletService {
               status.serverMessage = deprecatedServerMessage(wallet, this.appName, this.appVersion);
             }
             next();
-          });
-        },
-        next => {
-          opts.wallet = status.wallet;
-          this.getBalance(opts, (err, balance) => {
-            // ignore WALLET_NEED_SCAN err is includeExtendedInfo is given
-            // (to allow `importWallet` to import a wallet, while scan has
-            // failed)
-            if (opts.includeExtendedInfo) {
-              if (err && err.code != 'WALLET_NEED_SCAN') {
+          },
+          next => {
+            this.getBalance({ ...opts, wallet: copyOfWallet() }, (err, balance) => {
+              // ignore WALLET_NEED_SCAN err is includeExtendedInfo is given
+              // (to allow `importWallet` to import a wallet, while scan has
+              // failed)
+              if (opts.includeExtendedInfo) {
+                if (err && err.code != 'WALLET_NEED_SCAN') {
+                  return next(err);
+                }
+              } else if (err) {
                 return next(err);
               }
-            } else if (err) {
-              return next(err);
-            }
 
-            status.balance = balance;
-            next();
-          });
-        },
-        next => {
-          this.getPendingTxs(opts, (err, pendingTxps) => {
-            if (err) return next(err);
-            status.pendingTxps = pendingTxps;
-            next();
-          });
-        },
-        next => {
-          this.getPreferences({}, (err, preferences) => {
-            if (err) return next(err);
-            status.preferences = preferences;
-            next();
-          });
+              status.balance = balance;
+              next();
+            });
+          },
+          next => {
+            this.getPendingTxs({ ...opts, wallet: copyOfWallet() }, (err, pendingTxps) => {
+              if (err) return next(err);
+              status.pendingTxps = pendingTxps;
+              next();
+            });
+          },
+          next => {
+            this.getPreferences({}, (err, preferences) => {
+              if (err) return next(err);
+              status.preferences = preferences;
+              next();
+            });
+          }
+        ],
+        err => {
+          if (err) return cb(err);
+          return cb(null, status);
         }
-      ],
-      err => {
-        if (err) return cb(err);
-        return cb(null, status);
-      }
-    );
+      );
+    });
   }
 
   /**
@@ -1538,9 +1537,10 @@ export class WalletService implements IWalletService {
   _canCreateAddress(ignoreMaxGap, cb) {
     if (ignoreMaxGap) return cb(null, true);
 
-    this.storage.fetchAddresses(this.walletId, (err, addresses: IAddress[]) => {
+    const newest = { noChange: true, reverse: true, limit: Defaults.MAX_MAIN_ADDRESS_GAP };
+    this.storage.fetchAddressesPage(this.walletId, newest, (err, addresses: IAddress[]) => {
       if (err) return cb(err);
-      const latestAddresses = addresses.filter(x => !x.isChange).slice(-Defaults.MAX_MAIN_ADDRESS_GAP) as IAddress[];
+      const latestAddresses = addresses.reverse();
       if (
         latestAddresses.length < Defaults.MAX_MAIN_ADDRESS_GAP ||
         latestAddresses.some(a => a.hasActivity)
@@ -1641,7 +1641,7 @@ export class WalletService implements IWalletService {
     };
 
     const getFirstAddress = (wallet, cb) => {
-      this.storage.fetchAddresses(this.walletId, (err, addresses) => {
+      this.storage.fetchAddressesPage(this.walletId, { limit: 1 }, (err, addresses) => {
         if (err) return cb(err);
         if (addresses?.length) {
           const x = addresses[0];
@@ -1694,17 +1694,9 @@ export class WalletService implements IWalletService {
 
   getAddresses(opts: GetAddressesOpts, cb) {
     opts = opts || {};
-    this.storage.fetchAddresses(this.walletId, (err, addresses) => {
+    const { noChange, addresses: only, reverse, skip, limit } = opts;
+    this.storage.fetchAddressesPage(this.walletId, { noChange, addresses: only, reverse, skip, limit }, (err, addresses) => {
       if (err) return cb(err);
-      if (opts.noChange) {
-        addresses = addresses.filter(a => !a.isChange);
-      }
-      if (opts.addresses) {
-        addresses = addresses.filter(a => opts.addresses.includes(a.address));
-      }
-      if (opts.reverse) addresses.reverse();
-      if (opts.skip > 0) addresses = addresses.slice(opts.skip);
-      if (opts.limit > 0) addresses = addresses.slice(0, opts.limit);
 
       this.getWallet({}, (err, wallet) => {
         if (err) return cb(err);
@@ -1786,7 +1778,7 @@ export class WalletService implements IWalletService {
     async.series(
       [
         next => {
-          this.getWallet({}, (err, w) => {
+          const useWallet = (err, w) => {
             if (err) return next(err);
 
             wallet = w;
@@ -1796,7 +1788,10 @@ export class WalletService implements IWalletService {
             bc = this._getBlockchainExplorer(wallet.chain, wallet.network);
             if (!bc) return cb(new Error('Could not get blockchain explorer instance'));
             return next();
-          });
+          };
+          // the balance code passes the wallet it already has
+          if (opts.wallet) return useWallet(null, opts.wallet);
+          this.getWallet({}, useWallet);
         },
         next => {
           if (Array.isArray(opts.addresses)) {
@@ -1892,7 +1887,7 @@ export class WalletService implements IWalletService {
         next => {
           utxoIndex = _.keyBy(allUtxos, utxoKey);
 
-          this.getPendingTxs({ numberFormat: opts.numberFormat }, (err, txps) => {
+          this.getPendingTxs({ numberFormat: opts.numberFormat, wallet }, (err, txps) => {
             if (err) return next(err);
 
             const lockedInputs = txps.flatMap(t => t.inputs).map(utxoKey);
@@ -1936,7 +1931,8 @@ export class WalletService implements IWalletService {
               });
               logger.debug(`Got ${allUtxos.length} usable UTXOs`);
               return next();
-            }
+            },
+            wallet
           );
         },
         next => {
@@ -1949,6 +1945,7 @@ export class WalletService implements IWalletService {
             }
             utxo.path = addressToPath[utxo.address].path;
             utxo.publicKeys = addressToPath[utxo.address].publicKeys;
+            utxo.isChange = addressToPath[utxo.address].isChange;
           }
           return next();
         }
@@ -2402,6 +2399,37 @@ export class WalletService implements IWalletService {
   }
 
   _validateAndSanitizeTxOpts(wallet, opts, cb) {
+    const gasFeeFields = ['gasPrice', 'maxGasFee', 'priorityGasFee'];
+    const hasGasFeeOverride = gasFeeFields.some(key => opts[key] != null);
+    if (hasGasFeeOverride) {
+      if (!Constants.EVM_CHAINS[wallet.chain.toUpperCase()]) {
+        return cb(new ClientError('Gas fee overrides are only supported for EVM chains'));
+      }
+      for (const key of gasFeeFields) {
+        if (opts[key] != null && (!Number.isSafeInteger(opts[key]) || opts[key] <= 0)) {
+          return cb(new ClientError(`${key} must be a positive safe integer in wei`));
+        }
+      }
+      if (opts.gasPrice != null && Number(opts.txType || 0) !== 0) {
+        return cb(new ClientError('gasPrice requires a type 0 transaction'));
+      }
+      if ((opts.maxGasFee != null || opts.priorityGasFee != null) && Number(opts.txType) !== 2) {
+        return cb(new ClientError('maxGasFee and priorityGasFee require a type 2 transaction'));
+      }
+      if ((opts.maxGasFee != null) !== (opts.priorityGasFee != null)) {
+        return cb(new ClientError('maxGasFee and priorityGasFee must be supplied together'));
+      }
+      if (opts.priorityGasFee > opts.maxGasFee) {
+        return cb(new ClientError('priorityGasFee must not exceed maxGasFee'));
+      }
+      if (opts.feePerKb != null || opts.fee != null) {
+        return cb(new ClientError('Gas fee overrides cannot be combined with feePerKb or fee'));
+      }
+      // sendMax calculates its amount before getFee, using a separate fee estimate.
+      if (opts.sendMax) {
+        return cb(new ClientError('Gas fee overrides are not supported with sendMax'));
+      }
+    }
     async.series(
       [
         next => {
@@ -2409,7 +2437,7 @@ export class WalletService implements IWalletService {
             boolToNum(!!opts.feeLevel) + boolToNum(Utils.isNumber(opts.feePerKb)) + boolToNum(Utils.isNumber(opts.fee));
           if (feeArgs > 1) return next(new ClientError('Only one of feeLevel/feePerKb/fee can be specified'));
 
-          if (feeArgs == 0) {
+          if (feeArgs == 0 && !hasGasFeeOverride) {
             opts.feeLevel = 'normal';
           }
 
@@ -2421,6 +2449,11 @@ export class WalletService implements IWalletService {
               );
           }
 
+          // An explicit gas fee determines the price, not the named fee level.
+          if (hasGasFeeOverride) {
+            delete opts.feeLevel;
+          }
+
           const error = ChainService.checkUtxos(wallet.chain, opts);
           if (error) {
             return next(new ClientError('fee can only be set when inputs are specified'));
@@ -2782,6 +2815,9 @@ export class WalletService implements IWalletService {
    * @param {Boolean} opts.enableRBF - Optional. enable BTC Replace By Fee
    * @param {Boolean} opts.replaceTxByFee - Optional. Ignore locked utxos check ( used for replacing a transaction designated as RBF)
    * @param {number} opts.txType - Optional. Type of EVM transaction
+   * @param {number} opts.gasPrice - Optional. Type 0 gas price in wei. Overrides feeLevel; incompatible with fee/feePerKb/sendMax.
+   * @param {number} opts.maxGasFee - Optional. Type 2 maximum fee per gas in wei; requires priorityGasFee.
+   * @param {number} opts.priorityGasFee - Optional. Positive type 2 priority fee per gas in wei; requires maxGasFee and must not exceed it. Gas fee overrides cannot be used with fee/feePerKb/sendMax.
    * @param {number} opts.gasLimitBuffer - Optional. Percentage of buffer to add to the gasLimit
    * @param {number} opts.priorityFeePercentile - Optional. Percentile of targeted priority fee rate
    * @param {Boolean} opts.multiTx - Optional. Proposal will create multiple transactions
@@ -3172,19 +3208,23 @@ export class WalletService implements IWalletService {
    * @returns {Object} txProposal
    */
   getTx(opts, cb: (err: any, txp?: TxProposal) => void) {
-    this.storage.fetchTx(this.walletId, opts.txProposalId, (err, txp) => {
+    // the tx and its note are both completed from the wallet, so read it once
+    this.storage.fetchWallet(this.walletId, (err, wallet) => {
       if (err) return cb(err);
-      if (!txp) return cb(Errors.TX_NOT_FOUND);
+      this.storage.fetchTx(this.walletId, opts.txProposalId, (err, txp) => {
+        if (err) return cb(err);
+        if (!txp) return cb(Errors.TX_NOT_FOUND);
 
-      if (!txp.txid) return cb(null, txp);
+        if (!txp.txid) return cb(null, txp);
 
-      this.storage.fetchTxNote(this.walletId, txp.txid, (err, note) => {
-        if (err) {
-          this.logw(`Error fetching tx note for ${txp.txid}:`, err);
-        }
-        txp.note = note;
-        return cb(null, txp);
-      });
+        this.storage.fetchTxNote(this.walletId, txp.txid, (err, note) => {
+          if (err) {
+            this.logw(`Error fetching tx note for ${txp.txid}:`, err);
+          }
+          txp.note = note;
+          return cb(null, txp);
+        }, wallet);
+      }, wallet);
     });
   }
 
@@ -3202,19 +3242,22 @@ export class WalletService implements IWalletService {
     // foreign wallet's proposal data to any authenticated copayer. The
     // internal global consumers (BlockchainMonitor, getWalletFromIdentifier)
     // are unaffected; they keep calling storage.fetchTxByHash directly.
-    this.storage.fetchTxByHashForWallet(this.walletId, opts.txid, (err, txp) => {
+    this.storage.fetchWallet(this.walletId, (err, wallet) => {
       if (err) return cb(err);
-      if (!txp) return cb(Errors.TX_NOT_FOUND);
+      this.storage.fetchTxByHashForWallet(this.walletId, opts.txid, (err, txp) => {
+        if (err) return cb(err);
+        if (!txp) return cb(Errors.TX_NOT_FOUND);
 
-      if (!txp.txid) return cb(null, txp);
+        if (!txp.txid) return cb(null, txp);
 
-      this.storage.fetchTxNote(this.walletId, txp.txid, (err, note) => {
-        if (err) {
-          this.logw(`Error fetching tx note for ${txp.txid}:`, err);
-        }
-        txp.note = note;
-        return cb(null, txp);
-      });
+        this.storage.fetchTxNote(this.walletId, txp.txid, (err, note) => {
+          if (err) {
+            this.logw(`Error fetching tx note for ${txp.txid}:`, err);
+          }
+          txp.note = note;
+          return cb(null, txp);
+        }, wallet);
+      }, wallet);
     });
   }
 
@@ -3844,7 +3887,7 @@ export class WalletService implements IWalletService {
             return cb(err, txps);
           }
         );
-      });
+      }, opts.wallet);
     }
   }
 
@@ -4870,7 +4913,8 @@ export class WalletService implements IWalletService {
                       minTs,
                       maxTs
                     },
-                    done
+                    done,
+                    wallet
                   );
                 },
                 done => {
@@ -4879,7 +4923,8 @@ export class WalletService implements IWalletService {
                     {
                       minTs
                     },
-                    done
+                    done,
+                    wallet
                   );
                 }
               ],

package/src/lib/storage.ts

@@ -304,8 +304,9 @@ export class Storage {
   }
 
   // TODO: should be done client-side
-  _completeTxData(walletId: string, txs: TxProposal | TxProposal[], cb: (err?: any, txs?: TxProposal | TxProposal[]) => void) {
-    this.fetchWallet(walletId, (err, wallet) => {
+  // Callers that already have the wallet pass it, to save reading it again
+  _completeTxData(walletId: string, txs: TxProposal | TxProposal[], cb: (err?: any, txs?: TxProposal | TxProposal[]) => void, wallet?: Wallet) {
+    const complete = (err, wallet: Wallet) => {
       if (err) return cb(err);
       for (const tx of [].concat(txs) as TxProposal[]) {
         tx.derivationStrategy = wallet.derivationStrategy || 'BIP45';
@@ -318,11 +319,13 @@ export class Storage {
           tx.raw = tx.getRawTx();
       }
       return cb(null, txs);
-    });
+    };
+    if (wallet) return complete(null, wallet);
+    this.fetchWallet(walletId, complete);
   }
 
   // TODO: remove walletId from signature
-  fetchTx(walletId: string, txProposalId: string, cb: (err?: any, tx?: TxProposal) => void) {
+  fetchTx(walletId: string, txProposalId: string, cb: (err?: any, tx?: TxProposal) => void, wallet?: Wallet) {
     if (!this.db) return cb();
 
     this.db.collection(collections.TXS).findOne(
@@ -333,7 +336,7 @@ export class Storage {
       (err, result) => {
         if (err) return cb(err);
         if (!result) return cb();
-        return this._completeTxData(walletId, TxProposal.fromObj(result), cb);
+        return this._completeTxData(walletId, TxProposal.fromObj(result), cb, wallet);
       }
     );
   }
@@ -356,7 +359,7 @@ export class Storage {
 
   // Wallet-scoped counterpart to fetchTxByHash, used by the authenticated
   // by-hash API read.
-  fetchTxByHashForWallet(walletId: string, hash, cb: (err?: any, tx?: TxProposal) => void) {
+  fetchTxByHashForWallet(walletId: string, hash, cb: (err?: any, tx?: TxProposal) => void, wallet?: Wallet) {
     if (!this.db) return cb();
 
     this.db.collection(collections.TXS).findOne(
@@ -368,7 +371,7 @@ export class Storage {
         if (err) return cb(err);
         if (!result) return cb();
 
-        return this._completeTxData(walletId, TxProposal.fromObj(result), cb);
+        return this._completeTxData(walletId, TxProposal.fromObj(result), cb, wallet);
       }
     );
   }
@@ -444,7 +447,7 @@ export class Storage {
     });
   }
 
-  fetchPendingTxs(walletId, cb) {
+  fetchPendingTxs(walletId, cb, wallet?: Wallet) {
     this.db
       .collection(collections.TXS)
       .find({
@@ -460,7 +463,7 @@ export class Storage {
         const txs = _.map(result, tx => {
           return TxProposal.fromObj(tx);
         });
-        return this._completeTxData(walletId, txs, cb);
+        return this._completeTxData(walletId, txs, cb, wallet);
       });
   }
 
@@ -472,7 +475,7 @@ export class Storage {
    * @param opts.maxTs
    * @param opts.limit
    */
-  fetchTxs(walletId, opts, cb) {
+  fetchTxs(walletId, opts, cb, wallet?: Wallet) {
     opts = opts || {};
 
     const tsFilter: { $gte?: number; $lte?: number } = {};
@@ -499,7 +502,7 @@ export class Storage {
         const txs = _.map(result, tx => {
           return TxProposal.fromObj(tx);
         });
-        return this._completeTxData(walletId, txs, cb);
+        return this._completeTxData(walletId, txs, cb, wallet);
       });
   }
 
@@ -511,7 +514,7 @@ export class Storage {
    * @param opts.maxTs
    * @param opts.limit
    */
-  fetchBroadcastedTxs(walletId, opts, cb) {
+  fetchBroadcastedTxs(walletId, opts, cb, wallet?: Wallet) {
     opts = opts || {};
 
     const tsFilter: { $gte?: number; $lte?: number } = {};
@@ -543,7 +546,7 @@ export class Storage {
         const txs = _.map(result, tx => {
           return TxProposal.fromObj(tx);
         });
-        return this._completeTxData(walletId, txs, cb);
+        return this._completeTxData(walletId, txs, cb, wallet);
       });
   }
 
@@ -678,6 +681,70 @@ export class Storage {
       });
   }
 
+  /**
+   * A page of the wallet's addresses, in fetchAddresses order (createdOn, then path), reading only the addresses the
+   * page needs. noChange and addresses filter the list, then reverse, skip and limit apply in that order.
+   *
+   * @param walletId
+   * @param opts.noChange - leave out change addresses
+   * @param opts.addresses - only these addresses
+   * @param opts.reverse - newest first
+   * @param opts.skip
+   * @param opts.limit
+   */
+  fetchAddressesPage(
+    walletId: string,
+    opts: { noChange?: boolean; addresses?: string[]; reverse?: boolean; skip?: number; limit?: number },
+    cb: (err?: any, addresses?: Address[]) => void
+  ) {
+    const query: { walletId: string; isChange?: { $in: Array<false | null> }; address?: { $in: string[] } } = { walletId };
+    // false, null or missing, the same addresses as !isChange
+    if (opts.noChange) query.isChange = { $in: [false, null] };
+    if (opts.addresses) query.address = { $in: opts.addresses };
+    // skip and limit apply only when positive, and as whole numbers, as slice does
+    const skip = opts.skip > 0 ? Math.floor(opts.skip) : 0;
+    const limit = opts.limit > 0 ? Math.floor(opts.limit) : null;
+    const collection = this.db.collection(collections.ADDRESSES);
+
+    const page = docs => {
+      let addresses = Utils.sortAsc(docs.map(Address.fromObj), 'createdOn', 'path');
+      if (opts.reverse) addresses.reverse();
+      if (skip) addresses = addresses.slice(skip);
+      if (limit !== null) addresses = addresses.slice(0, limit);
+      return addresses;
+    };
+    const readAll = () => collection.find(query).sort({ createdOn: 1 }).toArray((err, docs) => {
+      if (err) return cb(err);
+      return cb(null, page(docs));
+    });
+
+    // filtering by address, or reading without a limit or with one too large for a query limit, reads every matching
+    // address
+    if (opts.addresses || !(limit > 0) || !Number.isSafeInteger(skip + limit + 1)) return readAll();
+
+    // fetchAddresses sorts an address with a missing createdOn last and one with a null createdOn first, but Mongo sorts
+    // both first, so a wallet that has either is read whole
+    collection.findOne({ walletId, createdOn: null }, { projection: { _id: 1 } }, (err, unordered) => {
+      if (err) return cb(err);
+      if (unordered) return readAll();
+
+      // The page is within the first skip + limit addresses by createdOn plus any others sharing the last one's
+      // createdOn, whatever order addresses created in the same second are in. One more address shows whether there are any.
+      const count = skip + limit;
+      collection.find(query).sort({ createdOn: opts.reverse ? -1 : 1 }).limit(count + 1).toArray((err, docs) => {
+        if (err) return cb(err);
+        if (docs.length <= count || docs[count].createdOn !== docs[count - 1].createdOn) {
+          return cb(null, page(docs.slice(0, count)));
+        }
+        collection.find({ ...query, createdOn: docs[count - 1].createdOn }).toArray((err, ties) => {
+          if (err) return cb(err);
+          const read = new Set(docs.slice(0, count).map(doc => String(doc._id)));
+          return cb(null, page([...docs.slice(0, count), ...ties.filter(doc => !read.has(String(doc._id)))]));
+        });
+      });
+    });
+  }
+
   migrateToCashAddr(walletId, cb) {
     const cursor = this.db.collection(collections.ADDRESSES).find({
       walletId
@@ -1300,7 +1367,7 @@ export class Storage {
       });
   }
 
-  fetchTxNote(walletId, txid, cb: (err?: any, note?: TxNote) => void) {
+  fetchTxNote(walletId, txid, cb: (err?: any, note?: TxNote) => void, wallet?: Wallet) {
     this.db.collection(collections.TX_NOTES).findOne(
       {
         walletId,
@@ -1309,20 +1376,23 @@ export class Storage {
       (err, result) => {
         if (err) return cb(err);
         if (!result) return cb();
-        return this._completeTxNotesData(walletId, TxNote.fromObj(result), cb);
+        return this._completeTxNotesData(walletId, TxNote.fromObj(result), cb, wallet);
       }
     );
   }
 
   // TODO: should be done client-side
-  _completeTxNotesData(walletId, notes: TxNote | TxNote[], cb: (err?: any, notes?: TxNote | TxNote[]) => void) {
-    this.fetchWallet(walletId, (err, wallet) => {
+  // Callers that already have the wallet pass it, to save reading it again
+  _completeTxNotesData(walletId, notes: TxNote | TxNote[], cb: (err?: any, notes?: TxNote | TxNote[]) => void, wallet?: Wallet) {
+    const complete = (err, wallet: Wallet) => {
       if (err) return cb(err);
       for (const note of [].concat(notes) as TxNote[]) {
         note.editedByName = wallet.getCopayer(note.editedBy).name;
       }
       return cb(null, notes);
-    });
+    };
+    if (wallet) return complete(null, wallet);
+    this.fetchWallet(walletId, complete);
   }
 
   /**
@@ -1331,7 +1401,7 @@ export class Storage {
    * @param walletId
    * @param opts.minTs
    */
-  fetchTxNotes(walletId, opts, cb) {
+  fetchTxNotes(walletId, opts, cb, wallet?: Wallet) {
     const filter: { walletId: string; editedOn?: { $gte: number } } = {
       walletId
     };
@@ -1349,7 +1419,7 @@ export class Storage {
             return TxNote.fromObj(note);
           })
         );
-        return this._completeTxNotesData(walletId, notes, cb);
+        return this._completeTxNotesData(walletId, notes, cb, wallet);
       });
   }
 

package/src/types/externalservices.d.ts

@@ -20,7 +20,6 @@ export interface BuyCryptoConfig {
   sardine?: ExchangeConfig;
   simplex?: ExchangeConfig;
   transak?: ExchangeConfig;
-  wyre?: ExchangeConfig;
 }
 
 export interface SellCryptoConfig {