@gearbox-protocol/sdk 14.6.0 → 14.7.0-next.2

package/dist/cjs/common-utils/utils/strategies/index.js

@@ -20,6 +20,7 @@ __reExport(strategies_exports, require("./credit-managers/index.js"), module.exp
 __reExport(strategies_exports, require("./eligibility/index.js"), module.exports);
 __reExport(strategies_exports, require("./leverage/index.js"), module.exports);
 __reExport(strategies_exports, require("./lists/index.js"), module.exports);
+__reExport(strategies_exports, require("./points/index.js"), module.exports);
 __reExport(strategies_exports, require("./sort-strategy-cms-by-availability/index.js"), module.exports);
 __reExport(strategies_exports, require("./strategy-info/index.js"), module.exports);
 __reExport(strategies_exports, require("./strategy-state/index.js"), module.exports);
@@ -32,6 +33,7 @@ __reExport(strategies_exports, require("./types.js"), module.exports);
   ...require("./eligibility/index.js"),
   ...require("./leverage/index.js"),
   ...require("./lists/index.js"),
+  ...require("./points/index.js"),
   ...require("./sort-strategy-cms-by-availability/index.js"),
   ...require("./strategy-info/index.js"),
   ...require("./strategy-state/index.js"),

package/dist/cjs/common-utils/utils/strategies/points/get-complex-points-list.js

@@ -0,0 +1,38 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var get_complex_points_list_exports = {};
+__export(get_complex_points_list_exports, {
+  getComplexPointsList: () => getComplexPointsList
+});
+module.exports = __toCommonJS(get_complex_points_list_exports);
+var import_mappers = require("../../../../sdk/utils/mappers.js");
+function getComplexPointsList(baseList, extraList, pool) {
+  if (!pool) return baseList;
+  const poolExtra = extraList?.[pool];
+  if (!poolExtra) return baseList;
+  const baseCopy = { ...baseList };
+  import_mappers.TypedObjectUtils.entries(poolExtra).forEach(([token, extra]) => {
+    baseCopy[token] = extra;
+  });
+  return baseCopy;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getComplexPointsList
+});

package/dist/cjs/common-utils/utils/strategies/points/get-points-info.js

@@ -0,0 +1,43 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var get_points_info_exports = {};
+__export(get_points_info_exports, {
+  getPointsInfo: () => getPointsInfo
+});
+module.exports = __toCommonJS(get_points_info_exports);
+function getPointsInfo({
+  chainId,
+  pointsList,
+  token,
+  creditManagers
+}) {
+  if (chainId === void 0 || !pointsList || !token) return void 0;
+  const info = pointsList[token];
+  const r = info ? {
+    ...info,
+    debtRewards: creditManagers ? info.debtRewards?.filter(
+      (r2) => r2.cm === "any" || creditManagers[r2.cm]
+    ) : info.debtRewards
+  } : info;
+  return r;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getPointsInfo
+});

package/dist/cjs/common-utils/utils/strategies/points/get-points-rates.js

@@ -0,0 +1,33 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var get_points_rates_exports = {};
+__export(get_points_rates_exports, {
+  getPointsRates: () => getPointsRates
+});
+module.exports = __toCommonJS(get_points_rates_exports);
+var import_math = require("../../../../sdk/constants/math.js");
+function getPointsRates(rewards, leverage) {
+  return rewards.map(
+    (r) => r.multiplier === "soon" ? r.multiplier : leverage * r.multiplier / import_math.LEVERAGE_DECIMALS
+  );
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getPointsRates
+});

package/dist/cjs/common-utils/utils/strategies/points/get-strategy-points.js

