@bitpay-labs/bitcore-wallet-service 11.10.1 → 11.10.3

package/ts_build/src/lib/server.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UPGRADES = exports.WalletService = void 0;
 exports.checkRequired = checkRequired;
+const util_1 = __importDefault(require("util"));
 const crypto_wallet_core_1 = require("@bitpay-labs/crypto-wallet-core");
 const async = __importStar(require("async"));
 const email_validator_1 = __importDefault(require("email-validator"));
@@ -2260,7 +2261,8 @@ class WalletService {
                                     fromAta: opts.fromAta,
                                     decimals: opts.decimals,
                                     refreshOnPublish: opts.refreshOnPublish,
-                                    deferNonce: opts.deferNonce
+                                    deferNonce: opts.deferNonce,
+                                    flags: opts.flags
                                 };
                                 txp = model_1.TxProposal.create(txOpts);
                                 next();
@@ -2615,6 +2617,16 @@ class WalletService {
                                 return cb(errordefinitions_1.Errors.TX_NONCE_CONFLICT);
                             }
                         }
+                        if (txp.nonce != null && txp.deferNonce) {
+                            const broadcastedTxps = await util_1.default.promisify(this.storage.fetchBroadcastedTxs).call(this.storage, this.walletId, {
+                                minTs: Math.floor(Date.now() / 1000) - Defaults.BROADCASTED_NONCE_SCAN_WINDOW
+                            });
+                            for (const t of broadcastedTxps || []) {
+                                if (t.id !== txp.id && t.nonce != null && Number(t.nonce) === Number(txp.nonce)) {
+                                    return cb(errordefinitions_1.Errors.TX_NONCE_CONFLICT);
+                                }
+                            }
+                        }
                     }
                     catch (err) {
                         return cb(err);
@@ -2715,8 +2727,14 @@ class WalletService {
                         const pendingNonces = pendingTxps
                             .filter(t => t.id !== txp.id && t.nonce != null && t.status !== 'rejected')
                             .map(t => Number(t.nonce));
+                        const broadcastedTxps = await util_1.default.promisify(this.storage.fetchBroadcastedTxs).call(this.storage, this.walletId, {
+                            minTs: Math.floor(Date.now() / 1000) - Defaults.BROADCASTED_NONCE_SCAN_WINDOW
+                        });
+                        const inFlightNonces = (broadcastedTxps || [])
+                            .filter(t => t.nonce != null && Number(t.nonce) >= Number(confirmedNonce))
+                            .map(t => Number(t.nonce));
                         let suggestedNonce = Number(confirmedNonce);
-                        const allNonces = pendingNonces.sort((a, b) => a - b);
+                        const allNonces = [...pendingNonces, ...inFlightNonces].sort((a, b) => a - b);
                         for (const n of allNonces) {
                             if (n === suggestedNonce) {
                                 suggestedNonce++;
@@ -4046,6 +4064,27 @@ class WalletService {
             });
         });
     }
+    async getFlags(opts) {
+        try {
+            const wallet = await util_1.default.promisify(this.getWallet).call(this, {});
+            if (wallet.chain !== 'xrp')
+                throw new Error('Flags are only supported for XRP wallets');
+            const addresses = await util_1.default.promisify(this.storage.fetchAddresses).call(this.storage, this.walletId);
+            const addressObj = addresses.find(a => a.path === `m/0/${opts.account || 0}`);
+            if (!addressObj)
+                throw new Error('Could not find address for account ' + opts.account);
+            const bc = this._getBlockchainExplorer(wallet.chain, wallet.network);
+            if (!bc)
+                throw new Error('Could not get blockchain explorer instance');
+            const address = addressObj.address.split(':')[0];
+            const flags = await bc.getFlags({ address });
+            return flags;
+        }
+        catch (err) {
+            this.logw('Error getting flags: %o', err);
+            throw err;
+        }
+    }
     static upgradeNeeded(paths, opts) {
         paths = Array.isArray(paths) ? paths : [paths];
         const chain = opts.chain?.toLowerCase();