npm - @gearbox-protocol/sdk - Versions diffs - 3.0.0-next.93 → 3.0.0-next.95 - Mend

@gearbox-protocol/sdk 3.0.0-next.93 → 3.0.0-next.95

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/contracts/contractsRegister.d.ts +5 -2
package/lib/contracts/contractsRegister.js +12 -0
package/lib/core/creditAccount.d.ts +21 -9
package/lib/core/creditAccount.js +20 -17
package/lib/core/creditAccount.spec.js +79 -43
package/lib/core/strategy.d.ts +9 -3
package/lib/core/strategy.js +8 -6
package/lib/core/strategy.spec.js +10 -5
package/lib/core/transactions.js +10 -10
package/package.json +1 -1

package/lib/contracts/contractsRegister.d.ts CHANGED Viewed

@@ -3,7 +3,8 @@ export declare const stEthPoolWrapper: Record<NetworkType, string>;
 type MainnetCreditManagersV1 = "DAI_V1" | "USDC_V1" | "WETH_V1" | "WBTC_V1";
 type MainnetCreditManagersV2 = "DAI_V2" | "USDC_V2" | "WETH_V2" | "WSTETH_V2" | "WBTC_V2" | "FRAX_V2";
 type MainnetCreditManagersV2_1 = "WETH_V2_1";
