@bithomp/xrpl-api 3.2.0 → 3.2.2

package/lib/ledger/account_tx.js

@@ -124,28 +124,33 @@ async function findTransactions(account, options = { limit: DEFAULT_LIMIT, timeo
     loadOptions.binary = false;
     applyLimitOptions(loadOptions);
     await applyStartTxOptions(loadOptions);
+    let getTransactionsLimit = loadOptions.limit;
+    if (transactions.length === 0 && loadOptions.startTxHash) {
+        getTransactionsLimit += LIMIT_INCREASE_COUNT;
+    }
+    if (loadOptions.sourceTag || loadOptions.destinationTag) {
+        getTransactionsLimit += LIMIT_INCREASE_COUNT;
+    }
+    if (getTransactionsLimit > MAX_LIMIT) {
+        getTransactionsLimit = MAX_LIMIT;
+    }
     while (transactions.length !== loadOptions.limit) {
         const currentTime = new Date();
         if (loadOptions.timeout && currentTime.getTime() - timeStart.getTime() > loadOptions.timeout) {
             break;
         }
-        let limit = loadOptions.limit;
-        if (transactions.length === 0 && loadOptions.startTxHash) {
-            limit += LIMIT_INCREASE_COUNT;
-        }
-        if (loadOptions.sourceTag || loadOptions.destinationTag) {
-            limit += LIMIT_INCREASE_COUNT;
-        }
-        if (limit > MAX_LIMIT) {
-            limit = MAX_LIMIT;
-        }
         const accountTransactions = await getTransactions(account, {
             ...loadOptions,
-            ...{ balanceChanges: false, specification: false, limit },
+            ...{ balanceChanges: false, specification: false, limit: getTransactionsLimit },
         });
-        if (!accountTransactions || accountTransactions.error) {
-            accountTransactionsError = accountTransactions;
-            break;
+        if (accountTransactions.error) {
+            if (accountTransactions.error_message === "Request timeout.") {
+                continue;
+            }
+            else {
+                accountTransactionsError = accountTransactions;
+                break;
+            }
         }
         let newTransactions = accountTransactions.transactions;
         loadOptions.marker = accountTransactions.marker;
@@ -165,8 +170,16 @@ async function findTransactions(account, options = { limit: DEFAULT_LIMIT, timeo
                 }
             }
         }
-        transactions = transactions.concat(newTransactions);
-        transactions = transactions.slice(0, loadOptions.limit);
+        if (newTransactions.length === 0 && getTransactionsLimit < MAX_LIMIT) {
+            getTransactionsLimit += LIMIT_INCREASE_COUNT;
+            if (getTransactionsLimit > MAX_LIMIT) {
+                getTransactionsLimit = MAX_LIMIT;
+            }
+        }
+        if (newTransactions.length > 0) {
+            transactions = transactions.concat(newTransactions);
+            transactions = transactions.slice(0, loadOptions.limit);
+        }
         if (loadOptions.marker === undefined) {
             break;
         }
@@ -176,7 +189,7 @@ async function findTransactions(account, options = { limit: DEFAULT_LIMIT, timeo
     }
     if (loadOptions.marker && transactions.length === 0) {
         return {
-            status: "timeout",
+            status: "error",
             error: "searchTimeout",
             marker: loadOptions.marker,
         };

package/lib/ledger/transaction.js

@@ -408,10 +408,10 @@ async function waitForFinalTransactionOutcome(txHash, lastLedger) {
     }
     if (tx && !tx.hasOwnProperty("error") && tx.validated === false) {
         if (tx.hasOwnProperty("LastLedgerSequence")) {
-            return { ...tx, status: "timeout", error: "lastLedgerIndexReached" };
+            return { ...tx, status: "error", error: "lastLedgerIndexReached" };
         }
         else {
-            return { ...tx, status: "timeout", error: "waitingForValidation" };
+            return { ...tx, status: "error", error: "waitingForValidation" };
         }
     }
     return tx;

package/lib/models/base_model.d.ts

@@ -4,7 +4,7 @@ export interface ErrorResponse {
     transaction?: string;
     public_key?: string;
     nft_id?: string;
-    status: "error" | "timeout";
+    status: "error";
     error: string;
     error_code?: string;
     error_message?: string;

package/lib/types/mptokens.d.ts

@@ -1,12 +1,5 @@
+import { MPTokenIssuanceCreateFlags, MPTokenIssuanceSetFlags, MPTokenAuthorizeFlags } from "xrpl";
 import { FormattedBaseSpecification } from "./specification";
-declare enum MPTokenIssuanceCreateFlags {
-    tfMPTCanLock = 2,
-    tfMPTRequireAuth = 4,
-    tfMPTCanEscrow = 8,
-    tfMPTCanTrade = 16,
-    tfMPTCanTransfer = 32,
-    tfMPTCanClawback = 64
-}
 export declare const MPTokenIssuanceCreateFlagsKeys: {
     canLock: MPTokenIssuanceCreateFlags;
     requireAuth: MPTokenIssuanceCreateFlags;
@@ -23,10 +16,6 @@ export interface MPTokenIssuanceCreateFlagsKeysInterface {
     canTransfer?: boolean;
     canClawback?: boolean;
 }
-declare enum MPTokenIssuanceSetFlags {
-    tfMPTLock = 1,
-    tfMPTUnlock = 2
-}
 export declare const MPTokenIssuanceSetFlagsKeys: {
     lock: MPTokenIssuanceSetFlags;
     unlock: MPTokenIssuanceSetFlags;
@@ -35,9 +24,6 @@ export interface MPTokenIssuanceSetFlagsKeysInterface {
     lock?: boolean;
     unlock?: boolean;
 }
-declare enum MPTokenAuthorizeFlags {
-    tfMPTUnauthorize = 1
-}
 export declare const MPTokenAuthorizeFlagsKeys: {
     unauthorize: MPTokenAuthorizeFlags;
 };
@@ -66,4 +52,3 @@ export type FormattedMPTokenIssuanceSetSpecification = {
     holder?: string;
     mptIssuanceID?: string;
 } & FormattedBaseSpecification;
-export {};

package/lib/types/mptokens.js

@@ -1,36 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MPTokenAuthorizeFlagsKeys = exports.MPTokenIssuanceSetFlagsKeys = exports.MPTokenIssuanceCreateFlagsKeys = void 0;
-var MPTokenIssuanceCreateFlags;
-(function (MPTokenIssuanceCreateFlags) {
-    MPTokenIssuanceCreateFlags[MPTokenIssuanceCreateFlags["tfMPTCanLock"] = 2] = "tfMPTCanLock";
-    MPTokenIssuanceCreateFlags[MPTokenIssuanceCreateFlags["tfMPTRequireAuth"] = 4] = "tfMPTRequireAuth";
-    MPTokenIssuanceCreateFlags[MPTokenIssuanceCreateFlags["tfMPTCanEscrow"] = 8] = "tfMPTCanEscrow";
-    MPTokenIssuanceCreateFlags[MPTokenIssuanceCreateFlags["tfMPTCanTrade"] = 16] = "tfMPTCanTrade";
-    MPTokenIssuanceCreateFlags[MPTokenIssuanceCreateFlags["tfMPTCanTransfer"] = 32] = "tfMPTCanTransfer";
-    MPTokenIssuanceCreateFlags[MPTokenIssuanceCreateFlags["tfMPTCanClawback"] = 64] = "tfMPTCanClawback";
-})(MPTokenIssuanceCreateFlags || (MPTokenIssuanceCreateFlags = {}));
+const xrpl_1 = require("xrpl");
 exports.MPTokenIssuanceCreateFlagsKeys = {
-    canLock: MPTokenIssuanceCreateFlags.tfMPTCanLock,
-    requireAuth: MPTokenIssuanceCreateFlags.tfMPTRequireAuth,
-    canEscrow: MPTokenIssuanceCreateFlags.tfMPTCanEscrow,
-    canTrade: MPTokenIssuanceCreateFlags.tfMPTCanTrade,
-    canTransfer: MPTokenIssuanceCreateFlags.tfMPTCanTransfer,
-    canClawback: MPTokenIssuanceCreateFlags.tfMPTCanClawback,
+    canLock: xrpl_1.MPTokenIssuanceCreateFlags.tfMPTCanLock,
+    requireAuth: xrpl_1.MPTokenIssuanceCreateFlags.tfMPTRequireAuth,
+    canEscrow: xrpl_1.MPTokenIssuanceCreateFlags.tfMPTCanEscrow,
+    canTrade: xrpl_1.MPTokenIssuanceCreateFlags.tfMPTCanTrade,
+    canTransfer: xrpl_1.MPTokenIssuanceCreateFlags.tfMPTCanTransfer,
+    canClawback: xrpl_1.MPTokenIssuanceCreateFlags.tfMPTCanClawback,
 };
-var MPTokenIssuanceSetFlags;
-(function (MPTokenIssuanceSetFlags) {
-    MPTokenIssuanceSetFlags[MPTokenIssuanceSetFlags["tfMPTLock"] = 1] = "tfMPTLock";
-    MPTokenIssuanceSetFlags[MPTokenIssuanceSetFlags["tfMPTUnlock"] = 2] = "tfMPTUnlock";
-})(MPTokenIssuanceSetFlags || (MPTokenIssuanceSetFlags = {}));
 exports.MPTokenIssuanceSetFlagsKeys = {
-    lock: MPTokenIssuanceSetFlags.tfMPTLock,
-    unlock: MPTokenIssuanceSetFlags.tfMPTUnlock,
+    lock: xrpl_1.MPTokenIssuanceSetFlags.tfMPTLock,
+    unlock: xrpl_1.MPTokenIssuanceSetFlags.tfMPTUnlock,
 };
-var MPTokenAuthorizeFlags;
-(function (MPTokenAuthorizeFlags) {
-    MPTokenAuthorizeFlags[MPTokenAuthorizeFlags["tfMPTUnauthorize"] = 1] = "tfMPTUnauthorize";
-})(MPTokenAuthorizeFlags || (MPTokenAuthorizeFlags = {}));
 exports.MPTokenAuthorizeFlagsKeys = {
-    unauthorize: MPTokenAuthorizeFlags.tfMPTUnauthorize,
+    unauthorize: xrpl_1.MPTokenAuthorizeFlags.tfMPTUnauthorize,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bithomp/xrpl-api",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "A Bithomp JavaScript/TypeScript library for interacting with the XRP Ledger",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -11,7 +11,7 @@
     "url": "git+https://github.com/Bithomp/xrpl-api.git"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "keywords": [
     "xrpl",
@@ -58,29 +58,27 @@
     "elliptic": "^6.6.1",
     "lodash": "^4.17.21",
     "ripple-address-codec": "^5.0.0",
-    "ripple-binary-codec": "^2.1.0",
-    "xrpl": "^4.0.0"
+    "ripple-binary-codec": "^2.2.0",
+    "xrpl": "^4.1.0"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.2.0",
-    "@eslint/js": "^9.17.0",
     "@types/chai": "^5.0.1",
     "@types/chai-as-promised": "^8.0.1",
-    "@types/lodash": "^4.17.13",
+    "@types/lodash": "^4.17.14",
     "@types/mocha": "^10.0.10",
     "@types/nconf": "^0.10.7",
-    "@types/node": "^22.10.2",
-    "@typescript-eslint/eslint-plugin": "^8.18.1",
-    "@typescript-eslint/parser": "^8.18.1",
+    "@types/node": "^22.10.10",
+    "@typescript-eslint/eslint-plugin": "^8.21.0",
+    "@typescript-eslint/parser": "^8.21.0",
     "chai": "^4.5.0",
     "chai-as-promised": "^7.1.2",
-    "eslint": "^9.17.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint": "^9.19.0",
+    "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-chai-friendly": "^1.0.1",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-n": "^17.15.1",
     "eslint-plugin-promise": "^7.2.1",
-    "globals": "^15.14.0",
     "mocha": "^11.0.1",
     "nconf": "^0.12.1",
     "ts-jest": "^29.2.5",