@bithomp/xrpl-api 3.4.4 → 3.4.6

package/lib/common/utils.js

@@ -16,6 +16,7 @@ exports.getConstructorName = getConstructorName;
 const lodash_1 = __importDefault(require("lodash"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const errors_1 = require("./errors");
+const index_1 = require("./index");
 function signum(num) {
     return num === 0 ? 0 : num > 0 ? 1 : -1;
 }
@@ -87,7 +88,7 @@ function dropsToXrp(drops) {
     if (!drops.match(/^-?[0-9]+$/)) {
         throw new errors_1.ValidationError(`dropsToXrp: failed sanity check - value '${drops}', does not match (^-?[0-9]+$).`);
     }
-    return new bignumber_js_1.default(drops).dividedBy(1000000.0).toString(10);
+    return new bignumber_js_1.default(drops).dividedBy(index_1.dropsInXRP).toString(10);
 }
 function xrpToDrops(xrp) {
     if (typeof xrp === "string") {
@@ -110,7 +111,7 @@ function xrpToDrops(xrp) {
     if (fraction.length > 6) {
         throw new errors_1.ValidationError(`xrpToDrops: value '${xrp}' has too many decimal places.`);
     }
-    return new bignumber_js_1.default(xrp).times(1000000.0).integerValue(bignumber_js_1.default.ROUND_FLOOR).toString(10);
+    return new bignumber_js_1.default(xrp).times(index_1.dropsInXRP).integerValue(bignumber_js_1.default.ROUND_FLOOR).toString(10);
 }
 function removeUndefined(obj) {
     return lodash_1.default.omitBy(obj, (value) => value == null);

package/lib/connection.d.ts

@@ -32,7 +32,7 @@ declare class Connection extends EventEmitter {
     types: string[];
     latency: LatencyInfo[];
     readonly logger?: any;
-    readonly timeout?: number;
+    readonly timeout: number;
     readonly connectionTimeout: number;
     readonly hash?: string;
     private onlineSince;
@@ -49,6 +49,7 @@ declare class Connection extends EventEmitter {
     connect(): Promise<void>;
     disconnect(): Promise<void>;
     request(request: Request, options?: any): Promise<Response | any>;
+    _request(request: Request, options?: any): Promise<Response | any>;
     submit(transaction: string): Promise<Response | any>;
     isConnected(): boolean;
     getOnlinePeriodMs(): number | null;

package/lib/connection.js

@@ -45,7 +45,7 @@ const common_1 = require("./common");
 const utils_1 = require("./common/utils");
 const XRPLConnection = __importStar(require("xrpl/dist/npm/client/connection"));
 const RECONNECT_TIMEOUT = 1000 * 5;
-const LEDGER_CLOSED_TIMEOUT = 1000 * 15;
+const LEDGER_CLOSED_TIMEOUT = 1000 * 20;
 const SERVER_INFO_UPDATE_INTERVAL = 1000 * 60 * 5;
 const AVAILABLE_LEDGER_INDEX_WINDOW = 1000;
 exports.DEFAULT_API_VERSION = xrpl_1.RIPPLED_API_V1;
@@ -64,7 +64,7 @@ class Connection extends events_1.EventEmitter {
         this.updateTypes();
         this.client = null;
         this.logger = options.logger;
-        this.timeout = options.timeout;
+        this.timeout = options.timeout || LEDGER_CLOSED_TIMEOUT;
         this.connectionTimeout = options.connectionTimeout || RECONNECT_TIMEOUT;
         this.hash = crypto_1.default.createHash("sha256").update(url).digest("hex");
         if (typeof options.networkID === "number") {
@@ -112,6 +112,22 @@ class Connection extends events_1.EventEmitter {
         clearTimeout(this.connectionTimer);
     }
     async request(request, options) {
+        const result = await this._request(request, options);
+        if (result?.error === "timeout") {
+            const timeouts = this.latency.filter((info) => info.delta >= this.timeout).length;
+            if (timeouts >= 3) {
+                this.logger?.debug({
+                    service: "Bithomp::XRPL::Connection",
+                    function: "request",
+                    url: this.url,
+                    error: `Too many timeouts (${timeouts}) in last ${this.latency.length} requests, reconnecting...`,
+                });
+                this.reconnect();
+            }
+        }
+        return result;
+    }
+    async _request(request, options) {
         try {
             if (options?.skip_subscription_update !== true &&
                 (request.command === "subscribe" || request.command === "unsubscribe")) {
@@ -137,7 +153,7 @@ class Connection extends events_1.EventEmitter {
             return response;
         }
         catch (err) {
-            this.updateLatency(RECONNECT_TIMEOUT);
+            this.updateLatency(err.name === "TimeoutError" ? this.timeout : this.connectionTimeout);
             this.logger?.debug({
                 service: "Bithomp::XRPL::Connection",
                 function: "request",
@@ -160,7 +176,6 @@ class Connection extends events_1.EventEmitter {
             return await this.request({ command: "submit", tx_blob: transaction });
         }
         catch (err) {
-            this.updateLatency(1000);
             this.logger?.debug({
                 service: "Bithomp::XRPL::Connection",
                 function: "submit",

package/lib/ledger/account_tx.js

@@ -333,12 +333,21 @@ function counterpartyFilter(options, transaction) {
     if (transaction.tx.Destination === options.counterparty) {
         return true;
     }
+    if (transaction.tx.Delegate === options.counterparty) {
+        return true;
+    }
     if (transaction.tx.Amount?.issuer === options.counterparty) {
         return true;
     }
     if (transaction.tx.SendMax?.issuer === options.counterparty) {
         return true;
     }
+    if (typeof transaction.tx.TakerGets === "object" && transaction.tx.TakerGets?.issuer === options.counterparty) {
+        return true;
+    }
+    if (typeof transaction.tx.TakerPays === "object" && transaction.tx.TakerPays?.issuer === options.counterparty) {
+        return true;
+    }
     if (transaction.tx.LimitAmount?.issuer === options.counterparty) {
         return true;
     }

package/lib/parse/specification/nftoken-burn.js

@@ -48,7 +48,6 @@ function parseNFTokenBurn(tx) {
         signer: (0, regular_key_1.parseSignerRegularKey)(tx),
         delegate: (0, delegate_1.parseDelegate)(tx),
         source: (0, source_1.parseSource)(tx),
-        account: tx.Account,
         nftokenID: tx.NFTokenID,
         emittedDetails: (0, emit_details_1.parseEmittedDetails)(tx),
         memos: (0, memos_1.parseMemos)(tx),

package/lib/types/nftokens.d.ts

@@ -23,7 +23,6 @@ export interface NFTokenOfferFlagsKeysInterface {
     sellToken?: boolean;
 }
 export type FormattedNFTokenBurnSpecification = {
-    account: string;
     nftokenID: string;
 } & FormattedBaseSpecification;
 export type FormattedNFTokenMintSpecification = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bithomp/xrpl-api",
-  "version": "3.4.4",
+  "version": "3.4.6",
   "description": "A Bithomp JavaScript/TypeScript library for interacting with the XRP Ledger",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -43,7 +43,7 @@
     "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
     "lint": "eslint",
     "prepare": "npm run build",
-    "prepublishOnly": "npm test && npm run lint",
+    "-prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",
     "postversion": "git push && git push --tags"
@@ -72,9 +72,9 @@
     "@types/node": "^22.15.21",
     "@typescript-eslint/eslint-plugin": "^8.38.0",
     "@typescript-eslint/parser": "^8.38.0",
-    "chai": "^4.5.0",
-    "chai-as-promised": "^7.1.2",
-    "eslint": "^9.32.0",
+    "chai": "^6.0.1",
+    "chai-as-promised": "^8.0.2",
+    "eslint": "^9.34.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-chai-friendly": "^1.1.0",
     "eslint-plugin-import": "^2.32.0",