-export type MainnetCreditManagers = MainnetCreditManagersV1 | MainnetCreditManagersV2 | MainnetCreditManagersV2_1;
+type MainnetCreditManagersV3 = "USDC_V3_TRADE_TIER_1" | "USDC_V3_TRADE_TIER_2" | "USDC_V3_TRADE_TIER_3" | "WBTC_V3_TRADE_TIER_1" | "WBTC_V3_TRADE_TIER_2" | "WBTC_V3_TRADE_TIER_3" | "WETH_V3_TRADE_TIER_1" | "WETH_V3_TRADE_TIER_2" | "WETH_V3_TRADE_TIER_3";
+export type MainnetCreditManagers = MainnetCreditManagersV1 | MainnetCreditManagersV2 | MainnetCreditManagersV2_1 | MainnetCreditManagersV3;
 export type ArbitrumCreditManagers = never;
 type CreditManagersListType = {
     [key in NetworkType]: key extends "Mainnet" ? Record<MainnetCreditManagers, string> : key extends "Arbitrum" ? Record<ArbitrumCreditManagers, string> : never;
@@ -11,7 +12,9 @@ type CreditManagersListType = {
 export declare const creditManagerByNetwork: CreditManagersListType;
 export type SupportedCreditManagers = MainnetCreditManagers | ArbitrumCreditManagers;
 export declare const creditManagerByAddress: Record<string, SupportedCreditManagers>;
-export type MainnetPools = "DAI_V1" | "USDC_V1" | "WETH_V1" | "WBTC_V1" | "WSTETH_V1" | "FRAX_V1";
+export type MainnetPoolsV1 = "DAI_V1" | "USDC_V1" | "WETH_V1" | "WBTC_V1" | "WSTETH_V1" | "FRAX_V1";
+export type MainnetPoolsV3 = "USDC_V3_TRADE" | "WETH_V3_TRADE" | "WBTC_V3_TRADE";
+export type MainnetPools = MainnetPoolsV1 | MainnetPoolsV3;
 export type ArbitrumPools = never;
 type PoolsListType = {
     [key in NetworkType]: key extends "Mainnet" ? Record<MainnetPools, string> : key extends "Arbitrum" ? Record<ArbitrumPools, string> : never;

package/lib/contracts/contractsRegister.js CHANGED Viewed

@@ -19,6 +19,15 @@ exports.creditManagerByNetwork = {
         WBTC_V2: "0xc62BF8a7889AdF1c5Dc4665486c7683ae6E74e0F".toLowerCase(),
         FRAX_V2: "0xA3E1e0d58FE8dD8C9dd48204699a1178f1B274D8".toLowerCase(),
         WETH_V2_1: "0x4C6309fe2085EfE7A0Cfb426C16Ef3b41198cCE3".toLowerCase(),
+        USDC_V3_TRADE_TIER_1: "0x3eb95430fdb99439a86d3c6d7d01c3c561393556".toLowerCase(),
+        USDC_V3_TRADE_TIER_2: "0xea7c28428d3916dbe2f113b8a6e6dd0f3819c050".toLowerCase(),
+        USDC_V3_TRADE_TIER_3: "0x4e94cd228ef386ebc32900ec745d1865934688a3".toLowerCase(),
+        WBTC_V3_TRADE_TIER_1: "0xefc134755aaf89fe84476946251680bece41246e".toLowerCase(),
+        WBTC_V3_TRADE_TIER_2: "0xcac3e41b9bad20e2aa35e150de96eefb2d043735".toLowerCase(),
+        WBTC_V3_TRADE_TIER_3: "0x46709ca16b1ffea5d6c6bb6b7e77dd9e3b4908ed".toLowerCase(),
+        WETH_V3_TRADE_TIER_1: "0xa30099925b14b00b76ae2efe2639cd01598fe68a".toLowerCase(),
+        WETH_V3_TRADE_TIER_2: "0x3f11758aca3f2eb7a27828c9cbcd0b347944ac14".toLowerCase(),
+        WETH_V3_TRADE_TIER_3: "0x0b2486355e987586c32fc0feefe2943e396c484e".toLowerCase(),
     },
     Arbitrum: {},
 };
@@ -36,6 +45,9 @@ exports.poolByNetwork = {
         WBTC_V1: "0xB2A015c71c17bCAC6af36645DEad8c572bA08A08".toLowerCase(),
         WSTETH_V1: "0xB8cf3Ed326bB0E51454361Fb37E9E8df6DC5C286".toLowerCase(),
         FRAX_V1: "0x79012c8d491dcf3a30db20d1f449b14caf01da6c".toLowerCase(),
+        USDC_V3_TRADE: "0xda00000035fef4082f78def6a8903bee419fbf8e".toLowerCase(),
+        WBTC_V3_TRADE: "0xda00010eda646913f273e10e7a5d1f659242757d".toLowerCase(),
+        WETH_V3_TRADE: "0xda0002859b2d05f66a753d8241fcde8623f26f4f".toLowerCase(),
     },
     Arbitrum: {},
 };

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

@@ -8,10 +8,11 @@ export interface CalcOverallAPYProps {
     lpAPY: LpTokensAPY | undefined;
     quotas: Record<string, Asset>;
     quotaRates: Record<string, Pick<QuotaInfo, "isActive" | "rate">>;
+    feeInterest: number;
     prices: Record<string, bigint>;
     totalValue: bigint | undefined;
     debt: bigint | undefined;
-    baseBorrowRate: number;
+    baseRateWithFee: number;
     underlyingToken: string;
 }
 export interface CalcHealthFactorProps {
@@ -21,7 +22,7 @@ export interface CalcHealthFactorProps {
     prices: Record<string, bigint>;
     liquidationThresholds: Record<string, bigint>;
     underlyingToken: string;
-    borrowed: bigint;
+    debt: bigint;
 }
 export interface CalcQuotaUpdateProps {
     quotas: Record<string, Pick<QuotaInfo, "isActive" | "token">>;
@@ -39,7 +40,17 @@ interface CalcQuotaUpdateReturnType {
 export interface CalcQuotaBorrowRateProps {
     quotas: Record<string, Asset>;
     quotaRates: Record<string, Pick<QuotaInfo, "isActive" | "rate">>;
-    borrowAmount: bigint;
+}
+export interface CalcRelativeBaseBorrowRateProps {
+    debt: bigint;
+    baseRateWithFee: number;
+    assetAmountInUnderlying: bigint;
+    totalValue: bigint;
+}
+export interface CalcAvgQuotaBorrowRateProps {
+    quotas: Record<string, Asset>;
+    quotaRates: Record<string, Pick<QuotaInfo, "isActive" | "rate">>;
+    totalValue: bigint;
 }
 export declare class CreditAccountData {
     readonly isSuccessful: boolean;
@@ -55,8 +66,8 @@ export declare class CreditAccountData {
     readonly enabledTokenMask: bigint;
     readonly healthFactor: number;
     isDeleting: boolean;
-    readonly baseBorrowRate: number;
-    readonly borrowRate: number;
+    readonly baseBorrowRateWithoutFee: number;
+    readonly borrowRateWithoutFee: number;
     readonly borrowedAmount: bigint;
     readonly accruedInterest: bigint;
     readonly accruedFees: bigint;
@@ -81,12 +92,13 @@ export declare class CreditAccountData {
     isForbidden(token: string): boolean;
     isQuoted(token: string): boolean;
     isTokenEnabled(token: string): boolean;
-    static calcMaxDebtIncrease(healthFactor: number, borrowAmountPlusInterest: bigint, underlyingLT: number, minHf?: number): bigint;
-    static calcOverallAPY({ caAssets, lpAPY, prices, quotas, quotaRates, totalValue, debt, baseBorrowRate, underlyingToken, }: CalcOverallAPYProps): bigint | undefined;
+    static calcMaxDebtIncrease(healthFactor: number, debt: bigint, underlyingLT: number, minHf?: number): bigint;
+    static calcOverallAPY({ caAssets, lpAPY, prices, quotas, quotaRates, feeInterest, totalValue, debt, baseRateWithFee, underlyingToken, }: CalcOverallAPYProps): bigint | undefined;
     hash(): string;
     static hash(creditManager: string, borrower: string): string;
-    static calcHealthFactor({ assets, quotas, quotasInfo, liquidationThresholds, underlyingToken, borrowed, prices, }: CalcHealthFactorProps): number;
+    static calcHealthFactor({ assets, quotas, quotasInfo, liquidationThresholds, underlyingToken, debt, prices, }: CalcHealthFactorProps): number;
     static calcQuotaUpdate({ quotas, initialQuotas, assetsAfterUpdate, allowedToSpend, allowedToObtain, quotaReserve, }: CalcQuotaUpdateProps): CalcQuotaUpdateReturnType;
-    static calcQuotaBorrowRate({ quotas, quotaRates, borrowAmount, }: CalcQuotaBorrowRateProps): number;
+    static calcQuotaBorrowRate({ quotas, quotaRates }: CalcQuotaBorrowRateProps): bigint;
+    static calcRelativeBaseBorrowRate({ debt, baseRateWithFee, assetAmountInUnderlying, totalValue, }: CalcRelativeBaseBorrowRateProps): bigint;
 }
 export {};

package/lib/core/creditAccount.js CHANGED Viewed

@@ -19,8 +19,8 @@ class CreditAccountData {
     enabledTokenMask;
     healthFactor;
     isDeleting;
-    baseBorrowRate;
-    borrowRate;
+    baseBorrowRateWithoutFee;
+    borrowRateWithoutFee;
     borrowedAmount;
     accruedInterest;
     accruedFees;
@@ -60,10 +60,10 @@ class CreditAccountData {
         this.totalValue = (0, sdk_gov_1.toBigInt)(payload.totalValue || 0n);
         this.totalValueUSD = (0, sdk_gov_1.toBigInt)(payload.totalValueUSD);
         this.twvUSD = (0, sdk_gov_1.toBigInt)(payload.twvUSD);
-        this.baseBorrowRate = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.baseBorrowRate) *
+        this.baseBorrowRateWithoutFee = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.baseBorrowRate) *
             sdk_gov_1.PERCENTAGE_DECIMALS *
             sdk_gov_1.PERCENTAGE_FACTOR);
-        this.borrowRate = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.aggregatedBorrowRate) *
+        this.borrowRateWithoutFee = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.aggregatedBorrowRate) *
             sdk_gov_1.PERCENTAGE_DECIMALS *
             sdk_gov_1.PERCENTAGE_FACTOR);
         this.cumulativeIndexLastUpdate = (0, sdk_gov_1.toBigInt)(payload.cumulativeIndexLastUpdate);
@@ -132,12 +132,11 @@ class CreditAccountData {
     isTokenEnabled(token) {
         return this.allBalances[token].isEnabled;
     }
-    static calcMaxDebtIncrease(healthFactor, borrowAmountPlusInterest, underlyingLT, minHf = Number(sdk_gov_1.PERCENTAGE_FACTOR)) {
-        const result = (borrowAmountPlusInterest * BigInt(healthFactor - minHf)) /
-            BigInt(minHf - underlyingLT);
+    static calcMaxDebtIncrease(healthFactor, debt, underlyingLT, minHf = Number(sdk_gov_1.PERCENTAGE_FACTOR)) {
+        const result = (debt * BigInt(healthFactor - minHf)) / BigInt(minHf - underlyingLT);
         return math_1.BigIntMath.max(0n, result);
     }
-    static calcOverallAPY({ caAssets, lpAPY, prices, quotas, quotaRates, totalValue, debt, baseBorrowRate, underlyingToken, }) {
+    static calcOverallAPY({ caAssets, lpAPY, prices, quotas, quotaRates, feeInterest, totalValue, debt, baseRateWithFee, underlyingToken, }) {
         if (!lpAPY ||
             !totalValue ||
             totalValue <= 0n ||
@@ -160,14 +159,16 @@ class CreditAccountData {
             const { balance: quotaBalance = 0n } = quotas[tokenAddressLC] || {};
             const quotaAmount = isActive ? quotaBalance : 0n;
             const quotaMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice || 0n, quotaAmount, underlyingTokenDecimals);
-            const quotaAPYMoney = quotaMoney * BigInt(quotaAPY);
+            const quotaRate = ((0, sdk_gov_1.toBigInt)(quotaAPY) * (BigInt(feeInterest) + sdk_gov_1.PERCENTAGE_FACTOR)) /
+                sdk_gov_1.PERCENTAGE_FACTOR;
+            const quotaAPYMoney = quotaMoney * quotaRate;
             return acc + apyMoney - quotaAPYMoney;
         }, 0n);
         const assetAPYAmountInUnderlying = price_1.PriceUtils.convertByPrice(assetAPYMoney, {
             price: underlyingPrice || sdk_gov_1.PRICE_DECIMALS,
             decimals: underlyingTokenDecimals,
         });
-        const debtAPY = debt * BigInt(baseBorrowRate);
+        const debtAPY = debt * BigInt(baseRateWithFee);
         const yourAssets = totalValue - debt;
         const apyInPercent = (assetAPYAmountInUnderlying - debtAPY) / yourAssets;
         return apyInPercent;
@@ -178,7 +179,7 @@ class CreditAccountData {
     static hash(creditManager, borrower) {
         return `${creditManager.toLowerCase()}:${borrower.toLowerCase()}`;
     }
-    static calcHealthFactor({ assets, quotas, quotasInfo, liquidationThresholds, underlyingToken, borrowed, prices, }) {
+    static calcHealthFactor({ assets, quotas, quotasInfo, liquidationThresholds, underlyingToken, debt, prices, }) {
         const [, underlyingDecimals] = (0, sdk_gov_1.extractTokenData)(underlyingToken);
         const underlyingPrice = prices[underlyingToken] || 0n;
         const assetLTMoney = assets.reduce((acc, { token: tokenAddress, balance: amount }) => {
@@ -197,7 +198,7 @@ class CreditAccountData {
             const ltMoney = money * lt;
             return acc + ltMoney;
         }, 0n);
-        const borrowedMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice || sdk_gov_1.PRICE_DECIMALS, borrowed, underlyingDecimals);
+        const borrowedMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice || sdk_gov_1.PRICE_DECIMALS, debt, underlyingDecimals);
         const hfInPercent = borrowedMoney > 0n ? assetLTMoney / borrowedMoney : 0n;
         return Number(hfInPercent);
     }
@@ -247,17 +248,19 @@ class CreditAccountData {
         }, { desiredQuota: {}, quotaIncrease: [], quotaDecrease: [] });
         return r;
     }
-    static calcQuotaBorrowRate({ quotas, quotaRates, borrowAmount, }) {
-        if (borrowAmount <= 0)
-            return 0;
+    static calcQuotaBorrowRate({ quotas, quotaRates }) {
         const totalRateBalance = Object.values(quotas).reduce((acc, { token, balance }) => {
             const { rate = 0, isActive = false } = quotaRates?.[token] || {};
             const quotaBalance = isActive ? balance : 0n;
             const rateBalance = quotaBalance * BigInt(rate);
             return acc + rateBalance;
         }, 0n);
-        const quotaBorrowRate = Number(totalRateBalance / borrowAmount);
-        return quotaBorrowRate;
+        return totalRateBalance;
+    }
+    static calcRelativeBaseBorrowRate({ debt, baseRateWithFee, assetAmountInUnderlying, totalValue, }) {
+        if (totalValue === 0n)
+            return 0n;
+        return ((debt * BigInt(baseRateWithFee) * assetAmountInUnderlying) / totalValue);
     }
 }
 exports.CreditAccountData = CreditAccountData;

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

@@ -75,10 +75,11 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             caAssets: caWithoutLP.assets,
             totalValue: caWithoutLP.totalValue,
             debt: caWithoutLP.debt,
-            baseBorrowRate: caWithoutLP.borrowRate,
+            baseRateWithFee: caWithoutLP.borrowRate,
             underlyingToken: caWithoutLP.underlyingToken,
             quotaRates: {},
             quotas: {},
+            feeInterest: 0,
             lpAPY,
             prices,
         });
@@ -89,10 +90,11 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             caAssets: caWithLP.assets,
             totalValue: caWithLP.totalValue,
             debt: caWithLP.debt,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: {},
             quotas: {},
+            feeInterest: 0,
             lpAPY,
             prices,
         });
