@gearbox-protocol/sdk 3.0.0-vfour.13 → 3.0.0-vfour.15

package/dist/cjs/sdk/index.cjs

@@ -13216,6 +13216,7 @@ var CreditAccountsService = class extends SDKConstruct {
         functionName: "getCreditAccountData",
         args: [account],
         blockNumber
+        // TODO: we should cache price updates for block to speed up optimistic liquidator
       });
     } catch (e) {
       return void 0;
@@ -13305,19 +13306,12 @@ var CreditAccountsService = class extends SDKConstruct {
    */
   async fullyLiquidate(account, to, slippage = 50n) {
     const cm = this.sdk.marketRegister.findCreditManager(account.creditManager);
-    const market = this.sdk.marketRegister.findByCreditManager(
-      account.creditManager
-    );
     const preview = await this.sdk.router.findBestClosePath(
       account,
       cm.creditManager,
       slippage
     );
-    const priceUpdates = await this.#getUpdateForAccounts([account]);
-    const priceUpdateCalls = market.priceOracle.onDemandPriceUpdates(
-      cm.creditFacade.address,
-      priceUpdates
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade(account);
     const recipient = to ?? this.sdk.provider.account;
     if (!recipient) {
       throw new Error("liquidate account: assets recipient not specied");
@@ -13327,7 +13321,7 @@ var CreditAccountsService = class extends SDKConstruct {
       args: [
         account.creditAccount,
         recipient,
-        [...priceUpdateCalls, ...preview.calls]
+        [...priceUpdates, ...preview.calls]
       ]
     });
   }
@@ -13398,26 +13392,24 @@ var CreditAccountsService = class extends SDKConstruct {
    * @param accounts
    * @returns
    */
-  async #getUpdateForAccounts(accounts, blockNumber) {
+  async #getUpdateForAccount(acc, blockNumber) {
     const tokensByPool = /* @__PURE__ */ new Map();
     const oracleByPool = /* @__PURE__ */ new Map();
-    for (const acc of accounts) {
-      const market = this.sdk.marketRegister.findByCreditManager(
-        acc.creditManager
-      );
-      const pool = market.state.pool.pool.address;
-      oracleByPool.set(pool, market.priceOracle);
-      for (const t of acc.tokens) {
-        if (t.balance > 10n) {
-          const tokens = tokensByPool.get(pool) ?? /* @__PURE__ */ new Set();
-          tokens.add(t.token);
-          tokensByPool.set(pool, tokens);
-        }
+    const market = this.sdk.marketRegister.findByCreditManager(
+      acc.creditManager
+    );
+    const pool = market.state.pool.pool.address;
+    oracleByPool.set(pool, market.priceOracle);
+    for (const t of acc.tokens) {
+      if (t.balance > 10n) {
+        const tokens = tokensByPool.get(pool) ?? /* @__PURE__ */ new Set();
+        tokens.add(t.token);
+        tokensByPool.set(pool, tokens);
       }
     }
     const priceFeeds = [];
-    for (const [pool, priceFeedFactory] of oracleByPool.entries()) {
-      const tokens = Array.from(tokensByPool.get(pool) ?? []);
+    for (const [pool2, priceFeedFactory] of oracleByPool.entries()) {
+      const tokens = Array.from(tokensByPool.get(pool2) ?? []);
       priceFeeds.push(...priceFeedFactory.priceFeedsForTokens(tokens));
     }
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(
@@ -13425,22 +13417,46 @@ var CreditAccountsService = class extends SDKConstruct {
       blockNumber
     );
   }
-  async #prepareCloseCreditAccount(ca, cm, assetsToKeep, to, slippage = 50n) {
+  /**
+   * Returns account price updates in a non-encoded format
+   * @param acc
+   * @param blockNumber
+   * @returns
+   */
+  async getOnDemandPriceUpdates(acc, blockNumber) {
     const market = this.sdk.marketRegister.findByCreditManager(
-      ca.creditManager
+      acc.creditManager
     );
+    const update = await this.#getUpdateForAccount(acc, blockNumber);
+    return market.priceOracle.onDemandPriceUpdates(update);
+  }
+  /**
+   * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...)
+   * @param acc
+   * @param blockNumber
+   * @returns
+   */
+  async getPriceUpdatesForFacade(acc, blockNumber) {
+    const cm = this.sdk.marketRegister.findCreditManager(acc.creditManager);
+    const updates = await this.getOnDemandPriceUpdates(acc, blockNumber);
+    return updates.map(({ token, reserve, data }) => ({
+      target: cm.creditFacade.address,
+      callData: viem.encodeFunctionData({
+        abi: iCreditFacadeV3MulticallAbi,
+        functionName: "onDemandPriceUpdate",
+        args: [token, reserve, data]
+      })
+    }));
+  }
+  async #prepareCloseCreditAccount(ca, cm, assetsToKeep, to, slippage = 50n) {
     const closePath = await this.sdk.router.findBestClosePath(
       ca,
       cm.creditManager,
       slippage
     );
-    const priceUpdates = await this.#getUpdateForAccounts([ca]);
-    const priceUpdateCalls = market.priceOracle.onDemandPriceUpdates(
-      cm.creditFacade.address,
-      priceUpdates
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade(ca);
     return [
-      ...priceUpdateCalls,
+      ...priceUpdates,
       ...closePath.calls,
       ...this.#prepareDisableQuotas(ca),
       ...this.#prepareDecreaseDebt(ca),
@@ -14997,15 +15013,15 @@ var PriceOracleContract = class extends BaseContract {
   /**
    * Converts previously obtained price updates into CreditFacade multicall entries
    * @param creditFacade
-   * @param priceUpdates
+   * @param updates
    * @returns
    */
-  onDemandPriceUpdates(creditFacade, priceUpdates) {
+  onDemandPriceUpdates(updates) {
     const result = [];
-    if (!priceUpdates) {
+    if (!updates) {
       return result;
     }
-    const { txs } = priceUpdates;
+    const { txs } = updates;
     for (const tx of txs) {
       const { to: priceFeed, callData } = tx;
       const [token, reserve] = this.#findTokenForPriceFeed(priceFeed);
@@ -15015,12 +15031,9 @@ var PriceOracleContract = class extends BaseContract {
       });
       const data = args[0];
       result.push({
-        target: creditFacade,
-        callData: viem.encodeFunctionData({
-          abi: iCreditFacadeV3MulticallAbi,
-          functionName: "onDemandPriceUpdate",
-          args: [token, reserve, data]
-        })
+        token,
+        reserve,
+        data
       });
     }
     return result;
@@ -15524,7 +15537,7 @@ var RouterV3Contract = class extends BaseContract {
    *          - calls - list of calls which should be done to swap & unwrap everything to underlying token
    */
   async findBestClosePath(ca, cm, slippage) {
-    const { pathOptions, expected, leftover, connectors } = this.#getBestClosePathInput(ca, cm);
+    const { pathOptions, expected, leftover, connectors } = this.getFindClosePathInput(ca, cm);
     this.sdk.emit("foundPathOptions", { pathOptions });
     let results = [];
     for (const po of pathOptions) {
@@ -15566,7 +15579,13 @@ var RouterV3Contract = class extends BaseContract {
     });
     return result;
   }
-  #getBestClosePathInput(ca, cm) {
+  /**
+   * Finds input to be used with findBestClosePath
+   * @param ca
+   * @param cm
+   * @returns
+   */
+  getFindClosePathInput(ca, cm) {
     const expectedBalances = {};
     const leftoverBalances = {};
     for (const { token: t, balance, mask } of ca.tokens) {

package/dist/cjs/sdk/index.d.ts

@@ -16830,6 +16830,11 @@ interface PriceFeedsForTokensOptions {
     main?: boolean;
     reserve?: boolean;
 }
+interface OnDemandPriceUpdate {
+    token: Address;
+    reserve: boolean;
+    data: Hex;
+}
 declare class PriceOracleContract extends BaseContract<abi$1> {
     #private;
     /**
@@ -16868,10 +16873,10 @@ declare class PriceOracleContract extends BaseContract<abi$1> {
     /**
      * Converts previously obtained price updates into CreditFacade multicall entries
      * @param creditFacade
-     * @param priceUpdates
+     * @param updates
      * @returns
      */
-    onDemandPriceUpdates(creditFacade: Address, priceUpdates?: UpdatePriceFeedsResult): MultiCall[];
+    onDemandPriceUpdates(updates?: UpdatePriceFeedsResult): OnDemandPriceUpdate[];
     /**
      * Tries to convert amount of token into underlying of current market
      * @param token
@@ -16957,6 +16962,12 @@ interface Asset {
 }
 
 type abi = typeof routerV3Abi;
+interface FindClosePathInput {
+    pathOptions: PathOptionSerie[];
+    expected: Asset[];
+    leftover: Asset[];
+    connectors: Address[];
+}
 /**
  * Slice of credit manager data required for router operations
  */
@@ -17014,6 +17025,13 @@ declare class RouterV3Contract extends BaseContract<abi> {
      *          - calls - list of calls which should be done to swap & unwrap everything to underlying token
      */
     findBestClosePath(ca: CreditAccountData, cm: CreditManagerSlice, slippage: bigint | number): Promise<RouterCloseResult>;
+    /**
+     * Finds input to be used with findBestClosePath
+     * @param ca
+     * @param cm
+     * @returns
+     */
+    getFindClosePathInput(ca: CreditAccountData, cm: CreditManagerSlice): FindClosePathInput;
     getAvailableConnectors(collateralTokens: Address[]): Address[];
 }
 
@@ -17214,6 +17232,20 @@ declare class CreditAccountsService extends SDKConstruct {
      * @returns
      */
     closeCreditAccount(operation: "close" | "zeroDebt", ca: CreditAccountData, assetsToKeep: Address[], to?: Address, slippage?: bigint): Promise<RawTx>;
+    /**
+     * Returns account price updates in a non-encoded format
+     * @param acc
+     * @param blockNumber
+     * @returns
+     */
+    getOnDemandPriceUpdates(acc: CreditAccountData, blockNumber?: bigint): Promise<OnDemandPriceUpdate[]>;
+    /**
+     * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...)
+     * @param acc
+     * @param blockNumber
+     * @returns
+     */
+    getPriceUpdatesForFacade(acc: CreditAccountData, blockNumber?: bigint): Promise<MultiCall[]>;
     /**
      * Returns addresses of pools of attached markets
      */
@@ -17369,4 +17401,4 @@ type MulticallErrorType = GetChainContractAddressErrorType | ReadContractErrorTy
  */
 declare function simulateMulticall<const contracts extends readonly unknown[], chain extends Chain | undefined, allowFailure extends boolean = true>(client: Client<Transport, chain>, parameters: MulticallParameters<contracts, allowFailure>): Promise<MulticallReturnType<contracts, allowFailure>>;
 
-export { type ACLState, type ACLStateHuman, ADDRESS_0X0, ADDRESS_PROVIDER, AP_ACCOUNT_FACTORY, AP_ACL, AP_BOT_LIST, AP_CONTRACTS_REGISTER, AP_CONTROLLER_TIMELOCK, AP_CREDIT_ACCOUNT_COMPRESSOR, AP_DATA_COMPRESSOR, AP_DEGEN_DISTRIBUTOR, AP_DEGEN_NFT, AP_DELEVERAGE_BOT_HV, AP_DELEVERAGE_BOT_LV, AP_DELEVERAGE_BOT_PEGGED, AP_GEAR_STAKING, AP_GEAR_TOKEN, AP_INFLATION_ATTACK_BLOCKER, AP_INSOLVENCY_CHECKER, AP_MARKET_COMPRESSOR, AP_MULTI_PAUSE, AP_PARTIAL_LIQUIDATION_BOT, AP_PRICE_ORACLE, AP_ROUTER, AP_TREASURY, AP_WETH_GATEWAY, AP_WETH_TOKEN, AP_ZAPPER_REGISTER, AP_ZERO_PRICE_FEED, AbstractPriceFeedContract, type AccountFactoryStateHuman, AddressLabeller, AddressMap, AddressProviderContractV3_1, type AddressProviderV3State, type AddressProviderV3StateHuman, type AnvilActions, type AnvilClient, type AnvilClientConfig, type Asset, type AssetPriceFeedState, type AssetPriceFeedStateHuman, BalancerStablePriceFeedContract, BalancerWeightedPriceFeedContract, BaseContract, type BaseContractOptions, type BaseContractState, type BaseContractStateHuman, type BasePriceFeedState, type BasePriceFeedStateHuman, BotListContract, type BotListState, type BotListStateHuman, BotPermissions, type BoundedOracleState, type BoundedOracleStateHuman, BoundedPriceFeedContract, ChainlinkPriceFeedContract, CompositePriceFeedContract, type ContractMethod, type ContractsRegisterState, type ContractsRegisterStateHuman, type ControllerTimelockV3State, type ControllerTimelockV3StateHuman, type CoreState, type CoreStateHuman, type CreditAccountData, type CreditAccountFilter, CreditAccountsService, CreditConfiguratorContract, type CreditConfiguratorState, type CreditConfiguratorStateHuman, CreditFacadeContract, type CreditFacadeState, type CreditFacadeStateHuman, CreditFactory, type CreditFactoryState, type CreditFactoryStateHuman, CreditManagerContract, type CreditManagerData, type CreditManagerDebtParams, type CreditManagerDebtParamsHuman, type CreditManagerDebtParamsStruct, type CreditManagerState, type CreditManagerStateHuman, CurveCryptoPriceFeedContract, type CurvePoolStruct, CurveStablePriceFeedContract, CurveUSDPriceFeedContract, type DataCompressorV3State, type DegenDistributorState, type DegenDistributorStateHuman, type DegenNFT2State, type DegenNFT2StateHuman, Erc4626PriceFeedContract, type EtherscanURLParam, GaugeContract, type GaugeParams, type GaugeParamsHuman, type GaugeState, type GaugeStateHuman, GearStakingContract, type GearStakingV3State, type GearStakingV3StateHuman, GearboxSDK, type GearboxState, type GearboxStateHuman, type ILPPriceFeedContract, type ILogger, type IPriceFeedContract, LinearModelContract, type LinearModelState, type LinearModelStateHuman, type LogFn, MAX_UINT256, MIN_INT96, type MarketData, MarketFactory, MarketRegister, type MarketState, type MarketStateHuman, MellowLRTPriceFeedContract, type MultiCall, type MultiPauseState, type MulticallErrorType, type MulticallParameters, type MulticallReturnType, NOT_DEPLOYED, NO_VERSION, type NetworkType, type OpenStrategyResult, PERCENTAGE_DECIMALS, PERCENTAGE_FACTOR, PRICE_DECIMALS, PRICE_DECIMALS_POW, type PathOption, type PathOptionSerie, type PeripheryState, type PeripheryStateHuman, type PolicyStruct, type PolicyStructHuman, PoolContract, type PoolData, PoolFactory, type PoolFactoryState, type PoolFactoryStateHuman, PoolQuotaKeeperContract, type PoolQuotaKeeperData, type PoolQuotaKeeperState, type PoolQuotaKeeperStateHuman, type PoolState, type PoolStateHuman, type PriceFactoryStateHuman, type PriceFeedConstructorArgs, type PriceFeedContractType, type PriceFeedMapEntry, PriceFeedRef, PriceFeedRegister, type PriceFeedState, type PriceFeedStateHuman, type PriceFeedTreeNode, type PriceFeedUsageType, PriceOracleContract, type PriceOracleData, type PriceOracleState, type PriceOracleV3State, type PriceOracleV3StateHuman, Provider, type ProviderOptions, type QuotaParams, type QuotaParamsHuman, RAY, RAY_DECIMALS_POW, type RateKeeperData, type RawTx, type ReadContractOptions, RedstonePriceFeedContract, type RedstonePriceFeedState, type RedstonePriceFeedStateHuman, type RouterCloseResult, type RouterComponentRegisterHuman, type RouterResult, type RouterState, type RouterStateHuman, RouterV3Contract, type RouterV3ContractState, type RouterV3ContractStateHuman, type SDKAttachOptions, SDKConstruct, type SDKEventsMap, SUPPORTED_CHAINS, type SwapOperation, type SwapTask, TIMELOCK, type TVL, type TokenMetaData, type TokenTypeToResolverHuman, USDC, type UpdatePriceFeedsResult, VotingContractStatus, WAD, WAD_DECIMALS_POW, WstETHPriceFeedContract, YearnPriceFeedContract, type ZapperInfo, type ZapperInfoHuman, type ZapperRegisterState, type ZapperRegisterStateHuman, ZeroPriceFeedContract, botPermissionsToString, bytes32ToString, chains, childLogger, convertBaseContractState, convertCoreStateToHuman, convertCreditFactoryStateToHuman, convertGaugeStateToHuman, convertGearboxStateToHuman, convertGearboxStateToHumanLA, convertLinearModelStateToHuman, convertPeripheryStateToHuman, convertPoolFactoryStateToHuman, convertPoolQuotaKeeperStateToHuman, convertPoolStateToHuman, convertPriceFeedStateToHuman, convertPriceOracleStateToHuman, convertRouterStateToHuman, convertRouterV3StateToHuman, convertZapperRegisterStateToHuman, createAnvilClient, createRawTx, detectNetwork, etherscanUrl, filterDust, fmtBinaryMask, formatBN, formatBNvalue, formatBn4dig, formatDuration, formatNumberToString_, halfRAY, isAnvil, json_parse, json_stringify, numberWithCommas, percentFmt, simulateMulticall, toHumanFormat };
+export { type ACLState, type ACLStateHuman, ADDRESS_0X0, ADDRESS_PROVIDER, AP_ACCOUNT_FACTORY, AP_ACL, AP_BOT_LIST, AP_CONTRACTS_REGISTER, AP_CONTROLLER_TIMELOCK, AP_CREDIT_ACCOUNT_COMPRESSOR, AP_DATA_COMPRESSOR, AP_DEGEN_DISTRIBUTOR, AP_DEGEN_NFT, AP_DELEVERAGE_BOT_HV, AP_DELEVERAGE_BOT_LV, AP_DELEVERAGE_BOT_PEGGED, AP_GEAR_STAKING, AP_GEAR_TOKEN, AP_INFLATION_ATTACK_BLOCKER, AP_INSOLVENCY_CHECKER, AP_MARKET_COMPRESSOR, AP_MULTI_PAUSE, AP_PARTIAL_LIQUIDATION_BOT, AP_PRICE_ORACLE, AP_ROUTER, AP_TREASURY, AP_WETH_GATEWAY, AP_WETH_TOKEN, AP_ZAPPER_REGISTER, AP_ZERO_PRICE_FEED, AbstractPriceFeedContract, type AccountFactoryStateHuman, AddressLabeller, AddressMap, AddressProviderContractV3_1, type AddressProviderV3State, type AddressProviderV3StateHuman, type AnvilActions, type AnvilClient, type AnvilClientConfig, type Asset, type AssetPriceFeedState, type AssetPriceFeedStateHuman, BalancerStablePriceFeedContract, BalancerWeightedPriceFeedContract, BaseContract, type BaseContractOptions, type BaseContractState, type BaseContractStateHuman, type BasePriceFeedState, type BasePriceFeedStateHuman, BotListContract, type BotListState, type BotListStateHuman, BotPermissions, type BoundedOracleState, type BoundedOracleStateHuman, BoundedPriceFeedContract, ChainlinkPriceFeedContract, CompositePriceFeedContract, type ContractMethod, type ContractsRegisterState, type ContractsRegisterStateHuman, type ControllerTimelockV3State, type ControllerTimelockV3StateHuman, type CoreState, type CoreStateHuman, type CreditAccountData, type CreditAccountFilter, CreditAccountsService, CreditConfiguratorContract, type CreditConfiguratorState, type CreditConfiguratorStateHuman, CreditFacadeContract, type CreditFacadeState, type CreditFacadeStateHuman, CreditFactory, type CreditFactoryState, type CreditFactoryStateHuman, CreditManagerContract, type CreditManagerData, type CreditManagerDebtParams, type CreditManagerDebtParamsHuman, type CreditManagerDebtParamsStruct, type CreditManagerState, type CreditManagerStateHuman, CurveCryptoPriceFeedContract, type CurvePoolStruct, CurveStablePriceFeedContract, CurveUSDPriceFeedContract, type DataCompressorV3State, type DegenDistributorState, type DegenDistributorStateHuman, type DegenNFT2State, type DegenNFT2StateHuman, Erc4626PriceFeedContract, type EtherscanURLParam, type FindClosePathInput, GaugeContract, type GaugeParams, type GaugeParamsHuman, type GaugeState, type GaugeStateHuman, GearStakingContract, type GearStakingV3State, type GearStakingV3StateHuman, GearboxSDK, type GearboxState, type GearboxStateHuman, type ILPPriceFeedContract, type ILogger, type IPriceFeedContract, LinearModelContract, type LinearModelState, type LinearModelStateHuman, type LogFn, MAX_UINT256, MIN_INT96, type MarketData, MarketFactory, MarketRegister, type MarketState, type MarketStateHuman, MellowLRTPriceFeedContract, type MultiCall, type MultiPauseState, type MulticallErrorType, type MulticallParameters, type MulticallReturnType, NOT_DEPLOYED, NO_VERSION, type NetworkType, type OnDemandPriceUpdate, type OpenStrategyResult, PERCENTAGE_DECIMALS, PERCENTAGE_FACTOR, PRICE_DECIMALS, PRICE_DECIMALS_POW, type PathOption, type PathOptionSerie, type PeripheryState, type PeripheryStateHuman, type PolicyStruct, type PolicyStructHuman, PoolContract, type PoolData, PoolFactory, type PoolFactoryState, type PoolFactoryStateHuman, PoolQuotaKeeperContract, type PoolQuotaKeeperData, type PoolQuotaKeeperState, type PoolQuotaKeeperStateHuman, type PoolState, type PoolStateHuman, type PriceFactoryStateHuman, type PriceFeedConstructorArgs, type PriceFeedContractType, type PriceFeedMapEntry, PriceFeedRef, PriceFeedRegister, type PriceFeedState, type PriceFeedStateHuman, type PriceFeedTreeNode, type PriceFeedUsageType, PriceOracleContract, type PriceOracleData, type PriceOracleState, type PriceOracleV3State, type PriceOracleV3StateHuman, Provider, type ProviderOptions, type QuotaParams, type QuotaParamsHuman, RAY, RAY_DECIMALS_POW, type RateKeeperData, type RawTx, type ReadContractOptions, RedstonePriceFeedContract, type RedstonePriceFeedState, type RedstonePriceFeedStateHuman, type RouterCloseResult, type RouterComponentRegisterHuman, type RouterResult, type RouterState, type RouterStateHuman, RouterV3Contract, type RouterV3ContractState, type RouterV3ContractStateHuman, type SDKAttachOptions, SDKConstruct, type SDKEventsMap, SUPPORTED_CHAINS, type SwapOperation, type SwapTask, TIMELOCK, type TVL, type TokenMetaData, type TokenTypeToResolverHuman, USDC, type UpdatePriceFeedsResult, VotingContractStatus, WAD, WAD_DECIMALS_POW, WstETHPriceFeedContract, YearnPriceFeedContract, type ZapperInfo, type ZapperInfoHuman, type ZapperRegisterState, type ZapperRegisterStateHuman, ZeroPriceFeedContract, botPermissionsToString, bytes32ToString, chains, childLogger, convertBaseContractState, convertCoreStateToHuman, convertCreditFactoryStateToHuman, convertGaugeStateToHuman, convertGearboxStateToHuman, convertGearboxStateToHumanLA, convertLinearModelStateToHuman, convertPeripheryStateToHuman, convertPoolFactoryStateToHuman, convertPoolQuotaKeeperStateToHuman, convertPoolStateToHuman, convertPriceFeedStateToHuman, convertPriceOracleStateToHuman, convertRouterStateToHuman, convertRouterV3StateToHuman, convertZapperRegisterStateToHuman, createAnvilClient, createRawTx, detectNetwork, etherscanUrl, filterDust, fmtBinaryMask, formatBN, formatBNvalue, formatBn4dig, formatDuration, formatNumberToString_, halfRAY, isAnvil, json_parse, json_stringify, numberWithCommas, percentFmt, simulateMulticall, toHumanFormat };

package/dist/esm/sdk/index.d.mts

@@ -16830,6 +16830,11 @@ interface PriceFeedsForTokensOptions {
     main?: boolean;
     reserve?: boolean;
 }
+interface OnDemandPriceUpdate {
+    token: Address;
+    reserve: boolean;
+    data: Hex;
+}
 declare class PriceOracleContract extends BaseContract<abi$1> {
     #private;
     /**
@@ -16868,10 +16873,10 @@ declare class PriceOracleContract extends BaseContract<abi$1> {
     /**
      * Converts previously obtained price updates into CreditFacade multicall entries
      * @param creditFacade
-     * @param priceUpdates
+     * @param updates
      * @returns
      */
-    onDemandPriceUpdates(creditFacade: Address, priceUpdates?: UpdatePriceFeedsResult): MultiCall[];
+    onDemandPriceUpdates(updates?: UpdatePriceFeedsResult): OnDemandPriceUpdate[];
     /**
      * Tries to convert amount of token into underlying of current market
      * @param token
@@ -16957,6 +16962,12 @@ interface Asset {
 }
 
 type abi = typeof routerV3Abi;
+interface FindClosePathInput {
+    pathOptions: PathOptionSerie[];
+    expected: Asset[];
+    leftover: Asset[];
+    connectors: Address[];
+}
 /**
  * Slice of credit manager data required for router operations
  */
@@ -17014,6 +17025,13 @@ declare class RouterV3Contract extends BaseContract<abi> {
      *          - calls - list of calls which should be done to swap & unwrap everything to underlying token
      */
     findBestClosePath(ca: CreditAccountData, cm: CreditManagerSlice, slippage: bigint | number): Promise<RouterCloseResult>;
+    /**
+     * Finds input to be used with findBestClosePath
+     * @param ca
+     * @param cm
+     * @returns
+     */
+    getFindClosePathInput(ca: CreditAccountData, cm: CreditManagerSlice): FindClosePathInput;
     getAvailableConnectors(collateralTokens: Address[]): Address[];
 }
 
@@ -17214,6 +17232,20 @@ declare class CreditAccountsService extends SDKConstruct {
      * @returns
      */
     closeCreditAccount(operation: "close" | "zeroDebt", ca: CreditAccountData, assetsToKeep: Address[], to?: Address, slippage?: bigint): Promise<RawTx>;
+    /**
+     * Returns account price updates in a non-encoded format
+     * @param acc
+     * @param blockNumber
+     * @returns
+     */
+    getOnDemandPriceUpdates(acc: CreditAccountData, blockNumber?: bigint): Promise<OnDemandPriceUpdate[]>;
+    /**
+     * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...)
+     * @param acc
+     * @param blockNumber
+     * @returns
+     */
+    getPriceUpdatesForFacade(acc: CreditAccountData, blockNumber?: bigint): Promise<MultiCall[]>;
     /**
      * Returns addresses of pools of attached markets
      */
@@ -17369,4 +17401,4 @@ type MulticallErrorType = GetChainContractAddressErrorType | ReadContractErrorTy
  */
 declare function simulateMulticall<const contracts extends readonly unknown[], chain extends Chain | undefined, allowFailure extends boolean = true>(client: Client<Transport, chain>, parameters: MulticallParameters<contracts, allowFailure>): Promise<MulticallReturnType<contracts, allowFailure>>;
 
-export { type ACLState, type ACLStateHuman, ADDRESS_0X0, ADDRESS_PROVIDER, AP_ACCOUNT_FACTORY, AP_ACL, AP_BOT_LIST, AP_CONTRACTS_REGISTER, AP_CONTROLLER_TIMELOCK, AP_CREDIT_ACCOUNT_COMPRESSOR, AP_DATA_COMPRESSOR, AP_DEGEN_DISTRIBUTOR, AP_DEGEN_NFT, AP_DELEVERAGE_BOT_HV, AP_DELEVERAGE_BOT_LV, AP_DELEVERAGE_BOT_PEGGED, AP_GEAR_STAKING, AP_GEAR_TOKEN, AP_INFLATION_ATTACK_BLOCKER, AP_INSOLVENCY_CHECKER, AP_MARKET_COMPRESSOR, AP_MULTI_PAUSE, AP_PARTIAL_LIQUIDATION_BOT, AP_PRICE_ORACLE, AP_ROUTER, AP_TREASURY, AP_WETH_GATEWAY, AP_WETH_TOKEN, AP_ZAPPER_REGISTER, AP_ZERO_PRICE_FEED, AbstractPriceFeedContract, type AccountFactoryStateHuman, AddressLabeller, AddressMap, AddressProviderContractV3_1, type AddressProviderV3State, type AddressProviderV3StateHuman, type AnvilActions, type AnvilClient, type AnvilClientConfig, type Asset, type AssetPriceFeedState, type AssetPriceFeedStateHuman, BalancerStablePriceFeedContract, BalancerWeightedPriceFeedContract, BaseContract, type BaseContractOptions, type BaseContractState, type BaseContractStateHuman, type BasePriceFeedState, type BasePriceFeedStateHuman, BotListContract, type BotListState, type BotListStateHuman, BotPermissions, type BoundedOracleState, type BoundedOracleStateHuman, BoundedPriceFeedContract, ChainlinkPriceFeedContract, CompositePriceFeedContract, type ContractMethod, type ContractsRegisterState, type ContractsRegisterStateHuman, type ControllerTimelockV3State, type ControllerTimelockV3StateHuman, type CoreState, type CoreStateHuman, type CreditAccountData, type CreditAccountFilter, CreditAccountsService, CreditConfiguratorContract, type CreditConfiguratorState, type CreditConfiguratorStateHuman, CreditFacadeContract, type CreditFacadeState, type CreditFacadeStateHuman, CreditFactory, type CreditFactoryState, type CreditFactoryStateHuman, CreditManagerContract, type CreditManagerData, type CreditManagerDebtParams, type CreditManagerDebtParamsHuman, type CreditManagerDebtParamsStruct, type CreditManagerState, type CreditManagerStateHuman, CurveCryptoPriceFeedContract, type CurvePoolStruct, CurveStablePriceFeedContract, CurveUSDPriceFeedContract, type DataCompressorV3State, type DegenDistributorState, type DegenDistributorStateHuman, type DegenNFT2State, type DegenNFT2StateHuman, Erc4626PriceFeedContract, type EtherscanURLParam, GaugeContract, type GaugeParams, type GaugeParamsHuman, type GaugeState, type GaugeStateHuman, GearStakingContract, type GearStakingV3State, type GearStakingV3StateHuman, GearboxSDK, type GearboxState, type GearboxStateHuman, type ILPPriceFeedContract, type ILogger, type IPriceFeedContract, LinearModelContract, type LinearModelState, type LinearModelStateHuman, type LogFn, MAX_UINT256, MIN_INT96, type MarketData, MarketFactory, MarketRegister, type MarketState, type MarketStateHuman, MellowLRTPriceFeedContract, type MultiCall, type MultiPauseState, type MulticallErrorType, type MulticallParameters, type MulticallReturnType, NOT_DEPLOYED, NO_VERSION, type NetworkType, type OpenStrategyResult, PERCENTAGE_DECIMALS, PERCENTAGE_FACTOR, PRICE_DECIMALS, PRICE_DECIMALS_POW, type PathOption, type PathOptionSerie, type PeripheryState, type PeripheryStateHuman, type PolicyStruct, type PolicyStructHuman, PoolContract, type PoolData, PoolFactory, type PoolFactoryState, type PoolFactoryStateHuman, PoolQuotaKeeperContract, type PoolQuotaKeeperData, type PoolQuotaKeeperState, type PoolQuotaKeeperStateHuman, type PoolState, type PoolStateHuman, type PriceFactoryStateHuman, type PriceFeedConstructorArgs, type PriceFeedContractType, type PriceFeedMapEntry, PriceFeedRef, PriceFeedRegister, type PriceFeedState, type PriceFeedStateHuman, type PriceFeedTreeNode, type PriceFeedUsageType, PriceOracleContract, type PriceOracleData, type PriceOracleState, type PriceOracleV3State, type PriceOracleV3StateHuman, Provider, type ProviderOptions, type QuotaParams, type QuotaParamsHuman, RAY, RAY_DECIMALS_POW, type RateKeeperData, type RawTx, type ReadContractOptions, RedstonePriceFeedContract, type RedstonePriceFeedState, type RedstonePriceFeedStateHuman, type RouterCloseResult, type RouterComponentRegisterHuman, type RouterResult, type RouterState, type RouterStateHuman, RouterV3Contract, type RouterV3ContractState, type RouterV3ContractStateHuman, type SDKAttachOptions, SDKConstruct, type SDKEventsMap, SUPPORTED_CHAINS, type SwapOperation, type SwapTask, TIMELOCK, type TVL, type TokenMetaData, type TokenTypeToResolverHuman, USDC, type UpdatePriceFeedsResult, VotingContractStatus, WAD, WAD_DECIMALS_POW, WstETHPriceFeedContract, YearnPriceFeedContract, type ZapperInfo, type ZapperInfoHuman, type ZapperRegisterState, type ZapperRegisterStateHuman, ZeroPriceFeedContract, botPermissionsToString, bytes32ToString, chains, childLogger, convertBaseContractState, convertCoreStateToHuman, convertCreditFactoryStateToHuman, convertGaugeStateToHuman, convertGearboxStateToHuman, convertGearboxStateToHumanLA, convertLinearModelStateToHuman, convertPeripheryStateToHuman, convertPoolFactoryStateToHuman, convertPoolQuotaKeeperStateToHuman, convertPoolStateToHuman, convertPriceFeedStateToHuman, convertPriceOracleStateToHuman, convertRouterStateToHuman, convertRouterV3StateToHuman, convertZapperRegisterStateToHuman, createAnvilClient, createRawTx, detectNetwork, etherscanUrl, filterDust, fmtBinaryMask, formatBN, formatBNvalue, formatBn4dig, formatDuration, formatNumberToString_, halfRAY, isAnvil, json_parse, json_stringify, numberWithCommas, percentFmt, simulateMulticall, toHumanFormat };
+export { type ACLState, type ACLStateHuman, ADDRESS_0X0, ADDRESS_PROVIDER, AP_ACCOUNT_FACTORY, AP_ACL, AP_BOT_LIST, AP_CONTRACTS_REGISTER, AP_CONTROLLER_TIMELOCK, AP_CREDIT_ACCOUNT_COMPRESSOR, AP_DATA_COMPRESSOR, AP_DEGEN_DISTRIBUTOR, AP_DEGEN_NFT, AP_DELEVERAGE_BOT_HV, AP_DELEVERAGE_BOT_LV, AP_DELEVERAGE_BOT_PEGGED, AP_GEAR_STAKING, AP_GEAR_TOKEN, AP_INFLATION_ATTACK_BLOCKER, AP_INSOLVENCY_CHECKER, AP_MARKET_COMPRESSOR, AP_MULTI_PAUSE, AP_PARTIAL_LIQUIDATION_BOT, AP_PRICE_ORACLE, AP_ROUTER, AP_TREASURY, AP_WETH_GATEWAY, AP_WETH_TOKEN, AP_ZAPPER_REGISTER, AP_ZERO_PRICE_FEED, AbstractPriceFeedContract, type AccountFactoryStateHuman, AddressLabeller, AddressMap, AddressProviderContractV3_1, type AddressProviderV3State, type AddressProviderV3StateHuman, type AnvilActions, type AnvilClient, type AnvilClientConfig, type Asset, type AssetPriceFeedState, type AssetPriceFeedStateHuman, BalancerStablePriceFeedContract, BalancerWeightedPriceFeedContract, BaseContract, type BaseContractOptions, type BaseContractState, type BaseContractStateHuman, type BasePriceFeedState, type BasePriceFeedStateHuman, BotListContract, type BotListState, type BotListStateHuman, BotPermissions, type BoundedOracleState, type BoundedOracleStateHuman, BoundedPriceFeedContract, ChainlinkPriceFeedContract, CompositePriceFeedContract, type ContractMethod, type ContractsRegisterState, type ContractsRegisterStateHuman, type ControllerTimelockV3State, type ControllerTimelockV3StateHuman, type CoreState, type CoreStateHuman, type CreditAccountData, type CreditAccountFilter, CreditAccountsService, CreditConfiguratorContract, type CreditConfiguratorState, type CreditConfiguratorStateHuman, CreditFacadeContract, type CreditFacadeState, type CreditFacadeStateHuman, CreditFactory, type CreditFactoryState, type CreditFactoryStateHuman, CreditManagerContract, type CreditManagerData, type CreditManagerDebtParams, type CreditManagerDebtParamsHuman, type CreditManagerDebtParamsStruct, type CreditManagerState, type CreditManagerStateHuman, CurveCryptoPriceFeedContract, type CurvePoolStruct, CurveStablePriceFeedContract, CurveUSDPriceFeedContract, type DataCompressorV3State, type DegenDistributorState, type DegenDistributorStateHuman, type DegenNFT2State, type DegenNFT2StateHuman, Erc4626PriceFeedContract, type EtherscanURLParam, type FindClosePathInput, GaugeContract, type GaugeParams, type GaugeParamsHuman, type GaugeState, type GaugeStateHuman, GearStakingContract, type GearStakingV3State, type GearStakingV3StateHuman, GearboxSDK, type GearboxState, type GearboxStateHuman, type ILPPriceFeedContract, type ILogger, type IPriceFeedContract, LinearModelContract, type LinearModelState, type LinearModelStateHuman, type LogFn, MAX_UINT256, MIN_INT96, type MarketData, MarketFactory, MarketRegister, type MarketState, type MarketStateHuman, MellowLRTPriceFeedContract, type MultiCall, type MultiPauseState, type MulticallErrorType, type MulticallParameters, type MulticallReturnType, NOT_DEPLOYED, NO_VERSION, type NetworkType, type OnDemandPriceUpdate, type OpenStrategyResult, PERCENTAGE_DECIMALS, PERCENTAGE_FACTOR, PRICE_DECIMALS, PRICE_DECIMALS_POW, type PathOption, type PathOptionSerie, type PeripheryState, type PeripheryStateHuman, type PolicyStruct, type PolicyStructHuman, PoolContract, type PoolData, PoolFactory, type PoolFactoryState, type PoolFactoryStateHuman, PoolQuotaKeeperContract, type PoolQuotaKeeperData, type PoolQuotaKeeperState, type PoolQuotaKeeperStateHuman, type PoolState, type PoolStateHuman, type PriceFactoryStateHuman, type PriceFeedConstructorArgs, type PriceFeedContractType, type PriceFeedMapEntry, PriceFeedRef, PriceFeedRegister, type PriceFeedState, type PriceFeedStateHuman, type PriceFeedTreeNode, type PriceFeedUsageType, PriceOracleContract, type PriceOracleData, type PriceOracleState, type PriceOracleV3State, type PriceOracleV3StateHuman, Provider, type ProviderOptions, type QuotaParams, type QuotaParamsHuman, RAY, RAY_DECIMALS_POW, type RateKeeperData, type RawTx, type ReadContractOptions, RedstonePriceFeedContract, type RedstonePriceFeedState, type RedstonePriceFeedStateHuman, type RouterCloseResult, type RouterComponentRegisterHuman, type RouterResult, type RouterState, type RouterStateHuman, RouterV3Contract, type RouterV3ContractState, type RouterV3ContractStateHuman, type SDKAttachOptions, SDKConstruct, type SDKEventsMap, SUPPORTED_CHAINS, type SwapOperation, type SwapTask, TIMELOCK, type TVL, type TokenMetaData, type TokenTypeToResolverHuman, USDC, type UpdatePriceFeedsResult, VotingContractStatus, WAD, WAD_DECIMALS_POW, WstETHPriceFeedContract, YearnPriceFeedContract, type ZapperInfo, type ZapperInfoHuman, type ZapperRegisterState, type ZapperRegisterStateHuman, ZeroPriceFeedContract, botPermissionsToString, bytes32ToString, chains, childLogger, convertBaseContractState, convertCoreStateToHuman, convertCreditFactoryStateToHuman, convertGaugeStateToHuman, convertGearboxStateToHuman, convertGearboxStateToHumanLA, convertLinearModelStateToHuman, convertPeripheryStateToHuman, convertPoolFactoryStateToHuman, convertPoolQuotaKeeperStateToHuman, convertPoolStateToHuman, convertPriceFeedStateToHuman, convertPriceOracleStateToHuman, convertRouterStateToHuman, convertRouterV3StateToHuman, convertZapperRegisterStateToHuman, createAnvilClient, createRawTx, detectNetwork, etherscanUrl, filterDust, fmtBinaryMask, formatBN, formatBNvalue, formatBn4dig, formatDuration, formatNumberToString_, halfRAY, isAnvil, json_parse, json_stringify, numberWithCommas, percentFmt, simulateMulticall, toHumanFormat };

package/dist/esm/sdk/index.mjs

@@ -13214,6 +13214,7 @@ var CreditAccountsService = class extends SDKConstruct {
         functionName: "getCreditAccountData",
         args: [account],
         blockNumber
+        // TODO: we should cache price updates for block to speed up optimistic liquidator
       });
     } catch (e) {
       return void 0;
@@ -13303,19 +13304,12 @@ var CreditAccountsService = class extends SDKConstruct {
    */
   async fullyLiquidate(account, to, slippage = 50n) {
     const cm = this.sdk.marketRegister.findCreditManager(account.creditManager);
-    const market = this.sdk.marketRegister.findByCreditManager(
-      account.creditManager
-    );
     const preview = await this.sdk.router.findBestClosePath(
       account,
       cm.creditManager,
       slippage
     );
-    const priceUpdates = await this.#getUpdateForAccounts([account]);
-    const priceUpdateCalls = market.priceOracle.onDemandPriceUpdates(
-      cm.creditFacade.address,
-      priceUpdates
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade(account);
     const recipient = to ?? this.sdk.provider.account;
     if (!recipient) {
       throw new Error("liquidate account: assets recipient not specied");
@@ -13325,7 +13319,7 @@ var CreditAccountsService = class extends SDKConstruct {
       args: [
         account.creditAccount,
         recipient,
-        [...priceUpdateCalls, ...preview.calls]
+        [...priceUpdates, ...preview.calls]
       ]
     });
   }
@@ -13396,26 +13390,24 @@ var CreditAccountsService = class extends SDKConstruct {
    * @param accounts
    * @returns
    */
-  async #getUpdateForAccounts(accounts, blockNumber) {
+  async #getUpdateForAccount(acc, blockNumber) {
     const tokensByPool = /* @__PURE__ */ new Map();
     const oracleByPool = /* @__PURE__ */ new Map();
-    for (const acc of accounts) {
-      const market = this.sdk.marketRegister.findByCreditManager(
-        acc.creditManager
-      );
-      const pool = market.state.pool.pool.address;
-      oracleByPool.set(pool, market.priceOracle);
-      for (const t of acc.tokens) {
-        if (t.balance > 10n) {
-          const tokens = tokensByPool.get(pool) ?? /* @__PURE__ */ new Set();
-          tokens.add(t.token);
-          tokensByPool.set(pool, tokens);
-        }
+    const market = this.sdk.marketRegister.findByCreditManager(
+      acc.creditManager
+    );
+    const pool = market.state.pool.pool.address;
+    oracleByPool.set(pool, market.priceOracle);
+    for (const t of acc.tokens) {
+      if (t.balance > 10n) {
+        const tokens = tokensByPool.get(pool) ?? /* @__PURE__ */ new Set();
+        tokens.add(t.token);
+        tokensByPool.set(pool, tokens);
       }
     }
     const priceFeeds = [];
-    for (const [pool, priceFeedFactory] of oracleByPool.entries()) {
-      const tokens = Array.from(tokensByPool.get(pool) ?? []);
+    for (const [pool2, priceFeedFactory] of oracleByPool.entries()) {
+      const tokens = Array.from(tokensByPool.get(pool2) ?? []);
       priceFeeds.push(...priceFeedFactory.priceFeedsForTokens(tokens));
     }
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(
@@ -13423,22 +13415,46 @@ var CreditAccountsService = class extends SDKConstruct {
       blockNumber
     );
   }
-  async #prepareCloseCreditAccount(ca, cm, assetsToKeep, to, slippage = 50n) {
+  /**
+   * Returns account price updates in a non-encoded format
+   * @param acc
+   * @param blockNumber
+   * @returns
+   */
+  async getOnDemandPriceUpdates(acc, blockNumber) {
     const market = this.sdk.marketRegister.findByCreditManager(
-      ca.creditManager
+      acc.creditManager
     );
+    const update = await this.#getUpdateForAccount(acc, blockNumber);
+    return market.priceOracle.onDemandPriceUpdates(update);
+  }
+  /**
+   * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...)
+   * @param acc
+   * @param blockNumber
+   * @returns
+   */
+  async getPriceUpdatesForFacade(acc, blockNumber) {
+    const cm = this.sdk.marketRegister.findCreditManager(acc.creditManager);
+    const updates = await this.getOnDemandPriceUpdates(acc, blockNumber);
+    return updates.map(({ token, reserve, data }) => ({
+      target: cm.creditFacade.address,
+      callData: encodeFunctionData({
+        abi: iCreditFacadeV3MulticallAbi,
+        functionName: "onDemandPriceUpdate",
+        args: [token, reserve, data]
+      })
+    }));
+  }
+  async #prepareCloseCreditAccount(ca, cm, assetsToKeep, to, slippage = 50n) {
     const closePath = await this.sdk.router.findBestClosePath(
       ca,
       cm.creditManager,
       slippage
     );
-    const priceUpdates = await this.#getUpdateForAccounts([ca]);
-    const priceUpdateCalls = market.priceOracle.onDemandPriceUpdates(
-      cm.creditFacade.address,
-      priceUpdates
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade(ca);
     return [
-      ...priceUpdateCalls,
+      ...priceUpdates,
       ...closePath.calls,
       ...this.#prepareDisableQuotas(ca),
       ...this.#prepareDecreaseDebt(ca),
@@ -14995,15 +15011,15 @@ var PriceOracleContract = class extends BaseContract {
   /**
    * Converts previously obtained price updates into CreditFacade multicall entries
    * @param creditFacade
-   * @param priceUpdates
+   * @param updates
    * @returns
    */
-  onDemandPriceUpdates(creditFacade, priceUpdates) {
+  onDemandPriceUpdates(updates) {
     const result = [];
-    if (!priceUpdates) {
+    if (!updates) {
       return result;
     }
-    const { txs } = priceUpdates;
+    const { txs } = updates;
     for (const tx of txs) {
       const { to: priceFeed, callData } = tx;
       const [token, reserve] = this.#findTokenForPriceFeed(priceFeed);
@@ -15013,12 +15029,9 @@ var PriceOracleContract = class extends BaseContract {
       });
       const data = args[0];
       result.push({
-        target: creditFacade,
-        callData: encodeFunctionData({
-          abi: iCreditFacadeV3MulticallAbi,
-          functionName: "onDemandPriceUpdate",
-          args: [token, reserve, data]
-        })
+        token,
+        reserve,
+        data
       });
     }
     return result;
@@ -15522,7 +15535,7 @@ var RouterV3Contract = class extends BaseContract {
    *          - calls - list of calls which should be done to swap & unwrap everything to underlying token
    */
   async findBestClosePath(ca, cm, slippage) {
-    const { pathOptions, expected, leftover, connectors } = this.#getBestClosePathInput(ca, cm);
+    const { pathOptions, expected, leftover, connectors } = this.getFindClosePathInput(ca, cm);
     this.sdk.emit("foundPathOptions", { pathOptions });
     let results = [];
     for (const po of pathOptions) {
@@ -15564,7 +15577,13 @@ var RouterV3Contract = class extends BaseContract {
     });
     return result;
   }
-  #getBestClosePathInput(ca, cm) {
+  /**
+   * Finds input to be used with findBestClosePath
+   * @param ca
+   * @param cm
+   * @returns
+   */
+  getFindClosePathInput(ca, cm) {
     const expectedBalances = {};
     const leftoverBalances = {};
     for (const { token: t, balance, mask } of ca.tokens) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-vfour.13",
+  "version": "3.0.0-vfour.15",
   "description": "Gearbox SDK",
   "license": "MIT",
   "sideEffects": false,