@@ -0,0 +1,81 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var get_strategy_points_exports = {};
+__export(get_strategy_points_exports, {
+  getStrategyPoints: () => getStrategyPoints
+});
+module.exports = __toCommonJS(get_strategy_points_exports);
+var import_leverage = require("../leverage/index.js");
+var import_types = require("../types.js");
+var import_get_complex_points_list = require("./get-complex-points-list.js");
+var import_get_points_info = require("./get-points-info.js");
+var import_get_points_rates = require("./get-points-rates.js");
+const EMPTY_CHAIN_ID = 0;
+const EMPTY_ARRAY = [];
+function getStrategyPoints({
+  strategy,
+  info,
+  strategyCreditManagers,
+  apyListByNetwork
+}) {
+  const { maxLeverage = 0n, minCreditManager } = info || {};
+  const chainId = strategy.chainId;
+  const apySnapshotForChain = apyListByNetwork?.[chainId || EMPTY_CHAIN_ID];
+  const cmPointsList = (0, import_get_complex_points_list.getComplexPointsList)(
+    apySnapshotForChain?.pointsList,
+    apySnapshotForChain?.extraCollateralPointsList,
+    minCreditManager?.pool ?? import_types.EMPTY_ADDRESS
+  );
+  const pointsInfo = (0, import_get_points_info.getPointsInfo)({
+    chainId,
+    pointsList: cmPointsList,
+    token: strategy.tokenOutAddress,
+    creditManagers: minCreditManager ? { [minCreditManager.address]: minCreditManager } : void 0
+  });
+  const debtPointsList = (0, import_get_complex_points_list.getComplexPointsList)(
+    apySnapshotForChain?.pointsList,
+    apySnapshotForChain?.extraCollateralPointsList,
+    import_types.EMPTY_ADDRESS
+  );
+  const pointsInfoDebt = (0, import_get_points_info.getPointsInfo)({
+    chainId,
+    pointsList: debtPointsList,
+    token: strategy.tokenOutAddress,
+    creditManagers: strategyCreditManagers
+  });
+  const { rewards = EMPTY_ARRAY } = pointsInfo || {};
+  const { debtRewards = EMPTY_ARRAY } = pointsInfoDebt || {};
+  const rewardRates = (0, import_get_points_rates.getPointsRates)(rewards, BigInt(maxLeverage));
+  const debtRewardRates = (0, import_get_points_rates.getPointsRates)(
+    debtRewards,
+    (0, import_leverage.getFactorFromLeverage)(maxLeverage)
+  );
+  return {
+    pointsInfo,
+    pointsInfoDebt,
+    rewards,
+    debtRewards,
+    rewardRates,
+    debtRewardRates
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getStrategyPoints
+});

package/dist/cjs/common-utils/utils/strategies/points/index.js

@@ -0,0 +1,28 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var points_exports = {};
+module.exports = __toCommonJS(points_exports);
+__reExport(points_exports, require("./get-complex-points-list.js"), module.exports);
+__reExport(points_exports, require("./get-points-info.js"), module.exports);
+__reExport(points_exports, require("./get-points-rates.js"), module.exports);
+__reExport(points_exports, require("./get-strategy-points.js"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./get-complex-points-list.js"),
+  ...require("./get-points-info.js"),
+  ...require("./get-points-rates.js"),
+  ...require("./get-strategy-points.js")
+});

package/dist/cjs/common-utils/utils/strategies/strategy-info/get-strategy-info-core.js

@@ -21,6 +21,7 @@ __export(get_strategy_info_core_exports, {
   getStrategyInfoCore: () => getStrategyInfoCore
 });
 module.exports = __toCommonJS(get_strategy_info_core_exports);
+var import__ = require("../../index.js");
 var import_price_math = require("../../price-math.js");
 var import_leverage = require("../leverage/index.js");
 var import_sort_strategy_cms_by_availability = require("../sort-strategy-cms-by-availability/index.js");