@@ -103,10 +105,11 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             caAssets: caWithLP.assets,
             totalValue: caWithLP.totalValue,
             debt: caWithLP.debt,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: {},
             quotas: {},
+            feeInterest: 0,
             lpAPY: undefined,
             prices,
         });
@@ -117,10 +120,11 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             caAssets: caWithLP.assets,
             totalValue: undefined,
             debt: caWithLP.debt,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: {},
             quotas: {},
+            feeInterest: 0,
             lpAPY,
             prices,
         });
@@ -131,10 +135,11 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             caAssets: caWithLP.assets,
             totalValue: caWithLP.totalValue,
             debt: undefined,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: {},
             quotas: {},
+            feeInterest: 0,
             lpAPY,
             prices,
         });
@@ -145,10 +150,11 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             caAssets: caWithLP.assets,
             totalValue: 0n,
             debt: undefined,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: {},
             quotas: {},
+            feeInterest: 0,
             lpAPY,
             prices,
         });
@@ -159,10 +165,11 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             caAssets: caWithLP.assets,
             totalValue: caWithLP.totalValue,
             debt: caWithLP.debt,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: caWithLP.rates,
             quotas: caWithLP.quotas,
+            feeInterest: 0,
             lpAPY,
             prices,
         });
@@ -173,7 +180,7 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             caAssets: caWithLP.assets,
             totalValue: caWithLP.totalValue,
             debt: caWithLP.debt,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: caWithLP.rates,
             quotas: {
@@ -182,6 +189,7 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH.toLowerCase(),
                 },
             },
