@gearbox-protocol/sdk 3.0.0-vfour.94 → 3.0.0-vfour.96

package/dist/cjs/sdk/index.cjs

@@ -21225,8 +21225,9 @@ var RedstoneUpdater = class extends SDKConstruct {
   setHistoricalTimestamp(timestampMs) {
     this.#historicalTimestampMs = 6e4 * Math.floor(timestampMs / 6e4);
   }
-  async getUpdateTxs(feeds) {
+  async getUpdateTxs(feeds, logContext = {}) {
     this.#logger?.debug(
+      logContext,
       `generating update transactions for ${feeds.length} redstone price feeds`
     );
     const groupedFeeds = {};
@@ -21265,6 +21266,7 @@ var RedstoneUpdater = class extends SDKConstruct {
       }
     }
     this.#logger?.debug(
+      logContext,
       `generated ${results.length} update transactions for redstone price feeds`
     );
     return results;
@@ -21473,9 +21475,10 @@ var PriceFeedRegister = class extends SDKConstruct {
   /**
    * Returns RawTxs to update price feeds
    * @param priceFeeds top-level price feeds, actual updatable price feeds will be derived. If not provided will use all price feeds that are attached
+   * @param logContext extra information for logging
    * @returns
    */
-  async generatePriceFeedsUpdateTxs(priceFeeds) {
+  async generatePriceFeedsUpdateTxs(priceFeeds, logContext = {}) {
     const updateables = priceFeeds ? priceFeeds.flatMap((pf) => pf.updatableDependencies()) : this.#feeds.values();
     const txs = [];
     const redstonePFs = [];
@@ -21486,7 +21489,10 @@ var PriceFeedRegister = class extends SDKConstruct {
     }
     let maxTimestamp = 0;
     if (redstonePFs.length > 0) {
-      const redstoneUpdates = await this.#redstoneUpdater.getUpdateTxs(redstonePFs);
+      const redstoneUpdates = await this.#redstoneUpdater.getUpdateTxs(
+        redstonePFs,
+        logContext
+      );
       for (const { tx, timestamp } of redstoneUpdates) {
         if (timestamp > maxTimestamp) {
           maxTimestamp = timestamp;
@@ -21496,6 +21502,7 @@ var PriceFeedRegister = class extends SDKConstruct {
     }
     const result = { txs, timestamp: maxTimestamp };
     this.logger?.debug(
+      logContext,
       `generated ${txs.length} price feed update transactions, timestamp: ${maxTimestamp}`
     );
     if (txs.length) {
@@ -22743,7 +22750,9 @@ var CreditAccountsService = class extends SDKConstruct {
     if (raw.success) {
       return raw;
     }
-    const { txs: priceUpdateTxs, timestamp: _ } = await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs();
+    const { txs: priceUpdateTxs, timestamp: _ } = await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(void 0, {
+      account
+    });
     const resp = await simulateMulticall(this.provider.publicClient, {
       contracts: [
         ...priceUpdateTxs.map(rawTxToMulticallPriceUpdate),
@@ -22824,7 +22833,11 @@ var CreditAccountsService = class extends SDKConstruct {
       creditManager: cm.creditManager,
       slippage
     });
-    const priceUpdates = await this.getPriceUpdatesForFacade(account);
+    const priceUpdates = await this.getPriceUpdatesForFacade(
+      account.creditManager,
+      account,
+      void 0
+    );
     const tx = cm.creditFacade.liquidateCreditAccount(
       account.creditAccount,
       to,
@@ -22862,7 +22875,7 @@ var CreditAccountsService = class extends SDKConstruct {
       ...this.#prepareDecreaseDebt(ca),
       ...this.#prepareDisableTokens(ca),
       ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
+        (t) => this.#prepareWithdrawToken(ca.creditFacade, t, MAX_UINT256, to)
       )
     ];
     const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
@@ -22890,13 +22903,13 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const calls = [
-      ...this.#prepareAddCollateral(addCollateral, ca, permits),
+      ...this.#prepareAddCollateral(ca.creditFacade, addCollateral, permits),
       ...this.#prepareDisableQuotas(ca),
       ...this.#prepareDecreaseDebt(ca),
       ...this.#prepareDisableTokens(ca),
       // TODO: probably needs a better way to handle reward tokens
       ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
+        (t) => this.#prepareWithdrawToken(ca.creditFacade, t, MAX_UINT256, to)
       )
     ];
     const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
@@ -22919,13 +22932,17 @@ var CreditAccountsService = class extends SDKConstruct {
     to
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const priceUpdates = await this.getPriceUpdatesForFacade(ca);
+    const priceUpdates = await this.getPriceUpdatesForFacade(
+      ca.creditManager,
+      ca,
+      void 0
+    );
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const calls = [
       ...priceUpdates,
-      ...this.#prepareAddCollateral(addCollateral, ca, permits),
+      ...this.#prepareAddCollateral(ca.creditFacade, addCollateral, permits),
       ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
+        (t) => this.#prepareWithdrawToken(ca.creditFacade, t, MAX_UINT256, to)
       )
     ];
     const tx = cm.creditFacade.liquidateCreditAccount(
@@ -22940,14 +22957,18 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdates = await this.getPriceUpdatesForFacade(creditAccount);
+    const priceUpdates = await this.getPriceUpdatesForFacade(
+      creditAccount.creditManager,
+      creditAccount,
+      void 0
+    );
     const calls = [
       ...priceUpdates,
-      ...this.#prepareUpdateQuotas(props)
+      ...this.#prepareUpdateQuotas(props.creditAccount.creditFacade, props)
     ];
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, [
       ...priceUpdates,
-      ...this.#prepareUpdateQuotas(props)
+      ...this.#prepareUpdateQuotas(props.creditAccount.creditFacade, props)
     ]);
     return {
       tx,
@@ -22959,15 +22980,19 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(creditAccount);
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
+      creditAccount.creditManager,
+      creditAccount,
+      props.averageQuota
+    );
     const calls = [
       ...priceUpdatesCalls,
       ...this.#prepareAddCollateral(
+        creditAccount.creditFacade,
         [asset],
-        creditAccount,
         permit ? { [asset.token]: permit } : {}
       ),
-      ...this.#prepareUpdateQuotas(props)
+      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, props)
     ];
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     tx.value = ethAmount.toString(10);
@@ -22985,20 +23010,19 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(creditAccount);
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
+      creditAccount.creditManager,
+      creditAccount,
+      void 0
+    );
     const underlyingEnabled = (creditAccount.enabledTokensMask & 1n) === 1n;
     const shouldEnable = !isDecrease && !underlyingEnabled;
     const calls = [
       ...priceUpdatesCalls,
-      ...shouldEnable ? this.#prepareEnableTokens(creditAccount, [creditAccount.underlying]) : [],
-      {
-        target: creditAccount.creditFacade,
-        callData: viem.encodeFunctionData({
-          abi: iCreditFacadeV3MulticallAbi,
-          functionName: isDecrease ? "decreaseDebt" : "increaseDebt",
-          args: [change]
-        })
-      }
+      ...shouldEnable ? this.#prepareEnableTokens(creditAccount.creditFacade, [
+        creditAccount.underlying
+      ]) : [],
+      this.#prepareChangeDebt(creditAccount.creditFacade, change, isDecrease)
     ];
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     return { tx, calls };
@@ -23008,13 +23032,22 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(creditAccount);
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
+      creditAccount.creditManager,
+      creditAccount,
+      void 0
+    );
     const calls = [
       ...priceUpdatesCalls,
       ...assetsToWithdraw.map(
-        (a) => this.#prepareWithdrawToken(creditAccount, a.token, a.balance, to)
+        (a) => this.#prepareWithdrawToken(
+          creditAccount.creditFacade,
+          a.token,
+          a.balance,
+          to
+        )
       ),
-      ...this.#prepareUpdateQuotas(props)
+      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, props)
     ];
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     return { tx, calls };
@@ -23025,11 +23058,15 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(creditAccount);
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
+      creditAccount.creditManager,
+      creditAccount,
+      props.averageQuota
+    );
     const calls = [
       ...priceUpdatesCalls,
       ...swapCalls,
-      ...this.#prepareUpdateQuotas(props)
+      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, props)
     ];
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     return { tx, calls };
@@ -23040,14 +23077,18 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(creditAccount);
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
+      creditAccount.creditManager,
+      creditAccount,
+      props.averageQuota
+    );
     const calls = [
       ...priceUpdatesCalls,
       ...claimCalls,
       ...tokensToDisable.map(
-        (a) => this.#prepareDisableToken(a.token, creditAccount)
+        (a) => this.#prepareDisableToken(creditAccount.creditFacade, a.token)
       ),
-      ...this.#prepareUpdateQuotas(props)
+      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, props)
     ];
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     return { tx, calls };
@@ -23118,16 +23159,64 @@ var CreditAccountsService = class extends SDKConstruct {
     }
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(priceFeeds);
   }
