@gearbox-protocol/sdk 12.5.0 → 12.6.0-next.1

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

@@ -22,14 +22,11 @@ __export(PythUpdater_exports, {
   PythUpdater: () => PythUpdater
 });
 module.exports = __toCommonJS(PythUpdater_exports);
-var import_buffer = require("buffer");
-var import_viem = require("viem");
 var import_v4 = require("zod/v4");
 var import_base = require("../../../base/index.js");
-var import_utils = require("../../../utils/index.js");
+var import_fetchPythPayloads = require("./fetchPythPayloads.js");
 var import_PriceUpdatesCache = require("./PriceUpdatesCache.js");
 var import_PriceUpdateTx = require("./PriceUpdateTx.js");
-var import_PythAccumulatorUpdateData = require("./PythAccumulatorUpdateData.js");
 class PythUpdateTx extends import_PriceUpdateTx.PriceUpdateTx {
   name = "pyth";
 }
@@ -58,16 +55,15 @@ const PythOptions = import_v4.z.object({
 class PythUpdater extends import_base.SDKConstruct {
   #cache;
   #historicalTimestamp;
-  #api;
+  #apiProxy;
   #ignoreMissingFeeds;
   constructor(sdk, opts = {}) {
     super(sdk);
-    this.#ignoreMissingFeeds = opts.ignoreMissingFeeds;
-    this.#api = opts.apiProxy ?? "https://hermes.pyth.network/v2/updates/price/";
-    this.#api = this.#api.endsWith("/") ? this.#api : `${this.#api}/`;
-    const ts = opts.historicTimestamp;
-    if (ts) {
-      this.#historicalTimestamp = ts === true ? Number(this.sdk.timestamp) : ts;
+    const { apiProxy, cacheTTL, ignoreMissingFeeds, historicTimestamp } = opts;
+    this.#ignoreMissingFeeds = ignoreMissingFeeds;
+    this.#apiProxy = apiProxy;
+    if (historicTimestamp) {
+      this.#historicalTimestamp = historicTimestamp === true ? Number(this.sdk.timestamp) : historicTimestamp;
       this.logger?.debug(
         `using historical timestamp ${this.#historicalTimestamp}`
       );
@@ -76,8 +72,8 @@ class PythUpdater extends import_base.SDKConstruct {
       // currently staleness period is 240 seconds on all networks, add some buffer
       // this period of 4 minutes is selected based on time that is required for user to sign transaction with wallet
       // so it's unlikely to decrease
-      ttl: opts.cacheTTL ?? 225 * 1e3,
-      historical: !!ts
+      ttl: cacheTTL ?? 225 * 1e3,
+      historical: !!historicTimestamp
     });
   }
   async getUpdateTxs(feeds) {
@@ -168,72 +164,18 @@ class PythUpdater extends import_base.SDKConstruct {
     this.logger?.debug(
       `fetching pyth payloads for ${dataFeedsIds.size} price feeds: ${ids.join(", ")}${tsStr}`
     );
-    const url = new URL(this.#api + (this.#historicalTimestamp ?? "latest"));
-    url.searchParams.append("parsed", "false");
-    if (this.#ignoreMissingFeeds) {
-      url.searchParams.append("ignore_invalid_price_ids", "true");
-    }
-    for (const id of dataFeedsIds) {
-      url.searchParams.append("ids[]", id);
-    }
-    const resp = await (0, import_utils.retry)(
-      async () => {
-        const resp2 = await fetch(url.toString());
-        if (!resp2.ok) {
-          const body = await resp2.text();
-          throw new Error(
-            `failed to fetch pyth payloads: ${resp2.statusText}: ${body}`
-          );
-        }
-        const data = await resp2.json();
-        return data;
-      },
-      { attempts: 3, exponent: 2, interval: 200 }
-    );
-    const result = respToCalldata(resp);
-    if (!this.#ignoreMissingFeeds && result.length !== dataFeedsIds.size) {
-      throw new Error(
-        `expected ${dataFeedsIds.size} price feeds, got ${result.length}`
-      );
-    }
-    return result;
+    return (0, import_fetchPythPayloads.fetchPythPayloads)({
+      dataFeedsIds,
+      historicalTimestampSeconds: this.#historicalTimestamp,
+      apiProxy: this.#apiProxy,
+      ignoreMissingFeeds: this.#ignoreMissingFeeds,
+      logger: this.logger
+    });
   }
 }
 function isPyth(pf) {
   return pf.contractType === "PRICE_FEED::PYTH";
 }
-function respToCalldata(resp) {
-  if (resp.binary.data.length === 0) {
-    return [];
-  }
-  const updates = splitAccumulatorUpdates(resp.binary.data[0]);
-  return updates.map(({ data, dataFeedId, timestamp }) => {
-    return {
-      dataFeedId,
-      data: (0, import_viem.encodeAbiParameters)(
-        [{ type: "uint256" }, { type: "bytes[]" }],
-        [BigInt(timestamp), [data]]
-      ),
-      timestamp,
-      cached: false
-    };
-  });
-}
-function splitAccumulatorUpdates(binary) {
-  const data = import_buffer.Buffer.from(binary, "hex");
-  const parsed = (0, import_PythAccumulatorUpdateData.parseAccumulatorUpdateData)(data);
-  const results = [];
-  for (let i = 0; i < parsed.updates.length; i++) {
-    const upd = parsed.updates[i].message;
-    const msg = (0, import_PythAccumulatorUpdateData.parsePriceFeedMessage)(upd);
-    results.push({
-      dataFeedId: (0, import_viem.toHex)(msg.feedId),
-      timestamp: msg.publishTime.toNumber(),
-      data: (0, import_viem.toHex)((0, import_PythAccumulatorUpdateData.sliceAccumulatorUpdateData)(data, i, i + 1))
-    });
-  }
-  return results;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PythOptions,

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

@@ -22,13 +22,10 @@ __export(RedstoneUpdater_exports, {
   RedstoneUpdater: () => RedstoneUpdater
 });
 module.exports = __toCommonJS(RedstoneUpdater_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_viem = require("viem");
 var import_v4 = require("zod/v4");
 var import_base = require("../../../base/index.js");
 var import_utils = require("../../../utils/index.js");
+var import_fetchRedstonePayloads = require("./fetchRedstonePayloads.js");
 var import_PriceUpdatesCache = require("./PriceUpdatesCache.js");
 var import_PriceUpdateTx = require("./PriceUpdateTx.js");
 class RedstoneUpdateTx extends import_PriceUpdateTx.PriceUpdateTx {
@@ -244,102 +241,18 @@ class RedstoneUpdater extends import_base.SDKConstruct {
     this.logger?.debug(
       `fetching redstone payloads for ${dataFeedsIds.size} data feeds in ${dataServiceId} with ${uniqueSignersCount} signers: ${dataPackagesIds.join(", ")}${tsStr}`
     );
-    const wrapper = new import_evm_connector.DataServiceWrapper({
+    return (0, import_fetchRedstonePayloads.fetchRedstonePayloads)({
       dataServiceId,
-      dataPackagesIds,
+      dataFeedsIds,
       uniqueSignersCount,
-      authorizedSigners: (0, import_sdk.getSignersForDataServiceId)(
-        dataServiceId
-      ),
-      historicalTimestamp: this.#historicalTimestampMs,
-      urls: this.#gateways,
-      ignoreMissingFeed: this.#ignoreMissingFeeds,
-      enableEnhancedLogs: this.#enableLogging
+      historicalTimestampMs: this.#historicalTimestampMs,
+      gateways: this.#gateways,
+      ignoreMissingFeeds: this.#ignoreMissingFeeds,
+      enableLogging: this.#enableLogging,
+      logger: this.logger,
+      metadataTimestampMs: Number(this.sdk.timestamp) * 1e3
     });
-    wrapper.setMetadataTimestamp(
-      this.#historicalTimestampMs ?? Number(this.sdk.timestamp) * 1e3
-    );
-    const dataPayload = await (0, import_utils.retry)(
-      () => wrapper.prepareRedstonePayload(true),
-      { attempts: 5, interval: this.#historicalTimestampMs ? 30500 : 250 }
-    );
-    const parsed = import_protocol.RedstonePayload.parse((0, import_viem.toBytes)(`0x${dataPayload}`));
-    const packagesByDataFeedId = groupDataPackages(parsed.signedDataPackages);
-    const result = [];
-    for (const dataFeedId of dataFeedsIds) {
-      const signedDataPackages = packagesByDataFeedId[dataFeedId];
-      if (!signedDataPackages) {
-        if (this.#ignoreMissingFeeds) {
-          this.logger?.warn(`cannot find data packages for ${dataFeedId}`);
-          continue;
-        }
-        throw new Error(`cannot find data packages for ${dataFeedId}`);
-      }
-      if (signedDataPackages.length !== uniqueSignersCount) {
-        if (this.#ignoreMissingFeeds) {
-          this.logger?.warn(
-            `got ${signedDataPackages.length} data packages for ${dataFeedId}, but expected ${uniqueSignersCount}`
-          );
-          continue;
-        }
-        throw new Error(
-          `got ${signedDataPackages.length} data packages for ${dataFeedId}, but expected ${uniqueSignersCount}`
-        );
-      }
-      result.push(
-        getCalldataWithTimestamp(
-          dataFeedId,
-          signedDataPackages,
-          wrapper.getUnsignedMetadata()
-        )
-      );
-    }
-    return result;
-  }
-}
-function groupDataPackages(signedDataPackages) {
-  const packagesByDataFeedId = {};
-  for (const p of signedDataPackages) {
-    const { dataPoints } = p.dataPackage;
-    const dataFeedId0 = dataPoints[0].dataFeedId;
-    for (const dp of dataPoints) {
-      if (dp.dataFeedId !== dataFeedId0) {
-        throw new Error(
-          `data package contains data points with different dataFeedIds: ${dp.dataFeedId} and ${dataFeedId0}`
-        );
-      }
-    }
-    if (!packagesByDataFeedId[dataFeedId0]) {
-      packagesByDataFeedId[dataFeedId0] = [];
-    }
-    packagesByDataFeedId[dataFeedId0].push(p);
-  }
-  return packagesByDataFeedId;
-}
-function getCalldataWithTimestamp(dataFeedId, packages, unsignedMetadata) {
-  const originalPayload = import_protocol.RedstonePayload.prepare(packages, unsignedMetadata);
-  const originalPayloadLength = originalPayload.length / 2;
-  const bytesToAdd = 32 - originalPayloadLength % 32;
-  const newUnsignedMetadata = unsignedMetadata + "_".repeat(bytesToAdd);
-  const payload = import_protocol.RedstonePayload.prepare(packages, newUnsignedMetadata);
-  let timestamp = 0;
-  for (const p of packages) {
-    const newTimestamp = p.dataPackage.timestampMilliseconds / 1e3;
-    if (timestamp === 0) {
-      timestamp = newTimestamp;
-    } else if (timestamp !== newTimestamp) {
-      throw new Error("Timestamps are not equal");
-    }
   }
-  return {
-    dataFeedId,
-    data: (0, import_viem.encodeAbiParameters)(
-      [{ type: "uint256" }, { type: "bytes" }],
-      [BigInt(timestamp), `0x${payload}`]
-    ),
-    timestamp,
-    cached: false
-  };
 }
 function isRedstone(pf) {
   return pf.contractType === "PRICE_FEED::REDSTONE";

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

@@ -0,0 +1,111 @@
+"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 fetchPythPayloads_exports = {};
+__export(fetchPythPayloads_exports, {
+  fetchPythPayloads: () => fetchPythPayloads
+});
+module.exports = __toCommonJS(fetchPythPayloads_exports);
+var import_buffer = require("buffer");
+var import_viem = require("viem");
+var import_utils = require("../../../utils/index.js");
+var import_PythAccumulatorUpdateData = require("./PythAccumulatorUpdateData.js");
+async function fetchPythPayloads(options) {
+  const {
+    dataFeedsIds,
+    ignoreMissingFeeds,
+    historicalTimestampSeconds,
+    logger,
+    apiProxy
+  } = options;
+  const ids = Array.from(new Set(dataFeedsIds));
+  if (ids.length === 0) {
+    return [];
+  }
+  let api = apiProxy ?? "https://hermes.pyth.network/v2/updates/price/";
+  api = api.endsWith("/") ? api : `${api}/`;
+  const url = new URL(api + (historicalTimestampSeconds ?? "latest"));
+  url.searchParams.append("parsed", "false");
+  if (ignoreMissingFeeds) {
+    url.searchParams.append("ignore_invalid_price_ids", "true");
+  }
+  for (const id of dataFeedsIds) {
+    url.searchParams.append("ids[]", id);
+  }
+  const resp = await (0, import_utils.retry)(
+    async () => {
+      const resp2 = await fetch(url.toString());
+      if (!resp2.ok) {
+        const body = await resp2.text();
+        throw new Error(
+          `failed to fetch pyth payloads: ${resp2.statusText}: ${body}`
+        );
+      }
+      const data = await resp2.json();
+      return data;
+    },
+    { attempts: 3, exponent: 2, interval: 200 }
+  );
+  const result = respToCalldata(resp);
+  if (result.length !== ids.length) {
+    if (ignoreMissingFeeds) {
+      logger?.warn(`expected ${ids.length} price feeds, got ${result.length}`);
+    } else {
+      throw new Error(
+        `expected ${ids.length} price feeds, got ${result.length}`
+      );
+    }
+  }
+  return result;
+}
+function respToCalldata(resp) {
+  if (resp.binary.data.length === 0) {
+    return [];
+  }
+  const updates = splitAccumulatorUpdates(resp.binary.data[0]);
+  return updates.map(({ data, dataFeedId, timestamp }) => {
+    return {
+      dataFeedId,
+      data: (0, import_viem.encodeAbiParameters)(
+        [{ type: "uint256" }, { type: "bytes[]" }],
+        [BigInt(timestamp), [data]]
+      ),
+      timestamp,
+      cached: false
+    };
+  });
+}
+function splitAccumulatorUpdates(binary) {
+  const data = import_buffer.Buffer.from(binary, "hex");
+  const parsed = (0, import_PythAccumulatorUpdateData.parseAccumulatorUpdateData)(data);
+  const results = [];
+  for (let i = 0; i < parsed.updates.length; i++) {
+    const upd = parsed.updates[i].message;
+    const msg = (0, import_PythAccumulatorUpdateData.parsePriceFeedMessage)(upd);
+    results.push({
+      dataFeedId: (0, import_viem.toHex)(msg.feedId),
+      timestamp: msg.publishTime.toNumber(),
+      data: (0, import_viem.toHex)((0, import_PythAccumulatorUpdateData.sliceAccumulatorUpdateData)(data, i, i + 1))
+    });
+  }
+  return results;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  fetchPythPayloads
+});

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

@@ -0,0 +1,144 @@
+"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 fetchRedstonePayloads_exports = {};
+__export(fetchRedstonePayloads_exports, {
+  fetchRedstonePayloads: () => fetchRedstonePayloads
+});
+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_viem = require("viem");
+var import_utils = require("../../../utils/index.js");
+async function fetchRedstonePayloads(options) {
+  const {
+    dataServiceId,
+    dataFeedsIds,
+    uniqueSignersCount,
+    historicalTimestampMs,
+    gateways,
+    ignoreMissingFeeds,
+    enableLogging,
+    logger
+  } = options;
+  const metadataTimestampMs = historicalTimestampMs ?? options.metadataTimestampMs;
+  const dataPackagesIds = Array.from(new Set(dataFeedsIds));
+  if (dataPackagesIds.length === 0) {
+    return [];
+  }
+  const wrapper = new import_evm_connector.DataServiceWrapper({
+    dataServiceId,
+    dataPackagesIds,
+    uniqueSignersCount,
+    authorizedSigners: (0, import_sdk.getSignersForDataServiceId)(
+      dataServiceId
+    ),
+    historicalTimestamp: historicalTimestampMs,
+    urls: gateways,
+    ignoreMissingFeed: ignoreMissingFeeds,
+    enableEnhancedLogs: enableLogging
+  });
+  if (metadataTimestampMs) {
+    wrapper.setMetadataTimestamp(metadataTimestampMs);
+  }
+  const dataPayload = await (0, import_utils.retry)(() => wrapper.prepareRedstonePayload(true), {
+    attempts: 5,
+    interval: historicalTimestampMs ? 30500 : 250
+  });
+  const parsed = import_protocol.RedstonePayload.parse((0, import_viem.toBytes)(`0x${dataPayload}`));
+  const packagesByDataFeedId = groupDataPackages(parsed.signedDataPackages);
+  const result = [];
+  for (const dataFeedId of dataFeedsIds) {
+    const signedDataPackages = packagesByDataFeedId[dataFeedId];
+    if (!signedDataPackages) {
+      if (ignoreMissingFeeds) {
+        logger?.warn(`cannot find data packages for ${dataFeedId}`);
+        continue;
+      }
+      throw new Error(`cannot find data packages for ${dataFeedId}`);
+    }
+    if (signedDataPackages.length !== uniqueSignersCount) {
+      if (ignoreMissingFeeds) {
+        logger?.warn(
+          `got ${signedDataPackages.length} data packages for ${dataFeedId}, but expected ${uniqueSignersCount}`
+        );
+        continue;
+      }
+      throw new Error(
+        `got ${signedDataPackages.length} data packages for ${dataFeedId}, but expected ${uniqueSignersCount}`
+      );
+    }
+    result.push(
+      getCalldataWithTimestamp(
+        dataFeedId,
+        signedDataPackages,
+        wrapper.getUnsignedMetadata()
+      )
+    );
+  }
+  return result;
+}
+function groupDataPackages(signedDataPackages) {
+  const packagesByDataFeedId = {};
+  for (const p of signedDataPackages) {
+    const { dataPoints } = p.dataPackage;
+    const dataFeedId0 = dataPoints[0].dataFeedId;
+    for (const dp of dataPoints) {
+      if (dp.dataFeedId !== dataFeedId0) {
+        throw new Error(
+          `data package contains data points with different dataFeedIds: ${dp.dataFeedId} and ${dataFeedId0}`
+        );
+      }
+    }
+    if (!packagesByDataFeedId[dataFeedId0]) {
+      packagesByDataFeedId[dataFeedId0] = [];
+    }
+    packagesByDataFeedId[dataFeedId0].push(p);
+  }
+  return packagesByDataFeedId;
+}
+function getCalldataWithTimestamp(dataFeedId, packages, unsignedMetadata) {
+  const originalPayload = import_protocol.RedstonePayload.prepare(packages, unsignedMetadata);
+  const originalPayloadLength = originalPayload.length / 2;
+  const bytesToAdd = 32 - originalPayloadLength % 32;
+  const newUnsignedMetadata = unsignedMetadata + "_".repeat(bytesToAdd);
+  const payload = import_protocol.RedstonePayload.prepare(packages, newUnsignedMetadata);
+  let timestamp = 0;
+  for (const p of packages) {
+    const newTimestamp = p.dataPackage.timestampMilliseconds / 1e3;
+    if (timestamp === 0) {
+      timestamp = newTimestamp;
+    } else if (timestamp !== newTimestamp) {
+      throw new Error("Timestamps are not equal");
+    }
+  }
+  return {
+    dataFeedId,
+    data: (0, import_viem.encodeAbiParameters)(
+      [{ type: "uint256" }, { type: "bytes" }],
+      [BigInt(timestamp), `0x${payload}`]
+    ),
+    timestamp,
+    cached: false
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  fetchRedstonePayloads
+});

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

@@ -15,6 +15,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 updates_exports = {};
 __export(updates_exports, {
@@ -24,6 +25,8 @@ __export(updates_exports, {
   RedstoneUpdater: () => import_RedstoneUpdater.RedstoneUpdater
 });
 module.exports = __toCommonJS(updates_exports);
+__reExport(updates_exports, require("./fetchPythPayloads.js"), module.exports);
+__reExport(updates_exports, require("./fetchRedstonePayloads.js"), module.exports);
 var import_PythUpdater = require("./PythUpdater.js");
 var import_RedstoneUpdater = require("./RedstoneUpdater.js");
 // Annotate the CommonJS export names for ESM import in node:
@@ -31,5 +34,7 @@ var import_RedstoneUpdater = require("./RedstoneUpdater.js");
   PythOptions,
   PythUpdater,
   RedstoneOptions,
-  RedstoneUpdater
+  RedstoneUpdater,
+  ...require("./fetchPythPayloads.js"),
+  ...require("./fetchRedstonePayloads.js")
 });

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

@@ -1,15 +1,8 @@
-import { Buffer } from "buffer";
-import { encodeAbiParameters, toHex } from "viem";
 import { z } from "zod/v4";
 import { SDKConstruct } from "../../../base/index.js";
-import { retry } from "../../../utils/index.js";
+import { fetchPythPayloads } from "./fetchPythPayloads.js";
 import { PriceUpdatesCache } from "./PriceUpdatesCache.js";
 import { PriceUpdateTx } from "./PriceUpdateTx.js";
-import {
-  parseAccumulatorUpdateData,
-  parsePriceFeedMessage,
-  sliceAccumulatorUpdateData
-} from "./PythAccumulatorUpdateData.js";
 class PythUpdateTx extends PriceUpdateTx {
   name = "pyth";
 }
@@ -38,16 +31,15 @@ const PythOptions = z.object({
 class PythUpdater extends SDKConstruct {
   #cache;
   #historicalTimestamp;
-  #api;
+  #apiProxy;
   #ignoreMissingFeeds;
   constructor(sdk, opts = {}) {
     super(sdk);
-    this.#ignoreMissingFeeds = opts.ignoreMissingFeeds;
-    this.#api = opts.apiProxy ?? "https://hermes.pyth.network/v2/updates/price/";
-    this.#api = this.#api.endsWith("/") ? this.#api : `${this.#api}/`;
-    const ts = opts.historicTimestamp;
-    if (ts) {
-      this.#historicalTimestamp = ts === true ? Number(this.sdk.timestamp) : ts;
+    const { apiProxy, cacheTTL, ignoreMissingFeeds, historicTimestamp } = opts;
+    this.#ignoreMissingFeeds = ignoreMissingFeeds;
+    this.#apiProxy = apiProxy;
+    if (historicTimestamp) {
+      this.#historicalTimestamp = historicTimestamp === true ? Number(this.sdk.timestamp) : historicTimestamp;
       this.logger?.debug(
         `using historical timestamp ${this.#historicalTimestamp}`
       );
@@ -56,8 +48,8 @@ class PythUpdater extends SDKConstruct {
       // currently staleness period is 240 seconds on all networks, add some buffer
       // this period of 4 minutes is selected based on time that is required for user to sign transaction with wallet
       // so it's unlikely to decrease
-      ttl: opts.cacheTTL ?? 225 * 1e3,
-      historical: !!ts
+      ttl: cacheTTL ?? 225 * 1e3,
+      historical: !!historicTimestamp
     });
   }
   async getUpdateTxs(feeds) {
@@ -148,72 +140,18 @@ class PythUpdater extends SDKConstruct {
     this.logger?.debug(
       `fetching pyth payloads for ${dataFeedsIds.size} price feeds: ${ids.join(", ")}${tsStr}`
     );
-    const url = new URL(this.#api + (this.#historicalTimestamp ?? "latest"));
-    url.searchParams.append("parsed", "false");
-    if (this.#ignoreMissingFeeds) {
-      url.searchParams.append("ignore_invalid_price_ids", "true");
-    }
-    for (const id of dataFeedsIds) {
-      url.searchParams.append("ids[]", id);
-    }
-    const resp = await retry(
-      async () => {
-        const resp2 = await fetch(url.toString());
-        if (!resp2.ok) {
-          const body = await resp2.text();
-          throw new Error(
-            `failed to fetch pyth payloads: ${resp2.statusText}: ${body}`
-          );
-        }
-        const data = await resp2.json();
-        return data;
-      },
-      { attempts: 3, exponent: 2, interval: 200 }
-    );
-    const result = respToCalldata(resp);
-    if (!this.#ignoreMissingFeeds && result.length !== dataFeedsIds.size) {
-      throw new Error(
-        `expected ${dataFeedsIds.size} price feeds, got ${result.length}`
-      );
-    }
-    return result;
+    return fetchPythPayloads({
+      dataFeedsIds,
+      historicalTimestampSeconds: this.#historicalTimestamp,
+      apiProxy: this.#apiProxy,
+      ignoreMissingFeeds: this.#ignoreMissingFeeds,
+      logger: this.logger
+    });
   }
 }
 function isPyth(pf) {
   return pf.contractType === "PRICE_FEED::PYTH";
 }
-function respToCalldata(resp) {
-  if (resp.binary.data.length === 0) {
-    return [];
-  }
-  const updates = splitAccumulatorUpdates(resp.binary.data[0]);
-  return updates.map(({ data, dataFeedId, timestamp }) => {
-    return {
-      dataFeedId,
-      data: encodeAbiParameters(
-        [{ type: "uint256" }, { type: "bytes[]" }],
-        [BigInt(timestamp), [data]]
-      ),
-      timestamp,
-      cached: false
-    };
-  });
-}
-function splitAccumulatorUpdates(binary) {
-  const data = Buffer.from(binary, "hex");
-  const parsed = parseAccumulatorUpdateData(data);
-  const results = [];
-  for (let i = 0; i < parsed.updates.length; i++) {
-    const upd = parsed.updates[i].message;
-    const msg = parsePriceFeedMessage(upd);
-    results.push({
-      dataFeedId: toHex(msg.feedId),
-      timestamp: msg.publishTime.toNumber(),
-      data: toHex(sliceAccumulatorUpdateData(data, i, i + 1))
-    });
-  }
-  return results;
-}
 export {
   PythOptions,
   PythUpdater

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

@@ -1,12 +1,7 @@
-import { DataServiceWrapper } from "@redstone-finance/evm-connector";
-import { RedstonePayload } from "@redstone-finance/protocol";
-import {
-  getSignersForDataServiceId
-} from "@redstone-finance/sdk";
-import { encodeAbiParameters, toBytes } from "viem";
 import { z } from "zod/v4";
 import { SDKConstruct } from "../../../base/index.js";
-import { AddressMap, retry } from "../../../utils/index.js";
+import { AddressMap } from "../../../utils/index.js";
+import { fetchRedstonePayloads } from "./fetchRedstonePayloads.js";
 import { PriceUpdatesCache } from "./PriceUpdatesCache.js";
 import { PriceUpdateTx } from "./PriceUpdateTx.js";
 class RedstoneUpdateTx extends PriceUpdateTx {
@@ -222,102 +217,18 @@ class RedstoneUpdater extends SDKConstruct {
     this.logger?.debug(
       `fetching redstone payloads for ${dataFeedsIds.size} data feeds in ${dataServiceId} with ${uniqueSignersCount} signers: ${dataPackagesIds.join(", ")}${tsStr}`
     );
-    const wrapper = new DataServiceWrapper({
+    return fetchRedstonePayloads({
       dataServiceId,
-      dataPackagesIds,
+      dataFeedsIds,
       uniqueSignersCount,
-      authorizedSigners: getSignersForDataServiceId(
-        dataServiceId
-      ),
-      historicalTimestamp: this.#historicalTimestampMs,
-      urls: this.#gateways,
-      ignoreMissingFeed: this.#ignoreMissingFeeds,
-      enableEnhancedLogs: this.#enableLogging
+      historicalTimestampMs: this.#historicalTimestampMs,
+      gateways: this.#gateways,
+      ignoreMissingFeeds: this.#ignoreMissingFeeds,
+      enableLogging: this.#enableLogging,
+      logger: this.logger,
+      metadataTimestampMs: Number(this.sdk.timestamp) * 1e3
     });
-    wrapper.setMetadataTimestamp(
-      this.#historicalTimestampMs ?? Number(this.sdk.timestamp) * 1e3
-    );
-    const dataPayload = await retry(
-      () => wrapper.prepareRedstonePayload(true),
-      { attempts: 5, interval: this.#historicalTimestampMs ? 30500 : 250 }
-    );
-    const parsed = RedstonePayload.parse(toBytes(`0x${dataPayload}`));
-    const packagesByDataFeedId = groupDataPackages(parsed.signedDataPackages);
-    const result = [];
-    for (const dataFeedId of dataFeedsIds) {
-      const signedDataPackages = packagesByDataFeedId[dataFeedId];
-      if (!signedDataPackages) {
-        if (this.#ignoreMissingFeeds) {
-          this.logger?.warn(`cannot find data packages for ${dataFeedId}`);
-          continue;
-        }
-        throw new Error(`cannot find data packages for ${dataFeedId}`);
-      }
-      if (signedDataPackages.length !== uniqueSignersCount) {
-        if (this.#ignoreMissingFeeds) {
-          this.logger?.warn(
-            `got ${signedDataPackages.length} data packages for ${dataFeedId}, but expected ${uniqueSignersCount}`
-          );
-          continue;
-        }
-        throw new Error(
-          `got ${signedDataPackages.length} data packages for ${dataFeedId}, but expected ${uniqueSignersCount}`
-        );
-      }
-      result.push(
-        getCalldataWithTimestamp(
-          dataFeedId,
-          signedDataPackages,
-          wrapper.getUnsignedMetadata()
-        )
-      );
-    }
-    return result;
-  }
-}
-function groupDataPackages(signedDataPackages) {
-  const packagesByDataFeedId = {};
-  for (const p of signedDataPackages) {
-    const { dataPoints } = p.dataPackage;
-    const dataFeedId0 = dataPoints[0].dataFeedId;
-    for (const dp of dataPoints) {
-      if (dp.dataFeedId !== dataFeedId0) {
-        throw new Error(
-          `data package contains data points with different dataFeedIds: ${dp.dataFeedId} and ${dataFeedId0}`
-        );
-      }
-    }
-    if (!packagesByDataFeedId[dataFeedId0]) {
-      packagesByDataFeedId[dataFeedId0] = [];
-    }
-    packagesByDataFeedId[dataFeedId0].push(p);
-  }
-  return packagesByDataFeedId;
-}
-function getCalldataWithTimestamp(dataFeedId, packages, unsignedMetadata) {
-  const originalPayload = RedstonePayload.prepare(packages, unsignedMetadata);
-  const originalPayloadLength = originalPayload.length / 2;
-  const bytesToAdd = 32 - originalPayloadLength % 32;
-  const newUnsignedMetadata = unsignedMetadata + "_".repeat(bytesToAdd);
-  const payload = RedstonePayload.prepare(packages, newUnsignedMetadata);
-  let timestamp = 0;
-  for (const p of packages) {
-    const newTimestamp = p.dataPackage.timestampMilliseconds / 1e3;
-    if (timestamp === 0) {
-      timestamp = newTimestamp;
-    } else if (timestamp !== newTimestamp) {
-      throw new Error("Timestamps are not equal");
-    }
   }
-  return {
-    dataFeedId,
-    data: encodeAbiParameters(
-      [{ type: "uint256" }, { type: "bytes" }],
-      [BigInt(timestamp), `0x${payload}`]
-    ),
-    timestamp,
-    cached: false
-  };
 }
 function isRedstone(pf) {
   return pf.contractType === "PRICE_FEED::REDSTONE";

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

@@ -0,0 +1,91 @@
+import { Buffer } from "buffer";
+import { encodeAbiParameters, toHex } from "viem";
+import { retry } from "../../../utils/index.js";
+import {
+  parseAccumulatorUpdateData,
+  parsePriceFeedMessage,
+  sliceAccumulatorUpdateData
+} from "./PythAccumulatorUpdateData.js";
+async function fetchPythPayloads(options) {
+  const {
+    dataFeedsIds,
+    ignoreMissingFeeds,
+    historicalTimestampSeconds,
+    logger,
+    apiProxy
+  } = options;
+  const ids = Array.from(new Set(dataFeedsIds));
+  if (ids.length === 0) {
+    return [];
+  }
+  let api = apiProxy ?? "https://hermes.pyth.network/v2/updates/price/";
+  api = api.endsWith("/") ? api : `${api}/`;
+  const url = new URL(api + (historicalTimestampSeconds ?? "latest"));
+  url.searchParams.append("parsed", "false");
+  if (ignoreMissingFeeds) {
+    url.searchParams.append("ignore_invalid_price_ids", "true");
+  }
+  for (const id of dataFeedsIds) {
+    url.searchParams.append("ids[]", id);
+  }
+  const resp = await retry(
+    async () => {
+      const resp2 = await fetch(url.toString());
+      if (!resp2.ok) {
+        const body = await resp2.text();
+        throw new Error(
+          `failed to fetch pyth payloads: ${resp2.statusText}: ${body}`
+        );
+      }
+      const data = await resp2.json();
+      return data;
+    },
+    { attempts: 3, exponent: 2, interval: 200 }
+  );
+  const result = respToCalldata(resp);
+  if (result.length !== ids.length) {
+    if (ignoreMissingFeeds) {
+      logger?.warn(`expected ${ids.length} price feeds, got ${result.length}`);
+    } else {
+      throw new Error(
+        `expected ${ids.length} price feeds, got ${result.length}`
+      );
+    }
+  }
+  return result;
+}
+function respToCalldata(resp) {
+  if (resp.binary.data.length === 0) {
+    return [];
+  }
+  const updates = splitAccumulatorUpdates(resp.binary.data[0]);
+  return updates.map(({ data, dataFeedId, timestamp }) => {
+    return {
+      dataFeedId,
+      data: encodeAbiParameters(
+        [{ type: "uint256" }, { type: "bytes[]" }],
+        [BigInt(timestamp), [data]]
+      ),
+      timestamp,
+      cached: false
+    };
+  });
+}
+function splitAccumulatorUpdates(binary) {
+  const data = Buffer.from(binary, "hex");
+  const parsed = parseAccumulatorUpdateData(data);
+  const results = [];
+  for (let i = 0; i < parsed.updates.length; i++) {
+    const upd = parsed.updates[i].message;
+    const msg = parsePriceFeedMessage(upd);
+    results.push({
+      dataFeedId: toHex(msg.feedId),
+      timestamp: msg.publishTime.toNumber(),
+      data: toHex(sliceAccumulatorUpdateData(data, i, i + 1))
+    });
+  }
+  return results;
+}
+export {
+  fetchPythPayloads
+};

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

@@ -0,0 +1,124 @@
+import { DataServiceWrapper } from "@redstone-finance/evm-connector";
+import {
+  RedstonePayload
+} from "@redstone-finance/protocol";
+import {
+  getSignersForDataServiceId
+} from "@redstone-finance/sdk";
+import { encodeAbiParameters, toBytes } from "viem";
+import { retry } from "../../../utils/index.js";
+async function fetchRedstonePayloads(options) {
+  const {
+    dataServiceId,
+    dataFeedsIds,
+    uniqueSignersCount,
+    historicalTimestampMs,
+    gateways,
+    ignoreMissingFeeds,
+    enableLogging,
+    logger
+  } = options;
+  const metadataTimestampMs = historicalTimestampMs ?? options.metadataTimestampMs;
+  const dataPackagesIds = Array.from(new Set(dataFeedsIds));
+  if (dataPackagesIds.length === 0) {
+    return [];
+  }
+  const wrapper = new DataServiceWrapper({
+    dataServiceId,
+    dataPackagesIds,
+    uniqueSignersCount,
+    authorizedSigners: getSignersForDataServiceId(
+      dataServiceId
+    ),
+    historicalTimestamp: historicalTimestampMs,
+    urls: gateways,
+    ignoreMissingFeed: ignoreMissingFeeds,
+    enableEnhancedLogs: enableLogging
+  });
+  if (metadataTimestampMs) {
+    wrapper.setMetadataTimestamp(metadataTimestampMs);
+  }
+  const dataPayload = await retry(() => wrapper.prepareRedstonePayload(true), {
+    attempts: 5,
+    interval: historicalTimestampMs ? 30500 : 250
+  });
+  const parsed = RedstonePayload.parse(toBytes(`0x${dataPayload}`));
+  const packagesByDataFeedId = groupDataPackages(parsed.signedDataPackages);
+  const result = [];
+  for (const dataFeedId of dataFeedsIds) {
+    const signedDataPackages = packagesByDataFeedId[dataFeedId];
+    if (!signedDataPackages) {
+      if (ignoreMissingFeeds) {
+        logger?.warn(`cannot find data packages for ${dataFeedId}`);
+        continue;
+      }
+      throw new Error(`cannot find data packages for ${dataFeedId}`);
+    }
+    if (signedDataPackages.length !== uniqueSignersCount) {
+      if (ignoreMissingFeeds) {
+        logger?.warn(
+          `got ${signedDataPackages.length} data packages for ${dataFeedId}, but expected ${uniqueSignersCount}`
+        );
+        continue;
+      }
+      throw new Error(
+        `got ${signedDataPackages.length} data packages for ${dataFeedId}, but expected ${uniqueSignersCount}`
+      );
+    }
+    result.push(
+      getCalldataWithTimestamp(
+        dataFeedId,
+        signedDataPackages,
+        wrapper.getUnsignedMetadata()
+      )
+    );
+  }
+  return result;
+}
+function groupDataPackages(signedDataPackages) {
+  const packagesByDataFeedId = {};
+  for (const p of signedDataPackages) {
+    const { dataPoints } = p.dataPackage;
+    const dataFeedId0 = dataPoints[0].dataFeedId;
+    for (const dp of dataPoints) {
+      if (dp.dataFeedId !== dataFeedId0) {
+        throw new Error(
+          `data package contains data points with different dataFeedIds: ${dp.dataFeedId} and ${dataFeedId0}`
+        );
+      }
+    }
+    if (!packagesByDataFeedId[dataFeedId0]) {
+      packagesByDataFeedId[dataFeedId0] = [];
+    }
+    packagesByDataFeedId[dataFeedId0].push(p);
+  }
+  return packagesByDataFeedId;
+}
+function getCalldataWithTimestamp(dataFeedId, packages, unsignedMetadata) {
+  const originalPayload = RedstonePayload.prepare(packages, unsignedMetadata);
+  const originalPayloadLength = originalPayload.length / 2;
+  const bytesToAdd = 32 - originalPayloadLength % 32;
+  const newUnsignedMetadata = unsignedMetadata + "_".repeat(bytesToAdd);
+  const payload = RedstonePayload.prepare(packages, newUnsignedMetadata);
+  let timestamp = 0;
+  for (const p of packages) {
+    const newTimestamp = p.dataPackage.timestampMilliseconds / 1e3;
+    if (timestamp === 0) {
+      timestamp = newTimestamp;
+    } else if (timestamp !== newTimestamp) {
+      throw new Error("Timestamps are not equal");
+    }
+  }
+  return {
+    dataFeedId,
+    data: encodeAbiParameters(
+      [{ type: "uint256" }, { type: "bytes" }],
+      [BigInt(timestamp), `0x${payload}`]
+    ),
+    timestamp,
+    cached: false
+  };
+}
+export {
+  fetchRedstonePayloads
+};

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

@@ -1,3 +1,5 @@
+export * from "./fetchPythPayloads.js";
+export * from "./fetchRedstonePayloads.js";
 import { PythOptions, PythUpdater } from "./PythUpdater.js";
 import { RedstoneOptions, RedstoneUpdater } from "./RedstoneUpdater.js";
 export {

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

@@ -0,0 +1,30 @@
+import type { ILogger } from "../../../types/logger.js";
+import type { TimestampedCalldata } from "./types.js";
+export interface FetchPythPayloadsOptions {
+    /**
+     * Feeds to fetch
+     */
+    dataFeedsIds: Iterable<string>;
+    /**
+     * When true, will not throw an error if pyth is unable to fetch data for some feeds
+     */
+    ignoreMissingFeeds?: boolean;
+    /**
+     * Historical timestamp in seconds
+     */
+    historicalTimestampSeconds?: number;
+    /**
+     * Override Hermes API with this proxy. Can be used to set caching proxies, to avoid rate limiting
+     */
+    apiProxy?: string;
+    /**
+     * Logger to use
+     */
+    logger?: ILogger;
+}
+/**
+ * Fetches pyth payloads from Hermes API
+ * @param dataFeedsIds
+ * @returns
+ */
+export declare function fetchPythPayloads(options: FetchPythPayloadsOptions): Promise<TimestampedCalldata[]>;

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

@@ -0,0 +1,44 @@
+import type { ILogger } from "../../../types/logger.js";
+import type { TimestampedCalldata } from "./types.js";
+export interface FetchRedstonePayloadsOptions {
+    /**
+     * Redstone data service id
+     * Most likely "redstone-primary-prod"
+     */
+    dataServiceId: string;
+    /**
+     * Feeds to fetch
+     */
+    dataFeedsIds: Iterable<string>;
+    /**
+     * Ensure minimum number of signers for each feed
+     */
+    uniqueSignersCount: number;
+    /**
+     * Historical timestamp in milliseconds
+     * Must be rounded to the nearest minute
+     */
+    historicalTimestampMs?: number;
+    /**
+     * Metadata timestamp in milliseconds, if undefined, will be set to historical timestamp
+     * Can be used to set deterministic metadata timestamp, so requests sent by two services at the same block are identical
+     */
+    metadataTimestampMs?: number;
+    /**
+     * Redstone gateways (put caching proxies here to avoid rate limiting)
+     */
+    gateways?: string[];
+    /**
+     * Enable redstone internal logging
+     */
+    enableLogging?: boolean;
+    /**
+     * When true, will not throw an error if redstone is unable to fetch data for some feeds
+     */
+    ignoreMissingFeeds?: boolean;
+    /**
+     * Logger to use
+     */
+    logger?: ILogger;
+}
+export declare function fetchRedstonePayloads(options: FetchRedstonePayloadsOptions): Promise<TimestampedCalldata[]>;

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

@@ -1,3 +1,5 @@
+export * from "./fetchPythPayloads.js";
+export * from "./fetchRedstonePayloads.js";
 export { PythOptions, PythUpdater } from "./PythUpdater.js";
 export { RedstoneOptions, RedstoneUpdater } from "./RedstoneUpdater.js";
 export type * from "./types.js";

package/package.json

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