@gearbox-protocol/sdk 4.2.0-next.3 → 5.0.0-next.2

package/dist/cjs/bots/BotsPlugin.js

@@ -58,9 +58,9 @@ class BotsPlugin extends import_sdk.SDKConstruct {
   }
   async #load() {
     this.#botsByMarket.clear();
-    const pcAddr = this.sdk.addressProvider.getAddress(
+    const [pcAddr] = this.sdk.addressProvider.mustGetLatest(
       import_sdk.AP_PERIPHERY_COMPRESSOR,
-      310
+      import_sdk.VERSION_RANGE_310
     );
     this.#logger?.debug(`loading bots with periphery compressor ${pcAddr}`);
     const mcs = this.sdk.marketRegister.marketConfigurators.map(

package/dist/cjs/dev/calcLiquidatableLTs.js

@@ -30,7 +30,11 @@ async function calcLiquidatableLTs(sdk, ca, factor = 9990n, logger) {
     return balance > minBalance;
   }).map((t) => {
     const { token, balance } = t;
-    const balanceU = market.priceOracle.convertToUnderlying(token, balance);
+    const balanceU = market.priceOracle.convert(
+      token,
+      ca.underlying,
+      balance
+    );
     const lt = BigInt(cm.creditManager.liquidationThresholds.mustGet(token));
     return {
       token,

package/dist/cjs/dev/index.js

@@ -23,7 +23,6 @@ __reExport(dev_exports, require("./createTransport.js"), module.exports);
 __reExport(dev_exports, require("./detectChain.js"), module.exports);
 __reExport(dev_exports, require("./ltUtils.js"), module.exports);
 __reExport(dev_exports, require("./migrateFaucet.js"), module.exports);
-__reExport(dev_exports, require("./PriceFeedStore.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./AccountOpener.js"),
@@ -33,6 +32,5 @@ __reExport(dev_exports, require("./PriceFeedStore.js"), module.exports);
   ...require("./createTransport.js"),
   ...require("./detectChain.js"),
   ...require("./ltUtils.js"),
-  ...require("./migrateFaucet.js"),
-  ...require("./PriceFeedStore.js")
+  ...require("./migrateFaucet.js")
 });

package/dist/cjs/dev/ltUtils.js

@@ -45,9 +45,9 @@ async function setLTs(anvil, cm, newLTs, logger) {
 }
 async function setLTZero(anvil, cm, logger) {
   const v = Number(cm.creditConfigurator.baseParams.version);
-  if (v >= 300 && v < 310) {
+  if ((0, import_sdk.isV300)(v)) {
     await setLTZeroV300(anvil, cm, logger);
-  } else if (v >= 310 && v < 320) {
+  } else if ((0, import_sdk.isV310)(v)) {
     await setLTZeroV310(anvil, cm, logger);
   } else {
     throw new Error(

package/dist/cjs/sdk/GearboxSDK.js

@@ -485,11 +485,8 @@ class GearboxSDK {
       facadeAddr = cm.creditFacade.address;
     }
     const facadeV = this.contracts.mustGet(facadeAddr).version;
-    const routerRange = facadeV >= 310 ? [310, 319] : [300, 309];
-    const routerEntry = this.addressProvider.getLatestInRange(
-      import_constants.AP_ROUTER,
-      routerRange
-    );
+    const routerRange = (0, import_constants.isV310)(facadeV) ? import_constants.VERSION_RANGE_310 : import_constants.VERSION_RANGE_300;
+    const routerEntry = this.addressProvider.getLatest(import_constants.AP_ROUTER, routerRange);
     if (!routerEntry) {
       throw new Error(
         `router not found for facade v ${facadeV} at ${facadeAddr}`

package/dist/cjs/sdk/accounts/CreditAccountsService.js

@@ -39,8 +39,9 @@ class CreditAccountsService extends import_base.SDKConstruct {
   #logger;
   constructor(sdk, options) {
     super(sdk);
-    [this.#compressor] = sdk.addressProvider.getLatestVersion(
-      import_constants.AP_CREDIT_ACCOUNT_COMPRESSOR
+    [this.#compressor] = sdk.addressProvider.mustGetLatest(
+      import_constants.AP_CREDIT_ACCOUNT_COMPRESSOR,
+      import_constants.VERSION_RANGE_310
     );
     this.#batchSize = options?.batchSize;
     this.#logger = (0, import_utils.childLogger)("CreditAccountsService", sdk.logger);
@@ -1176,11 +1177,15 @@ class CreditAccountsService extends import_base.SDKConstruct {
     return this.sdk.marketRegister.marketConfigurators.map((mc) => mc.address);
   }
   get rewardCompressor() {
-    return this.sdk.addressProvider.getLatestVersion(import_constants.AP_REWARDS_COMPRESSOR)[0];
+    return this.sdk.addressProvider.mustGetLatest(
+      import_constants.AP_REWARDS_COMPRESSOR,
+      import_constants.VERSION_RANGE_310
+    )[0];
   }
   get peripheryCompressor() {
-    return this.sdk.addressProvider.getLatestVersion(
-      import_constants.AP_PERIPHERY_COMPRESSOR
+    return this.sdk.addressProvider.mustGetLatest(
+      import_constants.AP_PERIPHERY_COMPRESSOR,
+      import_constants.VERSION_RANGE_310
     )[0];
   }
 }

package/dist/cjs/sdk/base/BaseContract.js

@@ -75,7 +75,6 @@ class BaseContract extends import_SDKConstruct.SDKConstruct {
       this.addressLabels.set(this.#address, name);
     }
   }
-  // TODO: unused
   stateHuman(_ = true) {
     return {
       address: this.sdk.provider.addressLabels.get(this.address),

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

@@ -21,6 +21,7 @@ __reExport(constants_exports, require("./bot-permissions.js"), module.exports);
 __reExport(constants_exports, require("./math.js"), module.exports);
 __reExport(constants_exports, require("./networks.js"), module.exports);
 __reExport(constants_exports, require("./periphery.js"), module.exports);
+__reExport(constants_exports, require("./versions.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./address-provider.js"),
@@ -28,5 +29,6 @@ __reExport(constants_exports, require("./periphery.js"), module.exports);
   ...require("./bot-permissions.js"),
   ...require("./math.js"),
   ...require("./networks.js"),
-  ...require("./periphery.js")
+  ...require("./periphery.js"),
+  ...require("./versions.js")
 });

package/dist/cjs/sdk/{utils/version.js → constants/versions.js}

@@ -16,20 +16,31 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var version_exports = {};
-__export(version_exports, {
+var versions_exports = {};
+__export(versions_exports, {
+  VERSION_RANGE_300: () => VERSION_RANGE_300,
+  VERSION_RANGE_310: () => VERSION_RANGE_310,
   isV300: () => isV300,
-  isV310: () => isV310
+  isV310: () => isV310,
+  isVersionRange: () => isVersionRange
 });
-module.exports = __toCommonJS(version_exports);
+module.exports = __toCommonJS(versions_exports);
+const VERSION_RANGE_300 = [300, 309];
+const VERSION_RANGE_310 = [310, 319];
 function isV300(version) {
-  return version >= 300 && version < 310;
+  return isVersionRange(version, VERSION_RANGE_300);
 }
 function isV310(version) {
-  return version >= 310 && version < 320;
+  return isVersionRange(version, VERSION_RANGE_310);
+}
+function isVersionRange(version, range) {
+  return Number(version) >= range[0] && Number(version) <= range[1];
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  VERSION_RANGE_300,
+  VERSION_RANGE_310,
   isV300,
-  isV310
+  isV310,
+  isVersionRange
 });

package/dist/cjs/sdk/core/address-provider/AbstractAddressProviderContract.js

@@ -27,7 +27,6 @@ var import_constants = require("../../constants/index.js");
 var import_mappers = require("../../utils/mappers.js");
 class AbstractAddressProviderContract extends import_base.BaseContract {
   #addresses = {};
-  #latest = {};
   constructor(sdk, args, addresses = {}) {
     super(sdk, args);
     this.#addresses = addresses;
@@ -38,9 +37,6 @@ class AbstractAddressProviderContract extends import_base.BaseContract {
       this.#addresses[k] = {};
     }
     this.#addresses[k][version] = address;
-    if (!this.#latest[k] || version > this.#latest[k]) {
-      this.#latest[k] = version;
-    }
     this.logger?.debug(`Set address for ${k}@${version} to ${address}`);
   }
   getAddress(contract, version = import_constants.NO_VERSION) {
@@ -53,14 +49,7 @@ class AbstractAddressProviderContract extends import_base.BaseContract {
     }
     return result;
   }
-  getLatestVersion(contract) {
-    const version = this.#latest[contract];
-    if (!version) {
-      throw new Error(`Latest version for ${contract} not found`);
-    }
-    return [this.getAddress(contract, version), version];
-  }
-  getLatestInRange(contract, range) {
+  getLatest(contract, range) {
     const allVersions = this.#addresses[contract];
     if (!allVersions) {
       return void 0;
@@ -79,6 +68,13 @@ class AbstractAddressProviderContract extends import_base.BaseContract {
     }
     return [address, version];
   }
+  mustGetLatest(contract, range) {
+    const result = this.getLatest(contract, range);
+    if (!result) {
+      throw new Error(`no address found for ${contract} in range ${range}`);
+    }
+    return result;
+  }
   get state() {
     return {
       baseParams: {

package/dist/cjs/sdk/core/address-provider/createAddressProvider.js

@@ -23,7 +23,7 @@ __export(createAddressProvider_exports, {
 });
 module.exports = __toCommonJS(createAddressProvider_exports);
 var import_iVersion = require("../../../abi/iVersion.js");
-var import_utils = require("../../utils/index.js");
+var import_constants = require("../../constants/index.js");
 var import_AddressProviderV300Contract = require("./AddressProviderV300Contract.js");
 var import_AddressProviderV310Contract = require("./AddressProviderV310Contract.js");
 async function createAddressProvider(sdk, address) {
@@ -39,10 +39,10 @@ function hydrateAddressProvider(sdk, state) {
   return newAddressProvider(sdk, addr, Number(version), state.addresses);
 }
 function newAddressProvider(sdk, address, version, addresses) {
-  if ((0, import_utils.isV300)(version)) {
+  if ((0, import_constants.isV300)(version)) {
     return new import_AddressProviderV300Contract.AddressProviderV300Contract(sdk, address, version, addresses);
   }
-  if ((0, import_utils.isV310)(version)) {
+  if ((0, import_constants.isV310)(version)) {
     return new import_AddressProviderV310Contract.AddressProviderV310Contract(sdk, address, version, addresses);
   }
   throw new Error(`unsupported address provider version: ${version}`);

package/dist/cjs/sdk/gauges/GaugeStakingService.js

@@ -28,7 +28,10 @@ class GaugeStakingService extends import_base.SDKConstruct {
   #compressor;
   constructor(sdk) {
     super(sdk);
-    [this.#compressor] = this.sdk.addressProvider.getLatestVersion(import_constants.AP_GAUGE_COMPRESSOR);
+    [this.#compressor] = this.sdk.addressProvider.mustGetLatest(
+      import_constants.AP_GAUGE_COMPRESSOR,
+      import_constants.VERSION_RANGE_310
+    );
   }
   /**
    * Returns voting state for wallet

package/dist/cjs/sdk/market/MarketRegister.js

@@ -85,9 +85,9 @@ class MarketRegister extends import_base.SDKConstruct {
       pools,
       underlying: import_constants.ADDRESS_0X0
     };
-    const marketCompressorAddress = this.sdk.addressProvider.getAddress(
+    const [marketCompressorAddress] = this.sdk.addressProvider.mustGetLatest(
       import_constants.AP_MARKET_COMPRESSOR,
-      310
+      import_constants.VERSION_RANGE_310
     );
     let txs = [];
     if (!ignoreUpdateablePrices) {

package/dist/cjs/sdk/market/MarketSuite.js

@@ -58,11 +58,7 @@ class MarketSuite extends import_base.SDKConstruct {
     for (let i = 0; i < marketData.creditManagers.length; i++) {
       this.creditManagers.push(new import_credit.CreditSuite(sdk, marketData, i));
     }
-    this.priceOracle = (0, import_oracle.createPriceOracle)(
-      sdk,
-      marketData.priceOracle,
-      marketData.pool.underlying
-    );
+    this.priceOracle = (0, import_oracle.getOrCreatePriceOracle)(sdk, marketData.priceOracle);
   }
   get dirty() {
     return this.configurator.dirty || this.pool.dirty || this.priceOracle.dirty || this.creditManagers.some((cm) => cm.dirty);

package/dist/cjs/sdk/market/credit/createCreditConfigurator.js

@@ -21,13 +21,14 @@ __export(createCreditConfigurator_exports, {
   default: () => createCreditConfigurator
 });
 module.exports = __toCommonJS(createCreditConfigurator_exports);
+var import_constants = require("../../constants/index.js");
 var import_CreditConfiguratorV300Contract = require("./CreditConfiguratorV300Contract.js");
 var import_CreditConfiguratorV310Contract = require("./CreditConfiguratorV310Contract.js");
 function createCreditConfigurator(sdk, data) {
   const v = data.creditConfigurator.baseParams.version;
-  if (v >= 300 && v < 310) {
+  if ((0, import_constants.isV300)(v)) {
     return new import_CreditConfiguratorV300Contract.CreditConfiguratorV300Contract(sdk, data);
-  } else if (v === 310n) {
+  } else if ((0, import_constants.isV310)(v)) {
     return new import_CreditConfiguratorV310Contract.CreditConfiguratorV310Contract(sdk, data);
   }
   throw new Error(`Unsupported credit configurator version: ${v}`);

package/dist/cjs/sdk/market/credit/createCreditFacade.js

@@ -21,13 +21,14 @@ __export(createCreditFacade_exports, {
   default: () => createCreditFacade
 });
 module.exports = __toCommonJS(createCreditFacade_exports);
+var import_constants = require("../../constants/index.js");
 var import_CreditFacadeV300Contract = require("./CreditFacadeV300Contract.js");
 var import_CreditFacadeV310Contract = require("./CreditFacadeV310Contract.js");
 function createCreditFacade(sdk, data) {
   const v = data.creditFacade.baseParams.version;
-  if (v >= 300 && v < 310) {
+  if ((0, import_constants.isV300)(v)) {
     return new import_CreditFacadeV300Contract.CreditFacadeV300Contract(sdk, data);
-  } else if (v === 310n) {
+  } else if ((0, import_constants.isV310)(v)) {
     return new import_CreditFacadeV310Contract.CreditFacadeV310Contract(sdk, data);
   }
   throw new Error(`Unsupported credit facade version: ${v}`);

package/dist/cjs/sdk/market/credit/createCreditManager.js

@@ -21,13 +21,14 @@ __export(createCreditManager_exports, {
   default: () => createCreditManager
 });
 module.exports = __toCommonJS(createCreditManager_exports);
+var import_constants = require("../../constants/index.js");
 var import_CreditManagerV300Contract = require("./CreditManagerV300Contract.js");
 var import_CreditManagerV310Contract = require("./CreditManagerV310Contract.js");
 function createCreditManager(sdk, data) {
   const v = data.creditManager.baseParams.version;
-  if (v >= 300 && v < 310) {
+  if ((0, import_constants.isV300)(v)) {
     return new import_CreditManagerV300Contract.CreditManagerV300Contract(sdk, data);
-  } else if (v === 310n) {
+  } else if ((0, import_constants.isV310)(v)) {
     return new import_CreditManagerV310Contract.CreditManagerV310Contract(sdk, data);
   }
   throw new Error(`Unsupported credit manager version: ${v}`);

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

@@ -42,10 +42,6 @@ var import_pricefeeds = require("../pricefeeds/index.js");
 var import_PriceFeedAnswerMap = __toESM(require("./PriceFeedAnswerMap.js"));
 const ZERO_PRICE_FEED = (0, import_viem.stringToHex)("PRICE_FEED::ZERO", { size: 32 });
 class PriceOracleBaseContract extends import_base.BaseContract {
-  /**
-   * Underlying token of market to which this price oracle belongs
-   */
-  underlying;
   /**
    * Mapping Token => [PriceFeed Address, stalenessPeriod]
    */
@@ -71,12 +67,14 @@ class PriceOracleBaseContract extends import_base.BaseContract {
     void 0,
     "reservePrices"
   );
-  #priceFeedTree = [];
-  constructor(sdk, args, data, underlying) {
+  #priceFeedTree = new import_utils.AddressMap(
+    void 0,
+    "priceFeedTree"
+  );
+  constructor(sdk, args, data) {
     super(sdk, args);
-    this.underlying = underlying;
     const { priceFeedMap, priceFeedTree } = data;
-    this.#loadState(priceFeedMap, priceFeedTree);
+    this.#loadState(priceFeedMap, priceFeedTree, true);
   }
   /**
    * Returns main and reserve price feeds for given tokens
@@ -98,7 +96,7 @@ class PriceOracleBaseContract extends import_base.BaseContract {
    */
   async updatePriceFeeds() {
     const updatables = [];
-    for (const node of this.#priceFeedTree) {
+    for (const node of this.#priceFeedTree.values()) {
       if (node.updatable) {
         updatables.push(this.sdk.priceFeeds.mustGet(node.baseParams.addr));
       }
@@ -164,30 +162,19 @@ class PriceOracleBaseContract extends import_base.BaseContract {
   }
   /**
    * Returns true if oracle's price feed tree contains given price feed
+   * This feed is not necessary connected to token, but can be a component of composite feed for some token
    * @param priceFeed
    * @returns
    */
   usesPriceFeed(priceFeed) {
-    return this.#priceFeedTree.some(
-      (node) => node.baseParams.addr.toLowerCase() === priceFeed.toLowerCase()
-    );
-  }
-  /**
-   * Tries to convert amount of token into underlying of current market
-   * @param token
-   * @param amount
-   * @param reserve
-   * @returns
-   */
-  convertToUnderlying(token, amount, reserve = false) {
-    return this.convert(token, this.underlying, amount, reserve);
+    return this.#priceFeedTree.has(priceFeed);
   }
   /**
    * Tries to convert amount of from one token to another, using latest known prices
    * @param from
    * @param to
    * @param amount
-   * @param reserve
+   * @param reserve use reserve price feed instead of main
    */
   convert(from, to, amount, reserve = false) {
     if (from === to) {
@@ -202,9 +189,8 @@ class PriceOracleBaseContract extends import_base.BaseContract {
   /**
    * Tries to convert amount of token to USD, using latest known prices
    * @param from
-   * @param to
    * @param amount
-   * @param reserve
+   * @param reserve use reserve price feed instead of main
    */
   convertToUSD(from, amount, reserve = false) {
     const price = reserve ? this.reservePrice(from) : this.mainPrice(from);
@@ -215,7 +201,7 @@ class PriceOracleBaseContract extends import_base.BaseContract {
    * Tries to convert amount of USD to token, using latest known prices
    * @param to
    * @param amount
-   * @param reserve
+   * @param reserve use reserve price feed instead of main
    */
   convertFromUSD(to, amount, reserve = false) {
     const price = reserve ? this.reservePrice(to) : this.mainPrice(to);
@@ -224,26 +210,30 @@ class PriceOracleBaseContract extends import_base.BaseContract {
   }
   /**
    * Loads new prices for this oracle from PriceFeedCompressor
-   * Does not update price feeds, only updates prices
+   * Will (re)create price feeds if needed
    */
   async updatePrices() {
     await this.sdk.marketRegister.updatePrices([this.address]);
   }
+  /**
+   * Paired method to updatePrices, helps to update prices on all oracles in one multicall
+   */
   syncStateMulticall() {
-    const args = [this.address];
-    if (this.version === 300) {
-      args.push(
+    let args = [this.address];
+    if ((0, import_constants.isV300)(this.version)) {
+      args = [
+        args[0],
         Array.from(
           /* @__PURE__ */ new Set([
-            this.underlying,
             ...this.mainPriceFeeds.keys(),
             ...this.reservePriceFeeds.keys()
           ])
         )
-      );
+      ];
     }
-    const [address] = this.sdk.addressProvider.getLatestVersion(
-      import_constants.AP_PRICE_FEED_COMPRESSOR
+    const [address] = this.sdk.addressProvider.mustGetLatest(
+      import_constants.AP_PRICE_FEED_COMPRESSOR,
+      import_constants.VERSION_RANGE_310
     );
     return {
       call: {
@@ -254,25 +244,39 @@ class PriceOracleBaseContract extends import_base.BaseContract {
       },
       onResult: (resp) => {
         const { priceFeedMap, priceFeedTree } = resp;
-        this.#loadState(priceFeedMap, priceFeedTree);
+        this.#loadState(priceFeedMap, priceFeedTree, true);
       }
     };
   }
-  #loadState(entries, tree) {
-    this.#priceFeedTree = tree;
-    this.mainPriceFeeds.clear();
-    this.reservePriceFeeds.clear();
-    this.mainPrices.clear();
-    this.reservePrices.clear();
+  /**
+   * Helper function to handle situation when we have multiple different compressor data entries for same oracle
+   * This happens in v300
+   *
+   * @deprecated should be unnecessary after full v310 migration (oracles will be unique)
+   * @param data
+   * @returns
+   */
+  merge(data) {
+    const { priceFeedMap, priceFeedTree } = data;
+    this.#loadState(priceFeedMap, priceFeedTree, false);
+    return this;
+  }
+  #loadState(entries, tree, reset) {
+    if (reset) {
+      this.#priceFeedTree.clear();
+      this.mainPriceFeeds.clear();
+      this.reservePriceFeeds.clear();
+      this.mainPrices.clear();
+      this.reservePrices.clear();
+    }
     for (const node of tree) {
+      this.#priceFeedTree.upsert(node.baseParams.addr, node);
       this.sdk.priceFeeds.getOrCreate(node);
     }
-    entries.forEach((entry) => {
+    for (const entry of entries) {
       const { token, priceFeed, reserve, stalenessPeriod } = entry;
       const ref = new import_pricefeeds.PriceFeedRef(this.sdk, priceFeed, stalenessPeriod);
-      const node = this.#priceFeedTree.find(
-        (n) => n.baseParams.addr === priceFeed
-      );
+      const node = this.#priceFeedTree.get(priceFeed);
       const price = node?.answer?.price;
       const priceFeedType = node?.baseParams.contractType;
       if (reserve) {
@@ -289,7 +293,7 @@ class PriceOracleBaseContract extends import_base.BaseContract {
         }
       }
       this.#labelPriceFeed(priceFeed, reserve ? "Reserve" : "Main", token);
-    });
+    }
     this.logger?.debug(
       `Got ${this.mainPriceFeeds.size} main and ${this.reservePriceFeeds.size} reserve price feeds`
     );
@@ -310,6 +314,8 @@ class PriceOracleBaseContract extends import_base.BaseContract {
    * Helper method to find "attachment point" of price feed (makes sense for updatable price feeds only) -
    * returns token (in v3.0 can be ticker) and main/reserve flag
    *
+   * @deprecated Should be gone after v310 migration
+   *
    * @param priceFeed
    * @returns
    */
@@ -326,6 +332,9 @@ class PriceOracleBaseContract extends import_base.BaseContract {
     }
     return [void 0, false];
   }
+  /**
+   * Returns list of addresses that should be watched for events to sync state
+   */
   get watchAddresses() {
     return /* @__PURE__ */ new Set([this.address]);
   }
@@ -352,9 +361,6 @@ class PriceOracleBaseContract extends import_base.BaseContract {
       )
     };
   }
-  get priceFeedTree() {
-    return this.#priceFeedTree;
-  }
   #noAnswerWarn(priceFeed, node) {
     let label = this.labelAddress(priceFeed);
     if (!node) {

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

@@ -27,7 +27,7 @@ var import_sdk_gov_legacy = require("../../sdk-gov-legacy/index.js");
 var import_PriceOracleBaseContract = require("./PriceOracleBaseContract.js");
 const abi = [...import_v300.iPriceOracleV300Abi, ...import_iPausable.iPausableAbi];
 class PriceOracleV300Contract extends import_PriceOracleBaseContract.PriceOracleBaseContract {
-  constructor(sdk, data, underlying) {
+  constructor(sdk, data) {
     super(
       sdk,
       {
@@ -35,8 +35,7 @@ class PriceOracleV300Contract extends import_PriceOracleBaseContract.PriceOracle
         name: "PriceOracleV3",
         abi
       },
-      data,
-      underlying
+      data
     );
   }
   processLog(log) {

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

@@ -25,7 +25,7 @@ var import_v310 = require("../../../abi/v310.js");
 var import_PriceOracleBaseContract = require("./PriceOracleBaseContract.js");
 const abi = import_v310.iPriceOracleV310Abi;
 class PriceOracleV310Contract extends import_PriceOracleBaseContract.PriceOracleBaseContract {
-  constructor(sdk, data, underlying) {
+  constructor(sdk, data) {
     super(
       sdk,
       {
@@ -33,8 +33,7 @@ class PriceOracleV310Contract extends import_PriceOracleBaseContract.PriceOracle
         name: "PriceOracleV3",
         abi
       },
-      data,
-      underlying
+      data
     );
   }
   processLog(log) {

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

@@ -18,22 +18,42 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var createPriceOracle_exports = {};
 __export(createPriceOracle_exports, {
-  createPriceOracle: () => createPriceOracle
+  getOrCreatePriceOracle: () => getOrCreatePriceOracle
 });
 module.exports = __toCommonJS(createPriceOracle_exports);
+var import_constants = require("../../constants/index.js");
+var import_PriceOracleBaseContract = require("./PriceOracleBaseContract.js");
 var import_PriceOracleV300Contract = require("./PriceOracleV300Contract.js");
 var import_PriceOracleV310Contract = require("./PriceOracleV310Contract.js");
-function createPriceOracle(sdk, data, underlying) {
-  const v = data.baseParams.version;
-  if (v >= 300n && v < 310n) {
-    return new import_PriceOracleV300Contract.PriceOracleV300Contract(sdk, data, underlying);
+function getOrCreatePriceOracle(sdk, data) {
+  const { version, addr } = data.baseParams;
+  const existing = sdk.contracts.get(addr);
+  if (existing) {
+    return tryExtendExistingOracle(existing, data);
   }
-  if (v === 310n) {
-    return new import_PriceOracleV310Contract.PriceOracleV310Contract(sdk, data, underlying);
+  if ((0, import_constants.isV300)(version)) {
+    return new import_PriceOracleV300Contract.PriceOracleV300Contract(sdk, data);
   }
-  throw new Error(`Unsupported oracle version ${v}`);
+  if ((0, import_constants.isV310)(version)) {
+    return new import_PriceOracleV310Contract.PriceOracleV310Contract(sdk, data);
+  }
+  throw new Error(`Unsupported oracle version ${version}`);
+}
+function tryExtendExistingOracle(existing, data) {
+  const { version, addr } = data.baseParams;
+  if (!(existing instanceof import_PriceOracleBaseContract.PriceOracleBaseContract)) {
+    throw new Error(
+      `expected oracle contract at ${addr}, found existing ${existing.contractType}`
+    );
+  }
+  if (Number(existing.version) !== Number(version)) {
+    throw new Error(
+      `expected oracle contract at ${addr} to have version ${version}, found ${existing.version}`
+    );
+  }
+  return existing.merge(data);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createPriceOracle
+  getOrCreatePriceOracle
 });

package/dist/cjs/sdk/market/pool/createPool.js

@@ -21,14 +21,15 @@ __export(createPool_exports, {
   default: () => createPool
 });
 module.exports = __toCommonJS(createPool_exports);
+var import_constants = require("../../constants/index.js");
 var import_PoolV300Contract = require("./PoolV300Contract.js");
 var import_PoolV310Contract = require("./PoolV310Contract.js");
 function createPool(sdk, data) {
   const v = data.baseParams.version;
-  if (v >= 300n && v < 310n) {
+  if ((0, import_constants.isV300)(v)) {
     return new import_PoolV300Contract.PoolV300Contract(sdk, data);
   }
-  if (v === 310n) {
+  if ((0, import_constants.isV310)(v)) {
     return new import_PoolV310Contract.PoolV310Contract(sdk, data);
   }
   throw new Error(`Unsupported pool version ${v}`);