@bithomp/xrpl-api 3.2.8 → 3.2.9

package/lib/ledger/account_lines.d.ts

@@ -2,7 +2,7 @@ import { LedgerIndex } from "../models/ledger";
 import { AccountLinesResponse } from "../models/account_lines";
 import { ErrorResponse } from "../models/base_model";
 export interface GetAccountLinesOptions {
-    counterparty?: string;
+    issuer?: string;
     currency?: string;
     ledgerIndex?: LedgerIndex;
     limit?: number;

package/lib/ledger/account_lines.js

@@ -46,8 +46,6 @@ async function getAccountLines(account, options = {}) {
     const response = await connection.request({
         command: "account_lines",
         account,
-        counterparty: options.counterparty,
-        currency: options.currency,
         ledger_index: options.ledgerIndex || "validated",
         limit: options.limit,
         marker: options.marker,
@@ -71,6 +69,17 @@ async function getAccountLines(account, options = {}) {
         };
     }
     const result = response.result;
+    if (options.currency || options.issuer) {
+        result.lines = result.lines.filter((line) => {
+            if (options.currency && line.currency !== options.currency) {
+                return false;
+            }
+            if (options.issuer && line.account !== options.issuer) {
+                return false;
+            }
+            return true;
+        });
+    }
     const newMarker = (0, utils_1.createMarker)(connection.hash, result.marker);
     if (newMarker) {
         result.marker = newMarker;

package/lib/ledger/currency.d.ts

@@ -15,6 +15,7 @@ interface DecodedNFTCurrencyTransactionInterface {
     type?: string;
     account?: string;
     destination?: string;
+    issuer?: string;
     counterparty?: string;
     hash?: string;
     memos?: string;

package/lib/ledger/currency.js

@@ -38,6 +38,7 @@ const Client = __importStar(require("../client"));
 const utils_1 = require("../parse/utils");
 const transaction_1 = require("../parse/transaction");
 const client_1 = require("../client");
+const common_1 = require("../common");
 const maxLength = 12;
 async function parseCurrencyInformation(currency) {
     if (!currency || typeof currency !== "string") {
@@ -90,14 +91,15 @@ async function decodeXlf15d(currencyCode) {
             if (transaction.metaData.TransactionIndex === ctiTxIndex) {
                 const { Account: account, Destination: destination, LimitAmount: limit, Memos: memos, hash: hash, } = transaction;
                 const type = (0, transaction_1.parseTransactionType)(transaction.TransactionType);
-                ctiTx = {
+                ctiTx = (0, common_1.removeUndefined)({
                     type,
                     account,
                     destination,
+                    issuer: limit?.issuer,
                     counterparty: limit?.issuer,
                     hash,
                     memos,
-                };
+                });
                 break;
             }
         }

package/lib/models/book_offers.d.ts

@@ -1,7 +1,7 @@
-import { FormattedIssuedCurrency } from "../types";
+import { IssuedCurrency, FormattedIssuedCurrency } from "../types";
 export type OrderbookInfo = {
-    base: FormattedIssuedCurrency;
-    counter: FormattedIssuedCurrency;
+    base: IssuedCurrency | FormattedIssuedCurrency;
+    counter: IssuedCurrency | FormattedIssuedCurrency;
 };
 export declare function formatBidsAndAsks(orderbook: OrderbookInfo, offers: any[]): {
     bids: any[];

package/lib/models/book_offers.js

@@ -8,7 +8,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const orderbook_order_1 = require("../parse/ledger/orderbook-order");
 function isSameIssue(a, b) {
-    return a.currency === b.currency && a.counterparty === b.counterparty;
+    return a.currency === b.currency && a.issuer === b.issuer;
 }
 function directionFilter(direction, order) {
     return order.specification.direction === direction;

package/lib/parse/ledger/amount.d.ts

@@ -1,3 +1,3 @@
-import { FormattedIssuedCurrencyAmount, FormattedIssuedMPTAmount, Amount } from "../../types";
-declare function parseAmount(amount: Amount): FormattedIssuedCurrencyAmount | FormattedIssuedMPTAmount;
+import { IssuedCurrencyAmount, FormattedIssuedCurrencyAmount, FormattedIssuedMPTAmount, Amount } from "../../types";
+declare function parseAmount(amount: Amount): IssuedCurrencyAmount | FormattedIssuedCurrencyAmount | FormattedIssuedMPTAmount;
 export default parseAmount;

package/lib/parse/ledger/amount.js

@@ -11,6 +11,7 @@ function parseAmount(amount) {
     }
     if ("value" in amount && "currency" in amount && "issuer" in amount) {
         return {
+            issuer: amount.issuer,
             currency: amount.currency,
             value: amount.value,
             counterparty: amount.issuer,

package/lib/parse/ledger/asset.d.ts

@@ -1,3 +1,3 @@
 import { FormattedIssuedCurrency, IssuedCurrency } from "../../types";
-declare function parseAsset(asset: IssuedCurrency): FormattedIssuedCurrency | undefined;
+declare function parseAsset(asset: IssuedCurrency): IssuedCurrency | FormattedIssuedCurrency | undefined;
 export default parseAsset;

package/lib/parse/ledger/asset.js

@@ -11,6 +11,7 @@ function parseAsset(asset) {
         };
     }
     return {
+        issuer: asset.issuer,
         currency: asset.currency,
         counterparty: asset.issuer,
     };

package/lib/parse/ledger/gateway-balances.js

@@ -5,22 +5,22 @@ function parseGatewayBalances(balanceSheet) {
     const result = {};
     if (typeof balanceSheet.balances === "object") {
         Object.entries(balanceSheet.balances).forEach((entry) => {
-            const [counterparty, balances] = entry;
+            const [issuer, balances] = entry;
             balances.forEach((balance) => {
                 if (!result.balances) {
                     result.balances = [];
                 }
-                result.balances.push(Object.assign({ counterparty }, balance));
+                result.balances.push(Object.assign({ issuer, counterparty: issuer }, balance));
             });
         });
     }
     if (typeof balanceSheet.assets === "object") {
-        Object.entries(balanceSheet.assets).forEach(([counterparty, assets]) => {
+        Object.entries(balanceSheet.assets).forEach(([issuer, assets]) => {
             assets.forEach((balance) => {
                 if (!result.assets) {
                     result.assets = [];
                 }
-                result.assets.push(Object.assign({ counterparty }, balance));
+                result.assets.push(Object.assign({ issuer, counterparty: issuer }, balance));
             });
         });
     }

package/lib/parse/ledger/ledger.js

@@ -8,21 +8,24 @@ const lodash_1 = __importDefault(require("lodash"));
 const common_1 = require("../../common");
 const models_1 = require("../../models");
 const transaction_1 = require("../transaction");
-function parseTransactionWrapper(ledgerVersion, includeRawTransaction, tx) {
+function parseTransactionWrapper(ledgerIndex, includeRawTransaction, tx) {
     const transaction = Object.assign({}, lodash_1.default.omit(tx, "metaData"), {
         meta: tx.metaData,
-        ledger_index: ledgerVersion,
+        ledger_index: ledgerIndex,
     });
     const result = (0, transaction_1.parseTransaction)(transaction, includeRawTransaction);
     if (!result.outcome) {
         result.outcome = {};
     }
+    if (!result.outcome.ledgerIndex) {
+        result.outcome.ledgerIndex = ledgerIndex;
+    }
     if (!result.outcome.ledgerVersion) {
-        result.outcome.ledgerVersion = ledgerVersion;
+        result.outcome.ledgerVersion = ledgerIndex;
     }
     return result;
 }
-function parseTransactions(transactions, ledgerVersion, includeRawTransactions) {
+function parseTransactions(transactions, ledgerIndex, includeRawTransactions) {
     if (lodash_1.default.isEmpty(transactions)) {
         return {};
     }
@@ -30,7 +33,7 @@ function parseTransactions(transactions, ledgerVersion, includeRawTransactions)
         return { transactionHashes: transactions };
     }
     return {
-        transactions: transactions.map(lodash_1.default.partial(parseTransactionWrapper, ledgerVersion, includeRawTransactions)),
+        transactions: transactions.map(lodash_1.default.partial(parseTransactionWrapper, ledgerIndex, includeRawTransactions)),
     };
 }
 function parseState(state) {
@@ -43,7 +46,7 @@ function parseState(state) {
     return { rawState: JSON.stringify(state) };
 }
 function parseLedger(ledger, includeRawTransactions) {
-    const ledgerVersion = parseInt(ledger.ledger_index, 10);
+    const ledgerIndex = parseInt(ledger.ledger_index, 10);
     return (0, common_1.removeUndefined)(Object.assign({
         stateHash: ledger.account_hash,
         close_time: (0, models_1.ledgerTimeToUnixTime)(ledger.close_time),
@@ -51,10 +54,11 @@ function parseLedger(ledger, includeRawTransactions) {
         closeTimeResolution: ledger.close_time_resolution,
         closeFlags: ledger.close_flags,
         ledgerHash: ledger.ledger_hash,
-        ledgerVersion: ledgerVersion,
+        ledgerIndex: ledgerIndex,
+        ledgerVersion: ledgerIndex,
         parentLedgerHash: ledger.parent_hash,
         parentCloseTime: (0, models_1.ledgerTimeToISO8601)(ledger.parent_close_time),
         totalDrops: ledger.total_coins,
         transactionHash: ledger.transaction_hash,
-    }, parseTransactions(ledger.transactions, ledgerVersion, includeRawTransactions), parseState(ledger.accountState)));
+    }, parseTransactions(ledger.transactions, ledgerIndex, includeRawTransactions), parseState(ledger.accountState)));
 }

package/lib/parse/outcome/amm_changes.js

@@ -104,10 +104,11 @@ function summarizeActionSlotChanges(node) {
         if (final.AuctionSlot.Price.value !== prev.AuctionSlot.Price.value) {
             changes.priceChange = {
                 currency: final.AuctionSlot.Price.currency,
-                counterparty: final.AuctionSlot.Price.issuer,
+                issuer: final.AuctionSlot.Price.issuer,
                 value: new bignumber_js_1.default(final.AuctionSlot.Price.value)
                     .minus(new bignumber_js_1.default(prev.AuctionSlot.Price.value))
                     .toString(10),
+                counterparty: final.AuctionSlot.Price.issuer,
             };
         }
         if (final.AuctionSlot.TimeInterval !== prev.AuctionSlot.TimeInterval) {
@@ -184,8 +185,9 @@ function summarizeAmm(node) {
     if (prev.LPTokenBalance) {
         summary.lpTokenBalanceChange = {
             currency: final.LPTokenBalance.currency,
-            counterparty: final.LPTokenBalance.issuer,
+            issuer: final.LPTokenBalance.issuer,
             value: new bignumber_js_1.default(final.LPTokenBalance.value).minus(new bignumber_js_1.default(prev.LPTokenBalance.value)).toString(10),
+            counterparty: final.LPTokenBalance.issuer,
         };
     }
     if (prev.VoteSlots) {

package/lib/parse/outcome/balance_changes.d.ts

@@ -1,8 +1,9 @@
 import { TransactionMetadata } from "xrpl";
 interface BalanceChangeQuantity {
-    counterparty?: string;
+    issuer?: string;
     currency?: string;
     value: string;
+    counterparty?: string;
     mpt_issuance_id?: string;
 }
 export interface AddressBalanceChangeQuantity {

package/lib/parse/outcome/balance_changes.js

@@ -73,11 +73,12 @@ function parseXRPQuantity(node, valueParser, nativeCurrency) {
 function flipTrustlinePerspective(quantity) {
     const negatedBalance = new bignumber_js_1.default(quantity.balance.value).negated();
     return {
-        address: quantity.balance.counterparty,
+        address: quantity.balance.issuer,
         balance: {
-            counterparty: quantity.address,
+            issuer: quantity.address,
             currency: quantity.balance.currency,
             value: negatedBalance.toString(),
+            counterparty: quantity.address,
         },
     };
 }
@@ -90,9 +91,10 @@ function parseTrustlineQuantity(node, valueParser) {
     const result = {
         address: fields.LowLimit.issuer,
         balance: {
-            counterparty: fields.HighLimit.issuer,
+            issuer: fields.HighLimit.issuer,
             currency: fields.Balance.currency,
             value: value.toString(),
+            counterparty: fields.HighLimit.issuer,
         },
     };
     return [result, flipTrustlinePerspective(result)];

package/lib/parse/outcome/locked_balance_changes.d.ts

@@ -1,8 +1,9 @@
 import { TransactionMetadata } from "xrpl";
 interface LockedBalanceChangeQuantity {
-    counterparty: string;
+    issuer: string;
     currency: string;
     value: string;
+    counterparty: string;
 }
 export interface AddressLockedBalanceChangeQuantity {
     address: string;

package/lib/parse/outcome/locked_balance_changes.js

@@ -53,9 +53,10 @@ function parseTrustlineQuantity(node, valueParser) {
     const result = {
         address: fields.LowLimit.issuer,
         lockedBalance: {
-            counterparty: LockedBalanceFields.LockedBalance.issuer,
+            issuer: LockedBalanceFields.LockedBalance.issuer,
             currency: LockedBalanceFields.LockedBalance.currency,
             value: value.toString(),
+            counterparty: LockedBalanceFields.LockedBalance.issuer,
         },
     };
     return [result];

package/lib/parse/outcome.js

@@ -31,7 +31,7 @@ function parseOutcome(tx, nativeCurrency, definitions) {
         result: tx.meta.TransactionResult,
         timestamp: (0, utils_1.parseTimestamp)(tx.date),
         fee: (0, common_1.dropsToXrp)(tx.Fee),
-        balanceChanges,
+        balanceChanges: Object.keys(balanceChanges).length > 0 ? balanceChanges : undefined,
         lockedBalanceChanges: Object.keys(lockedBalanceChanges).length > 0 ? lockedBalanceChanges : undefined,
         orderbookChanges: Object.keys(orderbookChanges).length > 0 ? orderbookChanges : undefined,
         channelChanges,
@@ -49,7 +49,8 @@ function parseOutcome(tx, nativeCurrency, definitions) {
         unlReportChanges,
         hooksExecutions,
         emittedTxns,
-        ledgerVersion: tx.ledger_index,
+        ledgerIndex: tx.ledger_index || tx.inLedger,
+        ledgerVersion: tx.ledger_index || tx.inLedger,
         indexInLedger: tx.meta.TransactionIndex,
         deliveredAmount: (0, index_1.parseDeliveredAmount)(tx),
     });

package/lib/parse/specification/payment-channel-claim.js

@@ -39,15 +39,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const assert = __importStar(require("assert"));
 const xrpl_1 = require("xrpl");
 const common_1 = require("../../common");
-const ripple_amount_1 = __importDefault(require("../ledger/ripple-amount"));
+const amount_1 = __importDefault(require("../ledger/amount"));
 const emit_details_1 = require("../ledger/emit_details");
 const memos_1 = require("../ledger/memos");
 function parsePaymentChannelClaim(tx) {
     assert.ok(tx.TransactionType === "PaymentChannelClaim");
     return (0, common_1.removeUndefined)({
         channel: tx.Channel,
-        balance: (0, ripple_amount_1.default)(tx.Balance),
-        amount: (0, ripple_amount_1.default)(tx.Amount),
+        balance: (0, amount_1.default)(tx.Balance),
+        amount: (0, amount_1.default)(tx.Amount),
         signature: tx.Signature,
         publicKey: tx.PublicKey,
         renew: Boolean(tx.Flags & xrpl_1.PaymentChannelClaimFlags.tfRenew) || undefined,

package/lib/parse/specification/payment-channel-create.js

@@ -39,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const assert = __importStar(require("assert"));
 const common_1 = require("../../common");
 const utils_1 = require("../utils");
-const ripple_amount_1 = __importDefault(require("../ledger/ripple-amount"));
+const amount_1 = __importDefault(require("../ledger/amount"));
 const emit_details_1 = require("../ledger/emit_details");
 const memos_1 = require("../ledger/memos");
 const account_1 = require("../ledger/account");
@@ -56,7 +56,7 @@ function parsePaymentChannelCreate(tx) {
     return (0, common_1.removeUndefined)({
         source: (0, common_1.removeUndefined)(source),
         destination: (0, common_1.removeUndefined)(destination),
-        amount: (0, ripple_amount_1.default)(tx.Amount),
+        amount: (0, amount_1.default)(tx.Amount),
         settleDelay: tx.SettleDelay,
         publicKey: tx.PublicKey,
         cancelAfter: tx.CancelAfter && (0, utils_1.parseTimestamp)(tx.CancelAfter),

package/lib/parse/specification/payment-channel-fund.js

@@ -39,14 +39,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const assert = __importStar(require("assert"));
 const common_1 = require("../../common");
 const utils_1 = require("../utils");
-const ripple_amount_1 = __importDefault(require("../ledger/ripple-amount"));
+const amount_1 = __importDefault(require("../ledger/amount"));
 const emit_details_1 = require("../ledger/emit_details");
 const memos_1 = require("../ledger/memos");
 function parsePaymentChannelFund(tx) {
     assert.ok(tx.TransactionType === "PaymentChannelFund");
     return (0, common_1.removeUndefined)({
         channel: tx.Channel,
-        amount: (0, ripple_amount_1.default)(tx.Amount),
+        amount: (0, amount_1.default)(tx.Amount),
         expiration: tx.Expiration && (0, utils_1.parseTimestamp)(tx.Expiration),
         emittedDetails: (0, emit_details_1.parseEmittedDetails)(tx),
         memos: (0, memos_1.parseMemos)(tx),

package/lib/parse/utils.d.ts

@@ -1,10 +1,10 @@
 import { TransactionMetadata } from "xrpl";
-import { FormattedIssuedCurrencyAmount, FormattedIssuedMPTAmount } from "../types";
+import { IssuedCurrencyAmount, FormattedIssuedCurrencyAmount, FormattedIssuedMPTAmount } from "../types";
 declare function adjustQualityForXRP(quality: string, takerGetsCurrency: string, takerPaysCurrency: string): string;
 declare function parseQuality(quality?: number | null): number | undefined;
 declare function parseTimestamp(rippleTime?: number | null): string | undefined;
 declare function isPartialPayment(tx: any): boolean;
-declare function removeGenericCounterparty(amount: FormattedIssuedCurrencyAmount | FormattedIssuedMPTAmount, address: string): FormattedIssuedCurrencyAmount | FormattedIssuedMPTAmount;
+declare function removeGenericCounterparty(amount: IssuedCurrencyAmount | FormattedIssuedCurrencyAmount | FormattedIssuedMPTAmount, address: string): FormattedIssuedCurrencyAmount | FormattedIssuedMPTAmount;
 declare function normalizeNodes(metadata: TransactionMetadata): any[];
 declare function hexToString(hex: string | undefined): string | undefined;
 declare function stringToHex(value: string | undefined): string | undefined;

package/lib/parse/utils.js

@@ -45,6 +45,9 @@ function removeGenericCounterparty(amount, address) {
     if ("counterparty" in amount) {
         return amount.counterparty === address ? lodash_1.default.omit(amount, "counterparty") : amount;
     }
+    if ("issuer" in amount) {
+        return amount.issuer === address ? lodash_1.default.omit(amount, "issuer") : amount;
+    }
     return amount;
 }
 function normalizeNode(affectedNode) {

package/lib/types/adjustments.d.ts

@@ -1,16 +1,16 @@
-import { FormattedIssuedCurrencyAmount } from "./amounts";
+import { IssuedCurrencyAmount, FormattedIssuedCurrencyAmount } from "./amounts";
 export type Adjustment = {
     address: string;
-    amount: FormattedIssuedCurrencyAmount;
+    amount: IssuedCurrencyAmount | FormattedIssuedCurrencyAmount;
     tag?: number;
 };
 export type MaxAdjustment = {
     address: string;
-    maxAmount: FormattedIssuedCurrencyAmount;
+    maxAmount: IssuedCurrencyAmount | FormattedIssuedCurrencyAmount;
     tag?: number;
 };
 export type MinAdjustment = {
     address: string;
-    minAmount: FormattedIssuedCurrencyAmount;
+    minAmount: IssuedCurrencyAmount | FormattedIssuedCurrencyAmount;
     tag?: number;
 };

package/lib/types/amounts.d.ts

@@ -17,4 +17,4 @@ export interface FormattedIssuedMPTAmount {
     value: string;
 }
 export type Amount = IssuedCurrencyAmount | FormattedIssuedMPTAmount | string;
-export type FormattedAmount = FormattedIssuedCurrencyAmount | FormattedIssuedMPTAmount | string;
+export type FormattedAmount = IssuedCurrency | FormattedIssuedCurrencyAmount | FormattedIssuedMPTAmount | string;

package/lib/types/gateway_balances.d.ts

@@ -1,11 +1,11 @@
-import { FormattedIssuedCurrency } from "./amounts";
+import { IssuedCurrency, FormattedIssuedCurrency } from "./amounts";
 type FormattedGatewayBalanceObligations = {
     currency: string;
     value: string;
 };
 export type FormattedGatewayBalances = {
-    balances?: FormattedIssuedCurrency[];
-    assets?: FormattedIssuedCurrency[];
+    balances?: IssuedCurrency[] | FormattedIssuedCurrency[];
+    assets?: IssuedCurrency[] | FormattedIssuedCurrency[];
     obligations?: FormattedGatewayBalanceObligations[];
 };
 export {};

package/lib/types/ledger.d.ts

@@ -21,6 +21,7 @@ export type FormattedLedger = {
     closeTimeResolution: number;
     closeFlags: number;
     ledgerHash: string;
+    ledgerIndex: number;
     ledgerVersion: number;
     parentLedgerHash: string;
     parentCloseTime: string;

package/lib/types/outcome.d.ts

@@ -3,6 +3,7 @@ import { LockedBalanceChanges } from "../parse/outcome/locked_balance_changes";
 import { BalanceChanges } from "../parse/outcome/balance_changes";
 export type Outcome = {
     result?: string;
+    ledgerIndex?: number;
     ledgerVersion?: number;
     indexInLedger?: number;
     fee?: string;

package/lib/v1/transaction/payment.js

@@ -26,13 +26,25 @@ function isXRPToXRPPayment(payment) {
         (destinationCurrency === (0, client_1.getNativeCurrency)() || destinationCurrency === "drops"));
 }
 function isIOUWithoutCounterparty(amount) {
-    return (amount && amount.currency !== (0, client_1.getNativeCurrency)() && amount.currency !== "drops" && amount.counterparty == null);
+    if (typeof amount === "object") {
+        if ("currency" in amount && amount.currency !== (0, client_1.getNativeCurrency)() && amount.currency !== "drops") {
+            return false;
+        }
+        if ("mpt_issuance_id" in amount && amount.mpt_issuance_id) {
+            return false;
+        }
+        if (amount.issuer == null &&
+            amount.counterparty == null) {
+            return true;
+        }
+    }
+    return false;
 }
 function applyAnyCounterpartyEncoding(payment) {
     [payment.source, payment.destination].forEach((adjustment) => {
         ["amount", "minAmount", "maxAmount"].forEach((key) => {
             if (isIOUWithoutCounterparty(adjustment[key])) {
-                adjustment[key].counterparty = adjustment.address;
+                adjustment[key].issuer = adjustment.address;
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bithomp/xrpl-api",
-  "version": "3.2.8",
+  "version": "3.2.9",
   "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"