+  async getUpdateForAccount(creditManager, creditAccount, desiredQuotas) {
+    const tokensByPool = /* @__PURE__ */ new Map();
+    const oracleByPool = /* @__PURE__ */ new Map();
+    const quotaRecord = desiredQuotas ? assetsMap(desiredQuotas) : desiredQuotas;
+    const caBalancesRecord = creditAccount ? assetsMap(creditAccount.tokens) : creditAccount;
+    const market = this.sdk.marketRegister.findByCreditManager(creditManager);
+    const cm = this.sdk.marketRegister.findCreditManager(creditManager).creditManager;
+    const pool = market.poolFactory.pool.address;
+    oracleByPool.set(pool, market.priceOracle);
+    const insertToken = (p, t) => {
+      const tokens = tokensByPool.get(p) ?? /* @__PURE__ */ new Set();
+      tokens.add(t);
+      tokensByPool.set(pool, tokens);
+    };
+    for (const t of cm.collateralTokens) {
+      if (creditAccount && caBalancesRecord && quotaRecord) {
+        const balanceAsset = caBalancesRecord.get(t);
+        const balance = balanceAsset?.balance || 0n;
+        const mask = balanceAsset?.mask || 0n;
+        const isEnabled = (mask & creditAccount.enabledTokensMask) !== 0n;
+        const quotaAsset = quotaRecord.get(t);
+        const quotaBalance = quotaAsset?.balance || 0n;
+        if (balance > 10n && isEnabled || quotaBalance > 0)
+          insertToken(pool, t);
+      } else if (creditAccount && caBalancesRecord) {
+        const balanceAsset = caBalancesRecord.get(t);
+        const balance = balanceAsset?.balance || 0n;
+        const mask = balanceAsset?.mask || 0n;
+        const isEnabled = (mask & creditAccount.enabledTokensMask) !== 0n;
+        if (balance > 10n && isEnabled) insertToken(pool, t);
+      } else if (quotaRecord) {
+        const quotaAsset = quotaRecord.get(t);
+        const quotaBalance = quotaAsset?.balance || 0n;
+        if (quotaBalance > 0) insertToken(pool, t);
+      }
+    }
+    const priceFeeds = [];
+    for (const [pool2, priceFeedFactory] of oracleByPool.entries()) {
+      const tokens = Array.from(tokensByPool.get(pool2) ?? []);
+      priceFeeds.push(...priceFeedFactory.priceFeedsForTokens(tokens));
+    }
+    return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(
+      priceFeeds,
+      creditAccount ? { account: creditAccount.creditAccount } : void 0
+    );
+  }
   /**
    * Returns account price updates in a non-encoded format
    * @param acc
    * @returns
    */