@@ -65,8 +66,8 @@ function getStrategyInfoCore({
     bonusAPY,
     totalMaxApy = 0,
     maxLeverage = 0n,
-    baseBorrowRate = 0,
-    quotaRateMin = 0n
+    effectiveBaseRate = 0,
+    effectiveQuotaRate = 0n
   } = (0, import_get_strategy_max_apy.getStrategyMaxAPY)(
     targetTokenAddress,
     minCreditManager,
@@ -86,14 +87,25 @@ function getStrategyInfoCore({
     availableToBorrow,
     underlyingDecimals
   );
-  const r = BigInt(baseBorrowRate) * (0, import_leverage.getFactorFromLeverage)(maxLeverage) / maxLeverage;
-  const qr = quotaRateMin;
+  const r = BigInt(effectiveBaseRate) * (0, import_leverage.getFactorFromLeverage)(maxLeverage) / maxLeverage;
+  const qr = effectiveQuotaRate;
   const totalBorrowRate = Number(r + qr);
+  const baseQuotaRateWithFee = (0, import__.getSingleQuotaBorrowRate)({
+    quotaRates: minCreditManager?.quotas || {},
+    feeInterest: minCreditManager?.feeInterest || 0,
+    quotas: {
+      [targetTokenAddress]: {
+        token: targetTokenAddress,
+        balance: 1n
+      }
+    }
+  });
   return {
     maxLeverage,
     maxAPY: totalMaxApy,
     bonusAPY,
     totalBorrowRate,
+    baseQuotaRateWithFee,
     availableToBorrowMoney,
     minCreditManager
   };

package/dist/cjs/common-utils/utils/strategies/strategy-info/get-strategy-max-apy.js

@@ -35,27 +35,21 @@ function getStrategyMaxAPY(targetToken, cm, apyListByNetwork, slippage, quotaRes
     apyListByNetwork?.[cm.chainId]?.extraCollateralAPYList,
     cm.pool
   );
-  const baseRateWithFee = (0, import_calculate_effective_borrow_rate.calculateEffectiveBorrowRate)({
+  const effectiveBaseRate = (0, import_calculate_effective_borrow_rate.calculateEffectiveBorrowRate)({
     underlyingTokenAddress: cm.underlyingToken,
     baseRateWithFee: cm.baseBorrowRate,
     apyList: apyRecord
   });
   const lt = cm.liquidationThresholds[targetToken] || 0n;
   const feeInterest = cm.feeInterest;
-  const tokenQuota = cm.quotas[targetToken] || {
-    token: targetToken,
-    rate: 0n,
-    quotaIncreaseFee: 0n,
-    totalQuoted: 0n,
-    limit: 0n,
-    isActive: true
-  };
+  const tokenQuota = cm.quotas[targetToken];
   const qRate = (tokenQuota?.rate || 0n) * lt / import_sdk.PERCENTAGE_FACTOR;
   const qRate_reserve = qRate * (import_sdk.PERCENTAGE_FACTOR + (0, import_sdk.toBigInt)(quotaReserve)) / import_sdk.PERCENTAGE_FACTOR;
-  const quotaRateWithFee = (0, import_get_single_quota_borrow_rate.getSingleQuotaBorrowRate)({
+  const effectiveQuotaRate = (0, import_get_single_quota_borrow_rate.getSingleQuotaBorrowRate)({
     quotaRates: {
       [targetToken]: {
         ...tokenQuota,
+        isActive: tokenQuota?.isActive ?? true,
         rate: qRate_reserve
       }
     },
@@ -79,20 +73,20 @@ function getStrategyMaxAPY(targetToken, cm, apyListByNetwork, slippage, quotaRes
   const maxAPY = apyRecord ? (0, import_max_apy_formula.maxAPYFormula)({
     apy,
     leverage,
-    baseRateWithFee,
-    quotaRateWithFee: Number(quotaRateWithFee)
+    baseRateWithFee: effectiveBaseRate,
+    quotaRateWithFee: Number(effectiveQuotaRate)
   }) : void 0;
   const bonusAPY = import_bonus_apy_from_points.BONUS_APY_FROM_POINTS[targetToken];
   const bonusAPYTotal = BigInt(bonusAPY?.value || 0) * leverage / import_sdk.LEVERAGE_DECIMALS;
   const totalMaxApy = (maxAPY || 0) + Number(bonusAPYTotal);
-  const totalBorrowRate = baseRateWithFee + Number(quotaRateWithFee);
+  const totalBorrowRate = effectiveBaseRate + Number(effectiveQuotaRate);
   return {
     totalMaxApy,
     bonusAPY,
     maxAPY: maxAPY || 0,
     maxLeverage: leverage,
-    quotaRateMin: quotaRateWithFee,
-    baseBorrowRate: baseRateWithFee,
+    effectiveBaseRate,
+    effectiveQuotaRate,
     totalBorrowRate
   };
 }

package/dist/cjs/common-utils/utils/strategies/types/index.js

@@ -20,6 +20,7 @@ __reExport(types_exports, require("./constants.js"), module.exports);
 __reExport(types_exports, require("./credit-manager-data-legacy.js"), module.exports);
 __reExport(types_exports, require("./curator-filter.js"), module.exports);
 __reExport(types_exports, require("./legacy-strategy-data-source.js"), module.exports);
+__reExport(types_exports, require("./points-slices.js"), module.exports);
 __reExport(types_exports, require("./sdk-state.js"), module.exports);
 __reExport(types_exports, require("./strategies-cm-list.js"), module.exports);
 __reExport(types_exports, require("./strategy.js"), module.exports);
@@ -32,6 +33,7 @@ __reExport(types_exports, require("./targetable.js"), module.exports);
   ...require("./credit-manager-data-legacy.js"),
   ...require("./curator-filter.js"),
   ...require("./legacy-strategy-data-source.js"),
+  ...require("./points-slices.js"),
   ...require("./sdk-state.js"),
   ...require("./strategies-cm-list.js"),
   ...require("./strategy.js"),

package/dist/cjs/common-utils/utils/strategies/types/points-slices.js

@@ -0,0 +1,16 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var points_slices_exports = {};
+module.exports = __toCommonJS(points_slices_exports);

package/dist/esm/common-utils/utils/strategies/index.js

@@ -3,6 +3,7 @@ export * from "./credit-managers/index.js";
 export * from "./eligibility/index.js";
 export * from "./leverage/index.js";
 export * from "./lists/index.js";
+export * from "./points/index.js";
 export * from "./sort-strategy-cms-by-availability/index.js";
 export * from "./strategy-info/index.js";
 export * from "./strategy-state/index.js";

package/dist/esm/common-utils/utils/strategies/points/get-complex-points-list.js

@@ -0,0 +1,14 @@
+import { TypedObjectUtils } from "../../../../sdk/utils/mappers.js";
+function getComplexPointsList(baseList, extraList, pool) {
+  if (!pool) return baseList;
+  const poolExtra = extraList?.[pool];
+  if (!poolExtra) return baseList;
+  const baseCopy = { ...baseList };
+  TypedObjectUtils.entries(poolExtra).forEach(([token, extra]) => {
+    baseCopy[token] = extra;
+  });
+  return baseCopy;
+}
+export {
+  getComplexPointsList
+};

package/dist/esm/common-utils/utils/strategies/points/get-points-info.js

@@ -0,0 +1,19 @@
+function getPointsInfo({
+  chainId,
+  pointsList,
+  token,
+  creditManagers
+}) {
+  if (chainId === void 0 || !pointsList || !token) return void 0;
+  const info = pointsList[token];
+  const r = info ? {
+    ...info,
+    debtRewards: creditManagers ? info.debtRewards?.filter(
+      (r2) => r2.cm === "any" || creditManagers[r2.cm]
+    ) : info.debtRewards
+  } : info;
+  return r;
+}
+export {
+  getPointsInfo
+};

package/dist/esm/common-utils/utils/strategies/points/get-points-rates.js

@@ -0,0 +1,9 @@
+import { LEVERAGE_DECIMALS } from "../../../../sdk/constants/math.js";
+function getPointsRates(rewards, leverage) {
+  return rewards.map(
+    (r) => r.multiplier === "soon" ? r.multiplier : leverage * r.multiplier / LEVERAGE_DECIMALS
+  );
+}
+export {
+  getPointsRates
+};

package/dist/esm/common-utils/utils/strategies/points/get-strategy-points.js

@@ -0,0 +1,57 @@
+import { getFactorFromLeverage } from "../leverage/index.js";
+import { EMPTY_ADDRESS } from "../types.js";
+import { getComplexPointsList } from "./get-complex-points-list.js";
+import { getPointsInfo } from "./get-points-info.js";
+import { getPointsRates } from "./get-points-rates.js";
+const EMPTY_CHAIN_ID = 0;
+const EMPTY_ARRAY = [];
+function getStrategyPoints({
+  strategy,
+  info,
+  strategyCreditManagers,
+  apyListByNetwork
+}) {
+  const { maxLeverage = 0n, minCreditManager } = info || {};
+  const chainId = strategy.chainId;
+  const apySnapshotForChain = apyListByNetwork?.[chainId || EMPTY_CHAIN_ID];
+  const cmPointsList = getComplexPointsList(
+    apySnapshotForChain?.pointsList,
+    apySnapshotForChain?.extraCollateralPointsList,
+    minCreditManager?.pool ?? EMPTY_ADDRESS
+  );
+  const pointsInfo = getPointsInfo({
+    chainId,
+    pointsList: cmPointsList,
+    token: strategy.tokenOutAddress,
+    creditManagers: minCreditManager ? { [minCreditManager.address]: minCreditManager } : void 0
+  });
+  const debtPointsList = getComplexPointsList(
+    apySnapshotForChain?.pointsList,
+    apySnapshotForChain?.extraCollateralPointsList,
+    EMPTY_ADDRESS
+  );
+  const pointsInfoDebt = getPointsInfo({
+    chainId,
+    pointsList: debtPointsList,
+    token: strategy.tokenOutAddress,
+    creditManagers: strategyCreditManagers
+  });
+  const { rewards = EMPTY_ARRAY } = pointsInfo || {};
+  const { debtRewards = EMPTY_ARRAY } = pointsInfoDebt || {};
+  const rewardRates = getPointsRates(rewards, BigInt(maxLeverage));
+  const debtRewardRates = getPointsRates(
+    debtRewards,
+    getFactorFromLeverage(maxLeverage)
+  );
+  return {
+    pointsInfo,
+    pointsInfoDebt,
+    rewards,
+    debtRewards,
+    rewardRates,
+    debtRewardRates
+  };
+}
+export {
+  getStrategyPoints
+};

package/dist/esm/common-utils/utils/strategies/points/index.js

@@ -0,0 +1,4 @@
+export * from "./get-complex-points-list.js";
+export * from "./get-points-info.js";
+export * from "./get-points-rates.js";
+export * from "./get-strategy-points.js";

package/dist/esm/common-utils/utils/strategies/strategy-info/get-strategy-info-core.js

@@ -1,3 +1,4 @@
+import { getSingleQuotaBorrowRate } from "../../index.js";
 import { PriceUtils } from "../../price-math.js";
 import { getFactorFromLeverage } from "../leverage/index.js";
 import { sortStrategyCMsByAvailability } from "../sort-strategy-cms-by-availability/index.js";
@@ -42,8 +43,8 @@ function getStrategyInfoCore({
     bonusAPY,
     totalMaxApy = 0,
     maxLeverage = 0n,
-    baseBorrowRate = 0,
-    quotaRateMin = 0n
+    effectiveBaseRate = 0,
+    effectiveQuotaRate = 0n
   } = getStrategyMaxAPY(
     targetTokenAddress,
     minCreditManager,
@@ -63,14 +64,25 @@ function getStrategyInfoCore({
     availableToBorrow,
     underlyingDecimals
   );
-  const r = BigInt(baseBorrowRate) * getFactorFromLeverage(maxLeverage) / maxLeverage;
-  const qr = quotaRateMin;
+  const r = BigInt(effectiveBaseRate) * getFactorFromLeverage(maxLeverage) / maxLeverage;
+  const qr = effectiveQuotaRate;
   const totalBorrowRate = Number(r + qr);
+  const baseQuotaRateWithFee = getSingleQuotaBorrowRate({
+    quotaRates: minCreditManager?.quotas || {},
+    feeInterest: minCreditManager?.feeInterest || 0,
+    quotas: {
+      [targetTokenAddress]: {
+        token: targetTokenAddress,
+        balance: 1n
+      }
+    }
+  });
   return {
     maxLeverage,
     maxAPY: totalMaxApy,
     bonusAPY,
     totalBorrowRate,
+    baseQuotaRateWithFee,
     availableToBorrowMoney,
     minCreditManager
   };

package/dist/esm/common-utils/utils/strategies/strategy-info/get-strategy-max-apy.js

@@ -19,27 +19,21 @@ function getStrategyMaxAPY(targetToken, cm, apyListByNetwork, slippage, quotaRes
     apyListByNetwork?.[cm.chainId]?.extraCollateralAPYList,
     cm.pool
   );
-  const baseRateWithFee = calculateEffectiveBorrowRate({
+  const effectiveBaseRate = calculateEffectiveBorrowRate({
     underlyingTokenAddress: cm.underlyingToken,
     baseRateWithFee: cm.baseBorrowRate,
     apyList: apyRecord
   });
   const lt = cm.liquidationThresholds[targetToken] || 0n;
   const feeInterest = cm.feeInterest;
-  const tokenQuota = cm.quotas[targetToken] || {
-    token: targetToken,
-    rate: 0n,
-    quotaIncreaseFee: 0n,
-    totalQuoted: 0n,
-    limit: 0n,
-    isActive: true
-  };
+  const tokenQuota = cm.quotas[targetToken];
   const qRate = (tokenQuota?.rate || 0n) * lt / PERCENTAGE_FACTOR;
   const qRate_reserve = qRate * (PERCENTAGE_FACTOR + toBigInt(quotaReserve)) / PERCENTAGE_FACTOR;
-  const quotaRateWithFee = getSingleQuotaBorrowRate({
+  const effectiveQuotaRate = getSingleQuotaBorrowRate({
     quotaRates: {
       [targetToken]: {
         ...tokenQuota,
+        isActive: tokenQuota?.isActive ?? true,
         rate: qRate_reserve
       }
     },
@@ -63,20 +57,20 @@ function getStrategyMaxAPY(targetToken, cm, apyListByNetwork, slippage, quotaRes
   const maxAPY = apyRecord ? maxAPYFormula({
     apy,
     leverage,
-    baseRateWithFee,
-    quotaRateWithFee: Number(quotaRateWithFee)
+    baseRateWithFee: effectiveBaseRate,
+    quotaRateWithFee: Number(effectiveQuotaRate)
   }) : void 0;
   const bonusAPY = BONUS_APY_FROM_POINTS[targetToken];
   const bonusAPYTotal = BigInt(bonusAPY?.value || 0) * leverage / LEVERAGE_DECIMALS;
   const totalMaxApy = (maxAPY || 0) + Number(bonusAPYTotal);
-  const totalBorrowRate = baseRateWithFee + Number(quotaRateWithFee);
+  const totalBorrowRate = effectiveBaseRate + Number(effectiveQuotaRate);
   return {
     totalMaxApy,
     bonusAPY,
     maxAPY: maxAPY || 0,
     maxLeverage: leverage,
-    quotaRateMin: quotaRateWithFee,
-    baseBorrowRate: baseRateWithFee,
+    effectiveBaseRate,
+    effectiveQuotaRate,
     totalBorrowRate
   };
 }

package/dist/esm/common-utils/utils/strategies/types/index.js

@@ -3,6 +3,7 @@ export * from "./constants.js";
 export * from "./credit-manager-data-legacy.js";
 export * from "./curator-filter.js";
 export * from "./legacy-strategy-data-source.js";
+export * from "./points-slices.js";
 export * from "./sdk-state.js";
 export * from "./strategies-cm-list.js";
 export * from "./strategy.js";

package/dist/types/common-utils/utils/creditAccount/calc-quota-borrow-rate.d.ts

@@ -3,7 +3,7 @@ import type { Asset } from "../../../sdk/index.js";
 import type { QuotaInfoSlice } from "./types.js";
 export interface CalcQuotaBorrowRateProps {
     quotas: Record<Address, Asset>;
-    quotaRates: Record<Address, QuotaInfoSlice>;
+    quotaRates: Record<Address, QuotaInfoSlice | undefined>;
 }
 /**
  * Aggregates weighted quota borrow rate exposure across active quotas.

package/dist/types/common-utils/utils/strategies/index.d.ts

@@ -3,6 +3,7 @@ export * from "./credit-managers/index.js";
 export * from "./eligibility/index.js";
 export * from "./leverage/index.js";
 export * from "./lists/index.js";
+export * from "./points/index.js";
 export * from "./sort-strategy-cms-by-availability/index.js";
 export * from "./strategy-info/index.js";
 export * from "./strategy-state/index.js";

package/dist/types/common-utils/utils/strategies/points/get-complex-points-list.d.ts

@@ -0,0 +1,3 @@
+import type { Address } from "viem";
+import type { LocalPointsInfo } from "../types.js";
+export declare function getComplexPointsList<T extends Address | undefined = undefined>(baseList: Record<Address, LocalPointsInfo> | undefined, extraList: Record<Address, Record<Address, LocalPointsInfo>> | undefined, pool: T | undefined): Record<Address, LocalPointsInfo> | undefined;

package/dist/types/common-utils/utils/strategies/points/get-points-info.d.ts

@@ -0,0 +1,8 @@
+import type { Address } from "viem";
+import type { LocalPointsInfo, PointsList, StrategyCreditManagerLike } from "../types.js";
+export declare function getPointsInfo({ chainId, pointsList, token, creditManagers, }: {
+    chainId: number | undefined;
+    pointsList: PointsList | undefined;
+    token: Address | undefined;
+    creditManagers: Record<Address, StrategyCreditManagerLike> | undefined;
+}): LocalPointsInfo | undefined;

package/dist/types/common-utils/utils/strategies/points/get-points-rates.d.ts

@@ -0,0 +1,2 @@
+import type { LocalPointsReward } from "../types.js";
+export declare function getPointsRates(rewards: Array<Pick<LocalPointsReward, "multiplier">>, leverage: bigint): (bigint | "soon")[];

package/dist/types/common-utils/utils/strategies/points/get-strategy-points.d.ts

@@ -0,0 +1,16 @@
+import type { Address } from "viem";
+import type { APYListByNetwork, Strategy, StrategyCreditManagerLike, StrategyInfoLike } from "../types.js";
+export interface GetStrategyPointsProps {
+    readonly strategy: Strategy;
+    readonly info: StrategyInfoLike | undefined;
+    readonly strategyCreditManagers: Record<Address, StrategyCreditManagerLike>;
+    readonly apyListByNetwork: APYListByNetwork | undefined;
+}
+export declare function getStrategyPoints({ strategy, info, strategyCreditManagers, apyListByNetwork, }: GetStrategyPointsProps): {
+    pointsInfo: import("../types.js").LocalPointsInfo | undefined;
+    pointsInfoDebt: import("../types.js").LocalPointsInfo | undefined;
+    rewards: import("../../../../rewards/index.js").PointsReward<string>[];
+    debtRewards: import("../../../../rewards/index.js").DebtReward<string>[];
+    rewardRates: (bigint | "soon")[];
+    debtRewardRates: (bigint | "soon")[];
+};

package/dist/types/common-utils/utils/strategies/points/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./get-complex-points-list.js";
+export * from "./get-points-info.js";
+export * from "./get-points-rates.js";
+export * from "./get-strategy-points.js";

package/dist/types/common-utils/utils/strategies/strategy-info/get-strategy-max-apy.d.ts

@@ -8,8 +8,8 @@ export declare function getStrategyMaxAPY(targetToken: Address, cm: CMForStrateg
     } | undefined;
     maxAPY: number;
     maxLeverage: bigint;
-    quotaRateMin: bigint;
-    baseBorrowRate: number;
+    effectiveBaseRate: number;
+    effectiveQuotaRate: bigint;
     totalBorrowRate: number;
 } | undefined;
 export {};

package/dist/types/common-utils/utils/strategies/strategy-info/types.d.ts

@@ -63,6 +63,7 @@ export interface StrategyInfoResult<CM extends CreditManagerSlice = CreditManage
     totalBorrowRate: number;
     availableToBorrowMoney: bigint;
     minCreditManager: CM;
+    baseQuotaRateWithFee: bigint;
 }
 export interface GetStrategyInfoArgs<ID extends string | number, CM extends CreditManagerSlice> {
     strategy: StrategySlice<ID>;

package/dist/types/common-utils/utils/strategies/types/index.d.ts

@@ -4,6 +4,7 @@ export * from "./constants.js";
 export * from "./credit-manager-data-legacy.js";
 export * from "./curator-filter.js";
 export * from "./legacy-strategy-data-source.js";
+export * from "./points-slices.js";
 export * from "./sdk-state.js";
 export * from "./strategies-cm-list.js";
 export * from "./strategy.js";

package/dist/types/common-utils/utils/strategies/types/points-slices.d.ts

@@ -0,0 +1,20 @@
+import type { Address } from "viem";
+import type { DebtReward, PointsInfo, PointsReward } from "../../../../rewards/index.js";
+export type LocalPointsReward = PointsReward<string>;
+export type LocalDebtReward = DebtReward<string>;
+export type LocalPointsInfo = PointsInfo<string>;
+export type PointsList = Record<Address, LocalPointsInfo>;
+export type BasePointsList = Record<Address, LocalPointsInfo>;
+export type ExtraCollateralPointsList = Record<Address, Record<Address, LocalPointsInfo>>;
+export type APYListByNetwork = Partial<Record<number, {
+    pointsList?: BasePointsList;
+    extraCollateralPointsList?: ExtraCollateralPointsList;
+} | undefined>>;
+export interface StrategyCreditManagerLike {
+    address: Address;
+    pool?: Address | undefined;
+}
+export interface StrategyInfoLike {
+    maxLeverage?: bigint | undefined;
+    minCreditManager?: StrategyCreditManagerLike | undefined;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "14.6.0",
+  "version": "14.7.0-next.2",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",