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

package/dist/cjs/dev/calcLiquidatableLTs.js

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

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

@@ -75,6 +75,7 @@ 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/market/MarketSuite.js

@@ -58,7 +58,11 @@ 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.getOrCreatePriceOracle)(sdk, marketData.priceOracle);
+    this.priceOracle = (0, import_oracle.createPriceOracle)(
+      sdk,
+      marketData.priceOracle,
+      marketData.pool.underlying
+    );
   }
   get dirty() {
     return this.configurator.dirty || this.pool.dirty || this.priceOracle.dirty || this.creditManagers.some((cm) => cm.dirty);

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

@@ -42,6 +42,10 @@ 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]
    */
@@ -67,14 +71,12 @@ class PriceOracleBaseContract extends import_base.BaseContract {
     void 0,
     "reservePrices"
   );
-  #priceFeedTree = new import_utils.AddressMap(
-    void 0,
-    "priceFeedTree"
-  );
-  constructor(sdk, args, data) {
+  #priceFeedTree = [];
+  constructor(sdk, args, data, underlying) {
     super(sdk, args);
+    this.underlying = underlying;
     const { priceFeedMap, priceFeedTree } = data;
-    this.#loadState(priceFeedMap, priceFeedTree, true);
+    this.#loadState(priceFeedMap, priceFeedTree);
   }
   /**
    * Returns main and reserve price feeds for given tokens
@@ -96,7 +98,7 @@ class PriceOracleBaseContract extends import_base.BaseContract {
    */
   async updatePriceFeeds() {
     const updatables = [];
-    for (const node of this.#priceFeedTree.values()) {
+    for (const node of this.#priceFeedTree) {
       if (node.updatable) {
         updatables.push(this.sdk.priceFeeds.mustGet(node.baseParams.addr));
       }
@@ -162,19 +164,30 @@ 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.has(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);
   }
   /**
    * Tries to convert amount of from one token to another, using latest known prices
    * @param from
    * @param to
    * @param amount
-   * @param reserve use reserve price feed instead of main
+   * @param reserve
    */
   convert(from, to, amount, reserve = false) {
     if (from === to) {
@@ -189,8 +202,9 @@ 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 use reserve price feed instead of main
+   * @param reserve
    */
   convertToUSD(from, amount, reserve = false) {
     const price = reserve ? this.reservePrice(from) : this.mainPrice(from);
@@ -201,7 +215,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 use reserve price feed instead of main
+   * @param reserve
    */
   convertFromUSD(to, amount, reserve = false) {
     const price = reserve ? this.reservePrice(to) : this.mainPrice(to);
@@ -210,26 +224,23 @@ class PriceOracleBaseContract extends import_base.BaseContract {
   }
   /**
    * Loads new prices for this oracle from PriceFeedCompressor
-   * Will (re)create price feeds if needed
+   * Does not update price feeds, only updates prices
    */
   async updatePrices() {
     await this.sdk.marketRegister.updatePrices([this.address]);
   }
-  /**
-   * Paired method to updatePrices, helps to update prices on all oracles in one multicall
-   */
   syncStateMulticall() {
-    let args = [this.address];
-    if ((0, import_constants.isV300)(this.version)) {
-      args = [
-        args[0],
+    const args = [this.address];
+    if (this.version === 300) {
+      args.push(
         Array.from(
           /* @__PURE__ */ new Set([
+            this.underlying,
             ...this.mainPriceFeeds.keys(),
             ...this.reservePriceFeeds.keys()
           ])
         )
-      ];
+      );
     }
     const [address] = this.sdk.addressProvider.mustGetLatest(
       import_constants.AP_PRICE_FEED_COMPRESSOR,
@@ -244,39 +255,25 @@ class PriceOracleBaseContract extends import_base.BaseContract {
       },
       onResult: (resp) => {
         const { priceFeedMap, priceFeedTree } = resp;
-        this.#loadState(priceFeedMap, priceFeedTree, true);
+        this.#loadState(priceFeedMap, priceFeedTree);
       }
     };
   }
-  /**
-   * 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();
-    }
+  #loadState(entries, tree) {
+    this.#priceFeedTree = tree;
+    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);
     }
-    for (const entry of entries) {
+    entries.forEach((entry) => {
       const { token, priceFeed, reserve, stalenessPeriod } = entry;
       const ref = new import_pricefeeds.PriceFeedRef(this.sdk, priceFeed, stalenessPeriod);
-      const node = this.#priceFeedTree.get(priceFeed);
+      const node = this.#priceFeedTree.find(
+        (n) => n.baseParams.addr === priceFeed
+      );
       const price = node?.answer?.price;
       const priceFeedType = node?.baseParams.contractType;
       if (reserve) {
@@ -293,7 +290,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`
     );
@@ -314,8 +311,6 @@ 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
    */
@@ -332,9 +327,6 @@ 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]);
   }
@@ -361,6 +353,9 @@ 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) {
+  constructor(sdk, data, underlying) {
     super(
       sdk,
       {
@@ -35,7 +35,8 @@ class PriceOracleV300Contract extends import_PriceOracleBaseContract.PriceOracle
         name: "PriceOracleV3",
         abi
       },
-      data
+      data,
+      underlying
     );
   }
   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) {
+  constructor(sdk, data, underlying) {
     super(
       sdk,
       {
@@ -33,7 +33,8 @@ class PriceOracleV310Contract extends import_PriceOracleBaseContract.PriceOracle
         name: "PriceOracleV3",
         abi
       },
-      data
+      data,
+      underlying
     );
   }
   processLog(log) {

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

@@ -18,42 +18,23 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var createPriceOracle_exports = {};
 __export(createPriceOracle_exports, {
-  getOrCreatePriceOracle: () => getOrCreatePriceOracle
+  createPriceOracle: () => createPriceOracle
 });
 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 getOrCreatePriceOracle(sdk, data) {
-  const { version, addr } = data.baseParams;
-  const existing = sdk.contracts.get(addr);
-  if (existing) {
-    return tryExtendExistingOracle(existing, data);
+function createPriceOracle(sdk, data, underlying) {
+  const v = data.baseParams.version;
+  if ((0, import_constants.isV300)(v)) {
+    return new import_PriceOracleV300Contract.PriceOracleV300Contract(sdk, data, underlying);
   }
-  if ((0, import_constants.isV300)(version)) {
-    return new import_PriceOracleV300Contract.PriceOracleV300Contract(sdk, data);
+  if ((0, import_constants.isV310)(v)) {
+    return new import_PriceOracleV310Contract.PriceOracleV310Contract(sdk, data, underlying);
   }
-  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);
+  throw new Error(`Unsupported oracle version ${v}`);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getOrCreatePriceOracle
+  createPriceOracle
 });

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

@@ -22,7 +22,6 @@ __export(AbstractLPPriceFeed_exports, {
 });
 module.exports = __toCommonJS(AbstractLPPriceFeed_exports);
 var import_viem = require("viem");
-var import_versions = require("../../constants/versions.js");
 var import_AbstractPriceFeed = require("./AbstractPriceFeed.js");
 const LOWER_BOUND_FACTOR = 99n;
 class AbstractLPPriceFeedContract extends import_AbstractPriceFeed.AbstractPriceFeedContract {
@@ -37,7 +36,7 @@ class AbstractLPPriceFeedContract extends import_AbstractPriceFeed.AbstractPrice
   constructor(sdk, args) {
     super(sdk, { ...args, decimals: 8 });
     this.hasLowerBoundCap = true;
-    if ((0, import_versions.isV310)(args.baseParams.version)) {
+    if (args.baseParams.version === 310n) {
       const decoder = (0, import_viem.decodeAbiParameters)(
         [
           { type: "address", name: "lpToken" },

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

@@ -40,7 +40,7 @@ class RedstonePriceFeedContract extends import_AbstractPriceFeed.AbstractPriceFe
       name: `RedstonePriceFeed`,
       abi: import_abi.redstonePriceFeedAbi
     });
-    if ((0, import_constants.isV310)(args.baseParams.version)) {
+    if (args.baseParams.version === 310n) {
       const decoder = (0, import_viem.decodeAbiParameters)(
         [
           { type: "address", name: "token" },

package/dist/cjs/sdk/plugins/V300StalenessPeriodPlugin.js

@@ -39,12 +39,12 @@ class V300StalenessPeriodPlugin extends import_base.SDKConstruct {
     this.#logger = sdk.logger?.child?.({ name: "V300StalenessPeriodPlugin" }) ?? sdk.logger;
   }
   async attach() {
-    await this.#syncPriceFeeds();
+    await this.#syncReservePriceFeeds();
   }
   async syncState() {
-    await this.#syncPriceFeeds();
+    await this.#syncReservePriceFeeds();
   }
-  async #syncPriceFeeds() {
+  async #syncReservePriceFeeds() {
     const oracles = this.#getOraclesMap();
     const [fromBlock, toBlock] = [this.#syncedTo + 1n, this.sdk.currentBlock];
     if (oracles.size === 0 || fromBlock > toBlock) {
@@ -67,7 +67,7 @@ class V300StalenessPeriodPlugin extends import_base.SDKConstruct {
       strict: true
     });
     this.#logger?.info(
-      `loaded ${events.length} price feed events in range [${fromBlock}; ${toBlock}]`
+      `loaded ${events.length} SetReservePriceFeed events in range [${fromBlock}; ${toBlock}]`
     );
     for (const e of events) {
       const oracle = oracles.mustGet(e.address);
@@ -120,7 +120,7 @@ class V300StalenessPeriodPlugin extends import_base.SDKConstruct {
   }
   #getOraclesMap() {
     return new import_utils.AddressMap(
-      this.sdk.marketRegister.markets.filter((m) => (0, import_constants.isV300)(m.priceOracle.version)).map((m) => [m.priceOracle.address, m.priceOracle])
+      this.sdk.marketRegister.markets.filter((m) => m.priceOracle.version === 300).map((m) => [m.priceOracle.address, m.priceOracle])
     );
   }
 }

package/dist/esm/dev/calcLiquidatableLTs.js

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

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

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

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

@@ -1,7 +1,7 @@
 import { SDKConstruct } from "../base/index.js";
 import { CreditSuite } from "./credit/index.js";
 import { MarketConfiguratorContract } from "./MarketConfiguratorContract.js";
-import { getOrCreatePriceOracle } from "./oracle/index.js";
+import { createPriceOracle } from "./oracle/index.js";
 import { PoolSuite } from "./pool/index.js";
 class MarketSuite extends SDKConstruct {
   acl;
@@ -35,7 +35,11 @@ class MarketSuite extends SDKConstruct {
     for (let i = 0; i < marketData.creditManagers.length; i++) {
       this.creditManagers.push(new CreditSuite(sdk, marketData, i));
     }
-    this.priceOracle = getOrCreatePriceOracle(sdk, marketData.priceOracle);
+    this.priceOracle = createPriceOracle(
+      sdk,
+      marketData.priceOracle,
+      marketData.pool.underlying
+    );
   }
   get dirty() {
     return this.configurator.dirty || this.pool.dirty || this.priceOracle.dirty || this.creditManagers.some((cm) => cm.dirty);

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

@@ -5,7 +5,6 @@ import { iUpdatablePriceFeedAbi } from "../../../abi/iUpdatablePriceFeed.js";
 import { BaseContract } from "../../base/index.js";
 import {
   AP_PRICE_FEED_COMPRESSOR,
-  isV300,
   VERSION_RANGE_310
 } from "../../constants/index.js";
 import { AddressMap, formatBN } from "../../utils/index.js";
@@ -13,6 +12,10 @@ import { PriceFeedRef } from "../pricefeeds/index.js";
 import PriceFeedAnswerMap from "./PriceFeedAnswerMap.js";
 const ZERO_PRICE_FEED = stringToHex("PRICE_FEED::ZERO", { size: 32 });
 class PriceOracleBaseContract extends BaseContract {
+  /**
+   * Underlying token of market to which this price oracle belongs
+   */
+  underlying;
   /**
    * Mapping Token => [PriceFeed Address, stalenessPeriod]
    */
@@ -38,14 +41,12 @@ class PriceOracleBaseContract extends BaseContract {
     void 0,
     "reservePrices"
   );
-  #priceFeedTree = new AddressMap(
-    void 0,
-    "priceFeedTree"
-  );
-  constructor(sdk, args, data) {
+  #priceFeedTree = [];
+  constructor(sdk, args, data, underlying) {
     super(sdk, args);
+    this.underlying = underlying;
     const { priceFeedMap, priceFeedTree } = data;
-    this.#loadState(priceFeedMap, priceFeedTree, true);
+    this.#loadState(priceFeedMap, priceFeedTree);
   }
   /**
    * Returns main and reserve price feeds for given tokens
@@ -67,7 +68,7 @@ class PriceOracleBaseContract extends BaseContract {
    */
   async updatePriceFeeds() {
     const updatables = [];
-    for (const node of this.#priceFeedTree.values()) {
+    for (const node of this.#priceFeedTree) {
       if (node.updatable) {
         updatables.push(this.sdk.priceFeeds.mustGet(node.baseParams.addr));
       }
@@ -133,19 +134,30 @@ class PriceOracleBaseContract extends 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.has(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);
   }
   /**
    * Tries to convert amount of from one token to another, using latest known prices
    * @param from
    * @param to
    * @param amount
-   * @param reserve use reserve price feed instead of main
+   * @param reserve
    */
   convert(from, to, amount, reserve = false) {
     if (from === to) {
@@ -160,8 +172,9 @@ class PriceOracleBaseContract extends BaseContract {
   /**
    * Tries to convert amount of token to USD, using latest known prices
    * @param from
+   * @param to
    * @param amount
-   * @param reserve use reserve price feed instead of main
+   * @param reserve
    */
   convertToUSD(from, amount, reserve = false) {
     const price = reserve ? this.reservePrice(from) : this.mainPrice(from);
@@ -172,7 +185,7 @@ class PriceOracleBaseContract extends BaseContract {
    * Tries to convert amount of USD to token, using latest known prices
    * @param to
    * @param amount
-   * @param reserve use reserve price feed instead of main
+   * @param reserve
    */
   convertFromUSD(to, amount, reserve = false) {
     const price = reserve ? this.reservePrice(to) : this.mainPrice(to);
@@ -181,26 +194,23 @@ class PriceOracleBaseContract extends BaseContract {
   }
   /**
    * Loads new prices for this oracle from PriceFeedCompressor
-   * Will (re)create price feeds if needed
+   * Does not update price feeds, only updates prices
    */
   async updatePrices() {
     await this.sdk.marketRegister.updatePrices([this.address]);
   }
-  /**
-   * Paired method to updatePrices, helps to update prices on all oracles in one multicall
-   */
   syncStateMulticall() {
-    let args = [this.address];
-    if (isV300(this.version)) {
-      args = [
-        args[0],
+    const args = [this.address];
+    if (this.version === 300) {
+      args.push(
         Array.from(
           /* @__PURE__ */ new Set([
+            this.underlying,
             ...this.mainPriceFeeds.keys(),
             ...this.reservePriceFeeds.keys()
           ])
         )
-      ];
+      );
     }
     const [address] = this.sdk.addressProvider.mustGetLatest(
       AP_PRICE_FEED_COMPRESSOR,
@@ -215,39 +225,25 @@ class PriceOracleBaseContract extends BaseContract {
       },
       onResult: (resp) => {
         const { priceFeedMap, priceFeedTree } = resp;
-        this.#loadState(priceFeedMap, priceFeedTree, true);
+        this.#loadState(priceFeedMap, priceFeedTree);
       }
     };
   }
-  /**
-   * 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();
-    }
+  #loadState(entries, tree) {
+    this.#priceFeedTree = tree;
+    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);
     }
-    for (const entry of entries) {
+    entries.forEach((entry) => {
       const { token, priceFeed, reserve, stalenessPeriod } = entry;
       const ref = new PriceFeedRef(this.sdk, priceFeed, stalenessPeriod);
-      const node = this.#priceFeedTree.get(priceFeed);
+      const node = this.#priceFeedTree.find(
+        (n) => n.baseParams.addr === priceFeed
+      );
       const price = node?.answer?.price;
       const priceFeedType = node?.baseParams.contractType;
       if (reserve) {
@@ -264,7 +260,7 @@ class PriceOracleBaseContract extends BaseContract {
         }
       }
       this.#labelPriceFeed(priceFeed, reserve ? "Reserve" : "Main", token);
-    }
+    });
     this.logger?.debug(
       `Got ${this.mainPriceFeeds.size} main and ${this.reservePriceFeeds.size} reserve price feeds`
     );
@@ -285,8 +281,6 @@ class PriceOracleBaseContract extends 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
    */
@@ -303,9 +297,6 @@ class PriceOracleBaseContract extends 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]);
   }
@@ -332,6 +323,9 @@ class PriceOracleBaseContract extends BaseContract {
       )
     };
   }
+  get priceFeedTree() {
+    return this.#priceFeedTree;
+  }
   #noAnswerWarn(priceFeed, node) {
     let label = this.labelAddress(priceFeed);
     if (!node) {