-  async getOnDemandPriceUpdates(acc) {
-    const market = this.sdk.marketRegister.findByCreditManager(
-      acc.creditManager
+  async getOnDemandPriceUpdates(creditManager, creditAccount, desiredQuotas) {
+    const market = this.sdk.marketRegister.findByCreditManager(creditManager);
+    const update = await this.getUpdateForAccount(
+      creditManager,
+      creditAccount,
+      desiredQuotas
     );
-    const update = await this.getUpdateForAccounts([acc]);
     return market.priceOracle.onDemandPriceUpdates(update);
   }
   /**
@@ -23135,9 +23224,13 @@ var CreditAccountsService = class extends SDKConstruct {
    * @param acc
    * @returns
    */
-  async getPriceUpdatesForFacade(acc) {
-    const cm = this.sdk.marketRegister.findCreditManager(acc.creditManager);
-    const updates = await this.getOnDemandPriceUpdates(acc);
+  async getPriceUpdatesForFacade(creditManager, creditAccount, desiredQuotas) {
+    const cm = this.sdk.marketRegister.findCreditManager(creditManager);
+    const updates = await this.getOnDemandPriceUpdates(
+      creditManager,
+      creditAccount,
+      desiredQuotas
+    );
     return cm.creditFacade.encodeOnDemandPriceUpdates(updates);
   }
   #prepareDisableQuotas(ca) {
@@ -23156,17 +23249,13 @@ var CreditAccountsService = class extends SDKConstruct {
     }
     return calls;
   }
-  #prepareUpdateQuotas({
-    creditAccount,
-    averageQuota,
-    minQuota
-  }) {
+  #prepareUpdateQuotas(creditFacade, { averageQuota, minQuota }) {
     const minRecord = assetsMap(minQuota);
     const calls = averageQuota.map((q) => {
       const minAsset = minRecord.get(q.token);
       const min = minAsset && minAsset?.balance > 0 ? minAsset.balance : 0n;
       return {
-        target: creditAccount.creditFacade,
+        target: creditFacade,
         callData: viem.encodeFunctionData({
           abi: iCreditFacadeV3MulticallAbi,
           functionName: "updateQuota",
@@ -23195,14 +23284,14 @@ var CreditAccountsService = class extends SDKConstruct {
     const calls = [];
     for (const t of ca.tokens) {
       if (t.token !== ca.underlying && (t.mask & ca.enabledTokensMask) !== 0n && t.quota === 0n) {
-        calls.push(this.#prepareDisableToken(t.token, ca));
+        calls.push(this.#prepareDisableToken(ca.creditFacade, t.token));
       }
     }
     return calls;
   }
-  #prepareDisableToken(token, ca) {
+  #prepareDisableToken(creditFacade, token) {
     return {
-      target: ca.creditFacade,
+      target: creditFacade,
       callData: viem.encodeFunctionData({
         abi: iCreditFacadeV3MulticallAbi,
         functionName: "disableToken",
@@ -23210,9 +23299,9 @@ var CreditAccountsService = class extends SDKConstruct {
       })
     };
   }
-  #prepareEnableTokens(ca, tokens) {
+  #prepareEnableTokens(creditFacade, tokens) {
     return tokens.map((t) => ({
-      target: ca.creditFacade,
+      target: creditFacade,
       callData: viem.encodeFunctionData({
         abi: iCreditFacadeV3MulticallAbi,
         functionName: "enableToken",
@@ -23220,9 +23309,9 @@ var CreditAccountsService = class extends SDKConstruct {
       })
     }));
   }
-  #prepareWithdrawToken(ca, token, amount, to) {
+  #prepareWithdrawToken(creditFacade, token, amount, to) {
     return {
-      target: ca.creditFacade,
+      target: creditFacade,
       callData: viem.encodeFunctionData({
         abi: iCreditFacadeV3MulticallAbi,
         functionName: "withdrawCollateral",
@@ -23230,12 +23319,22 @@ var CreditAccountsService = class extends SDKConstruct {
       })
     };
   }
-  #prepareAddCollateral(assets, ca, permits) {
+  #prepareChangeDebt(creditFacade, change, isDecrease) {
+    return {
+      target: creditFacade,
+      callData: viem.encodeFunctionData({
+        abi: iCreditFacadeV3MulticallAbi,
+        functionName: isDecrease ? "decreaseDebt" : "increaseDebt",
+        args: [change]
+      })
+    };
+  }
+  #prepareAddCollateral(creditFacade, assets, permits) {
     const calls = assets.map(({ token, balance }) => {
       const p = permits[token];
       if (p) {
         return {
-          target: ca.creditFacade,
+          target: creditFacade,
           callData: viem.encodeFunctionData({
             abi: iCreditFacadeV3MulticallAbi,
             functionName: "addCollateralWithPermit",
@@ -23244,7 +23343,7 @@ var CreditAccountsService = class extends SDKConstruct {
         };
       }
       return {
-        target: ca.creditFacade,
+        target: creditFacade,
         callData: viem.encodeFunctionData({
           abi: iCreditFacadeV3MulticallAbi,
           functionName: "addCollateral",

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

@@ -22374,9 +22374,10 @@ declare class PriceFeedRegister extends SDKConstruct implements IHooks<PriceFeed
     /**
      * Returns RawTxs to update price feeds
      * @param priceFeeds top-level price feeds, actual updatable price feeds will be derived. If not provided will use all price feeds that are attached
+     * @param logContext extra information for logging
      * @returns
      */
-    generatePriceFeedsUpdateTxs(priceFeeds?: IPriceFeedContract[]): Promise<UpdatePriceFeedsResult>;
+    generatePriceFeedsUpdateTxs(priceFeeds?: IPriceFeedContract[], logContext?: Record<string, any>): Promise<UpdatePriceFeedsResult>;
     mustGet(address: Address): IPriceFeedContract;
     getOrCreate(data: PriceFeedTreeNode): IPriceFeedContract;
     /**
@@ -25049,7 +25050,7 @@ declare class RouterV3Contract extends BaseContract<abi> implements IHooks<Route
     getAvailableConnectors(collateralTokens: Array<Address>): Array<Address>;
 }
 declare function balancesMap(assets: Array<Asset>): AddressMap<bigint>;
-declare function assetsMap(assets: Array<Asset>): AddressMap<Asset>;
+declare function assetsMap<T extends Asset>(assets: Array<T> | readonly T[]): AddressMap<T>;
 
 interface SDKOptions {
     /**
@@ -25276,26 +25277,32 @@ interface RepayAndLiquidateCreditAccountProps {
     to: Address;
     permits: Record<string, PermitResult>;
 }
-interface UpdateQuotasProps {
-    creditAccount: CreditAccountDataSlice;
+interface PrepareUpdateQuotasProps {
     minQuota: Array<Asset>;
     averageQuota: Array<Asset>;
 }
-interface AddCollateralProps extends UpdateQuotasProps {
+interface UpdateQuotasProps extends PrepareUpdateQuotasProps {
+    creditAccount: CreditAccountDataSlice;
+}
+interface AddCollateralProps extends PrepareUpdateQuotasProps {
     asset: Asset;
     ethAmount: bigint;
-    permit?: PermitResult;
+    permit: PermitResult | undefined;
+    creditAccount: CreditAccountDataSlice;
 }
-interface WithdrawCollateralProps extends UpdateQuotasProps {
+interface WithdrawCollateralProps extends PrepareUpdateQuotasProps {
     assetsToWithdraw: Array<Asset>;
     to: Address;
+    creditAccount: CreditAccountDataSlice;
 }
-interface ExecuteSwapProps extends UpdateQuotasProps {
+interface ExecuteSwapProps extends PrepareUpdateQuotasProps {
     calls: Array<MultiCall>;
+    creditAccount: CreditAccountDataSlice;
 }
-interface ClaimFarmRewardsProps extends UpdateQuotasProps {
+interface ClaimFarmRewardsProps extends PrepareUpdateQuotasProps {
     tokensToDisable: Array<Asset>;
     calls: Array<MultiCall>;
+    creditAccount: CreditAccountDataSlice;
 }
 interface ChangeDeptProps {
     creditAccount: CreditAccountDataSlice;
@@ -25397,18 +25404,19 @@ declare class CreditAccountsService extends SDKConstruct {
      * @returns
      */
     getUpdateForAccounts(accounts: Array<CreditAccountDataSlice>): Promise<UpdatePriceFeedsResult>;
+    getUpdateForAccount(creditManager: Address, creditAccount: CreditAccountDataSlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<UpdatePriceFeedsResult>;
     /**
      * Returns account price updates in a non-encoded format
      * @param acc
      * @returns
      */
-    getOnDemandPriceUpdates(acc: CreditAccountDataSlice): Promise<Array<OnDemandPriceUpdate>>;
+    getOnDemandPriceUpdates(creditManager: Address, creditAccount: CreditAccountDataSlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<Array<OnDemandPriceUpdate>>;
     /**
      * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...)
      * @param acc
      * @returns
      */
-    getPriceUpdatesForFacade(acc: CreditAccountDataSlice): Promise<Array<MultiCall>>;
+    getPriceUpdatesForFacade(creditManager: Address, creditAccount: CreditAccountDataSlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<Array<MultiCall>>;
     /**
      * Returns addresses of pools of attached markets
      */

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

@@ -22374,9 +22374,10 @@ declare class PriceFeedRegister extends SDKConstruct implements IHooks<PriceFeed
     /**
      * Returns RawTxs to update price feeds
      * @param priceFeeds top-level price feeds, actual updatable price feeds will be derived. If not provided will use all price feeds that are attached
+     * @param logContext extra information for logging
      * @returns
      */
-    generatePriceFeedsUpdateTxs(priceFeeds?: IPriceFeedContract[]): Promise<UpdatePriceFeedsResult>;
+    generatePriceFeedsUpdateTxs(priceFeeds?: IPriceFeedContract[], logContext?: Record<string, any>): Promise<UpdatePriceFeedsResult>;
     mustGet(address: Address): IPriceFeedContract;
     getOrCreate(data: PriceFeedTreeNode): IPriceFeedContract;
     /**
@@ -25049,7 +25050,7 @@ declare class RouterV3Contract extends BaseContract<abi> implements IHooks<Route
     getAvailableConnectors(collateralTokens: Array<Address>): Array<Address>;
 }
 declare function balancesMap(assets: Array<Asset>): AddressMap<bigint>;
-declare function assetsMap(assets: Array<Asset>): AddressMap<Asset>;
+declare function assetsMap<T extends Asset>(assets: Array<T> | readonly T[]): AddressMap<T>;
 
 interface SDKOptions {
     /**
@@ -25276,26 +25277,32 @@ interface RepayAndLiquidateCreditAccountProps {
     to: Address;
     permits: Record<string, PermitResult>;
 }
-interface UpdateQuotasProps {
-    creditAccount: CreditAccountDataSlice;
+interface PrepareUpdateQuotasProps {
     minQuota: Array<Asset>;
     averageQuota: Array<Asset>;
 }
-interface AddCollateralProps extends UpdateQuotasProps {
+interface UpdateQuotasProps extends PrepareUpdateQuotasProps {
+    creditAccount: CreditAccountDataSlice;
+}
+interface AddCollateralProps extends PrepareUpdateQuotasProps {
     asset: Asset;
     ethAmount: bigint;
-    permit?: PermitResult;
+    permit: PermitResult | undefined;
+    creditAccount: CreditAccountDataSlice;
 }
-interface WithdrawCollateralProps extends UpdateQuotasProps {
+interface WithdrawCollateralProps extends PrepareUpdateQuotasProps {
     assetsToWithdraw: Array<Asset>;
     to: Address;
+    creditAccount: CreditAccountDataSlice;
 }
-interface ExecuteSwapProps extends UpdateQuotasProps {
+interface ExecuteSwapProps extends PrepareUpdateQuotasProps {
     calls: Array<MultiCall>;
+    creditAccount: CreditAccountDataSlice;
 }
-interface ClaimFarmRewardsProps extends UpdateQuotasProps {
+interface ClaimFarmRewardsProps extends PrepareUpdateQuotasProps {
     tokensToDisable: Array<Asset>;
     calls: Array<MultiCall>;
+    creditAccount: CreditAccountDataSlice;
 }
 interface ChangeDeptProps {
     creditAccount: CreditAccountDataSlice;
@@ -25397,18 +25404,19 @@ declare class CreditAccountsService extends SDKConstruct {
      * @returns
      */
     getUpdateForAccounts(accounts: Array<CreditAccountDataSlice>): Promise<UpdatePriceFeedsResult>;
+    getUpdateForAccount(creditManager: Address, creditAccount: CreditAccountDataSlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<UpdatePriceFeedsResult>;
     /**
      * Returns account price updates in a non-encoded format
      * @param acc
      * @returns
      */
-    getOnDemandPriceUpdates(acc: CreditAccountDataSlice): Promise<Array<OnDemandPriceUpdate>>;
+    getOnDemandPriceUpdates(creditManager: Address, creditAccount: CreditAccountDataSlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<Array<OnDemandPriceUpdate>>;
     /**
      * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...)
      * @param acc
      * @returns
      */
-    getPriceUpdatesForFacade(acc: CreditAccountDataSlice): Promise<Array<MultiCall>>;
+    getPriceUpdatesForFacade(creditManager: Address, creditAccount: CreditAccountDataSlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<Array<MultiCall>>;
     /**
      * Returns addresses of pools of attached markets
      */

package/dist/esm/sdk/index.mjs

@@ -21223,8 +21223,9 @@ var RedstoneUpdater = class extends SDKConstruct {
   setHistoricalTimestamp(timestampMs) {
     this.#historicalTimestampMs = 6e4 * Math.floor(timestampMs / 6e4);
   }
-  async getUpdateTxs(feeds) {
+  async getUpdateTxs(feeds, logContext = {}) {
     this.#logger?.debug(
+      logContext,
       `generating update transactions for ${feeds.length} redstone price feeds`
     );
     const groupedFeeds = {};
@@ -21263,6 +21264,7 @@ var RedstoneUpdater = class extends SDKConstruct {
       }
     }
     this.#logger?.debug(
+      logContext,
       `generated ${results.length} update transactions for redstone price feeds`
     );
     return results;
@@ -21471,9 +21473,10 @@ var PriceFeedRegister = class extends SDKConstruct {
   /**
    * Returns RawTxs to update price feeds
    * @param priceFeeds top-level price feeds, actual updatable price feeds will be derived. If not provided will use all price feeds that are attached
+   * @param logContext extra information for logging
    * @returns
    */
-  async generatePriceFeedsUpdateTxs(priceFeeds) {
+  async generatePriceFeedsUpdateTxs(priceFeeds, logContext = {}) {
     const updateables = priceFeeds ? priceFeeds.flatMap((pf) => pf.updatableDependencies()) : this.#feeds.values();
     const txs = [];
     const redstonePFs = [];
@@ -21484,7 +21487,10 @@ var PriceFeedRegister = class extends SDKConstruct {
     }
     let maxTimestamp = 0;
     if (redstonePFs.length > 0) {
-      const redstoneUpdates = await this.#redstoneUpdater.getUpdateTxs(redstonePFs);
+      const redstoneUpdates = await this.#redstoneUpdater.getUpdateTxs(
+        redstonePFs,
+        logContext
+      );
       for (const { tx, timestamp } of redstoneUpdates) {
         if (timestamp > maxTimestamp) {
           maxTimestamp = timestamp;
@@ -21494,6 +21500,7 @@ var PriceFeedRegister = class extends SDKConstruct {
     }
     const result = { txs, timestamp: maxTimestamp };
     this.logger?.debug(
+      logContext,
       `generated ${txs.length} price feed update transactions, timestamp: ${maxTimestamp}`
     );
     if (txs.length) {
@@ -22741,7 +22748,9 @@ var CreditAccountsService = class extends SDKConstruct {
     if (raw.success) {
       return raw;
     }
-    const { txs: priceUpdateTxs, timestamp: _ } = await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs();
+    const { txs: priceUpdateTxs, timestamp: _ } = await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(void 0, {
+      account
+    });
     const resp = await simulateMulticall(this.provider.publicClient, {
       contracts: [
         ...priceUpdateTxs.map(rawTxToMulticallPriceUpdate),
@@ -22822,7 +22831,11 @@ var CreditAccountsService = class extends SDKConstruct {
       creditManager: cm.creditManager,
       slippage
     });
-    const priceUpdates = await this.getPriceUpdatesForFacade(account);
+    const priceUpdates = await this.getPriceUpdatesForFacade(
+      account.creditManager,
+      account,
+      void 0
+    );
     const tx = cm.creditFacade.liquidateCreditAccount(
       account.creditAccount,
       to,
@@ -22860,7 +22873,7 @@ var CreditAccountsService = class extends SDKConstruct {
       ...this.#prepareDecreaseDebt(ca),
       ...this.#prepareDisableTokens(ca),
       ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
+        (t) => this.#prepareWithdrawToken(ca.creditFacade, t, MAX_UINT256, to)
       )
     ];
     const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
@@ -22888,13 +22901,13 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const calls = [
-      ...this.#prepareAddCollateral(addCollateral, ca, permits),
+      ...this.#prepareAddCollateral(ca.creditFacade, addCollateral, permits),
       ...this.#prepareDisableQuotas(ca),
       ...this.#prepareDecreaseDebt(ca),
       ...this.#prepareDisableTokens(ca),
       // TODO: probably needs a better way to handle reward tokens
       ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
+        (t) => this.#prepareWithdrawToken(ca.creditFacade, t, MAX_UINT256, to)
       )
     ];
     const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
@@ -22917,13 +22930,17 @@ var CreditAccountsService = class extends SDKConstruct {
     to
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const priceUpdates = await this.getPriceUpdatesForFacade(ca);
+    const priceUpdates = await this.getPriceUpdatesForFacade(
+      ca.creditManager,
+      ca,
+      void 0
+    );
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const calls = [
       ...priceUpdates,
-      ...this.#prepareAddCollateral(addCollateral, ca, permits),
+      ...this.#prepareAddCollateral(ca.creditFacade, addCollateral, permits),
       ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
+        (t) => this.#prepareWithdrawToken(ca.creditFacade, t, MAX_UINT256, to)
       )
     ];
     const tx = cm.creditFacade.liquidateCreditAccount(
@@ -22938,14 +22955,18 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdates = await this.getPriceUpdatesForFacade(creditAccount);
+    const priceUpdates = await this.getPriceUpdatesForFacade(
+      creditAccount.creditManager,
+      creditAccount,
+      void 0
+    );
     const calls = [
       ...priceUpdates,
-      ...this.#prepareUpdateQuotas(props)
+      ...this.#prepareUpdateQuotas(props.creditAccount.creditFacade, props)
     ];
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, [
       ...priceUpdates,
-      ...this.#prepareUpdateQuotas(props)
+      ...this.#prepareUpdateQuotas(props.creditAccount.creditFacade, props)
     ]);
     return {
       tx,
@@ -22957,15 +22978,19 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(creditAccount);
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
+      creditAccount.creditManager,
+      creditAccount,
+      props.averageQuota
+    );
     const calls = [
       ...priceUpdatesCalls,
       ...this.#prepareAddCollateral(
+        creditAccount.creditFacade,
         [asset],
-        creditAccount,
         permit ? { [asset.token]: permit } : {}
       ),
-      ...this.#prepareUpdateQuotas(props)
+      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, props)
     ];
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     tx.value = ethAmount.toString(10);
@@ -22983,20 +23008,19 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(creditAccount);
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
+      creditAccount.creditManager,
+      creditAccount,
+      void 0
+    );
     const underlyingEnabled = (creditAccount.enabledTokensMask & 1n) === 1n;
     const shouldEnable = !isDecrease && !underlyingEnabled;
     const calls = [
       ...priceUpdatesCalls,
-      ...shouldEnable ? this.#prepareEnableTokens(creditAccount, [creditAccount.underlying]) : [],
-      {
-        target: creditAccount.creditFacade,
-        callData: encodeFunctionData({
-          abi: iCreditFacadeV3MulticallAbi,
-          functionName: isDecrease ? "decreaseDebt" : "increaseDebt",
-          args: [change]
-        })
-      }
+      ...shouldEnable ? this.#prepareEnableTokens(creditAccount.creditFacade, [
+        creditAccount.underlying
+      ]) : [],
+      this.#prepareChangeDebt(creditAccount.creditFacade, change, isDecrease)
     ];
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     return { tx, calls };
@@ -23006,13 +23030,22 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(creditAccount);
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
+      creditAccount.creditManager,
+      creditAccount,
+      void 0
+    );
     const calls = [
       ...priceUpdatesCalls,
       ...assetsToWithdraw.map(
-        (a) => this.#prepareWithdrawToken(creditAccount, a.token, a.balance, to)
+        (a) => this.#prepareWithdrawToken(
+          creditAccount.creditFacade,
+          a.token,
+          a.balance,
+          to
+        )
       ),
-      ...this.#prepareUpdateQuotas(props)
+      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, props)
     ];
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     return { tx, calls };
@@ -23023,11 +23056,15 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(creditAccount);
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
+      creditAccount.creditManager,
+      creditAccount,
+      props.averageQuota
+    );
     const calls = [
       ...priceUpdatesCalls,
       ...swapCalls,
-      ...this.#prepareUpdateQuotas(props)
+      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, props)
     ];
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     return { tx, calls };
@@ -23038,14 +23075,18 @@ var CreditAccountsService = class extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(creditAccount);
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
+      creditAccount.creditManager,
+      creditAccount,
+      props.averageQuota
+    );
     const calls = [
       ...priceUpdatesCalls,
       ...claimCalls,
       ...tokensToDisable.map(
-        (a) => this.#prepareDisableToken(a.token, creditAccount)
+        (a) => this.#prepareDisableToken(creditAccount.creditFacade, a.token)
       ),
-      ...this.#prepareUpdateQuotas(props)
+      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, props)
     ];
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     return { tx, calls };
@@ -23116,16 +23157,64 @@ var CreditAccountsService = class extends SDKConstruct {
     }
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(priceFeeds);
   }
+  async getUpdateForAccount(creditManager, creditAccount, desiredQuotas) {
+    const tokensByPool = /* @__PURE__ */ new Map();
+    const oracleByPool = /* @__PURE__ */ new Map();
+    const quotaRecord = desiredQuotas ? assetsMap(desiredQuotas) : desiredQuotas;
+    const caBalancesRecord = creditAccount ? assetsMap(creditAccount.tokens) : creditAccount;
+    const market = this.sdk.marketRegister.findByCreditManager(creditManager);
+    const cm = this.sdk.marketRegister.findCreditManager(creditManager).creditManager;
+    const pool = market.poolFactory.pool.address;
+    oracleByPool.set(pool, market.priceOracle);
+    const insertToken = (p, t) => {
+      const tokens = tokensByPool.get(p) ?? /* @__PURE__ */ new Set();
+      tokens.add(t);
+      tokensByPool.set(pool, tokens);
+    };
+    for (const t of cm.collateralTokens) {
+      if (creditAccount && caBalancesRecord && quotaRecord) {
+        const balanceAsset = caBalancesRecord.get(t);
+        const balance = balanceAsset?.balance || 0n;
+        const mask = balanceAsset?.mask || 0n;
+        const isEnabled = (mask & creditAccount.enabledTokensMask) !== 0n;
+        const quotaAsset = quotaRecord.get(t);
+        const quotaBalance = quotaAsset?.balance || 0n;
+        if (balance > 10n && isEnabled || quotaBalance > 0)
+          insertToken(pool, t);
+      } else if (creditAccount && caBalancesRecord) {
+        const balanceAsset = caBalancesRecord.get(t);
+        const balance = balanceAsset?.balance || 0n;
+        const mask = balanceAsset?.mask || 0n;
+        const isEnabled = (mask & creditAccount.enabledTokensMask) !== 0n;
+        if (balance > 10n && isEnabled) insertToken(pool, t);
+      } else if (quotaRecord) {
+        const quotaAsset = quotaRecord.get(t);
+        const quotaBalance = quotaAsset?.balance || 0n;
+        if (quotaBalance > 0) insertToken(pool, t);
+      }
+    }
+    const priceFeeds = [];
+    for (const [pool2, priceFeedFactory] of oracleByPool.entries()) {
+      const tokens = Array.from(tokensByPool.get(pool2) ?? []);
+      priceFeeds.push(...priceFeedFactory.priceFeedsForTokens(tokens));
+    }
+    return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(
+      priceFeeds,
+      creditAccount ? { account: creditAccount.creditAccount } : void 0
+    );
+  }
   /**
    * Returns account price updates in a non-encoded format
    * @param acc
    * @returns
    */
-  async getOnDemandPriceUpdates(acc) {
-    const market = this.sdk.marketRegister.findByCreditManager(
-      acc.creditManager
+  async getOnDemandPriceUpdates(creditManager, creditAccount, desiredQuotas) {
+    const market = this.sdk.marketRegister.findByCreditManager(creditManager);
+    const update = await this.getUpdateForAccount(
+      creditManager,
+      creditAccount,
+      desiredQuotas
     );
-    const update = await this.getUpdateForAccounts([acc]);
     return market.priceOracle.onDemandPriceUpdates(update);
   }
   /**
@@ -23133,9 +23222,13 @@ var CreditAccountsService = class extends SDKConstruct {
    * @param acc
    * @returns
    */
-  async getPriceUpdatesForFacade(acc) {
-    const cm = this.sdk.marketRegister.findCreditManager(acc.creditManager);
-    const updates = await this.getOnDemandPriceUpdates(acc);
+  async getPriceUpdatesForFacade(creditManager, creditAccount, desiredQuotas) {
+    const cm = this.sdk.marketRegister.findCreditManager(creditManager);
+    const updates = await this.getOnDemandPriceUpdates(
+      creditManager,
+      creditAccount,
+      desiredQuotas
+    );
     return cm.creditFacade.encodeOnDemandPriceUpdates(updates);
   }
   #prepareDisableQuotas(ca) {
@@ -23154,17 +23247,13 @@ var CreditAccountsService = class extends SDKConstruct {
     }
     return calls;
   }
-  #prepareUpdateQuotas({
-    creditAccount,
-    averageQuota,
-    minQuota
-  }) {
+  #prepareUpdateQuotas(creditFacade, { averageQuota, minQuota }) {
     const minRecord = assetsMap(minQuota);
     const calls = averageQuota.map((q) => {
       const minAsset = minRecord.get(q.token);
       const min = minAsset && minAsset?.balance > 0 ? minAsset.balance : 0n;
       return {
-        target: creditAccount.creditFacade,
+        target: creditFacade,
         callData: encodeFunctionData({
           abi: iCreditFacadeV3MulticallAbi,
           functionName: "updateQuota",
@@ -23193,14 +23282,14 @@ var CreditAccountsService = class extends SDKConstruct {
     const calls = [];
     for (const t of ca.tokens) {
       if (t.token !== ca.underlying && (t.mask & ca.enabledTokensMask) !== 0n && t.quota === 0n) {
-        calls.push(this.#prepareDisableToken(t.token, ca));
+        calls.push(this.#prepareDisableToken(ca.creditFacade, t.token));
       }
     }
     return calls;
   }
-  #prepareDisableToken(token, ca) {
+  #prepareDisableToken(creditFacade, token) {
     return {
-      target: ca.creditFacade,
+      target: creditFacade,
       callData: encodeFunctionData({
         abi: iCreditFacadeV3MulticallAbi,
         functionName: "disableToken",
@@ -23208,9 +23297,9 @@ var CreditAccountsService = class extends SDKConstruct {
       })
     };
   }
-  #prepareEnableTokens(ca, tokens) {
+  #prepareEnableTokens(creditFacade, tokens) {
     return tokens.map((t) => ({
-      target: ca.creditFacade,
+      target: creditFacade,
       callData: encodeFunctionData({
         abi: iCreditFacadeV3MulticallAbi,
         functionName: "enableToken",
@@ -23218,9 +23307,9 @@ var CreditAccountsService = class extends SDKConstruct {
       })
     }));
   }
-  #prepareWithdrawToken(ca, token, amount, to) {
+  #prepareWithdrawToken(creditFacade, token, amount, to) {
     return {
-      target: ca.creditFacade,
+      target: creditFacade,
       callData: encodeFunctionData({
         abi: iCreditFacadeV3MulticallAbi,
         functionName: "withdrawCollateral",
@@ -23228,12 +23317,22 @@ var CreditAccountsService = class extends SDKConstruct {
       })
     };
   }
-  #prepareAddCollateral(assets, ca, permits) {
+  #prepareChangeDebt(creditFacade, change, isDecrease) {
+    return {
+      target: creditFacade,
+      callData: encodeFunctionData({
+        abi: iCreditFacadeV3MulticallAbi,
+        functionName: isDecrease ? "decreaseDebt" : "increaseDebt",
+        args: [change]
+      })
+    };
+  }
+  #prepareAddCollateral(creditFacade, assets, permits) {
     const calls = assets.map(({ token, balance }) => {
       const p = permits[token];
       if (p) {
         return {
-          target: ca.creditFacade,
+          target: creditFacade,
           callData: encodeFunctionData({
             abi: iCreditFacadeV3MulticallAbi,
             functionName: "addCollateralWithPermit",
@@ -23242,7 +23341,7 @@ var CreditAccountsService = class extends SDKConstruct {
         };
       }
       return {
-        target: ca.creditFacade,
+        target: creditFacade,
         callData: encodeFunctionData({
           abi: iCreditFacadeV3MulticallAbi,
           functionName: "addCollateral",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-vfour.94",
+  "version": "3.0.0-vfour.96",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.cjs",