@gearbox-protocol/sdk 11.11.0-next.2 → 11.11.1

package/dist/cjs/sdk/market/pricefeeds/RedstonePriceFeed.js

@@ -33,10 +33,10 @@ class RedstonePriceFeedContract extends import_AbstractPriceFeed.AbstractPriceFe
   signersThreshold;
   lastPrice;
   lastPayloadTimestamp;
-  constructor(options, args) {
-    super(options, {
+  constructor(sdk, args) {
+    super(sdk, {
       ...args,
-      name: "RedstonePriceFeed",
+      name: `RedstonePriceFeed`,
       abi: import_abi.redstonePriceFeedAbi
     });
     if ((0, import_constants.isV310)(args.baseParams.version)) {

package/dist/cjs/sdk/market/pricefeeds/WstETHPriceFeed.js

@@ -24,13 +24,20 @@ module.exports = __toCommonJS(WstETHPriceFeed_exports);
 var import_abi = require("../../abi/index.js");
 var import_AbstractLPPriceFeed = require("./AbstractLPPriceFeed.js");
 class WstETHPriceFeedContract extends import_AbstractLPPriceFeed.AbstractLPPriceFeedContract {
-  constructor(options, args) {
-    super(options, {
+  constructor(sdk, args) {
+    super(sdk, {
       ...args,
       name: "WstETHPriceFeed",
       abi: import_abi.wstEthPriceFeedAbi
     });
   }
+  async getValue() {
+    return await this.sdk.client.readContract({
+      abi: import_abi.iwstEthAbi,
+      address: this.lpContract,
+      functionName: "stEthPerToken"
+    });
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/sdk/market/pricefeeds/YearnPriceFeed.js

@@ -24,13 +24,20 @@ module.exports = __toCommonJS(YearnPriceFeed_exports);
 var import_abi = require("../../abi/index.js");
 var import_AbstractLPPriceFeed = require("./AbstractLPPriceFeed.js");
 class YearnPriceFeedContract extends import_AbstractLPPriceFeed.AbstractLPPriceFeedContract {
-  constructor(options, args) {
-    super(options, {
+  constructor(sdk, args) {
+    super(sdk, {
       ...args,
       name: "YearnPriceFeed",
       abi: import_abi.yearnPriceFeedAbi
     });
   }
+  async getValue() {
+    return await this.sdk.client.readContract({
+      abi: import_abi.iyVaultAbi,
+      address: this.lpContract,
+      functionName: "pricePerShare"
+    });
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/sdk/market/pricefeeds/ZeroPriceFeed.js

@@ -24,8 +24,8 @@ module.exports = __toCommonJS(ZeroPriceFeed_exports);
 var import_abi = require("../../abi/index.js");
 var import_AbstractPriceFeed = require("./AbstractPriceFeed.js");
 class ZeroPriceFeedContract extends import_AbstractPriceFeed.AbstractPriceFeedContract {
-  constructor(options, args) {
-    super(options, {
+  constructor(sdk, args) {
+    super(sdk, {
       ...args,
       name: "ZeroPriceFeed",
       abi: import_abi.zeroPriceFeedAbi,

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

@@ -22,23 +22,6 @@ __export(PriceUpdatesCache_exports, {
 });
 module.exports = __toCommonJS(PriceUpdatesCache_exports);
 class PriceUpdatesCache {
-  static #caches = /* @__PURE__ */ new Map();
-  /**
-   * Price update caches can be shared across networks
-   * @param id - unique key to identify the cache
-   * @param opts
-   * @returns
-   */
-  static get(id, opts) {
-    const key = `${id}:${opts.historical ? "historical" : "latest"}:${opts.ttl}`;
-    const cache = PriceUpdatesCache.#caches.get(key);
-    if (cache) {
-      return cache;
-    }
-    const newCache = new PriceUpdatesCache(opts);
-    PriceUpdatesCache.#caches.set(key, newCache);
-    return newCache;
-  }
   #cache = /* @__PURE__ */ new Map();
   #ttlMs;
   #historical;

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

@@ -56,23 +56,25 @@ const PythOptions = import_v4.z.object({
   ignoreMissingFeeds: import_v4.z.boolean().optional()
 });
 class PythUpdater extends import_base.SDKConstruct {
+  #logger;
   #cache;
   #historicalTimestamp;
   #api;
   #ignoreMissingFeeds;
   constructor(sdk, opts = {}) {
     super(sdk);
+    this.#logger = (0, import_utils.childLogger)("PythUpdater", sdk.logger);
     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;
-      this.logger?.debug(
+      this.#logger?.debug(
         `using historical timestamp ${this.#historicalTimestamp}`
       );
     }
-    this.#cache = import_PriceUpdatesCache.PriceUpdatesCache.get("pyth", {
+    this.#cache = new import_PriceUpdatesCache.PriceUpdatesCache({
       // 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
@@ -84,7 +86,7 @@ class PythUpdater extends import_base.SDKConstruct {
     if (feeds.length === 0) {
       return [];
     }
-    this.logger?.debug(
+    this.#logger?.debug(
       `generating update transactions for ${feeds.length} pyth price feeds`
     );
     const pythFeeds = new Map(
@@ -119,7 +121,7 @@ class PythUpdater extends import_base.SDKConstruct {
         tsRange = `${tsRange} - ${maxTimestamp} (${maxDelta})`;
       }
     }
-    this.logger?.debug(
+    this.#logger?.debug(
       `generated ${results.length} update transactions for pyth price feeds: ${Array.from(pythFeeds.keys()).join(", ")}${tsRange}`
     );
     return results;
@@ -130,7 +132,7 @@ class PythUpdater extends import_base.SDKConstruct {
    * @returns
    */
   async #getPayloads(dataFeedsIds) {
-    this.logger?.debug(
+    this.#logger?.debug(
       `getting pyth payloads for ${dataFeedsIds.size} price feeds: ${Array.from(dataFeedsIds).join(", ")}`
     );
     const fromCache = [];
@@ -149,7 +151,7 @@ class PythUpdater extends import_base.SDKConstruct {
     for (const resp of fromPyth) {
       this.#cache.set(resp, resp.dataFeedId);
     }
-    this.logger?.debug(
+    this.#logger?.debug(
       `got ${fromPyth.length} new pyth updates and ${fromCache.length} from cache`
     );
     return [...fromCache, ...fromPyth];
@@ -165,7 +167,7 @@ class PythUpdater extends import_base.SDKConstruct {
     }
     const ids = Array.from(dataFeedsIds);
     const tsStr = this.#historicalTimestamp ? ` with historical timestamp ${this.#historicalTimestamp}` : "";
-    this.logger?.debug(
+    this.#logger?.debug(
       `fetching pyth payloads for ${dataFeedsIds.size} price feeds: ${ids.join(", ")}${tsStr}`
     );
     const url = new URL(this.#api + (this.#historicalTimestamp ?? "latest"));

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

@@ -61,6 +61,7 @@ const RedstoneOptions = import_v4.z.object({
   enableLogging: import_v4.z.boolean().optional()
 });
 class RedstoneUpdater extends import_base.SDKConstruct {
+  #logger;
   #cache;
   #historicalTimestampMs;
   #gateways;
@@ -68,6 +69,7 @@ class RedstoneUpdater extends import_base.SDKConstruct {
   #enableLogging;
   constructor(sdk, opts = {}) {
     super(sdk);
+    this.#logger = (0, import_utils.childLogger)("RedstoneUpdater", sdk.logger);
     this.#ignoreMissingFeeds = opts.ignoreMissingFeeds;
     this.#enableLogging = opts.enableLogging;
     this.#gateways = opts.gateways?.length ? opts.gateways : void 0;
@@ -75,11 +77,11 @@ class RedstoneUpdater extends import_base.SDKConstruct {
     if (ts) {
       ts = ts === true ? Number(this.sdk.timestamp) * 1e3 : ts;
       this.#historicalTimestampMs = 6e4 * Math.floor(ts / 6e4);
-      this.logger?.debug(
+      this.#logger?.debug(
         `using historical timestamp ${this.#historicalTimestampMs}`
       );
     }
-    this.#cache = import_PriceUpdatesCache.PriceUpdatesCache.get("redstone", {
+    this.#cache = new import_PriceUpdatesCache.PriceUpdatesCache({
       // 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
@@ -91,7 +93,7 @@ class RedstoneUpdater extends import_base.SDKConstruct {
     if (feeds.length === 0) {
       return [];
     }
-    this.logger?.debug(
+    this.#logger?.debug(
       `generating update transactions for ${feeds.length} redstone price feeds`
     );
     const groupedFeeds = {};
@@ -148,7 +150,7 @@ class RedstoneUpdater extends import_base.SDKConstruct {
         tsRange = `${tsRange} - ${maxTimestamp} (${maxDelta})`;
       }
     }
-    this.logger?.debug(
+    this.#logger?.debug(
       `generated ${results.length} update transactions for redstone price feeds: ${Array.from(priceFeeds.keys()).join(", ")}${tsRange}`
     );
     return results;
@@ -173,7 +175,7 @@ class RedstoneUpdater extends import_base.SDKConstruct {
     for (const { timestamp, dataFeedId } of result) {
       const delta = Number(this.sdk.timestamp) - timestamp;
       if (delta >= 240 && delta < 255) {
-        this.logger?.warn(
+        this.#logger?.warn(
           `payload for ${dataFeedId} has expired by ${delta} seconds`
         );
         expired = true;
@@ -197,7 +199,7 @@ class RedstoneUpdater extends import_base.SDKConstruct {
    * @returns
    */
   async #getPayloads(dataServiceId, dataFeedsIds, uniqueSignersCount) {
-    this.logger?.debug(
+    this.#logger?.debug(
       `getting redstone payloads for ${dataFeedsIds.size} data feeds in ${dataServiceId} with ${uniqueSignersCount} signers: ${Array.from(dataFeedsIds).join(", ")}`
     );
     const fromCache = [];
@@ -222,7 +224,7 @@ class RedstoneUpdater extends import_base.SDKConstruct {
     for (const resp of fromRedstone) {
       this.#cache.set(resp, dataServiceId, resp.dataFeedId, uniqueSignersCount);
     }
-    this.logger?.debug(
+    this.#logger?.debug(
       `got ${fromRedstone.length} new redstone updates and ${fromCache.length} from cache`
     );
     return [...fromCache, ...fromRedstone];
@@ -241,7 +243,7 @@ class RedstoneUpdater extends import_base.SDKConstruct {
     }
     const dataPackagesIds = Array.from(dataFeedsIds);
     const tsStr = this.#historicalTimestampMs ? ` with historical timestamp ${this.#historicalTimestampMs}` : "";
-    this.logger?.debug(
+    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({
@@ -270,14 +272,14 @@ class RedstoneUpdater extends import_base.SDKConstruct {
       const signedDataPackages = packagesByDataFeedId[dataFeedId];
       if (!signedDataPackages) {
         if (this.#ignoreMissingFeeds) {
-          this.logger?.warn(`cannot find data packages for ${dataFeedId}`);
+          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(
+          this.#logger?.warn(
             `got ${signedDataPackages.length} data packages for ${dataFeedId}, but expected ${uniqueSignersCount}`
           );
           continue;

package/dist/cjs/sdk/router/AbstractRouterContract.js

@@ -30,11 +30,6 @@ class AbstractRouterContract extends import_base.BaseContract {
   hooks = new import_internal.Hooks();
   addHook = this.hooks.addHook.bind(this.hooks);
   removeHook = this.hooks.removeHook.bind(this.hooks);
-  sdk;
-  constructor(sdk, args) {
-    super(sdk, args);
-    this.sdk = sdk;
-  }
   getExpectedAndLeftover(ca, cm, options = {}) {
     const b = options.balances ? options.balances : this.getDefaultExpectedAndLeftover(
       ca,

package/dist/cjs/sdk/router/RouterV310Contract.js

@@ -299,15 +299,15 @@ class RouterV310Contract extends import_AbstractRouterContract.AbstractRouterCon
    * @returns
    */
   #convertToUSDForSort(oracle, token, amount) {
-    const scale = 10n ** BigInt(this.tokensMeta.get(token)?.decimals ?? 0);
+    const scale = 10n ** BigInt(this.sdk.tokensMeta.get(token)?.decimals ?? 0);
     const price = oracle.mainPrices.get(token)?.price || oracle.reservePrices.get(token)?.price || scale;
     return amount * price / scale;
   }
   #debugTokenData(tData) {
     return tData.map((t) => ({
       token: this.labelAddress(t.token),
-      balance: `${this.tokensMeta.formatBN(t.token, t.balance)} (${t.balance})`,
-      leftoverBalance: this.tokensMeta.formatBN(t.token, t.leftoverBalance) + ` (${t.leftoverBalance})`,
+      balance: `${this.sdk.tokensMeta.formatBN(t.token, t.balance)} (${t.balance})`,
+      leftoverBalance: this.sdk.tokensMeta.formatBN(t.token, t.leftoverBalance) + ` (${t.leftoverBalance})`,
       numSplits: t.numSplits,
       claimRewards: t.claimRewards
     }));

package/dist/cjs/sdk/router/createRouter.js

@@ -25,10 +25,6 @@ var import_constants = require("../constants/index.js");
 var import_RouterV300Contract = require("./RouterV300Contract.js");
 var import_RouterV310Contract = require("./RouterV310Contract.js");
 function createRouter(sdk, address, version) {
-  const contract = sdk.getContract(address);
-  if (contract) {
-    return contract;
-  }
   if ((0, import_constants.isV300)(version)) {
     return new import_RouterV300Contract.RouterV300Contract(sdk, address, version);
   }

package/dist/cjs/sdk/utils/index.js

@@ -17,7 +17,6 @@ var utils_exports = {};
 module.exports = __toCommonJS(utils_exports);
 __reExport(utils_exports, require("./AddressMap.js"), module.exports);
 __reExport(utils_exports, require("./AddressSet.js"), module.exports);
-__reExport(utils_exports, require("./abi-decode.js"), module.exports);
 __reExport(utils_exports, require("./bytes32ToString.js"), module.exports);
 __reExport(utils_exports, require("./childLogger.js"), module.exports);
 __reExport(utils_exports, require("./createRawTx.js"), module.exports);
@@ -36,7 +35,6 @@ __reExport(utils_exports, require("./zod.js"), module.exports);
 0 && (module.exports = {
   ...require("./AddressMap.js"),
   ...require("./AddressSet.js"),
-  ...require("./abi-decode.js"),
   ...require("./bytes32ToString.js"),
   ...require("./childLogger.js"),
   ...require("./createRawTx.js"),

package/dist/esm/dev/create2.js

@@ -5,10 +5,10 @@ import {
   stringToHex
 } from "viem";
 import { getCode, sendTransaction } from "viem/actions";
-import { Construct } from "../sdk/index.js";
+import { SDKConstruct } from "../sdk/index.js";
 const PUBLIC_CREATE2_FACTORY = "0x4e59b44847b379578588920ca78fbf26c0b4956c";
 const DEFAULT_CREATE2_SALT = "GEARBOX";
-class Create2Deployer extends Construct {
+class Create2Deployer extends SDKConstruct {
   #walletClient;
   #logger;
   constructor(sdk, walletClient) {

package/dist/esm/dev/mint/AbstractMinter.js

@@ -1,14 +1,18 @@
 import { parseEther } from "viem";
 import { ierc20Abi } from "../../abi/iERC20.js";
-import { SDKConstruct } from "../../sdk/index.js";
+import {
+  SDKConstruct
+} from "../../sdk/index.js";
 import { iOwnableAbi } from "../abi.js";
 class AbstractMinter extends SDKConstruct {
   anvil;
+  logger;
   name;
-  constructor(sdk, anvil) {
+  constructor(sdk, anvil, name = "Minter") {
     super(sdk);
     this.anvil = anvil;
-    this.name = this.constructor.name;
+    this.name = name;
+    this.logger = sdk.logger?.child?.({ name }) ?? sdk.logger;
   }
   async tryMint(token, dest, amount) {
     const amnt = this.fmt(token, amount);

package/dist/esm/dev/mint/DealMinter.js

@@ -1,5 +1,8 @@
 import AbstractMinter from "./AbstractMinter.js";
 class DealMinter extends AbstractMinter {
+  constructor(sdk, anvil) {
+    super(sdk, anvil, "DealMinter");
+  }
   async mint(token, dest, amount) {
     const { deal } = await import("viem-deal").catch(() => ({ deal: null }));
     if (!deal) {

package/dist/esm/dev/mint/DirectMinter.js

@@ -1,6 +1,9 @@
 import { parseAbi } from "viem";
 import AbstractMinter from "./AbstractMinter.js";
 class DirectMinter extends AbstractMinter {
+  constructor(sdk, anvil) {
+    super(sdk, anvil, "DirectMinter");
+  }
   async mint(token, dest, amount) {
     const owner = await this.getOwner(token);
     const stopImpersonating = await this.impersonateWithBalance(owner);

package/dist/esm/dev/mint/FallbackMinter.js

@@ -2,7 +2,7 @@ import AbstractMinter from "./AbstractMinter.js";
 class FallbackMinter extends AbstractMinter {
   #minters;
   constructor(sdk, anvil, minters) {
-    super(sdk, anvil);
+    super(sdk, anvil, "FallbackMinter");
     this.#minters = minters;
   }
   async mint(token, dest, amount) {

package/dist/esm/dev/mint/TransferMinter.js

@@ -2,6 +2,9 @@ import { parseAbi } from "viem";
 import { ierc20Abi } from "../../abi/iERC20.js";
 import AbstractMinter from "./AbstractMinter.js";
 class TransferMinter extends AbstractMinter {
+  constructor(sdk, anvil) {
+    super(sdk, anvil, "TransferMinter");
+  }
   async mint(token, dest, amount) {
     const owner = await this.getOwner(token);
     const stopImpersonating = await this.impersonateWithBalance(owner);

package/dist/esm/permissionless/bindings/address-provider.js

@@ -1,10 +1,10 @@
-import {
-  stringToHex
-} from "viem";
-import { AddressProviderV310Contract } from "../../sdk/index.js";
-class AddressProviderContract extends AddressProviderV310Contract {
-  constructor(addr, client) {
-    super({ client }, addr);
+import { stringToHex } from "viem";
+import { iAddressProviderV310Abi } from "../../abi/310/generated.js";
+import { BaseContract } from "./base-contract.js";
+const abi = iAddressProviderV310Abi;
+class AddressProviderContract extends BaseContract {
+  constructor(address, client) {
+    super(abi, address, client, "AddressProvider");
   }
   async getAddressOrRevert(key, version = 0n) {
     return await this.contract.read.getAddressOrRevert([

package/dist/esm/permissionless/bindings/base-contract.js

@@ -0,0 +1,151 @@
+import {
+  getContract
+} from "viem";
+import { createRawTx } from "../../sdk/utils/index.js";
+import { decodeFunctionWithNamedArgs } from "../utils/abi-decoder.js";
+class BaseContract {
+  abi;
+  address;
+  name;
+  static register = {};
+  contract;
+  client;
+  constructor(abi, address, client, name) {
+    this.abi = abi;
+    this.client = client;
+    this.address = address.toLowerCase();
+    this.name = name;
+    this.contract = getContract({
+      address,
+      abi,
+      client
+    });
+    BaseContract.register[this.address] = this;
+  }
+  static parseCall(call) {
+    const parsedCall = BaseContract.parse(call.target, call.callData);
+    return {
+      ...parsedCall,
+      chainId: call.chainId
+    };
+  }
+  static parse(address, calldata) {
+    const contract = BaseContract.register[address.toLowerCase()];
+    if (contract) {
+      return contract.parseFunctionData(calldata);
+    } else {
+      return {
+        chainId: 0,
+        target: address,
+        label: "Unknown contract",
+        functionName: `Unknown function: ${calldata}`,
+        args: {}
+      };
+    }
+  }
+  parseFunctionData(calldata) {
+    const decodedWithNames = decodeFunctionWithNamedArgs(this.abi, calldata);
+    if (!decodedWithNames) {
+      return {
+        chainId: 0,
+        target: this.address,
+        label: this.name,
+        functionName: `Unknown function: ${calldata}`,
+        args: {}
+      };
+    }
+    const specParsed = this.parseFunctionParams(
+      decodedWithNames.originalDecoded
+    );
+    if (specParsed) {
+      return specParsed;
+    }
+    return this.wrapParseCall(
+      decodedWithNames.originalDecoded,
+      decodedWithNames.args
+    );
+  }
+  wrapParseCall(params, parsedParams) {
+    return {
+      chainId: 0,
+      target: this.address,
+      label: this.name,
+      functionName: params.functionName,
+      args: parsedParams
+    };
+  }
+  parseFunctionParams(_params) {
+    return void 0;
+  }
+  createRawTx(parameters) {
+    const { description: argsDescription } = parameters;
+    const tx = createRawTx(
+      this.address,
+      {
+        abi: this.abi,
+        ...parameters
+      },
+      argsDescription
+    );
+    tx.description = parameters.description || argsDescription || this.stringifyParsedCall(this.parseFunctionData(tx.callData));
+    return tx;
+  }
+  stringifyParsedCall(parsedCall) {
+    const argsStr = Object.entries(parsedCall.args).map(([key, value]) => `${key}: ${value}`).join(", ");
+    return `${parsedCall.label}.${parsedCall.functionName}(${argsStr})`;
+  }
+  async getEvents(eventName, fromBlock, toBlock, args, chunkSize) {
+    if (chunkSize) {
+      const chunkSizeBigint = BigInt(chunkSize);
+      const getEventPromises = [];
+      for (let i = fromBlock; i < toBlock; i += chunkSizeBigint) {
+        getEventPromises.push(
+          this.client.getContractEvents({
+            address: this.address,
+            fromBlock: i,
+            toBlock: i + chunkSizeBigint,
+            abi: this.abi,
+            eventName,
+            args
+          })
+        );
+      }
+      const events = (await Promise.all(getEventPromises)).flat();
+      return events;
+    }
+    try {
+      const events = await this.client.getContractEvents({
+        address: this.address,
+        fromBlock,
+        toBlock,
+        abi: this.abi,
+        eventName,
+        args
+      });
+      return events;
+    } catch (e) {
+      const blockRangeErrors = [
+        "query exceeds max block",
+        "range is too large",
+        "eth_getLogs is limited to",
+        "Unable to perform request",
+        "Block range limit exceeded"
+      ];
+      if (e instanceof Error && blockRangeErrors.some((errorText) => e.message.includes(errorText))) {
+        const middle = (fromBlock + toBlock) / 2n;
+        const [firstHalfEvents, secondHalfEvents] = await Promise.all([
+          this.getEvents(eventName, fromBlock, middle, args),
+          this.getEvents(eventName, middle + 1n, toBlock, args)
+        ]);
+        return [...firstHalfEvents, ...secondHalfEvents];
+      }
+      throw e;
+    }
+  }
+  getContract() {
+    return this.contract;
+  }
+}
+export {
+  BaseContract
+};