@gearbox-protocol/sdk 3.0.0-next.181 → 3.0.0-next.183

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/lib/core/creditManager.d.ts

@@ -31,6 +31,7 @@ export declare class CreditManagerData {
     readonly liquidationDiscountExpired: number;
     readonly collateralTokens: Array<string>;
     readonly supportedTokens: Record<string, true>;
+    readonly usableTokens: Record<string, true>;
     readonly adapters: Record<string, string>;
     readonly contractsByAdapter: Record<string, string>;
     readonly liquidationThresholds: Record<string, bigint>;

package/lib/core/creditManager.js

@@ -32,6 +32,7 @@ class CreditManagerData {
     liquidationDiscountExpired;
     collateralTokens = [];
     supportedTokens = {};
+    usableTokens = {};
     adapters;
     contractsByAdapter;
     liquidationThresholds;
@@ -66,11 +67,6 @@ class CreditManagerData {
         this.liquidationDiscount = Number(payload.liquidationDiscount);
         this.feeLiquidationExpired = Number(payload.feeLiquidationExpired);
         this.liquidationDiscountExpired = Number(payload.liquidationDiscountExpired);
-        payload.collateralTokens.forEach(t => {
-            const tLc = t.toLowerCase();
-            this.collateralTokens.push(tLc);
-            this.supportedTokens[tLc] = true;
-        });
         this.adapters = Object.fromEntries(payload.adapters.map(a => [
             a.targetContract.toLowerCase(),
             a.adapter.toLowerCase(),
@@ -107,6 +103,16 @@ class CreditManagerData {
             version: Number(payload?.lirm?.version),
             isBorrowingMoreU2Forbidden: payload?.lirm?.isBorrowingMoreU2Forbidden,
         };
+        payload.collateralTokens.forEach(t => {
+            const tLc = t.toLowerCase();
+            const zeroLt = this.liquidationThresholds[tLc] === 0n;
+            const quotaNotActive = this.quotas[tLc]?.isActive === false;
+            const allowed = !zeroLt && !quotaNotActive;
+            if (allowed)
+                this.usableTokens[tLc] = true;
+            this.collateralTokens.push(tLc);
+            this.supportedTokens[tLc] = true;
+        });
         txParser_1.TxParser.addCreditManager(this.address, this.version);
         if (this.creditFacade !== "" && this.creditFacade !== sdk_gov_1.ADDRESS_0X0) {
             txParser_1.TxParser.addCreditFacade(this.creditFacade, sdk_gov_1.tokenSymbolByAddress[this.underlyingToken], this.version);

package/lib/gearboxRewards/api.js

@@ -18,17 +18,15 @@ const EXTRA_LM_MINING = {
         const REWARD_PERIOD = 14 * 24 * 60 * 60;
         // const REWARDS_FIRST_START = 1711641600;
         // const REWARDS_FIRST_END = 1712844000;
-        const REWARDS_SECOND_END = 1714150800;
-        const REWARDS_THIRD_END = REWARDS_SECOND_END + REWARD_PERIOD;
+        // const REWARDS_SECOND_END = 1714150800;
+        const REWARDS_THIRD_END = 1715374800;
+        const REWARDS_FOURTH_END = REWARDS_THIRD_END + REWARD_PERIOD;
         // const REWARD_FIRST_PART = toBN("15000", decimals.GHO);
-        const REWARD_SECOND_PART = (0, formatter_1.toBN)("15000", sdk_gov_1.decimals.GHO);
+        // const REWARD_SECOND_PART = toBN("15000", decimals.GHO);
         const REWARD_THIRD_PART = (0, formatter_1.toBN)("15000", sdk_gov_1.decimals.GHO);
-        const reward = timestamp >= REWARDS_SECOND_END
-            ? REWARD_THIRD_PART
-            : REWARD_SECOND_PART;
-        const finished = timestamp >= REWARDS_SECOND_END
-            ? REWARDS_THIRD_END
-            : REWARDS_SECOND_END;
+        const REWARD_FOURTH_PART = (0, formatter_1.toBN)("7500", sdk_gov_1.decimals.GHO);
+        const reward = timestamp >= REWARDS_THIRD_END ? REWARD_FOURTH_PART : REWARD_THIRD_PART;
+        const finished = timestamp >= REWARDS_THIRD_END ? REWARDS_FOURTH_END : REWARDS_THIRD_END;
         return {
             balance: 0n,
             duration: BigInt(REWARD_PERIOD),
@@ -237,6 +235,7 @@ class GearboxRewardsApi {
     }
 }
 exports.GearboxRewardsApi = GearboxRewardsApi;
+// https://api.merkl.xyz/v3/campaignsForMainParameter?chainId=1&mainParameter=0xE2037090f896A858E3168B978668F22026AC52e7
 class MerkleXYZApi {
     static domain = "https://api.merkl.xyz/v3";
     static getRewardsUrl = (options) => endpoint_1.ChartsApi.getRelativeUrl([this.domain, "userRewards"].join("/"), options);

package/package.json

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