@bitpay-labs/bitcore-wallet-service 11.11.1 → 11.11.3

package/ts_build/src/lib/server.js

@@ -503,6 +503,14 @@ class WalletService {
             if (!(opts.tssVersion >= Constants.TSS_KEYGEN_SCHEME_VERSION_MIN && opts.tssVersion <= Constants.TSS_KEYGEN_SCHEME_VERSION_MAX)) {
                 return cb(new clienterror_1.ClientError('Invalid TSS version'));
             }
+            if (opts.tssVersion >= 1.3) {
+                if (!opts.tssKeygenCopayerId) {
+                    return cb(new clienterror_1.ClientError('Copayer ID is required for TSS version >= 1.3'));
+                }
+                if (keySession.participants.indexOf(opts.tssKeygenCopayerId) !== 0) {
+                    return cb(new clienterror_1.ClientError('Only the TSS session leader can create a wallet'));
+                }
+            }
             opts.m = 1;
             opts.n = 1;
         }
@@ -641,25 +649,25 @@ class WalletService {
     getStatus(opts, cb) {
         opts = opts || {};
         const status = {};
-        async.parallel([
-            next => {
-                this.getWallet({}, (err, wallet) => {
-                    if (err)
-                        return next(err);
-                    if (this._upgradeNeeded(exports.UPGRADES.SOL_bwc_$lt_10_10_12, wallet)) {
-                        return next(errordefinitions_1.Errors.UPGRADE_NEEDED);
-                    }
+        this.getWallet({}, (err, fetchedWallet) => {
+            if (err)
+                return cb(err);
+            const copyOfWallet = () => model_1.Wallet.fromObj(fetchedWallet.toObject());
+            const omit = (obj, keys) => Object.fromEntries(Object.entries(obj).filter(([key]) => !keys.includes(key)));
+            async.parallel([
+                next => {
+                    let 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);
                         });
                     }
                     status.wallet = wallet;
@@ -670,43 +678,42 @@ class WalletService {
                         status.serverMessage = (0, deprecated_serverMessages_1.serverMessages)(wallet, this.appName, this.appVersion);
                     }
                     next();
-                });
-            },
-            next => {
-                opts.wallet = status.wallet;
-                this.getBalance(opts, (err, balance) => {
-                    if (opts.includeExtendedInfo) {
-                        if (err && err.code != 'WALLET_NEED_SCAN') {
+                },
+                next => {
+                    this.getBalance({ ...opts, wallet: copyOfWallet() }, (err, balance) => {
+                        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();
-                });
-            }
-        ], err => {
-            if (err)
-                return cb(err);
-            return cb(null, status);
+                        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);
+            });
         });
     }
     _verifySignature(text, signature, pubkey) {
@@ -896,6 +903,9 @@ class WalletService {
         }
         if (!Utils.checkValueInCollection(opts.chain, Constants.CHAINS))
             return cb(new clienterror_1.ClientError('Invalid coin'));
+        if (opts.tssKeygenChain != null && !Utils.checkValueInCollection(opts.tssKeygenChain, Constants.CHAINS)) {
+            return cb(new clienterror_1.ClientError('Invalid TSS keygen chain'));
+        }
         let xPubKey;
         try {
             xPubKey = Bitcore_[opts.chain].HDPublicKey(opts.xPubKey);
@@ -939,8 +949,13 @@ class WalletService {
                     return cb(errordefinitions_1.Errors.COPAYER_IN_WALLET);
                 if (wallet.tssKeyId) {
                     const keySession = await storage.fetchTssKeyGenSession({ id: wallet.tssKeyId });
-                    const copayerId = model_1.Copayer.xPubToCopayerId(opts.chain, opts.xPubKey);
-                    if (!keySession.participants.includes(copayerId)) {
+                    const idChain = opts.tssKeygenChain || opts.chain;
+                    const copayerIds = new Set([
+                        model_1.Copayer.xPubToCopayerId(idChain, opts.xPubKey),
+                        model_1.Copayer.xPubToCopayerId(idChain, Utils.convertXPubKeyForNetwork(opts.xPubKey, idChain, 'livenet')),
+                        model_1.Copayer.xPubToCopayerId(idChain, Utils.convertXPubKeyForNetwork(opts.xPubKey, idChain, 'testnet'))
+                    ]);
+                    if (!keySession?.participants.some(id => copayerIds.has(id))) {
                         return cb(errordefinitions_1.Errors.TSS_NON_PARTICIPANT);
                     }
                     return this._addCopayerToWallet(wallet, opts, cb);
@@ -1136,10 +1151,11 @@ class WalletService {
     _canCreateAddress(ignoreMaxGap, cb) {
         if (ignoreMaxGap)
             return cb(null, true);
-        this.storage.fetchAddresses(this.walletId, (err, addresses) => {
+        const newest = { noChange: true, reverse: true, limit: Defaults.MAX_MAIN_ADDRESS_GAP };
+        this.storage.fetchAddressesPage(this.walletId, newest, (err, addresses) => {
             if (err)
                 return cb(err);
-            const latestAddresses = addresses.filter(x => !x.isChange).slice(-Defaults.MAX_MAIN_ADDRESS_GAP);
+            const latestAddresses = addresses.reverse();
             if (latestAddresses.length < Defaults.MAX_MAIN_ADDRESS_GAP ||
                 latestAddresses.some(a => a.hasActivity))
                 return cb(null, true);
@@ -1212,7 +1228,7 @@ class WalletService {
             }, true);
         };
         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) {
@@ -1257,21 +1273,10 @@ class WalletService {
     }
     getAddresses(opts, 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);
@@ -1327,7 +1332,7 @@ class WalletService {
         let allAddresses, allUtxos, utxoIndex, bc, wallet, blockchainHeight;
         async.series([
             next => {
-                this.getWallet({}, (err, w) => {
+                const useWallet = (err, w) => {
                     if (err)
                         return next(err);
                     wallet = w;
@@ -1337,7 +1342,10 @@ class WalletService {
                     if (!bc)
                         return cb(new Error('Could not get blockchain explorer instance'));
                     return next();
-                });
+                };
+                if (opts.wallet)
+                    return useWallet(null, opts.wallet);
+                this.getWallet({}, useWallet);
             },
             next => {
                 if (Array.isArray(opts.addresses)) {
@@ -1420,7 +1428,7 @@ class WalletService {
             },
             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);
@@ -1454,7 +1462,7 @@ class WalletService {
                     });
                     logger_1.default.debug(`Got ${allUtxos.length} usable UTXOs`);
                     return next();
-                });
+                }, wallet);
             },
             next => {
                 const addressToPath = _.keyBy(allAddresses, 'address');
@@ -1466,6 +1474,7 @@ class WalletService {
                     }
                     utxo.path = addressToPath[utxo.address].path;
                     utxo.publicKeys = addressToPath[utxo.address].publicKeys;
+                    utxo.isChange = addressToPath[utxo.address].isChange;
                 }
                 return next();
             }
@@ -1815,12 +1824,42 @@ class WalletService {
         return null;
     }
     _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_1.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_1.ClientError(`${key} must be a positive safe integer in wei`));
+                }
+            }
+            if (opts.gasPrice != null && Number(opts.txType || 0) !== 0) {
+                return cb(new clienterror_1.ClientError('gasPrice requires a type 0 transaction'));
+            }
+            if ((opts.maxGasFee != null || opts.priorityGasFee != null) && Number(opts.txType) !== 2) {
+                return cb(new clienterror_1.ClientError('maxGasFee and priorityGasFee require a type 2 transaction'));
+            }
+            if ((opts.maxGasFee != null) !== (opts.priorityGasFee != null)) {
+                return cb(new clienterror_1.ClientError('maxGasFee and priorityGasFee must be supplied together'));
+            }
+            if (opts.priorityGasFee > opts.maxGasFee) {
+                return cb(new clienterror_1.ClientError('priorityGasFee must not exceed maxGasFee'));
+            }
+            if (opts.feePerKb != null || opts.fee != null) {
+                return cb(new clienterror_1.ClientError('Gas fee overrides cannot be combined with feePerKb or fee'));
+            }
+            if (opts.sendMax) {
+                return cb(new clienterror_1.ClientError('Gas fee overrides are not supported with sendMax'));
+            }
+        }
         async.series([
             next => {
                 const feeArgs = boolToNum(!!opts.feeLevel) + boolToNum(Utils.isNumber(opts.feePerKb)) + boolToNum(Utils.isNumber(opts.fee));
                 if (feeArgs > 1)
                     return next(new clienterror_1.ClientError('Only one of feeLevel/feePerKb/fee can be specified'));
-                if (feeArgs == 0) {
+                if (feeArgs == 0 && !hasGasFeeOverride) {
                     opts.feeLevel = 'normal';
                 }
                 const feeLevels = Defaults.FEE_LEVELS[wallet.chain];
@@ -1828,6 +1867,9 @@ class WalletService {
                     if (!feeLevels.some(lvl => lvl.name === opts.feeLevel))
                         return next(new clienterror_1.ClientError('Invalid fee level. Valid values are ' + feeLevels.map(lvl => lvl.name).join(', ')));
                 }
+                if (hasGasFeeOverride) {
+                    delete opts.feeLevel;
+                }
                 const error = index_1.ChainService.checkUtxos(wallet.chain, opts);
                 if (error) {
                     return next(new clienterror_1.ClientError('fee can only be set when inputs are specified'));
@@ -2465,39 +2507,47 @@ class WalletService {
         });
     }
     getTx(opts, cb) {
-        this.storage.fetchTx(this.walletId, opts.txProposalId, (err, txp) => {
+        this.storage.fetchWallet(this.walletId, (err, wallet) => {
             if (err)
                 return cb(err);
-            if (!txp)
-                return cb(errordefinitions_1.Errors.TX_NOT_FOUND);
-            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.fetchTx(this.walletId, opts.txProposalId, (err, txp) => {
+                if (err)
+                    return cb(err);
+                if (!txp)
+                    return cb(errordefinitions_1.Errors.TX_NOT_FOUND);
+                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);
+                }, wallet);
+            }, wallet);
         });
     }
     getTxByHash(opts, cb) {
         if (!checkRequired(opts, 'txid', cb))
             return;
-        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(errordefinitions_1.Errors.TX_NOT_FOUND);
-            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.fetchTxByHashForWallet(this.walletId, opts.txid, (err, txp) => {
+                if (err)
+                    return cb(err);
+                if (!txp)
+                    return cb(errordefinitions_1.Errors.TX_NOT_FOUND);
+                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);
+                }, wallet);
+            }, wallet);
         });
     }
     editTxNote(opts, cb) {
@@ -2973,7 +3023,7 @@ class WalletService {
                     }
                     return cb(err, txps);
                 });
-            });
+            }, opts.wallet);
         }
     }
     getPendingTxsPromise(opts) {
@@ -3202,7 +3252,7 @@ class WalletService {
                 return cb(err);
             }
             wallet.beRegistered = true;
-            return this.storage.storeWallet(wallet, err => cb(err, true));
+            return this.storage.storeWalletRegistration(wallet, err => cb(err, true));
         });
     }
     checkWalletSync(bc, wallet, simpleRun, cb) {
@@ -3755,12 +3805,12 @@ class WalletService {
                             this.storage.fetchTxs(this.walletId, {
                                 minTs,
                                 maxTs
-                            }, done);
+                            }, done, wallet);
                         },
                         done => {
                             this.storage.fetchTxNotes(this.walletId, {
                                 minTs
-                            }, done);
+                            }, done, wallet);
                         }
                     ], (err, res) => {
                         return next(err, {
@@ -4438,4 +4488,5 @@ exports.UPGRADES = {
     BCH_schnorr: 'BCH:schnorr',
     bwc_$lt_1_2: 'bwc<1.2',
 };
+;
 //# sourceMappingURL=server.js.map