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

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

@@ -21,14 +21,15 @@ __export(createPoolQuotaKeeper_exports, {
   default: () => createPoolQuotaKeeper
 });
 module.exports = __toCommonJS(createPoolQuotaKeeper_exports);
+var import_constants = require("../../constants/index.js");
 var import_PoolQuotaKeeperV300Contract = require("./PoolQuotaKeeperV300Contract.js");
 var import_PoolQuotaKeeperV310Contract = require("./PoolQuotaKeeperV310Contract.js");
 function createPoolQuotaKeeper(sdk, pool, pqk) {
   const v = pqk.baseParams.version;
-  if (v >= 300n && v < 310n) {
+  if ((0, import_constants.isV300)(v)) {
     return new import_PoolQuotaKeeperV300Contract.PoolQuotaKeeperV300Contract(sdk, pool, pqk);
   }
-  if (v === 310n) {
+  if ((0, import_constants.isV310)(v)) {
     return new import_PoolQuotaKeeperV310Contract.PoolQuotaKeeperV310Contract(sdk, pool, pqk);
   }
   throw new Error(`Unsupported pool quota keeper version ${v}`);

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

@@ -22,6 +22,7 @@ __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 {
@@ -36,7 +37,7 @@ class AbstractLPPriceFeedContract extends import_AbstractPriceFeed.AbstractPrice
   constructor(sdk, args) {
     super(sdk, { ...args, decimals: 8 });
     this.hasLowerBoundCap = true;
-    if (args.baseParams.version === 310n) {
+    if ((0, import_versions.isV310)(args.baseParams.version)) {
       const decoder = (0, import_viem.decodeAbiParameters)(
         [
           { type: "address", name: "lpToken" },

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

@@ -127,9 +127,9 @@ class PriceFeedRegister extends import_base.SDKConstruct {
    * This is not saved anywhere in PriceFeedRegister, and can later be used to load price feed updates
    */
   async getPartialUpdatablePriceFeeds(marketConfigurators, pools) {
-    const priceFeedCompressorAddress = this.sdk.addressProvider.getAddress(
+    const [priceFeedCompressorAddress] = this.sdk.addressProvider.mustGetLatest(
       import_constants.AP_PRICE_FEED_COMPRESSOR,
-      310
+      import_constants.VERSION_RANGE_310
     );
     const configurators = marketConfigurators ?? this.sdk.marketRegister.marketConfigurators.map((mc) => mc.address);
     this.logger?.debug(

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 (args.baseParams.version === 310n) {
+    if ((0, import_constants.isV310)(args.baseParams.version)) {
       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.#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) {
@@ -67,7 +67,7 @@ class V300StalenessPeriodPlugin extends import_base.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);
@@ -120,7 +120,7 @@ class V300StalenessPeriodPlugin extends import_base.SDKConstruct {
   }
   #getOraclesMap() {
     return new import_utils.AddressMap(
-      this.sdk.marketRegister.markets.filter((m) => m.priceOracle.version === 300).map((m) => [m.priceOracle.address, m.priceOracle])
+      this.sdk.marketRegister.markets.filter((m) => (0, import_constants.isV300)(m.priceOracle.version)).map((m) => [m.priceOracle.address, m.priceOracle])
     );
   }
 }

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

@@ -21,13 +21,14 @@ __export(createRouter_exports, {
   createRouter: () => createRouter
 });
 module.exports = __toCommonJS(createRouter_exports);
+var import_constants = require("../constants/index.js");
 var import_RouterV300Contract = require("./RouterV300Contract.js");
 var import_RouterV310Contract = require("./RouterV310Contract.js");
 function createRouter(sdk, address, version) {
-  if (version >= 300 && version < 310) {
+  if ((0, import_constants.isV300)(version)) {
     return new import_RouterV300Contract.RouterV300Contract(sdk, address, version);
   }
-  if (version === 310) {
+  if ((0, import_constants.isV310)(version)) {
     return new import_RouterV310Contract.RouterV310Contract(sdk, address, version);
   }
   throw new Error(`Unsupported router version ${version}`);

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

@@ -27,7 +27,6 @@ __reExport(utils_exports, require("./json.js"), module.exports);
 __reExport(utils_exports, require("./mappers.js"), module.exports);
 __reExport(utils_exports, require("./retry.js"), module.exports);
 __reExport(utils_exports, require("./toAddress.js"), module.exports);
-__reExport(utils_exports, require("./version.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./AddressMap.js"),
@@ -41,6 +40,5 @@ __reExport(utils_exports, require("./version.js"), module.exports);
   ...require("./json.js"),
   ...require("./mappers.js"),
   ...require("./retry.js"),
-  ...require("./toAddress.js"),
-  ...require("./version.js")
+  ...require("./toAddress.js")
 });

package/dist/cjs/zappers/ZappersPlugin.js

@@ -31,9 +31,9 @@ class ZappersPlugin extends import_sdk.SDKConstruct {
   }
   async loadZappers() {
     this.#zappers = new import_sdk.AddressMap(void 0, "zappers");
-    const pcAddr = this.sdk.addressProvider.getAddress(
+    const [pcAddr] = this.sdk.addressProvider.mustGetLatest(
       import_sdk.AP_PERIPHERY_COMPRESSOR,
-      310
+      import_sdk.VERSION_RANGE_310
     );
     this.sdk.logger?.debug(
       `loading zappers with periphery compressor ${pcAddr}`

package/dist/esm/bots/BotsPlugin.js

@@ -5,7 +5,8 @@ import {
   isV300,
   isV310,
   SDKConstruct,
-  TypedObjectUtils
+  TypedObjectUtils,
+  VERSION_RANGE_310
 } from "../sdk/index.js";
 import { PartialLiquidationBotV300Contract } from "./PartialLiquidationBotV300Contract.js";
 import { PartialLiquidationBotV310Contract } from "./PartialLiquidationBotV310Contract.js";
@@ -43,9 +44,9 @@ class BotsPlugin extends SDKConstruct {
   }
   async #load() {
     this.#botsByMarket.clear();
-    const pcAddr = this.sdk.addressProvider.getAddress(
+    const [pcAddr] = this.sdk.addressProvider.mustGetLatest(
       AP_PERIPHERY_COMPRESSOR,
-      310
+      VERSION_RANGE_310
     );
     this.#logger?.debug(`loading bots with periphery compressor ${pcAddr}`);
     const mcs = this.sdk.marketRegister.marketConfigurators.map(

package/dist/esm/dev/calcLiquidatableLTs.js

@@ -7,7 +7,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/esm/dev/index.js

@@ -6,4 +6,3 @@ export * from "./createTransport.js";
 export * from "./detectChain.js";
 export * from "./ltUtils.js";
 export * from "./migrateFaucet.js";
-export * from "./PriceFeedStore.js";

package/dist/esm/dev/ltUtils.js

@@ -3,7 +3,13 @@ import {
   iCreditConfiguratorV300Abi,
   iCreditManagerV300Abi
 } from "../abi/v300.js";
-import { hexEq, PERCENTAGE_FACTOR, TypedObjectUtils } from "../sdk/index.js";
+import {
+  hexEq,
+  isV300,
+  isV310,
+  PERCENTAGE_FACTOR,
+  TypedObjectUtils
+} from "../sdk/index.js";
 import { iaclTraitAbi, iOwnableAbi } from "./abi.js";
 async function setLTs(anvil, cm, newLTs, logger) {
   const configuratorAddr = await impresonateCCOwner(anvil, cm);
@@ -24,9 +30,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 (isV300(v)) {
     await setLTZeroV300(anvil, cm, logger);
-  } else if (v >= 310 && v < 320) {
+  } else if (isV310(v)) {
     await setLTZeroV310(anvil, cm, logger);
   } else {
     throw new Error(

package/dist/esm/sdk/GearboxSDK.js

@@ -12,7 +12,10 @@ import {
   AP_GEAR_STAKING,
   AP_GEAR_TOKEN,
   AP_ROUTER,
-  NO_VERSION
+  isV310,
+  NO_VERSION,
+  VERSION_RANGE_300,
+  VERSION_RANGE_310
 } from "./constants/index.js";
 import {
   BotListContract,
@@ -480,11 +483,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(
-      AP_ROUTER,
-      routerRange
-    );
+    const routerRange = isV310(facadeV) ? VERSION_RANGE_310 : VERSION_RANGE_300;
+    const routerEntry = this.addressProvider.getLatest(AP_ROUTER, routerRange);
     if (!routerEntry) {
       throw new Error(
         `router not found for facade v ${facadeV} at ${facadeAddr}`

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

@@ -18,7 +18,8 @@ import {
   AP_REWARDS_COMPRESSOR,
   MAX_UINT256,
   MIN_INT96,
-  NOT_DEPLOYED
+  NOT_DEPLOYED,
+  VERSION_RANGE_310
 } from "../constants/index.js";
 import { assetsMap } from "../router/index.js";
 import {
@@ -43,8 +44,9 @@ class CreditAccountsService extends SDKConstruct {
   #logger;
   constructor(sdk, options) {
     super(sdk);
-    [this.#compressor] = sdk.addressProvider.getLatestVersion(
-      AP_CREDIT_ACCOUNT_COMPRESSOR
+    [this.#compressor] = sdk.addressProvider.mustGetLatest(
+      AP_CREDIT_ACCOUNT_COMPRESSOR,
+      VERSION_RANGE_310
     );
     this.#batchSize = options?.batchSize;
     this.#logger = childLogger("CreditAccountsService", sdk.logger);
@@ -1180,11 +1182,15 @@ class CreditAccountsService extends SDKConstruct {
     return this.sdk.marketRegister.marketConfigurators.map((mc) => mc.address);
   }
   get rewardCompressor() {
-    return this.sdk.addressProvider.getLatestVersion(AP_REWARDS_COMPRESSOR)[0];
+    return this.sdk.addressProvider.mustGetLatest(
+      AP_REWARDS_COMPRESSOR,
+      VERSION_RANGE_310
+    )[0];
   }
   get peripheryCompressor() {
-    return this.sdk.addressProvider.getLatestVersion(
-      AP_PERIPHERY_COMPRESSOR
+    return this.sdk.addressProvider.mustGetLatest(
+      AP_PERIPHERY_COMPRESSOR,
+      VERSION_RANGE_310
     )[0];
   }
 }

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

@@ -57,7 +57,6 @@ 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/constants/index.js

@@ -4,3 +4,4 @@ export * from "./bot-permissions.js";
 export * from "./math.js";
 export * from "./networks.js";
 export * from "./periphery.js";
+export * from "./versions.js";

package/dist/esm/sdk/constants/versions.js

@@ -0,0 +1,18 @@
+const VERSION_RANGE_300 = [300, 309];
+const VERSION_RANGE_310 = [310, 319];
+function isV300(version) {
+  return isVersionRange(version, VERSION_RANGE_300);
+}
+function isV310(version) {
+  return isVersionRange(version, VERSION_RANGE_310);
+}
+function isVersionRange(version, range) {
+  return Number(version) >= range[0] && Number(version) <= range[1];
+}
+export {
+  VERSION_RANGE_300,
+  VERSION_RANGE_310,
+  isV300,
+  isV310,
+  isVersionRange
+};

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

@@ -4,7 +4,6 @@ import { NO_VERSION } from "../../constants/index.js";
 import { TypedObjectUtils } from "../../utils/mappers.js";
 class AbstractAddressProviderContract extends BaseContract {
   #addresses = {};
-  #latest = {};
   constructor(sdk, args, addresses = {}) {
     super(sdk, args);
     this.#addresses = addresses;
@@ -15,9 +14,6 @@ class AbstractAddressProviderContract extends 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 = NO_VERSION) {
@@ -30,14 +26,7 @@ class AbstractAddressProviderContract extends 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;
@@ -56,6 +45,13 @@ class AbstractAddressProviderContract extends 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/esm/sdk/core/address-provider/createAddressProvider.js

@@ -1,5 +1,5 @@
 import { iVersionAbi } from "../../../abi/iVersion.js";
-import { isV300, isV310 } from "../../utils/index.js";
+import { isV300, isV310 } from "../../constants/index.js";
 import { AddressProviderV300Contract } from "./AddressProviderV300Contract.js";
 import { AddressProviderV310Contract } from "./AddressProviderV310Contract.js";
 async function createAddressProvider(sdk, address) {

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

@@ -1,11 +1,14 @@
 import { iGaugeCompressorAbi } from "../../abi/compressors.js";
 import { SDKConstruct } from "../base/index.js";
-import { AP_GAUGE_COMPRESSOR } from "../constants/index.js";
+import { AP_GAUGE_COMPRESSOR, VERSION_RANGE_310 } from "../constants/index.js";
 class GaugeStakingService extends SDKConstruct {
   #compressor;
   constructor(sdk) {
     super(sdk);
-    [this.#compressor] = this.sdk.addressProvider.getLatestVersion(AP_GAUGE_COMPRESSOR);
+    [this.#compressor] = this.sdk.addressProvider.mustGetLatest(
+      AP_GAUGE_COMPRESSOR,
+      VERSION_RANGE_310
+    );
   }
   /**
    * Returns voting state for wallet

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

@@ -1,6 +1,10 @@
 import { iMarketCompressorAbi } from "../../abi/compressors.js";
 import { SDKConstruct } from "../base/index.js";
-import { ADDRESS_0X0, AP_MARKET_COMPRESSOR } from "../constants/index.js";
+import {
+  ADDRESS_0X0,
+  AP_MARKET_COMPRESSOR,
+  VERSION_RANGE_310
+} from "../constants/index.js";
 import { AddressMap, childLogger } from "../utils/index.js";
 import { simulateWithPriceUpdates } from "../utils/viem/index.js";
 import { MarketSuite } from "./MarketSuite.js";
@@ -62,9 +66,9 @@ class MarketRegister extends SDKConstruct {
       pools,
       underlying: ADDRESS_0X0
     };
-    const marketCompressorAddress = this.sdk.addressProvider.getAddress(
+    const [marketCompressorAddress] = this.sdk.addressProvider.mustGetLatest(
       AP_MARKET_COMPRESSOR,
-      310
+      VERSION_RANGE_310
     );
     let txs = [];
     if (!ignoreUpdateablePrices) {

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 { createPriceOracle } from "./oracle/index.js";
+import { getOrCreatePriceOracle } from "./oracle/index.js";
 import { PoolSuite } from "./pool/index.js";
 class MarketSuite extends SDKConstruct {
   acl;
@@ -35,11 +35,7 @@ class MarketSuite 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);

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

@@ -1,10 +1,11 @@
+import { isV300, isV310 } from "../../constants/index.js";
 import { CreditConfiguratorV300Contract } from "./CreditConfiguratorV300Contract.js";
 import { CreditConfiguratorV310Contract } from "./CreditConfiguratorV310Contract.js";
 function createCreditConfigurator(sdk, data) {
   const v = data.creditConfigurator.baseParams.version;
-  if (v >= 300 && v < 310) {
+  if (isV300(v)) {
     return new CreditConfiguratorV300Contract(sdk, data);
-  } else if (v === 310n) {
+  } else if (isV310(v)) {
     return new CreditConfiguratorV310Contract(sdk, data);
   }
   throw new Error(`Unsupported credit configurator version: ${v}`);

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

@@ -1,10 +1,11 @@
+import { isV300, isV310 } from "../../constants/index.js";
 import { CreditFacadeV300Contract } from "./CreditFacadeV300Contract.js";
 import { CreditFacadeV310Contract } from "./CreditFacadeV310Contract.js";
 function createCreditFacade(sdk, data) {
   const v = data.creditFacade.baseParams.version;
-  if (v >= 300 && v < 310) {
+  if (isV300(v)) {
     return new CreditFacadeV300Contract(sdk, data);
-  } else if (v === 310n) {
+  } else if (isV310(v)) {
     return new CreditFacadeV310Contract(sdk, data);
   }
   throw new Error(`Unsupported credit facade version: ${v}`);

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

@@ -1,10 +1,11 @@
+import { isV300, isV310 } from "../../constants/index.js";
 import { CreditManagerV300Contract } from "./CreditManagerV300Contract.js";
 import { CreditManagerV310Contract } from "./CreditManagerV310Contract.js";
 function createCreditManager(sdk, data) {
   const v = data.creditManager.baseParams.version;
-  if (v >= 300 && v < 310) {
+  if (isV300(v)) {
     return new CreditManagerV300Contract(sdk, data);
-  } else if (v === 310n) {
+  } else if (isV310(v)) {
     return new CreditManagerV310Contract(sdk, data);
   }
   throw new Error(`Unsupported credit manager version: ${v}`);