+            feeInterest: 0,
             lpAPY,
             prices,
         });
@@ -243,7 +251,7 @@ describe("CreditAccount calcHealthFactor test", () => {
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
+            debt: defaultCA.debt,
         });
         (0, chai_1.expect)(result).to.be.eq(defaultCA.healthFactor);
     });
@@ -255,7 +263,7 @@ describe("CreditAccount calcHealthFactor test", () => {
             prices: {},
             liquidationThresholds: {},
             underlyingToken: "",
-            borrowed: 0n,
+            debt: 0n,
         });
         (0, chai_1.expect)(result).to.be.eq(0);
     });
@@ -272,7 +280,7 @@ describe("CreditAccount calcHealthFactor test", () => {
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
+            debt: defaultCA.debt,
         });
         (0, chai_1.expect)(result).to.be.eq(11188);
     });
@@ -292,7 +300,7 @@ describe("CreditAccount calcHealthFactor test", () => {
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt - amountDecrease,
+            debt: defaultCA.debt - amountDecrease,
         });
         (0, chai_1.expect)(result).to.be.eq(10308);
     });
@@ -312,7 +320,7 @@ describe("CreditAccount calcHealthFactor test", () => {
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt + amountIncrease,
+            debt: defaultCA.debt + amountIncrease,
         });
         (0, chai_1.expect)(result).to.be.eq(10137);
     });
