@gearbox-protocol/sdk 8.2.0 → 8.3.0-next.1

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

@@ -26,6 +26,7 @@ var import_base = require("../base/index.js");
 var import_constants = require("../constants/index.js");
 var import_utils = require("../utils/index.js");
 var import_viem = require("../utils/viem/index.js");
+var import_MarketConfiguratorContract = require("./MarketConfiguratorContract.js");
 var import_MarketSuite = require("./MarketSuite.js");
 class MarketRegister extends import_base.SDKConstruct {
   #logger;
@@ -34,6 +35,10 @@ class MarketRegister extends import_base.SDKConstruct {
    */
   #markets = new import_utils.AddressMap(void 0, "markets");
   #marketFilter;
+  #marketConfigurators = new import_utils.AddressMap(
+    void 0,
+    "marketConfigurators"
+  );
   constructor(sdk) {
     super(sdk);
     this.#logger = (0, import_utils.childLogger)("MarketRegister", sdk.logger);
@@ -46,11 +51,7 @@ class MarketRegister extends import_base.SDKConstruct {
         new import_MarketSuite.MarketSuite(this.sdk, data)
       );
     }
-    this.#marketFilter = {
-      configurators: this.marketConfigurators.map((c) => c.address),
-      pools: [],
-      underlying: import_constants.ADDRESS_0X0
-    };
+    this.#setMarketFilter(this.marketConfigurators.map((c) => c.address));
   }
   async loadMarkets(marketConfigurators, ignoreUpdateablePrices) {
     if (!marketConfigurators.length) {
@@ -61,35 +62,43 @@ class MarketRegister extends import_base.SDKConstruct {
     }
     await this.#loadMarkets(marketConfigurators, [], ignoreUpdateablePrices);
   }
+  #setMarketFilter(configurators, pools = []) {
+    for (const c of configurators) {
+      this.#marketConfigurators.upsert(
+        c,
+        new import_MarketConfiguratorContract.MarketConfiguratorContract(this.sdk, c)
+      );
+    }
+    this.#marketFilter = {
+      configurators,
+      pools,
+      underlying: import_constants.ADDRESS_0X0
+    };
+  }
   get marketFilter() {
+    if (!this.#marketFilter) {
+      throw new Error(
+        "market filter is not set, check if market register was properly attached or hydrated"
+      );
+    }
     return this.#marketFilter;
   }
   async syncState(skipPriceUpdate) {
-    const dirtyPools = [];
-    const nonDirtyOracles = [];
-    for (const m of this.markets) {
-      if (m.dirty) {
-        dirtyPools.push(m.pool);
-      } else {
-        nonDirtyOracles.push(m.priceOracle.address);
-      }
-    }
-    if (dirtyPools.length) {
-      this.#logger?.debug(`need to reload ${dirtyPools.length} markets`);
+    const dirty = this.markets.some((m) => m.dirty) || this.marketConfigurators.some((c) => c.dirty);
+    if (dirty) {
+      this.#logger?.debug(
+        "some markets or market configurators are dirty, reloading everything"
+      );
       await this.#loadMarkets(
-        Array.from(new Set(dirtyPools.map((p) => p.marketConfigurator.address))),
-        dirtyPools.map((p) => p.pool.address)
+        [...this.marketFilter.configurators],
+        [...this.marketFilter.pools]
       );
-    } else if (!skipPriceUpdate && nonDirtyOracles.length) {
-      await this.updatePrices(nonDirtyOracles);
+    } else if (!skipPriceUpdate) {
+      await this.updatePrices();
     }
   }
   async #loadMarkets(configurators, pools, ignoreUpdateablePrices) {
