@gearbox-protocol/sdk 3.0.0-vfour.344 → 3.0.0-vfour.346

package/dist/cjs/adapters/AdaptersPlugin.js

@@ -111,7 +111,7 @@ class AdaptersPlugin extends import_sdk.SDKConstruct {
       }
     }
   }
-  stateHuman(raw) {
+  stateHuman(_) {
     return {};
   }
 }

package/dist/cjs/sdk/router/RouterV310Contract.js

@@ -216,21 +216,21 @@ class RouterV310Contract extends import_AbstractRouterContract.AbstractRouterCon
    * Implements {@link IRouterContract.findAllSwaps}
    * @deprecated v3.0 legacy method
    */
-  findAllSwaps(props) {
+  findAllSwaps(_) {
     throw ERR_NOT_IMPLEMENTED;
   }
   /**
    * Implements {@link IRouterContract.getAvailableConnectors}
    * @deprecated v3.0 legacy method
    */
-  getAvailableConnectors(collateralTokens) {
+  getAvailableConnectors(_) {
     throw ERR_NOT_IMPLEMENTED;
   }
   /**
    * Implements {@link IRouterContract.getFindClosePathInput}
    * @deprecated v3.0 legacy method
    */
-  getFindClosePathInput(ca, cm, balances) {
+  getFindClosePathInput(_, __, ___) {
     throw ERR_NOT_IMPLEMENTED;
   }
 }

package/dist/cjs/sdk/sdk-legacy/core/creditAccount.js

@@ -212,6 +212,10 @@ class CreditAccountData_Legacy {
     const max = underlyingPrice > 0 ? assetsLTMoney * 10n ** BigInt(underlyingDecimals) / underlyingPrice / targetHF / 10n ** BigInt(import_constants.WAD_DECIMALS_POW - import_constants.PRICE_DECIMALS_POW) : 0n;
     return max;
   }
+  // [
+  //  Sum(amount_i * price_i * apy_i - quota_i * quotaPrice * quotaRate_i * (1 + feeInterest)) -
+  //  debt * debtPrice * baseRateWithFee
+  // ] / (totalValue - debt) * debtPrice
   static calcOverallAPY({
     caAssets,
     lpAPY,
@@ -250,16 +254,18 @@ class CreditAccountData_Legacy {
       },
       0n
     );
-    const assetAPYAmountInUnderlying = import_price.PriceUtils.convertByPrice(
-      assetAPYMoney,
-      {
-        price: underlyingPrice || import_constants.PRICE_DECIMALS,
-        decimals: underlyingTokenDecimals
-      }
+    const debtMoney = import_price.PriceUtils.calcTotalPrice(
+      underlyingPrice || 0n,
+      debt,
+      underlyingTokenDecimals
+    );
+    const debtAPYMoney = debtMoney * BigInt(baseRateWithFee);
+    const yourAssetsMoney = import_price.PriceUtils.calcTotalPrice(
+      underlyingPrice || import_constants.PRICE_DECIMALS,
+      totalValue - debt,
+      underlyingTokenDecimals
     );
-    const debtAPY = debt * BigInt(baseRateWithFee);
-    const yourAssets = totalValue - debt;
-    const apyInPercent = (assetAPYAmountInUnderlying - debtAPY) / yourAssets;
+    const apyInPercent = (assetAPYMoney - debtAPYMoney) / yourAssetsMoney;
     return apyInPercent;
   }
   hash() {

package/dist/cjs/sdk/sdk-legacy/core/creditManager.js

@@ -26,7 +26,6 @@ var import_constants = require("../../constants/index.js");
 var import_utils = require("../../utils/index.js");
 class CreditManagerData_Legacy {
   address;
-  type;
   underlyingToken;
   pool;
   creditFacade;
@@ -43,7 +42,6 @@ class CreditManagerData_Legacy {
   isBorrowingForbidden;
   maxEnabledTokensLength;
   name;
-  tier;
   marketConfigurator;
   baseBorrowRate;
   minDebt;
@@ -59,6 +57,7 @@ class CreditManagerData_Legacy {
   collateralTokens = [];
   supportedTokens = {};
   usableTokens = {};
+  forbiddenTokens = {};
   adapters = {};
   contractsByAdapter = {};
   liquidationThresholds;
@@ -66,10 +65,8 @@ class CreditManagerData_Legacy {
   constructor(payload) {
     this.address = payload.addr.toLowerCase();
     this.underlyingToken = payload.underlying.toLowerCase();
-    this.type = CreditManagerData_Legacy.getType(payload.name || "");
     this.name = payload.name;
     this.pool = payload.pool.toLowerCase();
-    this.tier = CreditManagerData_Legacy.getTier(payload.name);
     this.creditFacade = payload.creditFacade.toLowerCase();
     this.creditConfigurator = payload.creditConfigurator.toLowerCase();
     this.degenNFT = payload.degenNFT.toLowerCase();
@@ -126,12 +123,15 @@ class CreditManagerData_Legacy {
       },
       {}
     );
-    payload.collateralTokens.forEach((t) => {
+    payload.collateralTokens.forEach((t, index) => {
       const tLc = t.toLowerCase();
+      const mask = BigInt(1 << index);
+      const isForbidden = (mask & payload.forbiddenTokenMask) !== 0n;
       const zeroLt = this.liquidationThresholds[tLc] === 0n;
       const quotaNotActive = this.quotas[tLc]?.isActive === false;
-      const allowed = !zeroLt && !quotaNotActive;
+      const allowed = !zeroLt && !quotaNotActive && !isForbidden;
       if (allowed) this.usableTokens[tLc] = true;
+      if (isForbidden) this.forbiddenTokens[tLc] = true;
       this.collateralTokens.push(tLc);
       this.supportedTokens[tLc] = true;
     });
@@ -139,22 +139,8 @@ class CreditManagerData_Legacy {
   isQuoted(token) {
     return !!this.quotas[token];
   }
-  static getTier(name) {
-    const DEFAULT_TIER = 99;
-    const l = name.split(" ") || [];
-    const index = l.findIndex((w) => w.toLowerCase() === "tier");
-    if (index < 0) return DEFAULT_TIER;
-    const number = l[index + 1];
-    const n = Number(number || DEFAULT_TIER);
-    return Number.isNaN(n) ? DEFAULT_TIER : n;
-  }
-  static getType(name) {
-    const [identity = ""] = name.split(" ") || [];
-    const lc = identity.toLowerCase();
-    if (lc === "farm") return "farm";
-    if (lc === "trade") return "trade";
-    if (lc === "restaking") return "restaking";
-    return "universal";
+  isForbidden(token) {
+    return !!this.forbiddenTokens[token];
   }
 }
 class ChartsCreditManagerData {
@@ -165,7 +151,6 @@ class ChartsCreditManagerData {
   pool;
   version;
   name;
-  tier;
   borrowRate;
   borrowRateOld;
   borrowRateChange;
@@ -210,7 +195,6 @@ class ChartsCreditManagerData {
     this.pool = (payload.poolAddress || "").toLowerCase();
     this.version = payload.version || 2;
     this.name = payload.name || "";
-    this.tier = CreditManagerData_Legacy.getTier(payload.name || "");
     this.borrowRate = Number(
       (0, import_utils.toBigInt)(payload.borrowRate || 0) * ((0, import_utils.toBigInt)(payload.feeInterest || 0) + import_constants.PERCENTAGE_FACTOR) * import_constants.PERCENTAGE_DECIMALS / import_constants.RAY
     );

package/dist/cjs/sdk/sdk-legacy/core/strategy.js

@@ -28,6 +28,10 @@ class PositionUtils {
     const maxLeverage = import_constants.PERCENTAGE_FACTOR * import_constants.LEVERAGE_DECIMALS / (import_constants.PERCENTAGE_FACTOR - maxThreshold);
     return Number(maxLeverage - import_constants.LEVERAGE_DECIMALS);
   }
+  // [apy - quotaRate * (1 + feeInterest)] +
+  // [
+  //  apy - baseRateWithFee - quotaRate * (1 + feeInterest)
+  // ] * (leverage - 1)
   static maxAPY({
     apy,
     leverage,

package/dist/cjs/zappers/ZappersPlugin.js

@@ -76,7 +76,7 @@ class ZappersPlugin extends import_sdk.SDKConstruct {
     }
     return this.#zappers;
   }
-  stateHuman(raw) {
+  stateHuman(_) {
     return this.zappers.values().flatMap(
       (l) => l.flatMap((z) => ({
         address: z.baseParams.addr,

package/dist/esm/adapters/AdaptersPlugin.js

@@ -88,7 +88,7 @@ class AdaptersPlugin extends SDKConstruct {
       }
     }
   }
-  stateHuman(raw) {
+  stateHuman(_) {
     return {};
   }
 }

package/dist/esm/sdk/router/RouterV310Contract.js

@@ -193,21 +193,21 @@ class RouterV310Contract extends AbstractRouterContract {
    * Implements {@link IRouterContract.findAllSwaps}
    * @deprecated v3.0 legacy method
    */
-  findAllSwaps(props) {
+  findAllSwaps(_) {
     throw ERR_NOT_IMPLEMENTED;
   }
   /**
    * Implements {@link IRouterContract.getAvailableConnectors}
    * @deprecated v3.0 legacy method
    */
-  getAvailableConnectors(collateralTokens) {
+  getAvailableConnectors(_) {
     throw ERR_NOT_IMPLEMENTED;
   }
   /**
    * Implements {@link IRouterContract.getFindClosePathInput}
    * @deprecated v3.0 legacy method
    */
-  getFindClosePathInput(ca, cm, balances) {
+  getFindClosePathInput(_, __, ___) {
     throw ERR_NOT_IMPLEMENTED;
   }
 }

package/dist/esm/sdk/sdk-legacy/core/creditAccount.js

@@ -198,6 +198,10 @@ class CreditAccountData_Legacy {
     const max = underlyingPrice > 0 ? assetsLTMoney * 10n ** BigInt(underlyingDecimals) / underlyingPrice / targetHF / 10n ** BigInt(WAD_DECIMALS_POW - PRICE_DECIMALS_POW) : 0n;
     return max;
   }
+  // [
+  //  Sum(amount_i * price_i * apy_i - quota_i * quotaPrice * quotaRate_i * (1 + feeInterest)) -
+  //  debt * debtPrice * baseRateWithFee
+  // ] / (totalValue - debt) * debtPrice
   static calcOverallAPY({
     caAssets,
     lpAPY,
@@ -236,16 +240,18 @@ class CreditAccountData_Legacy {
       },
       0n
     );
-    const assetAPYAmountInUnderlying = PriceUtils.convertByPrice(
-      assetAPYMoney,
-      {
-        price: underlyingPrice || PRICE_DECIMALS,
-        decimals: underlyingTokenDecimals
-      }
+    const debtMoney = PriceUtils.calcTotalPrice(
+      underlyingPrice || 0n,
+      debt,
+      underlyingTokenDecimals
+    );
+    const debtAPYMoney = debtMoney * BigInt(baseRateWithFee);
+    const yourAssetsMoney = PriceUtils.calcTotalPrice(
+      underlyingPrice || PRICE_DECIMALS,
+      totalValue - debt,
+      underlyingTokenDecimals
     );
-    const debtAPY = debt * BigInt(baseRateWithFee);
-    const yourAssets = totalValue - debt;
-    const apyInPercent = (assetAPYAmountInUnderlying - debtAPY) / yourAssets;
+    const apyInPercent = (assetAPYMoney - debtAPYMoney) / yourAssetsMoney;
     return apyInPercent;
   }
   hash() {

package/dist/esm/sdk/sdk-legacy/core/creditManager.js

@@ -6,7 +6,6 @@ import {
 import { toBigInt } from "../../utils/index.js";
 class CreditManagerData_Legacy {
   address;
-  type;
   underlyingToken;
   pool;
   creditFacade;
@@ -23,7 +22,6 @@ class CreditManagerData_Legacy {
   isBorrowingForbidden;
   maxEnabledTokensLength;
   name;
-  tier;
   marketConfigurator;
   baseBorrowRate;
   minDebt;
@@ -39,6 +37,7 @@ class CreditManagerData_Legacy {
   collateralTokens = [];
   supportedTokens = {};
   usableTokens = {};
+  forbiddenTokens = {};
   adapters = {};
   contractsByAdapter = {};
   liquidationThresholds;
@@ -46,10 +45,8 @@ class CreditManagerData_Legacy {
   constructor(payload) {
     this.address = payload.addr.toLowerCase();
     this.underlyingToken = payload.underlying.toLowerCase();
-    this.type = CreditManagerData_Legacy.getType(payload.name || "");
     this.name = payload.name;
     this.pool = payload.pool.toLowerCase();
-    this.tier = CreditManagerData_Legacy.getTier(payload.name);
     this.creditFacade = payload.creditFacade.toLowerCase();
     this.creditConfigurator = payload.creditConfigurator.toLowerCase();
     this.degenNFT = payload.degenNFT.toLowerCase();
@@ -106,12 +103,15 @@ class CreditManagerData_Legacy {
       },
       {}
     );
-    payload.collateralTokens.forEach((t) => {
+    payload.collateralTokens.forEach((t, index) => {
       const tLc = t.toLowerCase();
+      const mask = BigInt(1 << index);
+      const isForbidden = (mask & payload.forbiddenTokenMask) !== 0n;
       const zeroLt = this.liquidationThresholds[tLc] === 0n;
       const quotaNotActive = this.quotas[tLc]?.isActive === false;
-      const allowed = !zeroLt && !quotaNotActive;
+      const allowed = !zeroLt && !quotaNotActive && !isForbidden;
       if (allowed) this.usableTokens[tLc] = true;
+      if (isForbidden) this.forbiddenTokens[tLc] = true;
       this.collateralTokens.push(tLc);
       this.supportedTokens[tLc] = true;
     });
@@ -119,22 +119,8 @@ class CreditManagerData_Legacy {
   isQuoted(token) {
     return !!this.quotas[token];
   }
-  static getTier(name) {
-    const DEFAULT_TIER = 99;
-    const l = name.split(" ") || [];
-    const index = l.findIndex((w) => w.toLowerCase() === "tier");
-    if (index < 0) return DEFAULT_TIER;
-    const number = l[index + 1];
-    const n = Number(number || DEFAULT_TIER);
-    return Number.isNaN(n) ? DEFAULT_TIER : n;
-  }
-  static getType(name) {
-    const [identity = ""] = name.split(" ") || [];
-    const lc = identity.toLowerCase();
-    if (lc === "farm") return "farm";
-    if (lc === "trade") return "trade";
-    if (lc === "restaking") return "restaking";
-    return "universal";
+  isForbidden(token) {
+    return !!this.forbiddenTokens[token];
   }
 }
 class ChartsCreditManagerData {
@@ -145,7 +131,6 @@ class ChartsCreditManagerData {
   pool;
   version;
   name;
-  tier;
   borrowRate;
   borrowRateOld;
   borrowRateChange;
@@ -190,7 +175,6 @@ class ChartsCreditManagerData {
     this.pool = (payload.poolAddress || "").toLowerCase();
     this.version = payload.version || 2;
     this.name = payload.name || "";
-    this.tier = CreditManagerData_Legacy.getTier(payload.name || "");
     this.borrowRate = Number(
       toBigInt(payload.borrowRate || 0) * (toBigInt(payload.feeInterest || 0) + PERCENTAGE_FACTOR) * PERCENTAGE_DECIMALS / RAY
     );

package/dist/esm/sdk/sdk-legacy/core/strategy.js

@@ -5,6 +5,10 @@ class PositionUtils {
     const maxLeverage = PERCENTAGE_FACTOR * LEVERAGE_DECIMALS / (PERCENTAGE_FACTOR - maxThreshold);
     return Number(maxLeverage - LEVERAGE_DECIMALS);
   }
+  // [apy - quotaRate * (1 + feeInterest)] +
+  // [
+  //  apy - baseRateWithFee - quotaRate * (1 + feeInterest)
+  // ] * (leverage - 1)
   static maxAPY({
     apy,
     leverage,

package/dist/esm/zappers/ZappersPlugin.js

@@ -56,7 +56,7 @@ class ZappersPlugin extends SDKConstruct {
     }
     return this.#zappers;
   }
-  stateHuman(raw) {
+  stateHuman(_) {
     return this.zappers.values().flatMap(
       (l) => l.flatMap((z) => ({
         address: z.baseParams.addr,

package/dist/types/adapters/AdaptersPlugin.d.ts

@@ -3,5 +3,5 @@ import { SDKConstruct } from "../sdk/index.js";
 export declare class AdaptersPlugin extends SDKConstruct implements IGearboxSDKPlugin {
     readonly name = "Adapters";
     createContract(data: BaseState): IBaseContract | undefined;
-    stateHuman(raw?: boolean): {};
+    stateHuman(_?: boolean): {};
 }

package/dist/types/sdk/router/RouterV310Contract.d.ts

@@ -368,16 +368,16 @@ export declare class RouterV310Contract extends AbstractRouterContract<abi> impl
      * Implements {@link IRouterContract.findAllSwaps}
      * @deprecated v3.0 legacy method
      */
-    findAllSwaps(props: FindAllSwapsProps): Promise<RouterResult[]>;
+    findAllSwaps(_: FindAllSwapsProps): Promise<RouterResult[]>;
     /**
      * Implements {@link IRouterContract.getAvailableConnectors}
      * @deprecated v3.0 legacy method
      */
-    getAvailableConnectors(collateralTokens: Address[]): Address[];
+    getAvailableConnectors(_: Address[]): Address[];
     /**
      * Implements {@link IRouterContract.getFindClosePathInput}
      * @deprecated v3.0 legacy method
      */
-    getFindClosePathInput(ca: RouterCASlice, cm: RouterCMSlice, balances?: Leftovers): FindClosePathInput;
+    getFindClosePathInput(_: RouterCASlice, __: RouterCMSlice, ___?: Leftovers): FindClosePathInput;
 }
 export {};

package/dist/types/sdk/sdk-legacy/core/creditManager.d.ts

@@ -1,9 +1,7 @@
 import type { Address } from "viem";
 import type { ChartsCreditManagerPayload, CreditManagerDataPayload, QuotaInfo } from "../payload/creditManager.js";
-export type CreditManagerType = "universal" | "trade" | "farm" | "restaking";
 export declare class CreditManagerData_Legacy {
     readonly address: Address;
-    readonly type: CreditManagerType;
     readonly underlyingToken: Address;
     readonly pool: Address;
     readonly creditFacade: Address;
@@ -16,7 +14,6 @@ export declare class CreditManagerData_Legacy {
     readonly isBorrowingForbidden: boolean;
     readonly maxEnabledTokensLength: number;
     readonly name: string;
-    readonly tier: number;
     readonly marketConfigurator: Address;
     readonly baseBorrowRate: number;
     readonly minDebt: bigint;
@@ -32,14 +29,14 @@ export declare class CreditManagerData_Legacy {
     readonly collateralTokens: Array<Address>;
     readonly supportedTokens: Record<Address, true>;
     readonly usableTokens: Record<Address, true>;
+    readonly forbiddenTokens: Record<Address, true>;
     readonly adapters: Record<Address, CreditManagerDataPayload["adapters"][1]>;
     readonly contractsByAdapter: Record<Address, Address>;
     readonly liquidationThresholds: Record<Address, bigint>;
     readonly quotas: Record<Address, QuotaInfo>;
     constructor(payload: CreditManagerDataPayload);
     isQuoted(token: Address): boolean;
-    static getTier(name: string): number;
-    static getType(name: string): CreditManagerType;
+    isForbidden(token: Address): boolean;
 }
 export declare class ChartsCreditManagerData {
     readonly address: Address;
@@ -49,7 +46,6 @@ export declare class ChartsCreditManagerData {
     readonly pool: Address;
     readonly version: number;
     readonly name: string;
-    readonly tier: number;
     readonly borrowRate: number;
     readonly borrowRateOld: number;
     readonly borrowRateChange: number;

package/dist/types/zappers/ZappersPlugin.d.ts

@@ -6,5 +6,5 @@ export declare class ZappersPlugin extends SDKConstruct implements IGearboxSDKPl
     attach(): Promise<void>;
     loadZappers(): Promise<void>;
     get zappers(): AddressMap<ZapperDataFull[]>;
-    stateHuman(raw?: boolean): ZapperStateHuman[];
+    stateHuman(_?: boolean): ZapperStateHuman[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-vfour.344",
+  "version": "3.0.0-vfour.346",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",