@@ -337,7 +345,7 @@ describe("CreditAccount calcHealthFactor test", () => {
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
+            debt: defaultCA.debt,
         });
         (0, chai_1.expect)(result).to.be.eq(9444);
     });
@@ -349,7 +357,7 @@ describe("CreditAccount calcHealthFactor test", () => {
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
+            debt: defaultCA.debt,
         });
         (0, chai_1.expect)(result).to.be.eq(defaultCA.healthFactor);
     });
@@ -366,7 +374,7 @@ describe("CreditAccount calcHealthFactor test", () => {
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
+            debt: defaultCA.debt,
         });
         (0, chai_1.expect)(result).to.be.eq(9300);
     });
@@ -382,7 +390,7 @@ describe("CreditAccount calcHealthFactor test", () => {
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
+            debt: defaultCA.debt,
         });
         (0, chai_1.expect)(result).to.be.eq(9300);
     });
@@ -804,7 +812,7 @@ describe("CreditAccount calcQuotaUpdate test", () => {
         });
     });
 });
-describe("CreditAccount calcQuotaBorrowRate test", () => {
+describe("CreditAccount calcAvgQuotaBorrowRate test", () => {
     it("should calculate quota rate (same amounts, different rates)", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaBorrowRate({
             quotas: {
@@ -835,9 +843,8 @@ describe("CreditAccount calcQuotaBorrowRate test", () => {
                     isActive: true,
                 },
             },
-            borrowAmount: 30n,
         });
-        (0, chai_1.expect)(result).to.be.eq(10);
+        (0, chai_1.expect)(result).to.be.eq(300n);
     });
     it("should calculate quota rate (same rates, different amounts)", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaBorrowRate({
@@ -869,11 +876,10 @@ describe("CreditAccount calcQuotaBorrowRate test", () => {
                     isActive: true,
                 },
             },
-            borrowAmount: 30n,
         });
-        (0, chai_1.expect)(result).to.be.eq(10);
+        (0, chai_1.expect)(result).to.be.eq(300n);
     });
-    it("should calculate quota rate (borrow amount)", () => {
+    it("should calculate quota rate (disabled quota)", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaBorrowRate({
             quotas: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
@@ -896,49 +902,79 @@ describe("CreditAccount calcQuotaBorrowRate test", () => {
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
                     rate: 10,
-                    isActive: true,
+                    isActive: false,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
                     rate: 10,
                     isActive: true,
                 },
             },
-            borrowAmount: 60n,
         });
-        (0, chai_1.expect)(result).to.be.eq(5);
+        (0, chai_1.expect)(result).to.be.eq(200n);
     });
-    it("should calculate quota rate (disabled quota)", () => {
+});
+describe("CreditAccount calcQuotaBorrowRate test", () => {
+    it("should calculate quota borrow rate", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaBorrowRate({
             quotas: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
-                    balance: 5n,
-                },
-                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
                     balance: 10n,
                 },
-                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
-                    balance: 15n,
-                },
             },
             quotaRates: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                    rate: 10,
+                    rate: 5,
                     isActive: true,
                 },
-                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                    rate: 10,
-                    isActive: false,
+            },
+        });
+        (0, chai_1.expect)(result).to.be.eq(50n);
+    });
+    it("should calculate quota borrow rate when no balance", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaBorrowRate({
+            quotas: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                    balance: 1n,
                 },
-                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                    rate: 10,
+            },
+            quotaRates: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    rate: 5,
                     isActive: true,
                 },
             },
