@gearbox-protocol/deploy-tools 5.29.3 → 5.29.4

package/dist/index.mjs

@@ -389704,7 +389704,6 @@ var BaseContract = class extends SDKConstruct {
       this.addressLabels.set(this.#address, name);
     }
   }
-  // TODO: unused
   stateHuman(_ = true) {
     return {
       address: this.sdk.provider.addressLabels.get(this.address),
@@ -404993,7 +404992,7 @@ var AbstractLPPriceFeedContract = class _AbstractLPPriceFeedContract extends Abs
   constructor(sdk, args) {
     super(sdk, { ...args, decimals: 8 });
     this.hasLowerBoundCap = true;
-    if (args.baseParams.version === 310n) {
+    if (isV310(args.baseParams.version)) {
       const decoder = decodeAbiParameters(
         [
           { type: "address", name: "lpToken" },
@@ -405369,7 +405368,7 @@ var RedstonePriceFeedContract = class extends AbstractPriceFeedContract {
       name: `RedstonePriceFeed`,
       abi: redstonePriceFeedAbi
     });
-    if (args.baseParams.version === 310n) {
+    if (isV310(args.baseParams.version)) {
       const decoder = decodeAbiParameters(
         [
           { type: "address", name: "token" },
@@ -405928,10 +405927,6 @@ var PriceFeedAnswerMap = class extends AddressMap {
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/market/oracle/PriceOracleBaseContract.js
 var ZERO_PRICE_FEED = stringToHex("PRICE_FEED::ZERO", { size: 32 });
 var PriceOracleBaseContract = class extends BaseContract {
-  /**
-   * Underlying token of market to which this price oracle belongs
-   */
-  underlying;
   /**
    * Mapping Token => [PriceFeed Address, stalenessPeriod]
    */
@@ -405957,12 +405952,14 @@ var PriceOracleBaseContract = class extends BaseContract {
     void 0,
     "reservePrices"
   );
-  #priceFeedTree = [];
-  constructor(sdk, args, data, underlying) {
+  #priceFeedTree = new 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
@@ -405984,7 +405981,7 @@ var PriceOracleBaseContract = class extends 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));
       }
@@ -406050,30 +406047,19 @@ var PriceOracleBaseContract = class 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.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(from5, to, amount, reserve = false) {
     if (from5 === to) {
@@ -406088,9 +406074,8 @@ var PriceOracleBaseContract = class extends 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(from5, amount, reserve = false) {
     const price = reserve ? this.reservePrice(from5) : this.mainPrice(from5);
@@ -406101,7 +406086,7 @@ var PriceOracleBaseContract = class extends 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);
@@ -406110,23 +406095,26 @@ var PriceOracleBaseContract = class extends 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 (isV300(this.version)) {
+      args = [
+        args[0],
         Array.from(
           /* @__PURE__ */ new Set([
-            this.underlying,
             ...this.mainPriceFeeds.keys(),
             ...this.reservePriceFeeds.keys()
           ])
         )
-      );
+      ];
     }
     const [address] = this.sdk.addressProvider.mustGetLatest(
       AP_PRICE_FEED_COMPRESSOR,
@@ -406141,25 +406129,39 @@ var PriceOracleBaseContract = class extends 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, reset2) {
+    if (reset2) {
+      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 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) {
@@ -406176,7 +406178,7 @@ var PriceOracleBaseContract = class extends BaseContract {
         }
       }
       this.#labelPriceFeed(priceFeed, reserve ? "Reserve" : "Main", token);
-    });
+    }
     this.logger?.debug(
       `Got ${this.mainPriceFeeds.size} main and ${this.reservePriceFeeds.size} reserve price feeds`
     );
@@ -406197,6 +406199,8 @@ var PriceOracleBaseContract = class 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
    */
@@ -406213,6 +406217,9 @@ var PriceOracleBaseContract = class 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]);
   }
@@ -406239,9 +406246,6 @@ var PriceOracleBaseContract = class extends BaseContract {
       )
     };
   }
-  get priceFeedTree() {
-    return this.#priceFeedTree;
-  }
   #noAnswerWarn(priceFeed, node) {
     let label = this.labelAddress(priceFeed);
     if (!node) {
@@ -406282,7 +406286,7 @@ function formatAnswer({ price, success, updatedAt }, raw = true) {
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/market/oracle/PriceOracleV300Contract.js
 var abi17 = [...iPriceOracleV300Abi, ...iPausableAbi];
 var PriceOracleV300Contract = class extends PriceOracleBaseContract {
-  constructor(sdk, data, underlying) {
+  constructor(sdk, data) {
     super(
       sdk,
       {
@@ -406290,8 +406294,7 @@ var PriceOracleV300Contract = class extends PriceOracleBaseContract {
         name: "PriceOracleV3",
         abi: abi17
       },
-      data,
-      underlying
+      data
     );
   }
   processLog(log2) {
@@ -406330,7 +406333,7 @@ var PriceOracleV300Contract = class extends PriceOracleBaseContract {
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/market/oracle/PriceOracleV310Contract.js
 var abi18 = iPriceOracleV310Abi;
 var PriceOracleV310Contract = class extends PriceOracleBaseContract {
-  constructor(sdk, data, underlying) {
+  constructor(sdk, data) {
     super(
       sdk,
       {
@@ -406338,8 +406341,7 @@ var PriceOracleV310Contract = class extends PriceOracleBaseContract {
         name: "PriceOracleV3",
         abi: abi18
       },
-      data,
-      underlying
+      data
     );
   }
   processLog(log2) {
@@ -406353,15 +406355,33 @@ var PriceOracleV310Contract = class extends PriceOracleBaseContract {
 };
 
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/market/oracle/createPriceOracle.js
-function createPriceOracle(sdk, data, underlying) {
-  const v = data.baseParams.version;
-  if (isV300(v)) {
-    return new PriceOracleV300Contract(sdk, data, underlying);
+function getOrCreatePriceOracle(sdk, data) {
+  const { version: version4, addr } = data.baseParams;
+  const existing = sdk.contracts.get(addr);
+  if (existing) {
+    return tryExtendExistingOracle(existing, data);
   }
-  if (isV310(v)) {
-    return new PriceOracleV310Contract(sdk, data, underlying);
+  if (isV300(version4)) {
+    return new PriceOracleV300Contract(sdk, data);
+  }
+  if (isV310(version4)) {
+    return new PriceOracleV310Contract(sdk, data);
   }
-  throw new Error(`Unsupported oracle version ${v}`);
+  throw new Error(`Unsupported oracle version ${version4}`);
+}
+function tryExtendExistingOracle(existing, data) {
+  const { version: version4, addr } = data.baseParams;
+  if (!(existing instanceof PriceOracleBaseContract)) {
+    throw new Error(
+      `expected oracle contract at ${addr}, found existing ${existing.contractType}`
+    );
+  }
+  if (Number(existing.version) !== Number(version4)) {
+    throw new Error(
+      `expected oracle contract at ${addr} to have version ${version4}, found ${existing.version}`
+    );
+  }
+  return existing.merge(data);
 }
 
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/market/pool/GaugeContract.js
@@ -407032,11 +407052,7 @@ var MarketSuite = class extends SDKConstruct {
     for (let i = 0; i < marketData.creditManagers.length; i++) {
       this.creditManagers.push(new CreditSuite(sdk, marketData, i));
     }
-    this.priceOracle = createPriceOracle(
-      sdk,
-      marketData.priceOracle,
-      marketData.pool.underlying
-    );
+    this.priceOracle = getOrCreatePriceOracle(sdk, marketData.priceOracle);
   }
   get dirty() {
     return this.configurator.dirty || this.pool.dirty || this.priceOracle.dirty || this.creditManagers.some((cm) => cm.dirty);
@@ -407297,12 +407313,12 @@ var V300StalenessPeriodPlugin = class extends SDKConstruct {
     this.#logger = sdk.logger?.child?.({ name: "V300StalenessPeriodPlugin" }) ?? sdk.logger;
   }
   async attach() {
-    await this.#syncReservePriceFeeds();
+    await this.#syncPriceFeeds();
   }
   async syncState() {
-    await this.#syncReservePriceFeeds();
+    await this.#syncPriceFeeds();
   }
-  async #syncReservePriceFeeds() {
+  async #syncPriceFeeds() {
     const oracles = this.#getOraclesMap();
     const [fromBlock, toBlock] = [this.#syncedTo + 1n, this.sdk.currentBlock];
     if (oracles.size === 0 || fromBlock > toBlock) {
@@ -407325,7 +407341,7 @@ var V300StalenessPeriodPlugin = class extends SDKConstruct {
       strict: true
     });
     this.#logger?.info(
-      `loaded ${events.length} SetReservePriceFeed events in range [${fromBlock}; ${toBlock}]`
+      `loaded ${events.length} price feed events in range [${fromBlock}; ${toBlock}]`
     );
     for (const e of events) {
       const oracle = oracles.mustGet(e.address);
@@ -407378,7 +407394,7 @@ var V300StalenessPeriodPlugin = class extends SDKConstruct {
   }
   #getOraclesMap() {
     return new AddressMap(
-      this.sdk.marketRegister.markets.filter((m) => m.priceOracle.version === 300).map((m) => [m.priceOracle.address, m.priceOracle])
+      this.sdk.marketRegister.markets.filter((m) => isV300(m.priceOracle.version)).map((m) => [m.priceOracle.address, m.priceOracle])
     );
   }
 };
@@ -435993,7 +436009,7 @@ function getRenderer(opts) {
 var package_default = {
   name: "@gearbox-protocol/deploy-tools",
   description: "Gearbox deploy tools",
-  version: "5.29.3",
+  version: "5.29.4",
   homepage: "https://gearbox.fi",
   keywords: [
     "gearbox"
@@ -436036,7 +436052,7 @@ var package_default = {
     "@gearbox-protocol/deploy-tools-node": "0.0.0",
     "@gearbox-protocol/deploy-tools-shared": "0.0.0",
     "@gearbox-protocol/deploy-tools-types": "0.0.0",
-    "@gearbox-protocol/sdk": "5.1.0",
+    "@gearbox-protocol/sdk": "6.0.0-next.1",
     "@gearbox-protocol/sdk-gov": "^2.37.0",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.15.12",
@@ -436173,7 +436189,7 @@ function prices() {
           "",
           ""
         ],
-        ...printPrices(m.priceOracle)
+        ...printPrices(sdk, m.priceOracle)
       ];
       console.log((0, import_table2.table)(data, tableConfig));
     }
@@ -436198,8 +436214,8 @@ var tableConfig = {
     }
   ]
 };
-function printPrices(oracle) {
-  const { mainPriceFeeds, reservePriceFeeds, mainPrices, reservePrices, sdk } = oracle;
+function printPrices(sdk, oracle) {
+  const { mainPriceFeeds, reservePriceFeeds, mainPrices, reservePrices } = oracle;
   const tokens = /* @__PURE__ */ new Set([
     ...mainPriceFeeds.keys(),
     ...reservePriceFeeds.keys(),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/deploy-tools",
   "description": "Gearbox deploy tools",
-  "version": "5.29.3",
+  "version": "5.29.4",
   "homepage": "https://gearbox.fi",
   "keywords": [
     "gearbox"
@@ -44,7 +44,7 @@
     "@gearbox-protocol/deploy-tools-node": "0.0.0",
     "@gearbox-protocol/deploy-tools-shared": "0.0.0",
     "@gearbox-protocol/deploy-tools-types": "0.0.0",
-    "@gearbox-protocol/sdk": "5.1.0",
+    "@gearbox-protocol/sdk": "6.0.0-next.1",
     "@gearbox-protocol/sdk-gov": "^2.37.0",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.15.12",