@gearbox-protocol/sdk 5.1.0 → 6.0.0-next.1

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

@@ -4,7 +4,7 @@ import { tickerInfoTokensByNetwork } from "../../sdk-gov-legacy/index.js";
 import { PriceOracleBaseContract } from "./PriceOracleBaseContract.js";
 const abi = [...iPriceOracleV300Abi, ...iPausableAbi];
 class PriceOracleV300Contract extends PriceOracleBaseContract {
-  constructor(sdk, data, underlying) {
+  constructor(sdk, data) {
     super(
       sdk,
       {
@@ -12,8 +12,7 @@ class PriceOracleV300Contract extends PriceOracleBaseContract {
         name: "PriceOracleV3",
         abi
       },
-      data,
-      underlying
+      data
     );
   }
   processLog(log) {

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

@@ -2,7 +2,7 @@ import { iPriceOracleV310Abi } from "../../../abi/v310.js";
 import { PriceOracleBaseContract } from "./PriceOracleBaseContract.js";
 const abi = iPriceOracleV310Abi;
 class PriceOracleV310Contract extends PriceOracleBaseContract {
-  constructor(sdk, data, underlying) {
+  constructor(sdk, data) {
     super(
       sdk,
       {
@@ -10,8 +10,7 @@ class PriceOracleV310Contract extends PriceOracleBaseContract {
         name: "PriceOracleV3",
         abi
       },
-      data,
-      underlying
+      data
     );
   }
   processLog(log) {

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

@@ -1,16 +1,35 @@
 import { isV300, isV310 } from "../../constants/index.js";
+import { PriceOracleBaseContract } from "./PriceOracleBaseContract.js";
 import { PriceOracleV300Contract } from "./PriceOracleV300Contract.js";
 import { PriceOracleV310Contract } from "./PriceOracleV310Contract.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, 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(version)) {
+    return new PriceOracleV300Contract(sdk, data);
   }
-  throw new Error(`Unsupported oracle version ${v}`);
+  if (isV310(version)) {
+    return new PriceOracleV310Contract(sdk, data);
+  }
+  throw new Error(`Unsupported oracle version ${version}`);
+}
+function tryExtendExistingOracle(existing, data) {
+  const { version, addr } = data.baseParams;
+  if (!(existing instanceof 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);
 }
 export {
-  createPriceOracle
+  getOrCreatePriceOracle
 };

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

@@ -1,4 +1,5 @@
 import { decodeAbiParameters, hexToBytes } from "viem";
+import { isV310 } from "../../constants/versions.js";
 import {
   AbstractPriceFeedContract
 } from "./AbstractPriceFeed.js";
@@ -15,7 +16,7 @@ class AbstractLPPriceFeedContract extends AbstractPriceFeedContract {
   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" },

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

@@ -1,6 +1,6 @@
 import { bytesToString, decodeAbiParameters, toBytes } from "viem";
 import { redstonePriceFeedAbi } from "../../abi/index.js";
-import { ADDRESS_0X0 } from "../../constants/index.js";
+import { ADDRESS_0X0, isV310 } from "../../constants/index.js";
 import { AbstractPriceFeedContract } from "./AbstractPriceFeed.js";
 class RedstonePriceFeedContract extends AbstractPriceFeedContract {
   token;
@@ -16,7 +16,7 @@ class RedstonePriceFeedContract extends AbstractPriceFeedContract {
       name: `RedstonePriceFeed`,
       abi: redstonePriceFeedAbi
     });
-    if (args.baseParams.version === 310n) {
+    if (isV310(args.baseParams.version)) {
       const decoder = decodeAbiParameters(
         [
           { type: "address", name: "token" },

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

@@ -1,7 +1,7 @@
 import { getAbiItem, getAddress } from "viem";
 import { iPriceOracleV300Abi } from "../../abi/v300.js";
 import { SDKConstruct } from "../base/index.js";
-import { ADDRESS_PROVIDER_BLOCK } from "../constants/index.js";
+import { ADDRESS_PROVIDER_BLOCK, isV300 } from "../constants/index.js";
 import { PriceFeedRef } from "../market/index.js";
 import { AddressMap, formatDuration, hexEq } from "../utils/index.js";
 import { getLogsSafe } from "../utils/viem/index.js";
@@ -16,12 +16,12 @@ class V300StalenessPeriodPlugin 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) {
@@ -44,7 +44,7 @@ class V300StalenessPeriodPlugin 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);
@@ -97,7 +97,7 @@ class V300StalenessPeriodPlugin 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])
     );
   }
 }

package/dist/types/sdk/market/MarketSuite.d.ts

@@ -5,13 +5,13 @@ import type { GearboxSDK } from "../GearboxSDK.js";
 import type { MarketStateHuman } from "../types/index.js";
 import { CreditSuite } from "./credit/index.js";
 import { MarketConfiguratorContract } from "./MarketConfiguratorContract.js";
-import type { PriceOracleContract } from "./oracle/index.js";
+import type { IPriceOracleContract } from "./oracle/index.js";
 import { PoolSuite } from "./pool/index.js";
 export declare class MarketSuite extends SDKConstruct {
     readonly acl: Address;
     readonly configurator: MarketConfiguratorContract;
     readonly pool: PoolSuite;
-    readonly priceOracle: PriceOracleContract;
+    readonly priceOracle: IPriceOracleContract;
     readonly creditManagers: CreditSuite[];
     /**
      * Original data received from compressor