@gearbox-protocol/sdk 3.0.0-next.25 → 3.0.0-next.26

package/lib/core/creditAccount.d.ts

@@ -84,7 +84,7 @@ export declare class CreditAccountData {
     isTokenEnabled(index: number): boolean;
     static isTokenEnabled(index: number, enabledTokenMask: bigint): boolean;
     static calcMaxDebtIncrease(healthFactor: number, borrowAmountPlusInterest: bigint, underlyingLT: number, minHf?: number): bigint;
-    static calcOverallAPY({ caAssets, lpAPY, prices, quotas, quotaRates, totalValue, debt, baseBorrowRate, underlyingToken, }: CalcOverallAPYProps): number | undefined;
+    static calcOverallAPY({ caAssets, lpAPY, prices, quotas, quotaRates, totalValue, debt, baseBorrowRate, underlyingToken, }: CalcOverallAPYProps): bigint | undefined;
     hash(): string;
     static hash(creditManager: string, borrower: string): string;
     static calcHealthFactor({ assets, quotas, liquidationThresholds, underlyingToken, borrowed, prices, }: CalcHealthFactorProps): number;

package/lib/core/creditAccount.js

@@ -83,7 +83,7 @@ class CreditAccountData {
                 isEnabled: b.isEnabled,
                 isQuoted: b.isQuoted,
                 quota: (0, sdk_gov_1.toBigInt)(b.quota),
-                quotaRate: b.quotaRate,
+                quotaRate: Number((0, sdk_gov_1.toBigInt)(b.quotaRate) * sdk_gov_1.PERCENTAGE_DECIMALS),
             };
             if (!b.isForbidden) {
                 this.balances[token] = balance.balance;
@@ -181,10 +181,8 @@ class CreditAccountData {
         });
         const debtAPY = debt * BigInt(baseBorrowRate);
         const yourAssets = totalValue - debt;
-        const apyInPercent = ((assetAPYAmountInUnderlying - debtAPY) * sdk_gov_1.WAD) /
-            yourAssets /
-            sdk_gov_1.PERCENTAGE_FACTOR;
-        return Number((0, formatter_1.toSignificant)(apyInPercent, sdk_gov_1.WAD_DECIMALS_POW));
+        const apyInPercent = (assetAPYAmountInUnderlying - debtAPY) / yourAssets;
+        return apyInPercent;
     }
     hash() {
         return CreditAccountData.hash(this.creditManager, this.borrower);

package/lib/core/creditAccount.spec.js

@@ -79,7 +79,7 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             lpAPY,
             prices,
         });
