@gearbox-protocol/sdk 3.0.0-next.180 → 3.0.0-next.182

package/lib/apy/convexAPY.js

@@ -17,7 +17,7 @@ function getConvexAPYBulk(props) {
         acc.push(currentResponse);
         return [acc, end];
     }, [[], 0]);
-    const apyList = parsedResponse.map(([cvxPoolRewardsFinish = 0n, cvxPoolRate = 0n, cvxPoolSupply = 0n, crvVPrice = 0n, cvxTokenSupply = 0n, ...rest], i) => {
+    const apyList = parsedResponse.map(([cvxPoolRewardsFinish, cvxPoolRate, cvxPoolSupply, crvVPrice, cvxTokenSupply, ...rest], i) => {
         const { cvxExtraPools, crvLpPrice: crvLpPriceList } = poolsInfo[i];
         const extraEnd = cvxExtraPools.length;
         const cvxExtraRewards = rest.slice(0, extraEnd);
@@ -26,11 +26,11 @@ function getConvexAPYBulk(props) {
         const lpPriceEnd = extraFinishEnd + crvLpPriceList.length;
         const crvLpPrice = rest.slice(extraFinishEnd, lpPriceEnd);
         const apy = calculateConvexAPY({
-            cvxPoolRewardsFinish: (0, sdk_gov_1.toBigInt)(cvxPoolRewardsFinish),
-            cvxPoolRate: (0, sdk_gov_1.toBigInt)(cvxPoolRate),
-            cvxPoolSupply: (0, sdk_gov_1.toBigInt)(cvxPoolSupply),
-            crvVPrice: (0, sdk_gov_1.toBigInt)(crvVPrice),
-            cvxTokenSupply: (0, sdk_gov_1.toBigInt)(cvxTokenSupply),
+            cvxPoolRewardsFinish: (0, sdk_gov_1.toBigInt)(cvxPoolRewardsFinish || 0n),
+            cvxPoolRate: (0, sdk_gov_1.toBigInt)(cvxPoolRate || 0n),
+            cvxPoolSupply: (0, sdk_gov_1.toBigInt)(cvxPoolSupply || 0n),
+            crvVPrice: (0, sdk_gov_1.toBigInt)(crvVPrice || 0n),
+            cvxTokenSupply: (0, sdk_gov_1.toBigInt)(cvxTokenSupply || 0n),
             cvxExtraRewards: cvxExtraRewards.map(v => (0, sdk_gov_1.toBigInt)(v || 0n)),
             cvxExtraRewardsFinish: cvxExtraRewardsFinish.map(v => (0, sdk_gov_1.toBigInt)(v || 0n)),
             crvLpPrice: crvLpPrice.map(v => (0, sdk_gov_1.toBigInt)(v || 0n)),

package/lib/core/creditAccount.d.ts

@@ -60,12 +60,10 @@ 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;
 }
 interface LiquidationPriceProps {
     liquidationThresholds: Record<string, bigint>;
@@ -127,7 +125,7 @@ export declare class CreditAccountData {
     static calcQuotaUpdate(props: CalcQuotaUpdateProps): CalcQuotaUpdateReturnType;
     private static getSingleQuotaChange;
     static calcQuotaBorrowRate({ quotas, quotaRates }: CalcQuotaBorrowRateProps): bigint;
-    static calcRelativeBaseBorrowRate({ debt, baseRateWithFee, assetAmountInUnderlying, totalValue, }: CalcRelativeBaseBorrowRateProps): bigint;
+    static calcRelativeBaseBorrowRate({ debt, baseRateWithFee, assetAmountInUnderlying, }: CalcRelativeBaseBorrowRateProps): bigint;
     static liquidationPrice({ liquidationThresholds, debt, underlyingToken, targetToken, assets, }: LiquidationPriceProps): bigint;
 }
 export {};

package/lib/core/creditAccount.js

@@ -341,10 +341,8 @@ class CreditAccountData {
         }, 0n);
         return totalRateBalance;
     }
-    static calcRelativeBaseBorrowRate({ debt, baseRateWithFee, assetAmountInUnderlying, totalValue, }) {
-        if (totalValue === 0n)
-            return 0n;
-        return ((debt * BigInt(baseRateWithFee) * assetAmountInUnderlying) / totalValue);
+    static calcRelativeBaseBorrowRate({ debt, baseRateWithFee, assetAmountInUnderlying, }) {
+        return debt * BigInt(baseRateWithFee) * assetAmountInUnderlying;
     }
     static liquidationPrice({ liquidationThresholds, debt, underlyingToken, targetToken, assets, }) {
         const underlyingTokenLC = underlyingToken.toLowerCase();

package/lib/core/creditAccount.spec.js

@@ -1429,25 +1429,22 @@ describe("CreditAccount calcRelativeBaseBorrowRate test", () => {
             debt: 200n,
             baseRateWithFee: 250,
             assetAmountInUnderlying: 200n,
-            totalValue: 400n,
         });
-        (0, chai_1.expect)(result).to.be.eq(25000n);
+        (0, chai_1.expect)(result).to.be.eq(10000000n);
     });
     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);
+        (0, chai_1.expect)(result).to.be.eq(50000n);
     });
     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/package.json

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