-            borrowAmount: 50n,
         });
-        (0, chai_1.expect)(result).to.be.eq(4);
+        (0, chai_1.expect)(result).to.be.eq(5n);
+    });
+});
+describe("CreditAccount calcRelativeBaseBorrowRate test", () => {
+    it("should calculate relative borrow rate", () => {
+        const result = creditAccount_1.CreditAccountData.calcRelativeBaseBorrowRate({
+            debt: 200n,
+            baseRateWithFee: 250,
+            assetAmountInUnderlying: 200n,
+            totalValue: 400n,
+        });
+        (0, chai_1.expect)(result).to.be.eq(25000n);
+    });
+    it("should calculate relative borrow rate if position asset === 0", () => {
+        const result = creditAccount_1.CreditAccountData.calcRelativeBaseBorrowRate({
+            debt: 200n,
+            baseRateWithFee: 250,
+            assetAmountInUnderlying: 1n,
+            totalValue: 400n,
+        });
+        (0, chai_1.expect)(result).to.be.eq(125n);
+    });
+    it("should calculate relative borrow rate if position === 0", () => {
+        const result = creditAccount_1.CreditAccountData.calcRelativeBaseBorrowRate({
+            debt: 1n,
+            baseRateWithFee: 250,
+            assetAmountInUnderlying: 1n,
+            totalValue: 1n,
+        });
+        (0, chai_1.expect)(result).to.be.eq(250n);
     });
 });

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