-        (0, chai_1.expect)(result).to.be.eq(-6.94841);
+        (0, chai_1.expect)(result).to.be.eq(-69484n);
     });
     it("overall APY calculation for caWithLP is correct", () => {
         const result = creditAccount_1.CreditAccountData.calcOverallAPY({
@@ -93,7 +93,7 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             lpAPY,
             prices,
         });
-        (0, chai_1.expect)(result).to.be.eq(14.4919);
+        (0, chai_1.expect)(result).to.be.eq(144919n);
     });
     it("overall APY is undefined when !lpAPY", () => {
         const result = creditAccount_1.CreditAccountData.calcOverallAPY({
@@ -163,7 +163,7 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             lpAPY,
             prices,
         });
-        (0, chai_1.expect)(result).to.be.eq(-1.86801);
+        (0, chai_1.expect)(result).to.be.eq(-18680n);
     });
     it("overall APY calculation for caWithLP with insufficient quota is correct", () => {
         const result = creditAccount_1.CreditAccountData.calcOverallAPY({
@@ -182,7 +182,7 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             lpAPY,
             prices,
         });
-        (0, chai_1.expect)(result).to.be.eq(14.4919);
+        (0, chai_1.expect)(result).to.be.eq(144919n);
     });
 });
 describe("CreditAccount calcMaxIncreaseBorrow test", () => {

package/lib/core/creditManager.d.ts

@@ -1,8 +1,10 @@
 import { MultiCall } from "../pathfinder/core";
 import { ChartsCreditManagerPayload, CreditManagerDataPayload, QuotaInfo } from "../payload/creditManager";
 import { LinearModel } from "../payload/pool";
+type PoolType = "universal" | "trade" | "farm";
 export declare class CreditManagerData {
     readonly address: string;
+    readonly type: PoolType;
     readonly underlyingToken: string;
     readonly pool: string;
     readonly creditFacade: string;
@@ -32,6 +34,8 @@ export declare class CreditManagerData {
     readonly quotas: Record<string, QuotaInfo>;
     readonly interestModel: LinearModel;
     constructor(payload: CreditManagerDataPayload);
+    get id(): string;
+    static getCMType(name: string): PoolType;
     isQuoted(token: string): boolean;
     encodeAddCollateralV2(tokenAddress: string, amount: bigint): MultiCall;
     encodeAddCollateralV3(tokenAddress: string, amount: bigint): MultiCall;
@@ -45,7 +49,6 @@ export declare class CreditManagerData {
     encodeDisableTokenV3(token: string): MultiCall;
     encodeUpdateQuotaV3(token: string, quotaChange: bigint, minQuota: bigint): MultiCall;
     static withdrawAllAndUnwrap_Convex(address: string, claim: boolean): MultiCall;
-    get id(): string;
 }
 export declare class ChartsCreditManagerData {
     readonly id: string;
@@ -90,3 +93,4 @@ export declare class ChartsCreditManagerData {
     readonly liquidationThresholds: Record<string, bigint>;
     constructor(payload: ChartsCreditManagerPayload);
 }
+export {};

package/lib/core/creditManager.js

@@ -6,6 +6,7 @@ const txParser_1 = require("../parsers/txParser");
 const types_1 = require("../types");
 class CreditManagerData {
     address;
+    type;
     underlyingToken;
     pool;
     creditFacade; // V2 only: address of creditFacade
@@ -37,6 +38,8 @@ class CreditManagerData {
     constructor(payload) {
         this.address = payload.addr.toLowerCase();
         this.underlyingToken = payload.underlying.toLowerCase();
+        this.type = CreditManagerData.getCMType(payload.name || "");
+        this.name = payload.name;
         this.pool = payload.pool.toLowerCase();
         this.creditFacade = payload.creditFacade.toLowerCase();
         this.creditConfigurator = payload.creditConfigurator.toLowerCase();
@@ -46,7 +49,6 @@ class CreditManagerData {
         this.isPaused = payload.isPaused;
         this.forbiddenTokenMask = (0, sdk_gov_1.toBigInt)(payload.forbiddenTokenMask);
         this.maxEnabledTokensLength = payload.maxEnabledTokensLength;
-        this.name = payload.name;
         this.baseBorrowRate = Number(((0, sdk_gov_1.toBigInt)(payload.baseBorrowRate) *
             ((0, sdk_gov_1.toBigInt)(payload.feeInterest) + sdk_gov_1.PERCENTAGE_FACTOR) *
             sdk_gov_1.PERCENTAGE_DECIMALS) /
@@ -80,7 +82,7 @@ class CreditManagerData {
             q.token.toLowerCase(),
             {
                 token: q.token.toLowerCase(),
-                rate: q.rate,
+                rate: Number((0, sdk_gov_1.toBigInt)(q.rate) * sdk_gov_1.PERCENTAGE_DECIMALS),
                 quotaIncreaseFee: q.quotaIncreaseFee,
                 totalQuoted: (0, sdk_gov_1.toBigInt)(q.totalQuoted),
                 limit: (0, sdk_gov_1.toBigInt)(q.limit),
@@ -107,6 +109,18 @@ class CreditManagerData {
             })));
         }
     }
+    get id() {
+        return this.address;
+    }
+    static getCMType(name) {
+        const [identity = ""] = name.split(" ") || [];
+        const lc = identity.toLowerCase();
+        if (lc === "farm")
+            return "farm";
+        if (lc === "trade")
+            return "trade";
+        return "universal";
+    }
     isQuoted(token) {
         return !!this.quotas[token];
     }
@@ -182,9 +196,6 @@ class CreditManagerData {
             callData: types_1.IConvexV1BaseRewardPoolAdapter__factory.createInterface().encodeFunctionData("withdrawAllAndUnwrap", [claim]),
         };
     }
-    get id() {
-        return this.address;
-    }
 }
 exports.CreditManagerData = CreditManagerData;
 class ChartsCreditManagerData {

package/lib/core/gauge.js

@@ -22,9 +22,9 @@ class GaugeData {
             {
                 token: q.token.toLowerCase(),
                 isActive: q.isActive,
-                rate: q.rate,
-                minRate: q.minRate,
-                maxRate: q.maxRate,
+                rate: Number((0, sdk_gov_1.toBigInt)(q.rate) * sdk_gov_1.PERCENTAGE_DECIMALS),
+                minRate: Number((0, sdk_gov_1.toBigInt)(q.minRate) * sdk_gov_1.PERCENTAGE_DECIMALS),
+                maxRate: Number((0, sdk_gov_1.toBigInt)(q.maxRate) * sdk_gov_1.PERCENTAGE_DECIMALS),
                 quotaIncreaseFee: q.quotaIncreaseFee,
                 totalQuoted: (0, sdk_gov_1.toBigInt)(q.totalQuoted),
                 limit: (0, sdk_gov_1.toBigInt)(q.limit),

package/lib/core/pool.js

@@ -69,7 +69,7 @@ class PoolData {
                 token,
                 {
                     token,
-                    rate: q.rate,
+                    rate: Number((0, sdk_gov_1.toBigInt)(q.rate) * sdk_gov_1.PERCENTAGE_DECIMALS),
                     quotaIncreaseFee: q.quotaIncreaseFee,
                     totalQuoted: (0, sdk_gov_1.toBigInt)(q.totalQuoted),
                     limit: (0, sdk_gov_1.toBigInt)(q.limit),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-next.25",
+  "version": "3.0.0-next.26",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -43,9 +43,9 @@
     "@gearbox-protocol/core-v2": "1.19.0-base.17",
     "@gearbox-protocol/core-v3": "^1.41.0",
     "@gearbox-protocol/eslint-config": "^1.4.1",
-    "@gearbox-protocol/integrations-v3": "^1.18.0",
+    "@gearbox-protocol/integrations-v3": "^1.18.4",
     "@gearbox-protocol/oracles-v3": "^1.7.6",
-    "@gearbox-protocol/periphery-v3": "^1.3.0",
+    "@gearbox-protocol/periphery-v3": "^1.3.1",
     "@gearbox-protocol/prettier-config": "^1.4.1",
     "@openzeppelin/contracts": "^4.9.3",
     "@typechain/ethers-v5": "^10.1.0",