@gearbox-protocol/sdk 3.0.0-next.249 → 3.0.0-next.250

package/lib/redstone/api.d.ts

@@ -32,7 +32,7 @@ export declare class RedstoneApi {
     static getRedstonePriceFeeds: ({ priceOracleAddress, currentTokenData, provider, network, }: GetRedstoneFeedsProps) => Promise<{
         main: RedstonePriceFeeds;
         reserve: RedstonePriceFeeds;
-        allReserve: Record<`0x${string}`, `0x${string}`>;
+        allReserve: Record<`0x${string}`, `0x${string}`[]>;
     }>;
     private static unwrapSecondStage;
     private static unwrapThirdStage;

package/lib/redstone/api.js

@@ -274,20 +274,29 @@ class RedstoneApi {
         const getReserve = (symbol) => (0, sdk_gov_1.getPriceFeedsByToken)(symbol, network)?.Reserve;
         const mainPFData = this.getRedstonePF_Onchain(st3_NotTrustedMainPF, st4_MainTypeType, st4_MainFeedId, getMain, currentTokenData, false, network);
         const reservePFData = this.getRedstonePF_Onchain(st3_ReservePF, st4_ReserveType, st4_ReserveFeedId, getReserve, currentTokenData, true, network);
+        const allReserve = st3_ReservePF.reduce((acc, [s, pf]) => {
+            const token = currentTokenData[s];
+            if (!acc[token])
+                acc[token] = [];
+            acc[token].push(pf);
+            return acc;
+        }, {});
         return {
             main: mainPFData,
             reserve: reservePFData,
-            allReserve: sdk_gov_1.TypedObjectUtils.fromEntries(st3_ReservePF.map(([s, a]) => [currentTokenData[s], a])),
+            allReserve,
         };
     };
     static unwrapSecondStage(priceFeeds, feedsTypeResponse, priceFeedResponse) {
         const result = priceFeeds.reduce((acc, [symbol, baseAddress], index) => {
             const { error: typeError, result: feedType } = feedsTypeResponse[index];
             const { error: feedError, result: feed } = priceFeedResponse[index];
-            const isPendle = !typeError &&
-                Number(feedType) === sdk_gov_1.PriceFeedType.PENDLE_PT_TWAP_ORACLE;
+            const isRedstone = !typeError && Number(feedType) === sdk_gov_1.PriceFeedType.REDSTONE_ORACLE;
             const hasFeed = !feedError && typeof feed === "string";
-            if (isPendle && hasFeed) {
+            if (isRedstone) {
+                acc.push([symbol, baseAddress]);
+            }
+            else if (hasFeed) {
                 acc.push([symbol, feed]);
             }
             else {
@@ -303,16 +312,21 @@ class RedstoneApi {
             const { error: feed0Error, result: feed0 } = priceFeed0Response[index];
             const { error: feed1Error, result: feed1 } = priceFeed1Response[index];
             const isRedstone = !typeError && Number(feedType) === sdk_gov_1.PriceFeedType.REDSTONE_ORACLE;
+            const hasFeed0 = !feed0Error && typeof feed0 === "string";
+            const hasFeed1 = !feed1Error && typeof feed1 === "string";
             if (isRedstone) {
                 acc.push([symbol, baseAddress]);
             }
-            const hasFeed0 = !feed0Error && typeof feed0 === "string";
-            if (hasFeed0) {
-                acc.push([symbol, feed0]);
+            else if (hasFeed0 || hasFeed1) {
+                if (hasFeed0) {
+                    acc.push([symbol, feed0]);
+                }
+                if (hasFeed1) {
+                    acc.push([symbol, feed1]);
+                }
             }
-            const hasFeed1 = !feed1Error && typeof feed1 === "string";
-            if (hasFeed1) {
-                acc.push([symbol, feed1]);
+            else {
+                acc.push([symbol, baseAddress]);
             }
             return acc;
         }, []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-next.249",
+  "version": "3.0.0-next.250",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -28,7 +28,7 @@
     "test": "npx mocha -r ts-node/register -r dotenv/config 'src/**/*.spec.ts'"
   },
   "dependencies": {
-    "@gearbox-protocol/sdk-gov": "^2.26.1",
+    "@gearbox-protocol/sdk-gov": "^2.27.0",
     "@wagmi/cli": "^2.1.13",
     "axios": "^1.2.6",
     "decimal.js-light": "^2.5.1",
@@ -40,6 +40,7 @@
     "@1inch/solidity-utils": "^2.2.27",
     "@commitlint/cli": "^17.6.3",
     "@commitlint/config-conventional": "^17.0.3",
+    "@gearbox-protocol/bots-v3": "^1.5.1",
     "@gearbox-protocol/core-v2": "1.19.0-base.17",
     "@gearbox-protocol/core-v3": "^1.50.0",
     "@gearbox-protocol/eslint-config": "^1.4.1",
@@ -48,7 +49,6 @@
     "@gearbox-protocol/periphery-v3": "^1.6.1",
     "@gearbox-protocol/prettier-config": "^1.4.1",
     "@gearbox-protocol/router": "^1.5.5",
-    "@gearbox-protocol/bots-v3": "^1.5.1",
     "@gearbox-protocol/router-v3": "^1.37.0",
     "@openzeppelin/contracts": "^4.9.3",
     "@redstone-finance/evm-connector": "^0.5.4",