@@ -12,11 +12,17 @@ export interface StrategyPayload {
 interface LiquidationPriceProps {
     prices: Record<string, bigint>;
     liquidationThresholds: Record<string, bigint>;
-    borrowed: bigint;
+    debt: bigint;
     underlyingToken: string;
     targetToken: string;
     assets: Record<string, Asset>;
 }
+interface CalculateMaxAPYProps {
+    apy: number;
+    leverage: number;
+    baseRateWithFee: number;
+    quotaRateWithFee: number;
+}
 export declare class Strategy {
     apy: number | undefined;
     name: string;
@@ -27,8 +33,8 @@ export declare class Strategy {
     creditManagers: Array<string>;
     constructor(payload: StrategyPayload);
     static maxLeverage(lpToken: string, cms: Array<PartialCM>): number;
-    static maxAPY(baseAPY: number, maxLeverage: number, borrowAPY: number): number;
-    static liquidationPrice({ prices, liquidationThresholds, borrowed, underlyingToken, targetToken, assets, }: LiquidationPriceProps): bigint;
+    static maxAPY({ apy, leverage, baseRateWithFee, quotaRateWithFee, }: CalculateMaxAPYProps): number;
+    static liquidationPrice({ prices, liquidationThresholds, debt, underlyingToken, targetToken, assets, }: LiquidationPriceProps): bigint;
     protected static maxLeverageThreshold(lpToken: string, cms: Array<PartialCM>): readonly [bigint, string];
 }
 type PartialCM = Pick<CreditManagerData, "liquidationThresholds" | "address">;

package/lib/core/strategy.js CHANGED Viewed

@@ -27,17 +27,19 @@ class Strategy {
             (sdk_gov_1.PERCENTAGE_FACTOR - maxThreshold);
         return Number(maxLeverage - sdk_gov_1.LEVERAGE_DECIMALS);
     }
-    static maxAPY(baseAPY, maxLeverage, borrowAPY) {
-        return (baseAPY +
-            ((baseAPY - borrowAPY) * (maxLeverage - Number(sdk_gov_1.LEVERAGE_DECIMALS))) /
-                Number(sdk_gov_1.LEVERAGE_DECIMALS));
+    static maxAPY({ apy, leverage, baseRateWithFee, quotaRateWithFee, }) {
+        const collateralTerm = apy - quotaRateWithFee;
+        const debtTerm = ((apy - baseRateWithFee - quotaRateWithFee) *
+            (leverage - Number(sdk_gov_1.LEVERAGE_DECIMALS))) /
+            Number(sdk_gov_1.LEVERAGE_DECIMALS);
+        return collateralTerm + Math.floor(debtTerm);
     }
-    static liquidationPrice({ prices, liquidationThresholds, borrowed, underlyingToken, targetToken, assets, }) {
+    static liquidationPrice({ prices, liquidationThresholds, debt, underlyingToken, targetToken, assets, }) {
         const underlyingTokenLC = underlyingToken.toLowerCase();
         const [, underlyingDecimals = 18] = (0, sdk_gov_1.extractTokenData)(underlyingTokenLC);
         const { balance: underlyingBalance = 0n } = assets[underlyingTokenLC] || {};
         const underlyingPrice = prices[underlyingTokenLC] || sdk_gov_1.PRICE_DECIMALS;
-        const borrowedMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice, math_1.BigIntMath.max(0n, borrowed - underlyingBalance), underlyingDecimals);
+        const borrowedMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice, math_1.BigIntMath.max(0n, debt - underlyingBalance), underlyingDecimals);
         const targetTokenLC = targetToken.toLowerCase();
         const [, targetDecimals = 18] = (0, sdk_gov_1.extractTokenData)(targetTokenLC);
         const { balance: targetBalance = 0n } = assets[targetTokenLC] || {};

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

@@ -24,14 +24,19 @@ const liquidationThresholds = {
 };
 describe("Strategy test", () => {
     it("maxAPY calculation is correct", () => {
-        const result = strategy_1.Strategy.maxAPY(53203, 10 * Number(sdk_gov_1.LEVERAGE_DECIMALS), pools["0x1"].borrowRate);
+        const result = strategy_1.Strategy.maxAPY({
+            apy: 53203,
+            leverage: 10 * Number(sdk_gov_1.LEVERAGE_DECIMALS),
+            baseRateWithFee: pools["0x1"].borrowRate,
+            quotaRateWithFee: 0,
+        });
         (0, chai_1.expect)(result).to.be.eq(284143);
     });
     it("liquidationPrice: calculation is correct", () => {
         const result = strategy_1.Strategy.liquidationPrice({
             liquidationThresholds,
             prices,
-            borrowed: (0, formatter_1.toBN)("350", sdk_gov_1.decimals.WETH),
+            debt: (0, formatter_1.toBN)("350", sdk_gov_1.decimals.WETH),
             underlyingToken: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             targetToken: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             assets: {
@@ -47,7 +52,7 @@ describe("Strategy test", () => {
         const result = strategy_1.Strategy.liquidationPrice({
             liquidationThresholds,
             prices,
-            borrowed: (0, formatter_1.toBN)("350", sdk_gov_1.decimals.WETH),
+            debt: (0, formatter_1.toBN)("350", sdk_gov_1.decimals.WETH),
             underlyingToken: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             targetToken: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             assets: {
@@ -67,7 +72,7 @@ describe("Strategy test", () => {
         const result = strategy_1.Strategy.liquidationPrice({
             liquidationThresholds,
             prices,
-            borrowed: (0, formatter_1.toBN)("350", sdk_gov_1.decimals.WETH),
+            debt: (0, formatter_1.toBN)("350", sdk_gov_1.decimals.WETH),
             underlyingToken: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             targetToken: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             assets: {
@@ -87,7 +92,7 @@ describe("Strategy test", () => {
         const result = strategy_1.Strategy.liquidationPrice({
             liquidationThresholds,
             prices,
-            borrowed: (0, formatter_1.toBN)("450", sdk_gov_1.decimals.WETH),
+            debt: (0, formatter_1.toBN)("450", sdk_gov_1.decimals.WETH),
             underlyingToken: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             targetToken: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             assets: {

package/lib/core/transactions.js CHANGED Viewed

@@ -128,7 +128,7 @@ class TXSwap extends eventOrTx_1.EVMTx {
         this.tokenFrom = opts.tokenFrom;
         this.tokenTo = opts.tokenTo;
         this.creditManager = opts.creditManager;
-        this.creditManagerName = opts.creditManager;
+        this.creditManagerName = opts.creditManagerName;
     }
     toString() {
         let toPart = "";
@@ -157,7 +157,7 @@ class TxAddCollateral extends eventOrTx_1.EVMTx {
         this.amount = opts.amount;
         this.addedToken = opts.addedToken;
         this.creditManager = opts.creditManager;
-        this.creditManagerName = opts.creditManager;
+        this.creditManagerName = opts.creditManagerName;
     }
     toString() {
         const [addedSymbol, addedDecimals] = (0, sdk_gov_1.extractTokenData)(this.addedToken);
@@ -181,7 +181,7 @@ class TxIncreaseBorrowAmount extends eventOrTx_1.EVMTx {
         this.amount = opts.amount;
         this.underlyingToken = opts.underlyingToken;
         this.creditManager = opts.creditManager;
-        this.creditManagerName = opts.creditManager;
+        this.creditManagerName = opts.creditManagerName;
     }
     toString() {
         const [tokenSymbol, tokenDecimals] = (0, sdk_gov_1.extractTokenData)(this.underlyingToken);
@@ -205,7 +205,7 @@ class TxDecreaseBorrowAmount extends eventOrTx_1.EVMTx {
         this.amount = opts.amount;
         this.underlyingToken = opts.underlyingToken;
         this.creditManager = opts.creditManager;
-        this.creditManagerName = opts.creditManager;
+        this.creditManagerName = opts.creditManagerName;
     }
     toString() {
         const [tokenSymbol, tokenDecimals] = (0, sdk_gov_1.extractTokenData)(this.underlyingToken);
@@ -231,7 +231,7 @@ class TxOpenAccount extends eventOrTx_1.EVMTx {
         this.underlyingToken = opts.underlyingToken;
         this.leverage = opts.leverage;
         this.creditManager = opts.creditManager;
-        this.creditManagerName = opts.creditManager;
+        this.creditManagerName = opts.creditManagerName;
     }
     toString() {
         const [tokenSymbol, tokenDecimals] = (0, sdk_gov_1.extractTokenData)(this.underlyingToken);
@@ -259,7 +259,7 @@ class TxOpenMultitokenAccount extends eventOrTx_1.EVMTx {
         this.borrowedAmount = opts.borrowedAmount;
         this.underlyingToken = opts.underlyingToken;
         this.creditManager = opts.creditManager;
-        this.creditManagerName = opts.creditManager;
+        this.creditManagerName = opts.creditManagerName;
         this.assets = opts.assets;
     }
     toString() {
@@ -339,7 +339,7 @@ class TxRepayAccount extends eventOrTx_1.EVMTx {
     constructor(opts) {
         super(opts);
         this.creditManager = opts.creditManager;
-        this.creditManagerName = opts.creditManager;
+        this.creditManagerName = opts.creditManagerName;
     }
     toString() {
         return `Credit Account ${this.creditManagerName || (0, contractsRegister_1.getContractName)(this.creditManager)}: Repaying account`;
@@ -358,10 +358,10 @@ class TxCloseAccount extends eventOrTx_1.EVMTx {
     constructor(opts) {
         super(opts);
         this.creditManager = opts.creditManager;
-        this.creditManagerName = opts.creditManager;
+        this.creditManagerName = opts.creditManagerName;
     }
     toString() {
-        return `Credit Account ${this.creditManager || (0, contractsRegister_1.getContractName)(this.creditManager)}: Closing account`;
+        return `Credit Account ${this.creditManagerName || (0, contractsRegister_1.getContractName)(this.creditManager)}: Closing account`;
     }
     serialize() {
         return {
@@ -399,7 +399,7 @@ class TxEnableTokens extends eventOrTx_1.EVMTx {
         this.enabledTokens = opts.enabledTokens;
         this.disabledTokens = opts.disabledTokens;
         this.creditManager = opts.creditManager;
-        this.creditManagerName = opts.creditManager;
+        this.creditManagerName = opts.creditManagerName;
     }
     toString() {
         const enabledSymbols = this.enabledTokens.map(address => {

package/package.json CHANGED Viewed

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