-    this.#marketFilter = {
-      configurators,
-      pools,
-      underlying: import_constants.ADDRESS_0X0
-    };
+    this.#setMarketFilter(configurators, pools);
     const [marketCompressorAddress] = this.sdk.addressProvider.mustGetLatest(
       import_constants.AP_MARKET_COMPRESSOR,
       import_constants.VERSION_RANGE_310
@@ -118,7 +127,7 @@ class MarketRegister extends import_base.SDKConstruct {
               abi: import_compressors.iMarketCompressorAbi,
               address: marketCompressorAddress,
               functionName: "getMarkets",
-              args: [this.#marketFilter]
+              args: [this.marketFilter]
             }
           ],
           blockNumber: this.sdk.currentBlock,
@@ -131,7 +140,7 @@ class MarketRegister extends import_base.SDKConstruct {
         abi: import_compressors.iMarketCompressorAbi,
         address: marketCompressorAddress,
         functionName: "getMarkets",
-        args: [this.#marketFilter],
+        args: [this.marketFilter],
         blockNumber: this.sdk.currentBlock,
         // @ts-expect-error
         gas: this.sdk.gasLimit
@@ -179,7 +188,11 @@ class MarketRegister extends import_base.SDKConstruct {
     }
   }
   get watchAddresses() {
-    return new Set(this.markets.flatMap((m) => Array.from(m.watchAddresses)));
+    return /* @__PURE__ */ new Set([
+      ...this.markets.flatMap((m) => Array.from(m.watchAddresses)),
+      // this is needed to handle edge case of market configurator without markets, to detect CreateMarket event
+      ...this.marketFilter.configurators
+    ]);
   }
   get state() {
     return this.markets.map((market) => market.state);
@@ -196,11 +209,7 @@ class MarketRegister extends import_base.SDKConstruct {
     return this.markets.flatMap((market) => market.creditManagers);
   }
   get marketConfigurators() {
-    const result = /* @__PURE__ */ new Set();
-    for (const m of this.markets) {
-      result.add(m.configurator);
-    }
-    return Array.from(result);
+    return this.#marketConfigurators.values();
   }
   findCreditManager(creditManager) {
     const addr = creditManager.toLowerCase();

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

@@ -39,16 +39,13 @@ class MarketSuite extends import_base.SDKConstruct {
   constructor(sdk, marketData) {
     super(sdk);
     this.state = marketData;
-    let configurator = sdk.contracts.get(
-      marketData.configurator
-    );
-    if (!configurator) {
-      configurator = new import_MarketConfiguratorContract.MarketConfiguratorContract(
-        sdk,
-        marketData.configurator
+    const mc = sdk.contracts.mustGet(marketData.configurator);
+    if (!(mc instanceof import_MarketConfiguratorContract.MarketConfiguratorContract)) {
+      throw new Error(
+        `Market configurator ${marketData.configurator} is not a market configurator`
       );
     }
-    this.configurator = configurator;
+    this.configurator = mc;
     this.acl = marketData.acl;
     for (const t of marketData.tokens) {
       sdk.tokensMeta.upsert(t.addr, t);

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

@@ -98,6 +98,31 @@ class PriceFeedRegister extends import_base.SDKConstruct {
     this.#latestUpdate = latestUpdate;
     return result;
   }
+  /**
+   * Similar to generatePriceFeedsUpdateTxs, but will generate necessary price update transactions for external price feeds
+   * This does not add feeds to this register, so they won't be implicitly included in future generatePriceFeedsUpdateTxs calls
+   * @param feeds
+   * @param block
+   * @returns
+   */
+  async generateExternalPriceFeedsUpdateTxs(feeds, block) {
+    const [priceFeedCompressorAddress] = this.sdk.addressProvider.mustGetLatest(
+      import_constants.AP_PRICE_FEED_COMPRESSOR,
+      import_constants.VERSION_RANGE_310
+    );
+    const blockParam = block ?? { blockNumber: this.sdk.currentBlock };
+    const result = await this.provider.publicClient.readContract({
+      address: priceFeedCompressorAddress,
+      abi: import_compressors.iPriceFeedCompressorAbi,
+      functionName: "loadPriceFeedTree",
+      args: [feeds],
+      ...blockParam,
+      // @ts-expect-error
+      gas: this.sdk.gasLimit
+    });
+    const feedContracts = result.map((data) => this.create(data));
+    return this.generatePriceFeedsUpdateTxs(feedContracts);
+  }
   has(address) {
     return this.#feeds.has(address);
   }

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

@@ -204,6 +204,12 @@ class RouterV300Contract extends import_AbstractRouterContract.AbstractRouterCon
       leftover,
       connectors
     });
+    const force = ca.tokens.some(
+      (b) => b.token.toLowerCase() === import_sdk_gov_legacy.tokenDataByNetwork.Mainnet.stkcvxRLUSDUSDC.toLowerCase() && b.balance > 10n
+    );
+    if (force) {
+      this.logger?.warn("applying stkcvxRLUSDUSDC workaround");
+    }
     let results = [];
     for (const po of pathOptions) {
       const { result: result2 } = await this.contract.simulate.findBestClosePath(
@@ -215,7 +221,7 @@ class RouterV300Contract extends import_AbstractRouterContract.AbstractRouterCon
           BigInt(slippage),
           po,
           BigInt(LOOPS_PER_TX),
-          false
+          force
         ],
         {
           gas: GAS_PER_BLOCK

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

@@ -7,6 +7,7 @@ import {
 } from "../constants/index.js";
 import { AddressMap, childLogger } from "../utils/index.js";
 import { simulateWithPriceUpdates } from "../utils/viem/index.js";
+import { MarketConfiguratorContract } from "./MarketConfiguratorContract.js";
 import { MarketSuite } from "./MarketSuite.js";
 class MarketRegister extends SDKConstruct {
   #logger;
@@ -15,6 +16,10 @@ class MarketRegister extends SDKConstruct {
    */
   #markets = new AddressMap(void 0, "markets");
   #marketFilter;
+  #marketConfigurators = new AddressMap(
+    void 0,
+    "marketConfigurators"
+  );
   constructor(sdk) {
     super(sdk);
     this.#logger = childLogger("MarketRegister", sdk.logger);
@@ -27,11 +32,7 @@ class MarketRegister extends SDKConstruct {
         new MarketSuite(this.sdk, data)
       );
     }
-    this.#marketFilter = {
-      configurators: this.marketConfigurators.map((c) => c.address),
-      pools: [],
-      underlying: ADDRESS_0X0
-    };
+    this.#setMarketFilter(this.marketConfigurators.map((c) => c.address));
   }
   async loadMarkets(marketConfigurators, ignoreUpdateablePrices) {
     if (!marketConfigurators.length) {
@@ -42,35 +43,43 @@ class MarketRegister extends SDKConstruct {
     }
     await this.#loadMarkets(marketConfigurators, [], ignoreUpdateablePrices);
   }
+  #setMarketFilter(configurators, pools = []) {
+    for (const c of configurators) {
+      this.#marketConfigurators.upsert(
+        c,
+        new MarketConfiguratorContract(this.sdk, c)
+      );
+    }
+    this.#marketFilter = {
+      configurators,
+      pools,
+      underlying: ADDRESS_0X0
+    };
+  }
   get marketFilter() {
+    if (!this.#marketFilter) {
+      throw new Error(
+        "market filter is not set, check if market register was properly attached or hydrated"
+      );
+    }
     return this.#marketFilter;
   }
   async syncState(skipPriceUpdate) {
-    const dirtyPools = [];
-    const nonDirtyOracles = [];
-    for (const m of this.markets) {
-      if (m.dirty) {
-        dirtyPools.push(m.pool);
-      } else {
-        nonDirtyOracles.push(m.priceOracle.address);
-      }
-    }
-    if (dirtyPools.length) {
-      this.#logger?.debug(`need to reload ${dirtyPools.length} markets`);
+    const dirty = this.markets.some((m) => m.dirty) || this.marketConfigurators.some((c) => c.dirty);
+    if (dirty) {
+      this.#logger?.debug(
+        "some markets or market configurators are dirty, reloading everything"
+      );
       await this.#loadMarkets(
-        Array.from(new Set(dirtyPools.map((p) => p.marketConfigurator.address))),
-        dirtyPools.map((p) => p.pool.address)
+        [...this.marketFilter.configurators],
+        [...this.marketFilter.pools]
       );
-    } else if (!skipPriceUpdate && nonDirtyOracles.length) {
-      await this.updatePrices(nonDirtyOracles);
+    } else if (!skipPriceUpdate) {
+      await this.updatePrices();
     }
   }
   async #loadMarkets(configurators, pools, ignoreUpdateablePrices) {
-    this.#marketFilter = {
-      configurators,
-      pools,
-      underlying: ADDRESS_0X0
-    };
+    this.#setMarketFilter(configurators, pools);
     const [marketCompressorAddress] = this.sdk.addressProvider.mustGetLatest(
       AP_MARKET_COMPRESSOR,
       VERSION_RANGE_310
@@ -99,7 +108,7 @@ class MarketRegister extends SDKConstruct {
               abi: iMarketCompressorAbi,
               address: marketCompressorAddress,
               functionName: "getMarkets",
-              args: [this.#marketFilter]
+              args: [this.marketFilter]
             }
           ],
           blockNumber: this.sdk.currentBlock,
@@ -112,7 +121,7 @@ class MarketRegister extends SDKConstruct {
         abi: iMarketCompressorAbi,
         address: marketCompressorAddress,
         functionName: "getMarkets",
-        args: [this.#marketFilter],
+        args: [this.marketFilter],
         blockNumber: this.sdk.currentBlock,
         // @ts-expect-error
         gas: this.sdk.gasLimit
@@ -160,7 +169,11 @@ class MarketRegister extends SDKConstruct {
     }
   }
   get watchAddresses() {
-    return new Set(this.markets.flatMap((m) => Array.from(m.watchAddresses)));
+    return /* @__PURE__ */ new Set([
+      ...this.markets.flatMap((m) => Array.from(m.watchAddresses)),
+      // this is needed to handle edge case of market configurator without markets, to detect CreateMarket event
+      ...this.marketFilter.configurators
+    ]);
   }
   get state() {
     return this.markets.map((market) => market.state);
@@ -177,11 +190,7 @@ class MarketRegister extends SDKConstruct {
     return this.markets.flatMap((market) => market.creditManagers);
   }
   get marketConfigurators() {
-    const result = /* @__PURE__ */ new Set();
-    for (const m of this.markets) {
-      result.add(m.configurator);
-    }
-    return Array.from(result);
+    return this.#marketConfigurators.values();
   }
   findCreditManager(creditManager) {
     const addr = creditManager.toLowerCase();

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

@@ -16,16 +16,13 @@ class MarketSuite extends SDKConstruct {
   constructor(sdk, marketData) {
     super(sdk);
     this.state = marketData;
-    let configurator = sdk.contracts.get(
-      marketData.configurator
-    );
-    if (!configurator) {
-      configurator = new MarketConfiguratorContract(
-        sdk,
-        marketData.configurator
+    const mc = sdk.contracts.mustGet(marketData.configurator);
+    if (!(mc instanceof MarketConfiguratorContract)) {
+      throw new Error(
+        `Market configurator ${marketData.configurator} is not a market configurator`
       );
     }
-    this.configurator = configurator;
+    this.configurator = mc;
     this.acl = marketData.acl;
     for (const t of marketData.tokens) {
       sdk.tokensMeta.upsert(t.addr, t);

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

@@ -81,6 +81,31 @@ class PriceFeedRegister extends SDKConstruct {
     this.#latestUpdate = latestUpdate;
     return result;
   }
+  /**
+   * Similar to generatePriceFeedsUpdateTxs, but will generate necessary price update transactions for external price feeds
+   * This does not add feeds to this register, so they won't be implicitly included in future generatePriceFeedsUpdateTxs calls
+   * @param feeds
+   * @param block
+   * @returns
+   */
+  async generateExternalPriceFeedsUpdateTxs(feeds, block) {
+    const [priceFeedCompressorAddress] = this.sdk.addressProvider.mustGetLatest(
+      AP_PRICE_FEED_COMPRESSOR,
+      VERSION_RANGE_310
+    );
+    const blockParam = block ?? { blockNumber: this.sdk.currentBlock };
+    const result = await this.provider.publicClient.readContract({
+      address: priceFeedCompressorAddress,
+      abi: iPriceFeedCompressorAbi,
+      functionName: "loadPriceFeedTree",
+      args: [feeds],
+      ...blockParam,
+      // @ts-expect-error
+      gas: this.sdk.gasLimit
+    });
+    const feedContracts = result.map((data) => this.create(data));
+    return this.generatePriceFeedsUpdateTxs(feedContracts);
+  }
   has(address) {
     return this.#feeds.has(address);
   }

package/dist/esm/sdk/router/RouterV300Contract.js

@@ -2,7 +2,7 @@ import { encodeFunctionData, getContract } from "viem";
 import { iRouterV300Abi, iSwapperV300Abi } from "../../abi/routerV300.js";
 import { iCreditFacadeV300MulticallAbi } from "../../abi/v300.js";
 import { PERCENTAGE_FACTOR } from "../constants/index.js";
-import { getConnectors } from "../sdk-gov-legacy/index.js";
+import { getConnectors, tokenDataByNetwork } from "../sdk-gov-legacy/index.js";
 import { AbstractRouterContract } from "./AbstractRouterContract.js";
 import { assetsMap, balancesMap, compareRouterResults } from "./helpers.js";
 import { PathOptionFactory } from "./PathOptionFactory.js";
@@ -181,6 +181,12 @@ class RouterV300Contract extends AbstractRouterContract {
       leftover,
       connectors
     });
+    const force = ca.tokens.some(
+      (b) => b.token.toLowerCase() === tokenDataByNetwork.Mainnet.stkcvxRLUSDUSDC.toLowerCase() && b.balance > 10n
+    );
+    if (force) {
+      this.logger?.warn("applying stkcvxRLUSDUSDC workaround");
+    }
     let results = [];
     for (const po of pathOptions) {
       const { result: result2 } = await this.contract.simulate.findBestClosePath(
@@ -192,7 +198,7 @@ class RouterV300Contract extends AbstractRouterContract {
           BigInt(slippage),
           po,
           BigInt(LOOPS_PER_TX),
-          false
+          force
         ],
         {
           gas: GAS_PER_BLOCK

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

@@ -1,11 +1,11 @@
 import type { Address } from "viem";
-import type { MarketData } from "../base/index.js";
+import type { MarketData, MarketFilter } from "../base/index.js";
 import { SDKConstruct } from "../base/index.js";
 import type { GearboxSDK } from "../GearboxSDK.js";
 import type { MarketStateHuman } from "../types/index.js";
 import { AddressMap } from "../utils/index.js";
 import type { CreditSuite } from "./credit/index.js";
-import type { MarketConfiguratorContract } from "./MarketConfiguratorContract.js";
+import { MarketConfiguratorContract } from "./MarketConfiguratorContract.js";
 import { MarketSuite } from "./MarketSuite.js";
 import type { PoolSuite } from "./pool/index.js";
 export declare class MarketRegister extends SDKConstruct {
@@ -13,11 +13,7 @@ export declare class MarketRegister extends SDKConstruct {
     constructor(sdk: GearboxSDK);
     hydrate(state: MarketData[]): void;
     loadMarkets(marketConfigurators: Address[], ignoreUpdateablePrices?: boolean): Promise<void>;
-    get marketFilter(): {
-        configurators: readonly `0x${string}`[];
-        pools: readonly `0x${string}`[];
-        underlying: `0x${string}`;
-    } | undefined;
+    get marketFilter(): MarketFilter;
     syncState(skipPriceUpdate?: boolean): Promise<void>;
     /**
      * Loads new prices and price feeds for given oracles from PriceFeedCompressor, defaults to all oracles

package/dist/types/sdk/market/pricefeeds/PriceFeedsRegister.d.ts

@@ -1,4 +1,4 @@
-import type { Address } from "viem";
+import type { Address, BlockTag } from "viem";
 import type { PriceFeedTreeNode } from "../../base/index.js";
 import { SDKConstruct } from "../../base/index.js";
 import type { GearboxSDK } from "../../GearboxSDK.js";
@@ -40,6 +40,18 @@ export declare class PriceFeedRegister extends SDKConstruct implements IHooks<Pr
      * @returns
      */
     generatePriceFeedsUpdateTxs(priceFeeds?: IPriceFeedContract[], logContext?: Record<string, any>): Promise<UpdatePriceFeedsResult>;
+    /**
+     * Similar to generatePriceFeedsUpdateTxs, but will generate necessary price update transactions for external price feeds
+     * This does not add feeds to this register, so they won't be implicitly included in future generatePriceFeedsUpdateTxs calls
+     * @param feeds
+     * @param block
+     * @returns
+     */
+    generateExternalPriceFeedsUpdateTxs(feeds: Address[], block?: {
+        blockNumber: bigint;
+    } | {
+        blockTag: BlockTag;
+    }): Promise<UpdatePriceFeedsResult>;
     has(address: Address): boolean;
     mustGet(address: Address): IPriceFeedContract;
     getOrCreate(data: PriceFeedTreeNode): IPriceFeedContract;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "8.2.0",
+  "version": "8.3.0-next.1",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",