@gearbox-protocol/sdk 8.24.6 → 8.24.8

package/dist/cjs/sdk/market/oracle/PriceOracleBaseContract.js

@@ -120,7 +120,10 @@ class PriceOracleBaseContract extends import_base.BaseContract {
       const { to: priceFeed, callData, description } = tx.raw;
       const [token, reserve] = this.findTokenForPriceFeed(priceFeed);
       if (!token) {
+        const mains = this.mainPriceFeeds.values().map((v) => v.address);
+        const reserves = this.reservePriceFeeds.values().map((v) => v.address);
         this.logger?.debug(
+          { mainPriceFeeds: mains, reservePriceFeeds: reserves },
           `skipping onDemandPriceUpdate ${description}): token not found for price feed ${priceFeed} in oracle ${this.address}`
         );
         continue;
@@ -319,12 +322,12 @@ class PriceOracleBaseContract extends import_base.BaseContract {
    */
   findTokenForPriceFeed(priceFeed) {
     for (const [token, pf] of this.mainPriceFeeds.entries()) {
-      if (pf.address === priceFeed) {
+      if ((0, import_utils.hexEq)(pf.address, priceFeed)) {
         return [token, false];
       }
     }
     for (const [token, pf] of this.reservePriceFeeds.entries()) {
-      if (pf.address === priceFeed) {
+      if ((0, import_utils.hexEq)(pf.address, priceFeed)) {
         return [token, true];
       }
     }

package/dist/cjs/sdk/sdk-legacy/gearboxRewards/extraAPY.js

@@ -28,7 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var extraAPY_exports = {};
 __export(extraAPY_exports, {
-  GearboxRewardsExtraApy: () => GearboxRewardsExtraApy
+  GearboxRewardsExtraApy: () => GearboxRewardsExtraApy,
+  getKeyForPoolPointsInfo: () => getKeyForPoolPointsInfo
 });
 module.exports = __toCommonJS(extraAPY_exports);
 var import_axios = __toESM(require("axios"));
@@ -37,6 +38,18 @@ var import_constants = require("../../constants/index.js");
 var import_endpoint = require("../core/endpoint.js");
 var import_formatter = require("../utils/formatter.js");
 var import_math = require("../utils/math.js");
+function getKeyForPoolPointsInfo(i) {
+  return [
+    i.pool,
+    i.token,
+    i.symbol,
+    i.duration,
+    i.name,
+    i.type,
+    i.estimation,
+    i.condition
+  ].join("-");
+}
 class GearboxRewardsExtraApy {
   static async getTotalTokensOnProtocol({
     tokensToCheck,
@@ -76,7 +89,7 @@ class GearboxRewardsExtraApy {
     tokensList
   }) {
     const r = pools.reduce((acc, p) => {
-      const pointsInfo = Object.values(poolRewards[p.address] || {});
+      const pointsInfo = poolRewards[p.address] || [];
       const poolPointsList = pointsInfo.reduce(
         (acc2, pointsInfo2) => {
           const { address: tokenAddress } = tokensList[pointsInfo2.token];
@@ -88,7 +101,11 @@ class GearboxRewardsExtraApy {
             pointsInfo2
           );
           if (points !== null) {
-            acc2.push({ balance: points, token: tokenAddress });
+            acc2.push({
+              key: getKeyForPoolPointsInfo(pointsInfo2),
+              info: pointsInfo2,
+              points
+            });
           }
           return acc2;
         },
@@ -100,19 +117,21 @@ class GearboxRewardsExtraApy {
     return r;
   }
   static getPoolTokenPoints(tokenBalanceInPool, pool, tokensList, pointsInfo) {
-    if (!tokenBalanceInPool && pointsInfo.estimation === "relative")
-      return null;
     if (pool.expectedLiquidity <= 0) return 0n;
+    if (pointsInfo.estimation === "relative" && !tokenBalanceInPool)
+      return null;
     const { decimals = 18 } = tokensList[pointsInfo.token] || {};
     const targetFactor = 10n ** BigInt(decimals);
+    const defaultPoints = pointsInfo.amount * targetFactor / import_constants.PERCENTAGE_FACTOR;
+    if (pointsInfo.estimation === "absolute") return defaultPoints;
     const { decimals: underlyingDecimals = 18 } = tokensList[pool.underlyingToken] || {};
     const underlyingFactor = 10n ** BigInt(underlyingDecimals);
-    const defaultPoints = pointsInfo.amount * targetFactor / import_constants.PERCENTAGE_FACTOR;
-    const points = pointsInfo.estimation === "absolute" ? defaultPoints : (tokenBalanceInPool?.balance || 0n) * defaultPoints / (pool.expectedLiquidity * targetFactor / underlyingFactor);
+    const points = (tokenBalanceInPool?.balance || 0n) * defaultPoints / (pool.expectedLiquidity * targetFactor / underlyingFactor);
     return import_math.BigIntMath.min(points, defaultPoints);
   }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  GearboxRewardsExtraApy
+  GearboxRewardsExtraApy,
+  getKeyForPoolPointsInfo
 });

package/dist/esm/sdk/market/oracle/PriceOracleBaseContract.js

@@ -8,7 +8,7 @@ import {
   isV300,
   VERSION_RANGE_310
 } from "../../constants/index.js";
-import { AddressMap, formatBN } from "../../utils/index.js";
+import { AddressMap, formatBN, hexEq } from "../../utils/index.js";
 import { PriceFeedRef } from "../pricefeeds/index.js";
 import PriceFeedAnswerMap from "./PriceFeedAnswerMap.js";
 const ZERO_PRICE_FEED = stringToHex("PRICE_FEED::ZERO", { size: 32 });
@@ -91,7 +91,10 @@ class PriceOracleBaseContract extends BaseContract {
       const { to: priceFeed, callData, description } = tx.raw;
       const [token, reserve] = this.findTokenForPriceFeed(priceFeed);
       if (!token) {
+        const mains = this.mainPriceFeeds.values().map((v) => v.address);
+        const reserves = this.reservePriceFeeds.values().map((v) => v.address);
         this.logger?.debug(
+          { mainPriceFeeds: mains, reservePriceFeeds: reserves },
           `skipping onDemandPriceUpdate ${description}): token not found for price feed ${priceFeed} in oracle ${this.address}`
         );
         continue;
@@ -290,12 +293,12 @@ class PriceOracleBaseContract extends BaseContract {
    */
   findTokenForPriceFeed(priceFeed) {
     for (const [token, pf] of this.mainPriceFeeds.entries()) {
-      if (pf.address === priceFeed) {
+      if (hexEq(pf.address, priceFeed)) {
         return [token, false];
       }
     }
     for (const [token, pf] of this.reservePriceFeeds.entries()) {
-      if (pf.address === priceFeed) {
+      if (hexEq(pf.address, priceFeed)) {
         return [token, true];
       }
     }

package/dist/esm/sdk/sdk-legacy/gearboxRewards/extraAPY.js

@@ -4,6 +4,18 @@ import { PERCENTAGE_FACTOR } from "../../constants/index.js";
 import { GearboxBackendApi } from "../core/endpoint.js";
 import { toBN } from "../utils/formatter.js";
 import { BigIntMath } from "../utils/math.js";
+function getKeyForPoolPointsInfo(i) {
+  return [
+    i.pool,
+    i.token,
+    i.symbol,
+    i.duration,
+    i.name,
+    i.type,
+    i.estimation,
+    i.condition
+  ].join("-");
+}
 class GearboxRewardsExtraApy {
   static async getTotalTokensOnProtocol({
     tokensToCheck,
@@ -43,7 +55,7 @@ class GearboxRewardsExtraApy {
     tokensList
   }) {
     const r = pools.reduce((acc, p) => {
-      const pointsInfo = Object.values(poolRewards[p.address] || {});
+      const pointsInfo = poolRewards[p.address] || [];
       const poolPointsList = pointsInfo.reduce(
         (acc2, pointsInfo2) => {
           const { address: tokenAddress } = tokensList[pointsInfo2.token];
@@ -55,7 +67,11 @@ class GearboxRewardsExtraApy {
             pointsInfo2
           );
           if (points !== null) {
-            acc2.push({ balance: points, token: tokenAddress });
+            acc2.push({
+              key: getKeyForPoolPointsInfo(pointsInfo2),
+              info: pointsInfo2,
+              points
+            });
           }
           return acc2;
         },
@@ -67,18 +83,20 @@ class GearboxRewardsExtraApy {
     return r;
   }
   static getPoolTokenPoints(tokenBalanceInPool, pool, tokensList, pointsInfo) {
-    if (!tokenBalanceInPool && pointsInfo.estimation === "relative")
-      return null;
     if (pool.expectedLiquidity <= 0) return 0n;
+    if (pointsInfo.estimation === "relative" && !tokenBalanceInPool)
+      return null;
     const { decimals = 18 } = tokensList[pointsInfo.token] || {};
     const targetFactor = 10n ** BigInt(decimals);
+    const defaultPoints = pointsInfo.amount * targetFactor / PERCENTAGE_FACTOR;
+    if (pointsInfo.estimation === "absolute") return defaultPoints;
     const { decimals: underlyingDecimals = 18 } = tokensList[pool.underlyingToken] || {};
     const underlyingFactor = 10n ** BigInt(underlyingDecimals);
-    const defaultPoints = pointsInfo.amount * targetFactor / PERCENTAGE_FACTOR;
-    const points = pointsInfo.estimation === "absolute" ? defaultPoints : (tokenBalanceInPool?.balance || 0n) * defaultPoints / (pool.expectedLiquidity * targetFactor / underlyingFactor);
+    const points = (tokenBalanceInPool?.balance || 0n) * defaultPoints / (pool.expectedLiquidity * targetFactor / underlyingFactor);
     return BigIntMath.min(points, defaultPoints);
   }
 }
 export {
-  GearboxRewardsExtraApy
+  GearboxRewardsExtraApy,
+  getKeyForPoolPointsInfo
 };

package/dist/types/sdk/sdk-legacy/gearboxRewards/extraAPY.d.ts

@@ -16,7 +16,7 @@ export interface PoolPointsInfo {
 }
 type PartialPool = Pick<PoolData_Legacy, "expectedLiquidity" | "underlyingToken" | "address">;
 export interface GetPointsByPoolProps {
-    poolRewards: Record<Address, Record<Address, PoolPointsInfo>>;
+    poolRewards: Record<Address, Array<PoolPointsInfo>>;
     totalTokenBalances: Record<Address, Asset>;
     pools: Array<PartialPool>;
     tokensList: Record<Address, TokenData>;
@@ -26,10 +26,16 @@ export interface GetTotalTokensOnProtocolProps {
     tokensList: Record<Address, TokenData>;
     network: NetworkType;
 }
+export type PoolPointsBase = Record<Address, Array<{
+    key: string;
+    info: PoolPointsInfo;
+    points: bigint;
+}>>;
+export declare function getKeyForPoolPointsInfo(i: PoolPointsInfo): string;
 export declare class GearboxRewardsExtraApy {
     static getTotalTokensOnProtocol({ tokensToCheck, tokensList, network, }: GetTotalTokensOnProtocolProps): Promise<[`0x${string}`, PromiseSettledResult<Asset>][]>;
     private static getTokenTotal;
-    static getPointsByPool({ poolRewards, totalTokenBalances, pools, tokensList, }: GetPointsByPoolProps): Record<`0x${string}`, Asset[]>;
+    static getPointsByPool({ poolRewards, totalTokenBalances, pools, tokensList, }: GetPointsByPoolProps): PoolPointsBase;
     private static getPoolTokenPoints;
 }
 export {};

package/package.json

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