npm - @gearbox-protocol/sdk - Versions diffs - 1.20.8 → 1.20.10 - Mend

@gearbox-protocol/sdk 1.20.8 → 1.20.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/lib/core/assets.d.ts +22 -14
package/lib/core/assets.js +81 -81
package/lib/core/creditManager.spec.js +9 -5
package/lib/core/creditSession.d.ts +43 -9
package/lib/core/creditSession.js +75 -25
package/lib/core/pool/data.d.ts +47 -7
package/lib/core/pool/data.js +64 -58
package/lib/payload/creditSession.d.ts +66 -12
package/lib/payload/pool.d.ts +45 -24
package/package.json +1 -1

package/lib/core/assets.d.ts CHANGED Viewed

@@ -4,6 +4,12 @@ export interface Asset {
     token: string;
     balance: BigNumber;
 }
+export interface AssetWithView extends Asset {
+    balanceView: string;
+}
+export interface AssetWithAmountInTarget extends Asset {
+    amountInTarget: BigNumber;
+}
 interface NextAssetProps<T extends Asset> {
     allowedTokens: Array<string>;
     selectedAssets: Array<T>;
@@ -11,19 +17,21 @@ interface NextAssetProps<T extends Asset> {
     tokensList: Record<string, TokenData>;
     prices?: Record<string, BigNumber>;
 }
-export declare function nextAsset<T extends Asset>({ allowedTokens, selectedAssets, balances, tokensList, prices, }: NextAssetProps<T>): string | undefined;
-export declare function getBalances(allowedTokens: Array<string>, externalBalances: Record<string, BigNumber>): Record<string, BigNumber>;
-export declare function constructAssetRecord<A extends Asset>(a: Array<A>): Record<string, A>;
 export declare type WrapResult<T> = [Array<T>, BigNumber, BigNumber];
-export declare const memoWrapETH: (ethAddress: string, wethAddress: string) => <T extends Asset>(assets: T[]) => WrapResult<T>;
-/**
- * Sums the the second assets list into the first assets list
- * Creates new assets.
- */
-export declare function sumAssets<A extends Asset, B extends Asset>(a: Array<A>, b: Array<B>): Array<A | B>;
-/**
- * Subtracts the the second assets list from the first assets list
- * Balance cant be negative; doesn't create new assets.
- */
-export declare function subAssets<A extends Asset, B extends Asset>(a: Array<A>, b: Array<B>): Array<A>;
+export declare class AssetUtils {
+    static nextAsset<T extends Asset>({ allowedTokens, selectedAssets, balances, tokensList, prices, }: NextAssetProps<T>): string | undefined;
+    static getBalances(allowedTokens: Array<string>, externalBalances: Record<string, BigNumber>): Record<string, BigNumber>;
+    static constructAssetRecord<A extends Asset>(a: Array<A>): Record<string, A>;
+    static memoWrapETH: (ethAddress: string, wethAddress: string) => <T extends Asset>(assets: T[]) => WrapResult<T>;
+    /**
+     * Sums the the second assets list into the first assets list
+     * Creates new assets.
+     */
+    static sumAssets<A extends Asset, B extends Asset>(a: Array<A>, b: Array<B>): Array<A | B>;
+    /**
+     * Subtracts the the second assets list from the first assets list
+     * Balance cant be negative; doesn't create new assets.
+     */
+    static subAssets<A extends Asset, B extends Asset>(a: Array<A>, b: Array<B>): Array<A>;
+}
 export {};

package/lib/core/assets.js CHANGED Viewed

@@ -11,88 +11,88 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.subAssets = exports.sumAssets = exports.memoWrapETH = exports.constructAssetRecord = exports.getBalances = exports.nextAsset = void 0;
+exports.AssetUtils = void 0;
 var ethers_1 = require("ethers");
 var math_1 = require("../utils/math");
 var creditAccount_1 = require("./creditAccount");
-function nextAsset(_a) {
-    var allowedTokens = _a.allowedTokens, selectedAssets = _a.selectedAssets, balances = _a.balances, tokensList = _a.tokensList, _b = _a.prices, prices = _b === void 0 ? {} : _b;
-    var selectedRecord = selectedAssets.reduce(function (acc, _a) {
-        var token = _a.token;
-        acc[token.toLowerCase()] = true;
-        return acc;
-    }, {});
-    var notSelected = allowedTokens.filter(function (allowedToken) {
-        var alreadySelected = selectedRecord[allowedToken.toLowerCase()];
-        return !alreadySelected;
-    });
-    var sorted = (0, creditAccount_1.sortBalances)(getBalances(notSelected, balances), prices, tokensList);
-    var address = (sorted[0] || [])[0];
-    return address;
-}
-exports.nextAsset = nextAsset;
-function getBalances(allowedTokens, externalBalances) {
-    return allowedTokens.reduce(function (acc, address) {
-        var _a;
-        var addressLc = address.toLowerCase();
-        return __assign(__assign({}, acc), (_a = {}, _a[addressLc] = externalBalances[addressLc] || ethers_1.BigNumber.from(0), _a));
-    }, {});
-}
-exports.getBalances = getBalances;
-function constructAssetRecord(a) {
-    var record = a.reduce(function (acc, asset) {
-        acc[asset.token] = asset;
-        return acc;
-    }, {});
-    return record;
-}
-exports.constructAssetRecord = constructAssetRecord;
-var memoWrapETH = function (ethAddress, wethAddress) {
-    return function wrapETH(assets) {
-        var assetsRecord = constructAssetRecord(assets);
-        var weth = assetsRecord[wethAddress];
-        var _a = (weth || {}).balance, wethAmount = _a === void 0 ? ethers_1.BigNumber.from(0) : _a;
-        var eth = assetsRecord[ethAddress];
-        var _b = (eth || {}).balance, ethAmount = _b === void 0 ? ethers_1.BigNumber.from(0) : _b;
-        var wethOrETH = weth || eth;
-        if (wethOrETH) {
-            assetsRecord[wethAddress] = __assign(__assign({}, wethOrETH), { token: wethAddress, balance: (0, math_1.nonNegativeBn)(ethAmount).add((0, math_1.nonNegativeBn)(wethAmount)) });
-        }
-        if (eth) {
-            delete assetsRecord[ethAddress];
-        }
-        return [Object.values(assetsRecord), ethAmount, wethAmount];
+var AssetUtils = /** @class */ (function () {
+    function AssetUtils() {
+    }
+    AssetUtils.nextAsset = function (_a) {
+        var allowedTokens = _a.allowedTokens, selectedAssets = _a.selectedAssets, balances = _a.balances, tokensList = _a.tokensList, _b = _a.prices, prices = _b === void 0 ? {} : _b;
+        var selectedRecord = selectedAssets.reduce(function (acc, _a) {
+            var token = _a.token;
+            acc[token.toLowerCase()] = true;
+            return acc;
+        }, {});
+        var notSelected = allowedTokens.filter(function (allowedToken) {
+            var alreadySelected = selectedRecord[allowedToken.toLowerCase()];
+            return !alreadySelected;
+        });
+        var sorted = (0, creditAccount_1.sortBalances)(AssetUtils.getBalances(notSelected, balances), prices, tokensList);
+        var address = (sorted[0] || [])[0];
+        return address;
     };
-};
-exports.memoWrapETH = memoWrapETH;
-/**
- * Sums the the second assets list into the first assets list
- * Creates new assets.
- */
-function sumAssets(a, b) {
-    var aRecord = constructAssetRecord(a);
-    var resRecord = b.reduce(function (acc, bAsset) {
-        var aAsset = acc[bAsset.token];
-        var _a = (aAsset || {}).balance, amount = _a === void 0 ? ethers_1.BigNumber.from(0) : _a;
-        var amountSum = (0, math_1.nonNegativeBn)(bAsset.balance).add((0, math_1.nonNegativeBn)(amount));
-        var aOrB = aAsset || bAsset;
-        acc[bAsset.token] = __assign(__assign({}, aOrB), { balance: amountSum });
-        return acc;
-    }, aRecord);
-    return Object.values(resRecord);
-}
-exports.sumAssets = sumAssets;
-/**
- * Subtracts the the second assets list from the first assets list
- * Balance cant be negative; doesn't create new assets.
- */
-function subAssets(a, b) {
-    var bRecord = constructAssetRecord(b);
-    return a.map(function (asset) {
-        var bAsset = bRecord[asset.token];
-        var _a = (bAsset || {}).balance, bAmount = _a === void 0 ? ethers_1.BigNumber.from(0) : _a;
-        var amountSub = (0, math_1.nonNegativeBn)(asset.balance).sub((0, math_1.nonNegativeBn)(bAmount));
-        return __assign(__assign({}, asset), { balance: (0, math_1.nonNegativeBn)(amountSub) });
-    });
-}
-exports.subAssets = subAssets;
+    AssetUtils.getBalances = function (allowedTokens, externalBalances) {
+        return allowedTokens.reduce(function (acc, address) {
+            var _a;
+            var addressLc = address.toLowerCase();
+            return __assign(__assign({}, acc), (_a = {}, _a[addressLc] = externalBalances[addressLc] || ethers_1.BigNumber.from(0), _a));
+        }, {});
+    };
+    AssetUtils.constructAssetRecord = function (a) {
+        var record = a.reduce(function (acc, asset) {
+            acc[asset.token] = asset;
+            return acc;
+        }, {});
+        return record;
+    };
+    /**
+     * Sums the the second assets list into the first assets list
+     * Creates new assets.
+     */
+    AssetUtils.sumAssets = function (a, b) {
+        var aRecord = AssetUtils.constructAssetRecord(a);
+        var resRecord = b.reduce(function (acc, bAsset) {
+            var aAsset = acc[bAsset.token];
+            var _a = (aAsset || {}).balance, amount = _a === void 0 ? ethers_1.BigNumber.from(0) : _a;
+            var amountSum = (0, math_1.nonNegativeBn)(bAsset.balance).add((0, math_1.nonNegativeBn)(amount));
+            var aOrB = aAsset || bAsset;
+            acc[bAsset.token] = __assign(__assign({}, aOrB), { balance: amountSum });
+            return acc;
+        }, aRecord);
+        return Object.values(resRecord);
+    };
+    /**
+     * Subtracts the the second assets list from the first assets list
+     * Balance cant be negative; doesn't create new assets.
+     */
+    AssetUtils.subAssets = function (a, b) {
+        var bRecord = AssetUtils.constructAssetRecord(b);
+        return a.map(function (asset) {
+            var bAsset = bRecord[asset.token];
+            var _a = (bAsset || {}).balance, bAmount = _a === void 0 ? ethers_1.BigNumber.from(0) : _a;
+            var amountSub = (0, math_1.nonNegativeBn)(asset.balance).sub((0, math_1.nonNegativeBn)(bAmount));
+            return __assign(__assign({}, asset), { balance: (0, math_1.nonNegativeBn)(amountSub) });
+        });
+    };
+    AssetUtils.memoWrapETH = function (ethAddress, wethAddress) {
+        return function wrapETH(assets) {
+            var assetsRecord = AssetUtils.constructAssetRecord(assets);
+            var weth = assetsRecord[wethAddress];
+            var _a = (weth || {}).balance, wethAmount = _a === void 0 ? ethers_1.BigNumber.from(0) : _a;
+            var eth = assetsRecord[ethAddress];
+            var _b = (eth || {}).balance, ethAmount = _b === void 0 ? ethers_1.BigNumber.from(0) : _b;
+            var wethOrETH = weth || eth;
+            if (wethOrETH) {
+                assetsRecord[wethAddress] = __assign(__assign({}, wethOrETH), { token: wethAddress, balance: (0, math_1.nonNegativeBn)(ethAmount).add((0, math_1.nonNegativeBn)(wethAmount)) });
+            }
+            if (eth) {
+                delete assetsRecord[ethAddress];
+            }
+            return [Object.values(assetsRecord), ethAmount, wethAmount];
+        };
+    };
+    return AssetUtils;
+}());
+exports.AssetUtils = AssetUtils;

package/lib/core/creditManager.spec.js CHANGED Viewed

@@ -61,7 +61,7 @@ describe("CreditManager calcHealthFactor test", function () {
             balance: (0, formatter_1.toBN)("10", decimals_1.decimals.WETH),
             token: token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
         };
-        var afterAdd = (0, assets_1.sumAssets)(defaultCA.assets, [collateral]);
+        var afterAdd = assets_1.AssetUtils.sumAssets(defaultCA.assets, [collateral]);
         var result = (0, creditManager_1.calcHealthFactor)({
             assets: afterAdd,
             prices: prices,
@@ -77,7 +77,9 @@ describe("CreditManager calcHealthFactor test", function () {
             balance: amountDecrease,
             token: defaultCA.underlyingToken,
         };
-        var afterDecrease = (0, assets_1.subAssets)(defaultCA.assets, [debtDecrease]);
+        var afterDecrease = assets_1.AssetUtils.subAssets(defaultCA.assets, [
+            debtDecrease,
+        ]);
         var result = (0, creditManager_1.calcHealthFactor)({
             assets: afterDecrease,
             prices: prices,
@@ -93,7 +95,9 @@ describe("CreditManager calcHealthFactor test", function () {
             balance: amountIncrease,
             token: defaultCA.underlyingToken,
         };
-        var afterIncrease = (0, assets_1.sumAssets)(defaultCA.assets, [debtIncrease]);
+        var afterIncrease = assets_1.AssetUtils.sumAssets(defaultCA.assets, [
+            debtIncrease,
+        ]);
         var result = (0, creditManager_1.calcHealthFactor)({
             assets: afterIncrease,
             prices: prices,
@@ -115,8 +119,8 @@ describe("CreditManager calcHealthFactor test", function () {
             balance: getAmount,
             token: token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
         };
-        var afterSub = (0, assets_1.subAssets)(defaultCA.assets, [swapAsset]);
-        var afterSwap = (0, assets_1.sumAssets)(afterSub, [getAsset]);
+        var afterSub = assets_1.AssetUtils.subAssets(defaultCA.assets, [swapAsset]);
+        var afterSwap = assets_1.AssetUtils.sumAssets(afterSub, [getAsset]);
         var result = (0, creditManager_1.calcHealthFactor)({
             assets: afterSwap,
             prices: prices,

package/lib/core/creditSession.d.ts CHANGED Viewed

@@ -1,12 +1,12 @@
 import { BigNumber } from "ethers";
-import { CreditSessionPayload } from "../payload/creditSession";
-import { CreditOperation } from "./creditOperation";
-export declare type CreditSessionStatus = "active" | "closed" | "repaid" | "liquidated";
+import { CreditSessionFilteredPayload, CreditSessionPayload } from "../payload/creditSession";
+import { AssetWithView } from "./assets";
+export declare type CreditSessionStatus = "active" | "closed" | "repaid" | "liquidated" | "liquidateExpired" | "liquidatePaused";
+export declare const CREDIT_SESSION_STATUS_BY_ID: Record<number, CreditSessionStatus>;
+export declare const CREDIT_SESSION_ID_BY_STATUS: Record<CreditSessionStatus, number>;
 export declare class CreditSession {
     readonly id: string;
     readonly status: CreditSessionStatus;
-    readonly name: string;
-    readonly background: string;
     readonly borrower: string;
     readonly creditManager: string;
     readonly account: string;
@@ -18,9 +18,43 @@ export declare class CreditSession {
     readonly borrowedAmount: BigNumber;
     readonly totalValue: BigNumber;
     readonly healthFactor: number;
-    readonly profit: BigNumber;
-    readonly profitPercentage: number;
-    readonly score: number;
-    readonly operations: Array<CreditOperation>;
+    readonly profitInUSD: number;
+    readonly profitInUnderlying: number;
+    readonly collateralInUSD: number;
+    readonly collateralInUnderlying: number;
+    readonly roi: number;
+    readonly apy: number;
+    readonly currentBlock: number;
+    readonly currentTimestamp: number;
+    readonly spotDebt: BigNumber;
+    readonly spotTotalValue: BigNumber;
+    readonly spotUserFunds: BigNumber;
+    readonly cvxUnclaimedRewards: Record<string, BigNumber>;
+    readonly balances: Record<string, BigNumber>;
     constructor(payload: CreditSessionPayload);
 }
+export declare class CreditSessionFiltered {
+    readonly id: string;
+    readonly borrower: string;
+    readonly account: string;
+    readonly creditManager: string;
+    readonly underlyingToken: string;
+    readonly status: CreditSessionStatus;
+    readonly since: number;
+    readonly sinceDate: string;
+    readonly closedAt: number;
+    readonly closedAtDate: string;
+    readonly healthFactor: number;
+    readonly leverage: number;
+    readonly debt: BigNumber;
+    readonly debtUSD: number;
+    readonly totalValue: BigNumber;
+    readonly totalValueUSD: number;
+    readonly profitInUSD: number;
+    readonly profitInUnderlying: number;
+    readonly tfIndex: number;
+    readonly balances: Array<AssetWithView>;
+    constructor(payload: CreditSessionFilteredPayload);
+}
+export declare type CreditSessionSortFields = "type" | "tvl" | "hf" | "debt" | "pnl" | "leverage" | "tfIndex";
+export declare type CreditSessionSortType = "asc" | "desc";

package/lib/core/creditSession.js CHANGED Viewed

@@ -14,40 +14,90 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreditSession = void 0;
+exports.CreditSessionFiltered = exports.CreditSession = exports.CREDIT_SESSION_ID_BY_STATUS = exports.CREDIT_SESSION_STATUS_BY_ID = void 0;
 var ethers_1 = require("ethers");
 var moment_1 = __importDefault(require("moment"));
-var statusEnum = [
-    "active",
-    "closed",
-    "repaid",
-    "liquidated",
-];
+var mappers_1 = require("../utils/mappers");
+var constants_1 = require("./constants");
+exports.CREDIT_SESSION_STATUS_BY_ID = {
+    0: "active",
+    1: "closed",
+    2: "repaid",
+    3: "liquidated",
+    4: "liquidateExpired",
+    5: "liquidatePaused",
+};
+exports.CREDIT_SESSION_ID_BY_STATUS = (0, mappers_1.swapKeyValue)(exports.CREDIT_SESSION_STATUS_BY_ID);
 var CreditSession = /** @class */ (function () {
     function CreditSession(payload) {
-        this.id = payload.id;
-        this.status = statusEnum[payload.status];
-        this.name = payload.name;
-        this.background = payload.background;
-        this.borrower = payload.borrower;
-        this.creditManager = payload.creditManager;
-        this.account = payload.account;
-        this.since = payload.since;
-        this.closedAt = payload.closedAt;
+        this.id = (payload.id || "").toLowerCase();
+        this.status = exports.CREDIT_SESSION_STATUS_BY_ID[payload.status || 0];
+        this.borrower = (payload.borrower || "").toLowerCase();
+        this.creditManager = (payload.creditManager || "").toLowerCase();
+        this.account = (payload.account || "").toLowerCase();
         this.initialAmount = ethers_1.BigNumber.from(payload.initialAmount || 0);
         this.borrowedAmount = ethers_1.BigNumber.from(payload.borrowedAmount || 0);
-        this.profit = ethers_1.BigNumber.from(payload.profit || 0);
-        this.profitPercentage = payload.profitPercentage || 0;
         this.totalValue = ethers_1.BigNumber.from(payload.totalValue || 0);
         this.healthFactor = ethers_1.BigNumber.from(payload.healthFactor || 0).toNumber();
-        this.score = payload.score;
-        this.operations = (payload.operations || []).map(function (op) {
-            var formattedOp = __assign(__assign({}, op), { date: (0, moment_1.default)(op.timestamp * 1000).format("Do MMM YYYY") });
-            return formattedOp;
-        });
-        this.sinceDate = (0, moment_1.default)(payload.sinceTimestamp * 1000).format("Do MMM YYYY");
-        this.closedAtDate = (0, moment_1.default)(payload.closedAtTimestamp * 1000).format("Do MMM YYYY");
+        this.since = payload.since || 0;
+        this.closedAt = payload.closedAt || 0;
+        this.sinceDate = (0, moment_1.default)((payload.sinceTimestamp || 0) * 1000).format("Do MMM YYYY");
+        this.closedAtDate = (0, moment_1.default)((payload.closedAtTimestamp || 0) * 1000).format("Do MMM YYYY");
+        this.profitInUSD = payload.profitInUSD || 0;
+        this.profitInUnderlying = payload.profitInUnderlying || 0;
+        this.collateralInUSD = payload.collateralInUSD || 0;
+        this.collateralInUnderlying = payload.collateralInUnderlying || 0;
+        this.roi = (payload.roi || 0) / constants_1.PERCENTAGE_DECIMALS;
+        this.apy = (payload.apy || 0) / constants_1.PERCENTAGE_DECIMALS;
+        this.currentBlock = payload.currentBlock || 0;
+        this.currentTimestamp = payload.currentTimestamp || 0;
+        this.spotDebt = ethers_1.BigNumber.from(payload.spotDebt || 0);
+        this.spotTotalValue = ethers_1.BigNumber.from(payload.spotTotalValue || 0);
+        this.spotUserFunds = ethers_1.BigNumber.from(payload.spotUserFunds || 0);
+        this.cvxUnclaimedRewards = Object.entries(payload.cvxUnclaimedRewards).reduce(function (acc, _a) {
+            var _b;
+            var token = _a[0], balance = _a[1];
+            return (__assign(__assign({}, acc), (_b = {}, _b[token.toLowerCase()] = ethers_1.BigNumber.from(balance.bi), _b)));
+        }, {});
+        this.balances = Object.entries(payload.balances).reduce(function (acc, _a) {
+            var _b;
+            var token = _a[0], balance = _a[1];
+            return (__assign(__assign({}, acc), (_b = {}, _b[token.toLowerCase()] = ethers_1.BigNumber.from(balance.BI), _b)));
+        }, {});
     }
     return CreditSession;
 }());
 exports.CreditSession = CreditSession;
+var CreditSessionFiltered = /** @class */ (function () {
+    function CreditSessionFiltered(payload) {
+        this.id = (payload.id || "").toLowerCase();
+        this.borrower = (payload.borrower || "").toLowerCase();
+        this.account = (payload.account || "").toLowerCase();
+        this.creditManager = (payload.creditManager || "").toLowerCase();
+        this.underlyingToken = (payload.underlyingToken || "").toLowerCase();
+        this.status = exports.CREDIT_SESSION_STATUS_BY_ID[payload.status || 0];
+        this.since = payload.since || 0;
+        this.closedAt = payload.closedAt || 0;
+        this.sinceDate = (0, moment_1.default)((payload.since || 0) * 1000).format("Do MMM YYYY");
+        this.closedAtDate = (0, moment_1.default)((payload.closedAt || 0) * 1000).format("Do MMM YYYY");
+        this.healthFactor = ethers_1.BigNumber.from(payload.healthFactor || 0).toNumber();
+        this.leverage = payload.leverage || 0;
+        this.debt = ethers_1.BigNumber.from(payload.debt || 0);
+        this.debtUSD = payload.debtUSD || 0;
+        this.totalValue = ethers_1.BigNumber.from(payload.totalValue || 0);
+        this.totalValueUSD = payload.totalValueUSD || 0;
+        this.profitInUSD = payload.pnlUSD || 0;
+        this.profitInUnderlying = payload.pnl || 0;
+        this.tfIndex = (payload.tfIndex || 0) * constants_1.PERCENTAGE_DECIMALS;
+        this.balances = Object.entries(payload.balances).map(function (_a) {
+            var token = _a[0], balance = _a[1];
+            return ({
+                token: token.toLowerCase(),
+                balance: ethers_1.BigNumber.from(balance.BI),
+                balanceView: balance.F.toString(),
+            });
+        });
+    }
+    return CreditSessionFiltered;
+}());
+exports.CreditSessionFiltered = CreditSessionFiltered;

package/lib/core/pool/data.d.ts CHANGED Viewed

@@ -30,17 +30,57 @@ interface calculateBorrowRateProps {
     expectedLiquidity: BigNumber;
     availableLiquidity: BigNumber;
 }
-export declare class ChartsPoolData extends PoolData {
-    readonly expectedLiquidityInUSD: number;
-    readonly expectedLiquidityLimitInUSD: number;
+export declare class ChartsPoolData {
+    readonly id: string;
+    readonly address: string;
+    readonly underlyingToken: string;
+    readonly dieselToken: string;
+    readonly isWETH: boolean;
+    readonly addLiqCount: number;
+    readonly addedLiquidity: number;
+    readonly removeLiqCount: number;
+    readonly removedLiquidity: number;
+    readonly earned7D: number;
+    readonly earned7DInUSD: number;
+    readonly utilization: number;
+    readonly dieselRate: number;
+    readonly dieselRateRay: BigNumber;
+    readonly depositAPY: number;
+    readonly depositAPYRay: BigNumber;
+    readonly borrowAPY: number;
+    readonly borrowAPYRay: BigNumber;
+    readonly lmAPY: number;
+    readonly availableLiquidity: BigNumber;
+    readonly availableLiquidityChange: number;
     readonly availableLiquidityInUSD: number;
+    readonly caLockedValue: number;
+    readonly caLockedValueChange: number;
     readonly caLockedValueInUSD: number;
+    readonly expectedLiquidity: BigNumber;
+    readonly expectedLiquidityChange: number;
+    readonly expectedLiquidityInUSD: number;
+    readonly expectedLiqWeekAgo: number;
+    readonly expectedLiquidityLimit: BigNumber;
+    readonly expectedLiquidityLimitInUSD: number;
+    readonly totalBorrowed: BigNumber;
+    readonly totalBorrowedChange: number;
     readonly totalBorrowedInUSD: number;
-    readonly uniqueLPs: number;
+    readonly debtWithInterest: BigNumber;
+    readonly debtWithInterestChange: number;
+    readonly debtWithInterestInUSD: number;
+    readonly debtWithInterestOld: BigNumber;
+    readonly oldAvailableLiquidity: BigNumber;
+    readonly oldCALockedValue: number;
+    readonly oldExpectedLiquidity: BigNumber;
+    readonly oldTotalBorrowed: BigNumber;
+    readonly withdrawFee: number;
+    readonly depositAPY1D: number;
+    readonly depositAPY1DChange: number;
     readonly depositAPY7D: number;
     readonly depositAPY30D: number;
-    readonly lmAPY: number;
-    readonly utilization: number;
-    constructor({ expectedLiquidityInUSD, expectedLiquidityLimitInUSD, availableLiquidityInUSD, totalBorrowedInUSD, caLockedValueInUSD, uniqueLPs, dieselAPY7D, dieselAPY30D, lmAPY, ...restPayload }: ChartsPoolDataPayload);
+    readonly oldUniqueLPs: number;
+    readonly uniqueLPs: number;
+    readonly uniqueLPsChange: number;
+    constructor(payload: ChartsPoolDataPayload);
 }
 export {};

package/lib/core/pool/data.js CHANGED Viewed

@@ -1,30 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -61,17 +35,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChartsPoolData = exports.PoolData = void 0;
 var ethers_1 = require("ethers");
@@ -116,29 +79,72 @@ var PoolData = /** @class */ (function () {
     return PoolData;
 }());
 exports.PoolData = PoolData;
-var ChartsPoolData = /** @class */ (function (_super) {
-    __extends(ChartsPoolData, _super);
-    function ChartsPoolData(_a) {
-        var _this = this;
-        var expectedLiquidityInUSD = _a.expectedLiquidityInUSD, expectedLiquidityLimitInUSD = _a.expectedLiquidityLimitInUSD, availableLiquidityInUSD = _a.availableLiquidityInUSD, totalBorrowedInUSD = _a.totalBorrowedInUSD, caLockedValueInUSD = _a.caLockedValueInUSD, uniqueLPs = _a.uniqueLPs, _b = _a.dieselAPY7D, dieselAPY7D = _b === void 0 ? 0 : _b, _c = _a.dieselAPY30D, dieselAPY30D = _c === void 0 ? 0 : _c, lmAPY = _a.lmAPY, restPayload = __rest(_a, ["expectedLiquidityInUSD", "expectedLiquidityLimitInUSD", "availableLiquidityInUSD", "totalBorrowedInUSD", "caLockedValueInUSD", "uniqueLPs", "dieselAPY7D", "dieselAPY30D", "lmAPY"]);
-        var _d = restPayload.underlying, underlying = _d === void 0 ? restPayload.underlyingToken : _d, _e = restPayload.linearCumulativeIndex, linearCumulativeIndex = _e === void 0 ? 0 : _e, _f = restPayload.cumulativeIndex_RAY, cumulativeIndexRAY = _f === void 0 ? 0 : _f, _g = restPayload.timestampLU, timestampLU = _g === void 0 ? 0 : _g, _h = restPayload.version, version = _h === void 0 ? 1 : _h, v1Props = __rest(restPayload, ["underlying", "linearCumulativeIndex", "cumulativeIndex_RAY", "timestampLU", "version"]);
-        _this = _super.call(this, __assign(__assign({}, v1Props), { underlying: underlying, linearCumulativeIndex: linearCumulativeIndex, cumulativeIndex_RAY: cumulativeIndexRAY, timestampLU: timestampLU, version: version })) || this;
-        _this.expectedLiquidityInUSD = expectedLiquidityInUSD;
-        _this.expectedLiquidityLimitInUSD = expectedLiquidityLimitInUSD;
-        _this.availableLiquidityInUSD = availableLiquidityInUSD;
-        _this.totalBorrowedInUSD = totalBorrowedInUSD;
-        _this.uniqueLPs = uniqueLPs;
-        _this.depositAPY7D = dieselAPY7D / constants_1.PERCENTAGE_DECIMALS;
-        _this.depositAPY30D = dieselAPY30D / constants_1.PERCENTAGE_DECIMALS;
-        _this.caLockedValueInUSD = caLockedValueInUSD;
-        _this.lmAPY = lmAPY / constants_1.PERCENTAGE_FACTOR;
-        _this.utilization =
-            ethers_1.BigNumber.from(v1Props.totalBorrowed)
+var ChartsPoolData = /** @class */ (function () {
+    function ChartsPoolData(payload) {
+        this.id = payload.addr.toLowerCase();
+        this.address = payload.addr.toLowerCase();
+        this.underlyingToken = payload.underlyingToken.toLowerCase();
+        this.dieselToken = payload.dieselToken.toLowerCase();
+        this.isWETH = payload.isWETH;
+        this.earned7D = payload.earned7D || 0;
+        this.earned7DInUSD = payload.earned7DInUSD || 0;
+        this.utilization =
+            ethers_1.BigNumber.from(payload.totalBorrowed || 0)
                 .mul(constants_1.PERCENTAGE_FACTOR)
-                .div(ethers_1.BigNumber.from(v1Props.expectedLiquidity))
+                .div(ethers_1.BigNumber.from(payload.expectedLiquidity || 0))
                 .toNumber() / constants_1.PERCENTAGE_DECIMALS;
-        return _this;
+        this.dieselRate = (0, formatter_1.rayToNumber)(payload.dieselRate_RAY || 0);
+        this.dieselRateRay = ethers_1.BigNumber.from(payload.dieselRate_RAY || 0);
+        this.depositAPY =
+            (0, formatter_1.rayToNumber)(payload.depositAPY_RAY || 0) * constants_1.PERCENTAGE_DECIMALS;
+        this.depositAPYRay = ethers_1.BigNumber.from(payload.depositAPY_RAY || 0);
+        this.borrowAPY =
+            (0, formatter_1.rayToNumber)(payload.borrowAPY_RAY || 0) * constants_1.PERCENTAGE_DECIMALS;
+        this.borrowAPYRay = ethers_1.BigNumber.from(payload.borrowAPY_RAY || 0);
+        this.lmAPY = (payload.lmAPY || 0) / constants_1.PERCENTAGE_FACTOR;
+        this.availableLiquidity = ethers_1.BigNumber.from(payload.availableLiquidity || 0);
+        this.oldAvailableLiquidity = ethers_1.BigNumber.from(payload.availableLiquidityOld || 0);
+        this.availableLiquidityChange =
+            (payload.availableLiquidity10kBasis || 0) * constants_1.PERCENTAGE_DECIMALS;
+        this.availableLiquidityInUSD = payload.availableLiquidityInUSD || 0;
+        this.caLockedValue = payload.caLockedValue || 0;
+        this.oldCALockedValue = payload.caLockedValueOld || 0;
+        this.caLockedValueChange =
+            (payload.caLockedValue10kBasis || 0) * constants_1.PERCENTAGE_DECIMALS;
+        this.caLockedValueInUSD = payload.caLockedValueUSD || 0;
+        this.expectedLiquidity = ethers_1.BigNumber.from(payload.expectedLiquidity || 0);
+        this.oldExpectedLiquidity = ethers_1.BigNumber.from(payload.expectedLiquidityOld || 0);
+        this.expectedLiquidityChange =
+            (payload.expectedLiquidity10kBasis || 0) * constants_1.PERCENTAGE_DECIMALS;
+        this.expectedLiquidityInUSD = payload.expectedLiquidityInUSD || 0;
+        this.expectedLiqWeekAgo = payload.expectedLiqWeekAgo || 0;
+        this.expectedLiquidityLimit = ethers_1.BigNumber.from(payload.expectedLiquidityLimit || 0);
+        this.expectedLiquidityLimitInUSD = payload.expectedLiquidityLimitInUSD || 0;
+        this.totalBorrowed = ethers_1.BigNumber.from(payload.totalBorrowed || 0);
+        this.oldTotalBorrowed = ethers_1.BigNumber.from(payload.totalBorrowedOld || 0);
+        this.totalBorrowedChange =
+            (payload.totalBorrowed10kBasis || 0) * constants_1.PERCENTAGE_DECIMALS;
+        this.totalBorrowedInUSD = payload.totalBorrowedInUSD || 0;
+        this.debtWithInterest = ethers_1.BigNumber.from(payload.debtWithInterest || 0);
+        this.debtWithInterestOld = ethers_1.BigNumber.from(payload.debtWithInterestOld || 0);
+        this.debtWithInterestChange =
+            (payload.debtWithInterest10kBasis || 0) * constants_1.PERCENTAGE_DECIMALS;
+        this.debtWithInterestInUSD = payload.debtWithInterestInUSD || 0;
+        this.withdrawFee = payload.withdrawFee || 0;
+        this.addLiqCount = payload.addLiqCount || 0;
+        this.addedLiquidity = payload.addedLiquidity || 0;
+        this.removeLiqCount = payload.removeLiqCount || 0;
+        this.removedLiquidity = payload.removedLiquidity || 0;
+        this.depositAPY1D = (payload.dieselAPY1D || 0) / constants_1.PERCENTAGE_DECIMALS;
+        this.depositAPY1DChange =
+            (payload.dieselAPY1D10kBasis || 0) * constants_1.PERCENTAGE_DECIMALS;
+        this.depositAPY7D = (payload.dieselAPY7D || 0) / constants_1.PERCENTAGE_DECIMALS;
+        this.depositAPY30D = (payload.dieselAPY30D || 0) / constants_1.PERCENTAGE_DECIMALS;
+        this.uniqueLPs = payload.uniqueLPs || 0;
+        this.oldUniqueLPs = payload.uniqueLPsOld || 0;
+        this.uniqueLPsChange =
+            (payload.uniqueLPs10kBasis || 0) * constants_1.PERCENTAGE_DECIMALS;
     }
     return ChartsPoolData;
-}(PoolData));
+}());
 exports.ChartsPoolData = ChartsPoolData;

package/lib/payload/creditSession.d.ts CHANGED Viewed

@@ -1,23 +1,77 @@
 import { BigNumberish } from "ethers";
-import { CreditOperation } from "../core/creditOperation";
+export interface CreditSessionBalance {
+    BI: string;
+    F: number;
+    ind: number;
+    isAllowed: boolean;
+    isEnabled: boolean;
+}
+interface CreditSessionReward {
+    bi: BigNumberish;
+    f: number;
+    pool: string;
+    symbol: string;
+}
 export interface CreditSessionPayload {
     id: string;
     status: number;
-    name: string;
-    background: string;
     borrower: string;
-    creditManager: string;
     account: string;
+    creditManager: string;
+    healthFactor: BigNumberish;
+    initialAmount: BigNumberish;
+    borrowedAmount: BigNumberish;
+    totalValue: BigNumberish;
     since: number;
     sinceTimestamp: number;
     closedAt: number;
     closedAtTimestamp: number;
-    initialAmount: BigNumberish;
-    borrowedAmount: BigNumberish;
-    totalValue?: BigNumberish;
-    healthFactor?: BigNumberish;
-    profit: BigNumberish;
-    profitPercentage: number;
-    score: number;
-    operations: Array<CreditOperation>;
+    collateralInUSD: number;
+    collateralInUnderlying: number;
+    spotDebt: BigNumberish;
+    spotTotalValue: BigNumberish;
+    spotUserFunds: BigNumberish;
+    profitInUSD: number;
+    profitInUnderlying: number;
+    apy: number;
+    roi: number;
+    currentBlock: number;
+    currentTimestamp: number;
+    cvxUnclaimedRewards: Array<CreditSessionReward>;
+    balances: Record<string, CreditSessionBalance>;
+}
+export interface CreditSessionFilteredPayload {
+    balances: Record<string, CreditSessionBalance>;
+    id: string;
+    borrower: string;
+    account: string;
+    creditManager: string;
+    underlyingToken: string;
+    status: number;
+    closedAt: number;
+    since: number;
+    healthFactor: BigNumberish;
+    leverage: number;
+    debt: BigNumberish;
+    debtUSD: number;
+    totalValue: BigNumberish;
+    totalValueUSD: number;
+    pnl: number;
+    pnlUSD: number;
+    tfIndex: number;
+}
+export interface CreditSessionsAggregatedStatsPayload {
+    healthFactor: BigNumberish;
+    healthFactorOld: BigNumberish;
+    healthFactor10kBasis: number;
+    leverage: number;
+    leverageOld: number;
+    leverage10kBasis: number;
+    activeAccounts: number;
+    activeAccountsOld: number;
+    activeAccounts10kBasis: number;
+    openedAccounts: number;
+    openedAccountsOld: number;
+    openedAccounts10kBasis: number;
 }
+export {};

package/lib/payload/pool.d.ts CHANGED Viewed

@@ -4,43 +4,64 @@ import { ExcludeArrayProps } from "../utils/types";
 export declare type PoolDataPayload = ExcludeArrayProps<PoolDataStruct>;
 export interface ChartsPoolDataPayload {
     addr: string;
-    underlyingToken: string;
     dieselToken: string;
+    underlyingToken: string;
     isWETH: boolean;
-    expectedLiquidity: string;
-    expectedLiquidityLimit: string;
-    availableLiquidity: string;
-    totalBorrowed: string;
-    depositAPY_RAY: string;
-    borrowAPY_RAY: string;
-    dieselRate_RAY: string;
-    withdrawFee: number;
+    borrowAPY_RAY: BigNumberish;
+    depositAPY_RAY: BigNumberish;
+    dieselRate_RAY: BigNumberish;
     lmAPY: number;
-    underlying: string;
-    linearCumulativeIndex: BigNumberish;
-    cumulativeIndex_RAY: BigNumberish;
-    timestampLU: BigNumberish;
-    version: number;
+    earned7D: number;
+    earned7DInUSD: number;
+    availableLiquidity: BigNumberish;
+    availableLiquidityOld: BigNumberish;
+    availableLiquidity10kBasis: number;
+    availableLiquidityInUSD: number;
+    expectedLiqWeekAgo: number;
+    expectedLiquidity: BigNumberish;
+    expectedLiquidityOld: BigNumberish;
+    expectedLiquidity10kBasis: number;
     expectedLiquidityInUSD: number;
+    expectedLiquidityLimit: BigNumberish;
     expectedLiquidityLimitInUSD: number;
-    availableLiquidityInUSD: number;
+    caLockedValue: number;
+    caLockedValueOld: number;
+    caLockedValue10kBasis: number;
+    caLockedValueUSD: number;
+    totalBorrowed: BigNumberish;
+    totalBorrowedOld: BigNumberish;
+    totalBorrowed10kBasis: number;
     totalBorrowedInUSD: number;
-    uniqueLPs: number;
-    dieselAPY7D?: number;
-    dieselAPY30D?: number;
+    debtWithInterest: BigNumberish;
+    debtWithInterest10kBasis: number;
+    debtWithInterestInUSD: number;
+    debtWithInterestOld: BigNumberish;
+    withdrawFee: number;
     addLiqCount: number;
     addedLiquidity: number;
-    caLockedValue: number;
-    caLockedValueInUSD: number;
-    earned7D: number;
-    earned7DInUSD: number;
-    expectedLiqWeekAgo: number;
     removeLiqCount: number;
     removedLiquidity: number;
+    dieselAPY1D: number;
+    dieselAPY1D10kBasis: number;
+    dieselAPY7D: number;
+    dieselAPY30D: number;
+    uniqueLPsOld: number;
+    uniqueLPs: number;
+    uniqueLPs10kBasis: number;
 }
 export interface ChartsAggregatedStats {
-    uniqueLPs: number;
+    caLockedValue: number;
+    caLockedValue10kBasis: number;
+    expectedLiquidity: number;
+    expectedLiquidity10kBasis: number;
+    totalBorrowed: number;
+    totalBorrowed10kBasis: number;
+    totalValue: number;
+    totalValue10kBasis: number;
+    debtWithInterest: number;
+    debtWithInterest10kBasis: number;
     earned7D: number;
+    uniqueLPs: number;
 }
 export interface ChartsAggregatedPoolPayload extends ChartsAggregatedStats {
     pools: Array<ChartsPoolDataPayload>;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "1.20.8",
+  "version": "1.20.10",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",