@gearbox-protocol/sdk 12.6.0-next.3 → 12.6.0-next.4

package/dist/cjs/sdk/market/pricefeeds/updates/fetchPythPayloads.js

@@ -31,7 +31,9 @@ async function fetchPythPayloads(options) {
     ignoreMissingFeeds,
     historicalTimestampSeconds,
     logger,
-    apiProxy
+    apiProxy,
+    customFetch = fetch,
+    returnPrices
   } = options;
   const ids = Array.from(new Set(dataFeedsIds));
   if (ids.length === 0) {
@@ -49,7 +51,7 @@ async function fetchPythPayloads(options) {
   }
   const resp = await (0, import_utils.retry)(
     async () => {
-      const resp2 = await fetch(url.toString());
+      const resp2 = await customFetch(url.toString());
       if (!resp2.ok) {
         const body = await resp2.text();
         throw new Error(
@@ -61,7 +63,7 @@ async function fetchPythPayloads(options) {
     },
     { attempts: 3, exponent: 2, interval: 200 }
   );
-  const result = respToCalldata(resp);
+  const result = respToCalldata(resp, returnPrices);
   if (result.length !== ids.length) {
     if (ignoreMissingFeeds) {
       logger?.warn(`expected ${ids.length} price feeds, got ${result.length}`);
@@ -73,13 +75,23 @@ async function fetchPythPayloads(options) {
   }
   return result;
 }
-function respToCalldata(resp) {
+function respToCalldata(resp, returnPrices) {
   if (resp.binary.data.length === 0) {
     return [];
   }
   const updates = splitAccumulatorUpdates(resp.binary.data[0]);
+  const priceMap = /* @__PURE__ */ new Map();
+  if (returnPrices && resp.parsed) {
+    for (const feed of resp.parsed) {
+      const feedId = feed.id.startsWith("0x") ? feed.id : `0x${feed.id}`;
+      priceMap.set(feedId.toLowerCase(), {
+        price: BigInt(feed.price.price),
+        decimals: Math.abs(feed.price.expo)
+      });
+    }
+  }
   return updates.map(({ data, dataFeedId, timestamp }) => {
-    return {
+    const base = {
       dataFeedId,
       data: (0, import_viem.encodeAbiParameters)(
         [{ type: "uint256" }, { type: "bytes[]" }],
@@ -88,6 +100,18 @@ function respToCalldata(resp) {
       timestamp,
       cached: false
     };
+    if (returnPrices) {
+      const priceInfo = priceMap.get(dataFeedId.toLowerCase());
+      if (!priceInfo) {
+        throw new Error(`Price info not found for feed ${dataFeedId}`);
+      }
+      return {
+        ...base,
+        price: priceInfo.price,
+        decimals: priceInfo.decimals
+      };
+    }
+    return base;
   });
 }
 function splitAccumulatorUpdates(binary) {

package/dist/cjs/sdk/market/pricefeeds/updates/fetchRedstonePayloads.js

@@ -24,8 +24,9 @@ module.exports = __toCommonJS(fetchRedstonePayloads_exports);
 var import_evm_connector = require("@redstone-finance/evm-connector");
 var import_protocol = require("@redstone-finance/protocol");
 var import_sdk = require("@redstone-finance/sdk");
+var import_utils = require("@redstone-finance/utils");
 var import_viem = require("viem");
-var import_utils = require("../../../utils/index.js");
+var import_utils2 = require("../../../utils/index.js");
 async function fetchRedstonePayloads(options) {
   const {
     dataServiceId,
@@ -35,7 +36,8 @@ async function fetchRedstonePayloads(options) {
     gateways,
     ignoreMissingFeeds,
     enableLogging,
-    logger
+    logger,
+    returnPrices
   } = options;
   const metadataTimestampMs = historicalTimestampMs ?? options.metadataTimestampMs;
   const dataPackagesIds = Array.from(new Set(dataFeedsIds));
@@ -57,7 +59,7 @@ async function fetchRedstonePayloads(options) {
   if (metadataTimestampMs) {
     wrapper.setMetadataTimestamp(metadataTimestampMs);
   }
-  const dataPayload = await (0, import_utils.retry)(() => wrapper.prepareRedstonePayload(true), {
+  const dataPayload = await (0, import_utils2.retry)(() => wrapper.prepareRedstonePayload(true), {
     attempts: 5,
     interval: historicalTimestampMs ? 30500 : 250
   });
@@ -88,7 +90,8 @@ async function fetchRedstonePayloads(options) {
       getCalldataWithTimestamp(
         dataFeedId,
         signedDataPackages,
-        wrapper.getUnsignedMetadata()
+        wrapper.getUnsignedMetadata(),
+        returnPrices
       )
     );
   }
@@ -113,7 +116,7 @@ function groupDataPackages(signedDataPackages) {
   }
   return packagesByDataFeedId;
 }
-function getCalldataWithTimestamp(dataFeedId, packages, unsignedMetadata) {
+function getCalldataWithTimestamp(dataFeedId, packages, unsignedMetadata, returnPrices) {
   const originalPayload = import_protocol.RedstonePayload.prepare(packages, unsignedMetadata);
   const originalPayloadLength = originalPayload.length / 2;
   const bytesToAdd = 32 - originalPayloadLength % 32;
@@ -128,7 +131,7 @@ function getCalldataWithTimestamp(dataFeedId, packages, unsignedMetadata) {
       throw new Error("Timestamps are not equal");
     }
   }
-  return {
+  const base = {
     dataFeedId,
     data: (0, import_viem.encodeAbiParameters)(
       [{ type: "uint256" }, { type: "bytes" }],
@@ -137,6 +140,16 @@ function getCalldataWithTimestamp(dataFeedId, packages, unsignedMetadata) {
     timestamp,
     cached: false
   };
+  if (returnPrices) {
+    const prices = packages.flatMap((p) => p.dataPackage.dataPoints).map((dp) => BigInt(`0x${Buffer.from(dp.value).toString("hex")}`));
+    const medianPrice = BigInt(import_utils.MathUtils.getMedianOfBigNumbers(prices));
+    return {
+      ...base,
+      price: medianPrice,
+      decimals: 8
+    };
+  }
+  return base;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/esm/sdk/market/pricefeeds/updates/fetchPythPayloads.js

@@ -12,7 +12,9 @@ async function fetchPythPayloads(options) {
     ignoreMissingFeeds,
     historicalTimestampSeconds,
     logger,
-    apiProxy
+    apiProxy,
+    customFetch = fetch,
+    returnPrices
   } = options;
   const ids = Array.from(new Set(dataFeedsIds));
   if (ids.length === 0) {
@@ -30,7 +32,7 @@ async function fetchPythPayloads(options) {
   }
   const resp = await retry(
     async () => {
-      const resp2 = await fetch(url.toString());
+      const resp2 = await customFetch(url.toString());
       if (!resp2.ok) {
         const body = await resp2.text();
         throw new Error(
@@ -42,7 +44,7 @@ async function fetchPythPayloads(options) {
     },
     { attempts: 3, exponent: 2, interval: 200 }
   );
-  const result = respToCalldata(resp);
+  const result = respToCalldata(resp, returnPrices);
   if (result.length !== ids.length) {
     if (ignoreMissingFeeds) {
       logger?.warn(`expected ${ids.length} price feeds, got ${result.length}`);
@@ -54,13 +56,23 @@ async function fetchPythPayloads(options) {
   }
   return result;
 }
-function respToCalldata(resp) {
+function respToCalldata(resp, returnPrices) {
   if (resp.binary.data.length === 0) {
     return [];
   }
   const updates = splitAccumulatorUpdates(resp.binary.data[0]);
+  const priceMap = /* @__PURE__ */ new Map();
+  if (returnPrices && resp.parsed) {
+    for (const feed of resp.parsed) {
+      const feedId = feed.id.startsWith("0x") ? feed.id : `0x${feed.id}`;
+      priceMap.set(feedId.toLowerCase(), {
+        price: BigInt(feed.price.price),
+        decimals: Math.abs(feed.price.expo)
+      });
+    }
+  }
   return updates.map(({ data, dataFeedId, timestamp }) => {
-    return {
+    const base = {
       dataFeedId,
       data: encodeAbiParameters(
         [{ type: "uint256" }, { type: "bytes[]" }],
@@ -69,6 +81,18 @@ function respToCalldata(resp) {
       timestamp,
       cached: false
     };
+    if (returnPrices) {
+      const priceInfo = priceMap.get(dataFeedId.toLowerCase());
+      if (!priceInfo) {
+        throw new Error(`Price info not found for feed ${dataFeedId}`);
+      }
+      return {
+        ...base,
+        price: priceInfo.price,
+        decimals: priceInfo.decimals
+      };
+    }
+    return base;
   });
 }
 function splitAccumulatorUpdates(binary) {

package/dist/esm/sdk/market/pricefeeds/updates/fetchRedstonePayloads.js

@@ -5,6 +5,7 @@ import {
 import {
   getSignersForDataServiceId
 } from "@redstone-finance/sdk";
+import { MathUtils } from "@redstone-finance/utils";
 import { encodeAbiParameters, toBytes } from "viem";
 import { retry } from "../../../utils/index.js";
 async function fetchRedstonePayloads(options) {
@@ -16,7 +17,8 @@ async function fetchRedstonePayloads(options) {
     gateways,
     ignoreMissingFeeds,
     enableLogging,
-    logger
+    logger,
+    returnPrices
   } = options;
   const metadataTimestampMs = historicalTimestampMs ?? options.metadataTimestampMs;
   const dataPackagesIds = Array.from(new Set(dataFeedsIds));
@@ -69,7 +71,8 @@ async function fetchRedstonePayloads(options) {
       getCalldataWithTimestamp(
         dataFeedId,
         signedDataPackages,
-        wrapper.getUnsignedMetadata()
+        wrapper.getUnsignedMetadata(),
+        returnPrices
       )
     );
   }
@@ -94,7 +97,7 @@ function groupDataPackages(signedDataPackages) {
   }
   return packagesByDataFeedId;
 }
-function getCalldataWithTimestamp(dataFeedId, packages, unsignedMetadata) {
+function getCalldataWithTimestamp(dataFeedId, packages, unsignedMetadata, returnPrices) {
   const originalPayload = RedstonePayload.prepare(packages, unsignedMetadata);
   const originalPayloadLength = originalPayload.length / 2;
   const bytesToAdd = 32 - originalPayloadLength % 32;
@@ -109,7 +112,7 @@ function getCalldataWithTimestamp(dataFeedId, packages, unsignedMetadata) {
       throw new Error("Timestamps are not equal");
     }
   }
-  return {
+  const base = {
     dataFeedId,
     data: encodeAbiParameters(
       [{ type: "uint256" }, { type: "bytes" }],
@@ -118,6 +121,16 @@ function getCalldataWithTimestamp(dataFeedId, packages, unsignedMetadata) {
     timestamp,
     cached: false
   };
+  if (returnPrices) {
+    const prices = packages.flatMap((p) => p.dataPackage.dataPoints).map((dp) => BigInt(`0x${Buffer.from(dp.value).toString("hex")}`));
+    const medianPrice = BigInt(MathUtils.getMedianOfBigNumbers(prices));
+    return {
+      ...base,
+      price: medianPrice,
+      decimals: 8
+    };
+  }
+  return base;
 }
 export {
   fetchRedstonePayloads

package/dist/types/sdk/market/pricefeeds/updates/fetchPythPayloads.d.ts

@@ -1,5 +1,5 @@
 import type { ILogger } from "../../../types/logger.js";
-import type { TimestampedCalldata } from "./types.js";
+import type { TimestampedCalldata, TimestampedCalldataWithPrice } from "./types.js";
 export interface FetchPythPayloadsOptions {
     /**
      * Feeds to fetch
@@ -21,10 +21,25 @@ export interface FetchPythPayloadsOptions {
      * Logger to use
      */
     logger?: ILogger;
+    /**
+     * Custom fetch function to use instead of global fetch.
+     * Can be used to add custom headers, authentication, or use a different HTTP client.
+     */
+    customFetch?: typeof fetch;
+    /**
+     * When true, returns the price data for each feed.
+     */
+    returnPrices?: boolean;
 }
+/**
+ * Fetches pyth payloads from Hermes API with price data
+ */
+export declare function fetchPythPayloads(options: FetchPythPayloadsOptions & {
+    returnPrices: true;
+}): Promise<TimestampedCalldataWithPrice[]>;
 /**
  * Fetches pyth payloads from Hermes API
- * @param dataFeedsIds
- * @returns
  */
-export declare function fetchPythPayloads(options: FetchPythPayloadsOptions): Promise<TimestampedCalldata[]>;
+export declare function fetchPythPayloads(options: FetchPythPayloadsOptions & {
+    returnPrices?: false;
+}): Promise<TimestampedCalldata[]>;

package/dist/types/sdk/market/pricefeeds/updates/fetchRedstonePayloads.d.ts

@@ -1,5 +1,5 @@
 import type { ILogger } from "../../../types/logger.js";
-import type { TimestampedCalldata } from "./types.js";
+import type { TimestampedCalldata, TimestampedCalldataWithPrice } from "./types.js";
 export interface FetchRedstonePayloadsOptions {
     /**
      * Redstone data service id
@@ -40,5 +40,20 @@ export interface FetchRedstonePayloadsOptions {
      * Logger to use
      */
     logger?: ILogger;
+    /**
+     * When true, returns the price data for each feed.
+     */
+    returnPrices?: boolean;
 }
-export declare function fetchRedstonePayloads(options: FetchRedstonePayloadsOptions): Promise<TimestampedCalldata[]>;
+/**
+ * Fetches redstone payloads with price data
+ */
+export declare function fetchRedstonePayloads(options: FetchRedstonePayloadsOptions & {
+    returnPrices: true;
+}): Promise<TimestampedCalldataWithPrice[]>;
+/**
+ * Fetches redstone payloads
+ */
+export declare function fetchRedstonePayloads(options: FetchRedstonePayloadsOptions & {
+    returnPrices?: false;
+}): Promise<TimestampedCalldata[]>;

package/dist/types/sdk/market/pricefeeds/updates/types.d.ts

@@ -19,3 +19,7 @@ export interface TimestampedCalldata {
     timestamp: number;
     cached: boolean;
 }
+export interface TimestampedCalldataWithPrice extends TimestampedCalldata {
+    price: bigint;
+    decimals: number;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "12.6.0-next.3",
+  "version": "12.6.0-next.4",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",
@@ -55,6 +55,7 @@
     "@redstone-finance/evm-connector": "^0.9.0",
     "@redstone-finance/protocol": "^0.9.0",
     "@redstone-finance/sdk": "^0.9.0",
+    "@redstone-finance/utils": "^0.9.0",
     "@types/bn.js": "^5.2.0",
     "abitype": "^1.2.3",
     "bn.js": "^5.2.2",