@gearbox-protocol/sdk 1.20.10 → 1.20.11

package/lib/core/creditAccount.js

@@ -121,10 +121,7 @@ function sortBalances(balances, prices, tokens) {
                 ? tokensAbcComparator(token1, token2)
                 : amountAbcComparator(amount1, amount2);
         }
-        if (totalPrice1.gt(totalPrice2)) {
-            return -1;
-        }
-        return 1;
+        return amountAbcComparator(totalPrice1, totalPrice2);
     });
 }
 exports.sortBalances = sortBalances;
@@ -135,7 +132,7 @@ function tokensAbcComparator(t1, t2) {
 }
 exports.tokensAbcComparator = tokensAbcComparator;
 function amountAbcComparator(t1, t2) {
-    return (t1 === null || t1 === void 0 ? void 0 : t1.gt(t2)) ? -1 : 1;
+    return t1.gt(t2) ? -1 : 1;
 }
 exports.amountAbcComparator = amountAbcComparator;
 function calcOverallAPY(_a) {

package/lib/core/creditSession.d.ts

@@ -1,9 +1,13 @@
-import { BigNumber } from "ethers";
+import { BigNumber, BigNumberish } from "ethers";
 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 interface CreditSessionBalance {
+    balance: BigNumber;
+    token: string;
+}
 export declare class CreditSession {
     readonly id: string;
     readonly status: CreditSessionStatus;
@@ -26,11 +30,18 @@ export declare class CreditSession {
     readonly apy: number;
     readonly currentBlock: number;
     readonly currentTimestamp: number;
+    readonly borrowAPY_RAY: BigNumberish;
+    readonly borrowAPY7D: number;
+    readonly totalValueUSD: number;
+    readonly debt: BigNumberish;
+    readonly debtUSD: number;
+    readonly leverage: number;
+    readonly tfIndex: number;
     readonly spotDebt: BigNumber;
     readonly spotTotalValue: BigNumber;
     readonly spotUserFunds: BigNumber;
-    readonly cvxUnclaimedRewards: Record<string, BigNumber>;
-    readonly balances: Record<string, BigNumber>;
+    readonly cvxUnclaimedRewards: Record<string, CreditSessionBalance>;
+    readonly balances: Record<string, CreditSessionBalance>;
     constructor(payload: CreditSessionPayload);
 }
 export declare class CreditSessionFiltered {

package/lib/core/creditSession.js

@@ -47,6 +47,13 @@ var CreditSession = /** @class */ (function () {
         this.profitInUnderlying = payload.profitInUnderlying || 0;
         this.collateralInUSD = payload.collateralInUSD || 0;
         this.collateralInUnderlying = payload.collateralInUnderlying || 0;
+        this.borrowAPY_RAY = ethers_1.BigNumber.from(payload.borrowAPY_RAY || 0);
+        this.borrowAPY7D = (payload.borrowAPY7D || 0) * constants_1.PERCENTAGE_DECIMALS;
+        this.totalValueUSD = payload.totalValueUSD || 0;
+        this.debt = ethers_1.BigNumber.from(payload.debt || 0);
+        this.debtUSD = payload.debtUSD || 0;
+        this.leverage = payload.leverage || 0;
+        this.tfIndex = (payload.tfIndex || 0) * constants_1.PERCENTAGE_DECIMALS;
         this.roi = (payload.roi || 0) / constants_1.PERCENTAGE_DECIMALS;
         this.apy = (payload.apy || 0) / constants_1.PERCENTAGE_DECIMALS;
         this.currentBlock = payload.currentBlock || 0;
@@ -54,15 +61,23 @@ var CreditSession = /** @class */ (function () {
         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) {
+        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)));
+            var tokenLC = token.toLowerCase();
+            return __assign(__assign({}, acc), (_b = {}, _b[tokenLC] = {
+                balance: ethers_1.BigNumber.from(balance.bi),
+                token: tokenLC,
+            }, _b));
         }, {});
-        this.balances = Object.entries(payload.balances).reduce(function (acc, _a) {
+        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)));
+            var tokenLC = token.toLowerCase();
+            return __assign(__assign({}, acc), (_b = {}, _b[tokenLC] = {
+                balance: ethers_1.BigNumber.from(balance.BI),
+                token: tokenLC,
+            }, _b));
         }, {});
     }
     return CreditSession;
@@ -89,7 +104,7 @@ var CreditSessionFiltered = /** @class */ (function () {
         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) {
+        this.balances = Object.entries(payload.balances || {}).map(function (_a) {
             var token = _a[0], balance = _a[1];
             return ({
                 token: token.toLowerCase(),

package/lib/payload/creditSession.d.ts

@@ -1,5 +1,5 @@
 import { BigNumberish } from "ethers";
-export interface CreditSessionBalance {
+export interface CreditSessionBalancePayload {
     BI: string;
     F: number;
     ind: number;
@@ -18,30 +18,37 @@ export interface CreditSessionPayload {
     borrower: string;
     account: string;
     creditManager: string;
+    borrowAPY_RAY: BigNumberish;
+    borrowAPY7D: number;
     healthFactor: BigNumberish;
+    leverage: number;
+    tfIndex: number;
     initialAmount: BigNumberish;
+    collateralInUSD: number;
+    collateralInUnderlying: number;
+    spotUserFunds: BigNumberish;
+    debt: BigNumberish;
+    debtUSD: number;
     borrowedAmount: BigNumberish;
+    spotDebt: BigNumberish;
     totalValue: BigNumberish;
+    totalValueUSD: number;
+    spotTotalValue: BigNumberish;
     since: number;
     sinceTimestamp: number;
     closedAt: number;
     closedAtTimestamp: number;
-    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>;
+    cvxUnclaimedRewards: Record<string, CreditSessionReward>;
+    balances: Record<string, CreditSessionBalancePayload>;
 }
 export interface CreditSessionFilteredPayload {
-    balances: Record<string, CreditSessionBalance>;
+    balances: Record<string, CreditSessionBalancePayload>;
     id: string;
     borrower: string;
     account: string;

package/package.json

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