@gearbox-protocol/sdk 8.31.1 → 9.0.0

package/dist/cjs/sdk/GearboxSDK.js

@@ -563,6 +563,14 @@ class GearboxSDK {
     }
     return this.contracts.get(routerAddr);
   }
+  /**
+   * Helper to get human-friendly label for address
+   * @param address
+   * @returns
+   */
+  labelAddress(address) {
+    return this.provider.addressLabels.get(address);
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/sdk/accountMigration/AbstractMigrateCreditAccountsService.js

@@ -116,11 +116,10 @@ class AbstractMigrateCreditAccountsService extends import_base.SDKConstruct {
     return tx;
   }
   async getPriceUpdatesForMigration(targetCreditManager, expectedTargetQuota) {
-    const updatesPayload = await this.#service.getOnDemandPriceUpdates(
-      targetCreditManager,
-      void 0,
-      expectedTargetQuota
-    );
+    const updatesPayload = await this.#service.getOnDemandPriceUpdates({
+      creditManager: targetCreditManager,
+      desiredQuotas: expectedTargetQuota
+    });
     const market = this.sdk.marketRegister.findByCreditManager(targetCreditManager);
     const updates = updatesPayload.raw.length === 0 ? updatesPayload.raw : "priceFeed" in updatesPayload.raw[0] ? updatesPayload.raw : void 0;
     if (!(0, import_versions.isV310)(market.priceOracle.version) || !updates)

package/dist/cjs/sdk/accounts/AbstractCreditAccountsService.js

@@ -74,11 +74,10 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     if (raw.success) {
       return raw;
     }
-    const { txs: priceUpdateTxs } = await this.getUpdateForAccount(
-      raw.creditManager,
-      raw,
-      void 0
-    );
+    const { txs: priceUpdateTxs } = await this.getUpdateForAccount({
+      creditManager: raw.creditManager,
+      creditAccount: raw
+    });
     const [cad] = await (0, import_viem2.simulateWithPriceUpdates)(this.client, {
       priceUpdates: priceUpdateTxs,
       contracts: [
@@ -247,7 +246,14 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
    * @returns
    */
   async fullyLiquidate(props) {
-    const { account, to, slippage = 50n, force = false, keepAssets } = props;
+    const {
+      account,
+      to,
+      slippage = 50n,
+      force = false,
+      keepAssets,
+      ignoreReservePrices
+    } = props;
     const cm = this.sdk.marketRegister.findCreditManager(account.creditManager);
     const routerCloseResult = await this.sdk.routerFor(account).findBestClosePath({
       creditAccount: account,
@@ -256,11 +262,11 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
       force,
       keepAssets
     });
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      account.creditManager,
-      account,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: account.creditManager,
+      creditAccount: account,
+      ignoreReservePrices
+    });
     const calls = [...priceUpdates, ...routerCloseResult.calls];
     const tx = cm.creditFacade.liquidateCreditAccount(
       account.creditAccount,
@@ -299,11 +305,10 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
       creditManager: cm.creditManager,
       slippage
     });
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const calls = [
       ...operation === "close" ? [] : priceUpdates,
       ...routerCloseResult.calls,
@@ -333,11 +338,10 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
-      creditAccount,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
+      creditAccount
+    });
     const calls = [
       ...priceUpdates,
       ...this.prepareUpdateQuotas(creditAccount.creditFacade, {
@@ -370,11 +374,11 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
       creditAccount,
-      averageQuota
-    );
+      desiredQuotas: averageQuota
+    });
     const calls = [
       ...priceUpdatesCalls,
       ...this.prepareAddCollateral(
@@ -413,11 +417,10 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
-      creditAccount,
-      void 0
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
+      creditAccount
+    });
     const underlyingEnabled = (creditAccount.enabledTokensMask & 1n) === 1n;
     const shouldEnable = !isDecrease && !underlyingEnabled;
     const calls = [
@@ -449,11 +452,11 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
       creditAccount,
-      averageQuota
-    );
+      desiredQuotas: averageQuota
+    });
     const calls = [
       ...priceUpdatesCalls,
       ...swapCalls,
@@ -504,11 +507,11 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
         args: []
       })
     };
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
       creditAccount,
-      averageQuota
-    );
+      desiredQuotas: averageQuota
+    });
     const mellowAdapter = cm.creditManager.adapters.mustGet(sourceToken);
     const redeem = {
       target: mellowAdapter.address,
@@ -585,11 +588,11 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
         args: []
       })
     };
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
       creditAccount,
-      averageQuota
-    );
+      desiredQuotas: averageQuota
+    });
     const CLAIMER = "0x25024a3017B8da7161d8c5DCcF768F8678fB5802";
     const mellowClaimerAdapter = cm.creditManager.adapters.mustGet(CLAIMER);
     const multiAcceptContract = (0, import_viem.getContract)({
@@ -635,11 +638,10 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     creditAccount: ca
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const calls = [
       ...priceUpdatesCalls,
       ...disabledTokens.map(
@@ -689,11 +691,10 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
   }) {
     const cmSuite = this.sdk.marketRegister.findCreditManager(creditManager);
     const cm = cmSuite.creditManager;
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      cm.address,
-      void 0,
-      averageQuota
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: cm.address,
+      desiredQuotas: averageQuota
+    });
     const calls = [
       ...priceUpdatesCalls,
       this.#prepareIncreaseDebt(cm.creditFacade, debt),
@@ -824,7 +825,8 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     }
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(priceFeeds);
   }
-  async getUpdateForAccount(creditManager, creditAccount, desiredQuotas) {
+  async getUpdateForAccount(options) {
+    const { creditManager, creditAccount, desiredQuotas, ignoreReservePrices } = options;
     const quotaRecord = desiredQuotas ? (0, import_router.assetsMap)(desiredQuotas) : desiredQuotas;
     const caBalancesRecord = creditAccount ? (0, import_router.assetsMap)(creditAccount.tokens) : creditAccount;
     const market = this.sdk.marketRegister.findByCreditManager(creditManager);
@@ -857,7 +859,10 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
         }
       }
     }
-    const priceFeeds = market.priceOracle.priceFeedsForTokens(Array.from(tokens));
+    const priceFeeds = market.priceOracle.priceFeedsForTokens(Array.from(tokens), {
+      main: true,
+      reserve: !ignoreReservePrices
+    });
     const tStr = Array.from(tokens).map((t) => this.labelAddress(t)).join(", ");
     this.#logger?.debug(
       { account: creditAccount?.creditAccount, manager: cm.name },
@@ -870,19 +875,14 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
   }
   /**
    * Returns account price updates that can be used in credit facade multicall or liquidator calls
-   * @param creditManager
-   * @param creditAccount
-   * @param desiredQuotas
+   * @param options
    * @returns
    */
-  async getOnDemandPriceUpdates(creditManager, creditAccount, desiredQuotas) {
+  async getOnDemandPriceUpdates(options) {
+    const { creditManager, creditAccount } = options;
     const market = this.sdk.marketRegister.findByCreditManager(creditManager);
     const cm = this.sdk.marketRegister.findCreditManager(creditManager);
-    const update = await this.getUpdateForAccount(
-      creditManager,
-      creditAccount,
-      desiredQuotas
-    );
+    const update = await this.getUpdateForAccount(options);
     this.#logger?.debug(
       { account: creditAccount?.creditAccount, manager: cm.name },
       `getting on demand price updates from ${update.txs.length} txs`
@@ -900,12 +900,8 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
    * @param acc
    * @returns
    */
-  async getPriceUpdatesForFacade(creditManager, creditAccount, desiredQuotas) {
-    const updates = await this.getOnDemandPriceUpdates(
-      creditManager,
-      creditAccount,
-      desiredQuotas
-    );
+  async getPriceUpdatesForFacade(options) {
+    const updates = await this.getOnDemandPriceUpdates(options);
     return updates.multicall;
   }
   prepareDisableQuotas(ca) {

package/dist/cjs/sdk/accounts/CreditAccountsServiceV300.js

@@ -49,11 +49,10 @@ class CreditAccountServiceV300 extends import_AbstractCreditAccountsService.Abst
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
-      creditAccount,
-      void 0
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
+      creditAccount
+    });
     const { unwrapCalls, assetsToWithdraw } = this.#prepareUnwrapAndWithdrawCallsV3(
       wrapped,
       false,
@@ -92,11 +91,10 @@ class CreditAccountServiceV300 extends import_AbstractCreditAccountsService.Abst
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const { unwrapCalls, assetsToWithdraw } = this.#prepareUnwrapAndWithdrawCallsV3(
       wrapped,
       true,
@@ -128,11 +126,10 @@ class CreditAccountServiceV300 extends import_AbstractCreditAccountsService.Abst
     to
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const { unwrapCalls, assetsToWithdraw } = this.#prepareUnwrapAndWithdrawCallsV3(
       wrapped,
@@ -167,11 +164,10 @@ class CreditAccountServiceV300 extends import_AbstractCreditAccountsService.Abst
   }) {
     if (claimCalls.length === 0) throw new Error("No path to execute");
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      averageQuota
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const calls = [
       ...priceUpdatesCalls,
       ...claimCalls,

package/dist/cjs/sdk/accounts/CreditAccountsServiceV310.js

@@ -37,11 +37,10 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
     creditAccount: ca
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const addBotCall = {
       target: ca.creditFacade,
       callData: (0, import_viem.encodeFunctionData)({
@@ -67,11 +66,10 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
-      creditAccount,
-      void 0
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
+      creditAccount
+    });
     const calls = [
       ...priceUpdatesCalls,
       ...assetsToWithdraw.map(
@@ -108,11 +106,10 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
       calls: [],
       creditAccount: ca
     });
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const calls = [
       ...operation === "close" ? [] : priceUpdates,
       ...this.prepareAddCollateral(ca.creditFacade, addCollateral, permits),
@@ -143,11 +140,10 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
       calls: [],
       creditAccount: ca
     });
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const calls = [
       ...priceUpdates,
@@ -180,11 +176,11 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
       creditAccount: ca
     });
     if (claimPath.calls.length === 0) throw new Error("No path to execute");
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      averageQuota
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca,
+      desiredQuotas: averageQuota
+    });
     const calls = [
       ...priceUpdatesCalls,
       ...claimPath.calls,

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

@@ -277,14 +277,6 @@ class MarketRegister extends import_base.SDKConstruct {
   get markets() {
     return this.#markets.values();
   }
-  /**
-   * Helper to get human-friendly label for address
-   * @param address
-   * @returns
-   */
-  labelAddress(address) {
-    return this.provider.addressLabels.get(address);
-  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/esm/sdk/GearboxSDK.js

@@ -561,6 +561,14 @@ class GearboxSDK {
     }
     return this.contracts.get(routerAddr);
   }
+  /**
+   * Helper to get human-friendly label for address
+   * @param address
+   * @returns
+   */
+  labelAddress(address) {
+    return this.provider.addressLabels.get(address);
+  }
 }
 export {
   GearboxSDK,

package/dist/esm/sdk/accountMigration/AbstractMigrateCreditAccountsService.js

@@ -96,11 +96,10 @@ class AbstractMigrateCreditAccountsService extends SDKConstruct {
     return tx;
   }
   async getPriceUpdatesForMigration(targetCreditManager, expectedTargetQuota) {
-    const updatesPayload = await this.#service.getOnDemandPriceUpdates(
-      targetCreditManager,
-      void 0,
-      expectedTargetQuota
-    );
+    const updatesPayload = await this.#service.getOnDemandPriceUpdates({
+      creditManager: targetCreditManager,
+      desiredQuotas: expectedTargetQuota
+    });
     const market = this.sdk.marketRegister.findByCreditManager(targetCreditManager);
     const updates = updatesPayload.raw.length === 0 ? updatesPayload.raw : "priceFeed" in updatesPayload.raw[0] ? updatesPayload.raw : void 0;
     if (!isV310(market.priceOracle.version) || !updates)

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

@@ -71,11 +71,10 @@ class AbstractCreditAccountService extends SDKConstruct {
     if (raw.success) {
       return raw;
     }
-    const { txs: priceUpdateTxs } = await this.getUpdateForAccount(
-      raw.creditManager,
-      raw,
-      void 0
-    );
+    const { txs: priceUpdateTxs } = await this.getUpdateForAccount({
+      creditManager: raw.creditManager,
+      creditAccount: raw
+    });
     const [cad] = await simulateWithPriceUpdates(this.client, {
       priceUpdates: priceUpdateTxs,
       contracts: [
@@ -244,7 +243,14 @@ class AbstractCreditAccountService extends SDKConstruct {
    * @returns
    */
   async fullyLiquidate(props) {
-    const { account, to, slippage = 50n, force = false, keepAssets } = props;
+    const {
+      account,
+      to,
+      slippage = 50n,
+      force = false,
+      keepAssets,
+      ignoreReservePrices
+    } = props;
     const cm = this.sdk.marketRegister.findCreditManager(account.creditManager);
     const routerCloseResult = await this.sdk.routerFor(account).findBestClosePath({
       creditAccount: account,
@@ -253,11 +259,11 @@ class AbstractCreditAccountService extends SDKConstruct {
       force,
       keepAssets
     });
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      account.creditManager,
-      account,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: account.creditManager,
+      creditAccount: account,
+      ignoreReservePrices
+    });
     const calls = [...priceUpdates, ...routerCloseResult.calls];
     const tx = cm.creditFacade.liquidateCreditAccount(
       account.creditAccount,
@@ -296,11 +302,10 @@ class AbstractCreditAccountService extends SDKConstruct {
       creditManager: cm.creditManager,
       slippage
     });
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const calls = [
       ...operation === "close" ? [] : priceUpdates,
       ...routerCloseResult.calls,
@@ -330,11 +335,10 @@ class AbstractCreditAccountService extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
-      creditAccount,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
+      creditAccount
+    });
     const calls = [
       ...priceUpdates,
       ...this.prepareUpdateQuotas(creditAccount.creditFacade, {
@@ -367,11 +371,11 @@ class AbstractCreditAccountService extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
       creditAccount,
-      averageQuota
-    );
+      desiredQuotas: averageQuota
+    });
     const calls = [
       ...priceUpdatesCalls,
       ...this.prepareAddCollateral(
@@ -410,11 +414,10 @@ class AbstractCreditAccountService extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
-      creditAccount,
-      void 0
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
+      creditAccount
+    });
     const underlyingEnabled = (creditAccount.enabledTokensMask & 1n) === 1n;
     const shouldEnable = !isDecrease && !underlyingEnabled;
     const calls = [
@@ -446,11 +449,11 @@ class AbstractCreditAccountService extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
       creditAccount,
-      averageQuota
-    );
+      desiredQuotas: averageQuota
+    });
     const calls = [
       ...priceUpdatesCalls,
       ...swapCalls,
@@ -501,11 +504,11 @@ class AbstractCreditAccountService extends SDKConstruct {
         args: []
       })
     };
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
       creditAccount,
-      averageQuota
-    );
+      desiredQuotas: averageQuota
+    });
     const mellowAdapter = cm.creditManager.adapters.mustGet(sourceToken);
     const redeem = {
       target: mellowAdapter.address,
@@ -582,11 +585,11 @@ class AbstractCreditAccountService extends SDKConstruct {
         args: []
       })
     };
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
       creditAccount,
-      averageQuota
-    );
+      desiredQuotas: averageQuota
+    });
     const CLAIMER = "0x25024a3017B8da7161d8c5DCcF768F8678fB5802";
     const mellowClaimerAdapter = cm.creditManager.adapters.mustGet(CLAIMER);
     const multiAcceptContract = getContract({
@@ -632,11 +635,10 @@ class AbstractCreditAccountService extends SDKConstruct {
     creditAccount: ca
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const calls = [
       ...priceUpdatesCalls,
       ...disabledTokens.map(
@@ -686,11 +688,10 @@ class AbstractCreditAccountService extends SDKConstruct {
   }) {
     const cmSuite = this.sdk.marketRegister.findCreditManager(creditManager);
     const cm = cmSuite.creditManager;
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      cm.address,
-      void 0,
-      averageQuota
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: cm.address,
+      desiredQuotas: averageQuota
+    });
     const calls = [
       ...priceUpdatesCalls,
       this.#prepareIncreaseDebt(cm.creditFacade, debt),
@@ -821,7 +822,8 @@ class AbstractCreditAccountService extends SDKConstruct {
     }
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(priceFeeds);
   }
-  async getUpdateForAccount(creditManager, creditAccount, desiredQuotas) {
+  async getUpdateForAccount(options) {
+    const { creditManager, creditAccount, desiredQuotas, ignoreReservePrices } = options;
     const quotaRecord = desiredQuotas ? assetsMap(desiredQuotas) : desiredQuotas;
     const caBalancesRecord = creditAccount ? assetsMap(creditAccount.tokens) : creditAccount;
     const market = this.sdk.marketRegister.findByCreditManager(creditManager);
@@ -854,7 +856,10 @@ class AbstractCreditAccountService extends SDKConstruct {
         }
       }
     }
-    const priceFeeds = market.priceOracle.priceFeedsForTokens(Array.from(tokens));
+    const priceFeeds = market.priceOracle.priceFeedsForTokens(Array.from(tokens), {
+      main: true,
+      reserve: !ignoreReservePrices
+    });
     const tStr = Array.from(tokens).map((t) => this.labelAddress(t)).join(", ");
     this.#logger?.debug(
       { account: creditAccount?.creditAccount, manager: cm.name },
@@ -867,19 +872,14 @@ class AbstractCreditAccountService extends SDKConstruct {
   }
   /**
    * Returns account price updates that can be used in credit facade multicall or liquidator calls
-   * @param creditManager
-   * @param creditAccount
-   * @param desiredQuotas
+   * @param options
    * @returns
    */
-  async getOnDemandPriceUpdates(creditManager, creditAccount, desiredQuotas) {
+  async getOnDemandPriceUpdates(options) {
+    const { creditManager, creditAccount } = options;
     const market = this.sdk.marketRegister.findByCreditManager(creditManager);
     const cm = this.sdk.marketRegister.findCreditManager(creditManager);
-    const update = await this.getUpdateForAccount(
-      creditManager,
-      creditAccount,
-      desiredQuotas
-    );
+    const update = await this.getUpdateForAccount(options);
     this.#logger?.debug(
       { account: creditAccount?.creditAccount, manager: cm.name },
       `getting on demand price updates from ${update.txs.length} txs`
@@ -897,12 +897,8 @@ class AbstractCreditAccountService extends SDKConstruct {
    * @param acc
    * @returns
    */
-  async getPriceUpdatesForFacade(creditManager, creditAccount, desiredQuotas) {
-    const updates = await this.getOnDemandPriceUpdates(
-      creditManager,
-      creditAccount,
-      desiredQuotas
-    );
+  async getPriceUpdatesForFacade(options) {
+    const updates = await this.getOnDemandPriceUpdates(options);
     return updates.multicall;
   }
   prepareDisableQuotas(ca) {

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

@@ -38,11 +38,10 @@ class CreditAccountServiceV300 extends AbstractCreditAccountService {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
-      creditAccount,
-      void 0
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
+      creditAccount
+    });
     const { unwrapCalls, assetsToWithdraw } = this.#prepareUnwrapAndWithdrawCallsV3(
       wrapped,
       false,
@@ -81,11 +80,10 @@ class CreditAccountServiceV300 extends AbstractCreditAccountService {
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const { unwrapCalls, assetsToWithdraw } = this.#prepareUnwrapAndWithdrawCallsV3(
       wrapped,
       true,
@@ -117,11 +115,10 @@ class CreditAccountServiceV300 extends AbstractCreditAccountService {
     to
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const { unwrapCalls, assetsToWithdraw } = this.#prepareUnwrapAndWithdrawCallsV3(
       wrapped,
@@ -156,11 +153,10 @@ class CreditAccountServiceV300 extends AbstractCreditAccountService {
   }) {
     if (claimCalls.length === 0) throw new Error("No path to execute");
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      averageQuota
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const calls = [
       ...priceUpdatesCalls,
       ...claimCalls,

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

@@ -14,11 +14,10 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
     creditAccount: ca
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const addBotCall = {
       target: ca.creditFacade,
       callData: encodeFunctionData({
@@ -44,11 +43,10 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
-      creditAccount,
-      void 0
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: creditAccount.creditManager,
+      creditAccount
+    });
     const calls = [
       ...priceUpdatesCalls,
       ...assetsToWithdraw.map(
@@ -85,11 +83,10 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
       calls: [],
       creditAccount: ca
     });
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const calls = [
       ...operation === "close" ? [] : priceUpdates,
       ...this.prepareAddCollateral(ca.creditFacade, addCollateral, permits),
@@ -120,11 +117,10 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
       calls: [],
       creditAccount: ca
     });
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
+    const priceUpdates = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca
+    });
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const calls = [
       ...priceUpdates,
@@ -157,11 +153,11 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
       creditAccount: ca
     });
     if (claimPath.calls.length === 0) throw new Error("No path to execute");
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      averageQuota
-    );
+    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
+      creditManager: ca.creditManager,
+      creditAccount: ca,
+      desiredQuotas: averageQuota
+    });
     const calls = [
       ...priceUpdatesCalls,
       ...claimPath.calls,

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

@@ -258,14 +258,6 @@ class MarketRegister extends SDKConstruct {
   get markets() {
     return this.#markets.values();
   }
-  /**
-   * Helper to get human-friendly label for address
-   * @param address
-   * @returns
-   */
-  labelAddress(address) {
-    return this.provider.addressLabels.get(address);
-  }
 }
 export {
   MarketRegister

package/dist/types/sdk/GearboxSDK.d.ts

@@ -133,4 +133,10 @@ export declare class GearboxSDK<const Plugins extends PluginsMap = {}> {
     } | {
         creditFacade: Address | BaseState | IBaseContract;
     } | VersionRange): IRouterContract;
+    /**
+     * Helper to get human-friendly label for address
+     * @param address
+     * @returns
+     */
+    labelAddress(address: Address): string;
 }

package/dist/types/sdk/accounts/AbstractCreditAccountsService.d.ts

@@ -3,9 +3,9 @@ import type { CreditAccountData } from "../base/index.js";
 import { SDKConstruct } from "../base/index.js";
 import type { GearboxSDK } from "../GearboxSDK.js";
 import type { OnDemandPriceUpdates, PriceUpdateV300, PriceUpdateV310, UpdatePriceFeedsResult } from "../market/index.js";
-import { type Asset, type CreditAccountTokensSlice, type RouterCASlice } from "../router/index.js";
+import { type Asset, type RouterCASlice } from "../router/index.js";
 import type { MultiCall } from "../types/index.js";
-import type { ClaimDelayedProps, FullyLiquidateProps, GetConnectedBotsResult, GetConnectedMigrationBotsResult, StartDelayedWithdrawalProps } from "./types";
+import type { ClaimDelayedProps, FullyLiquidateProps, GetConnectedBotsResult, GetConnectedMigrationBotsResult, PriceUpdatesOptions, StartDelayedWithdrawalProps } from "./types";
 import type { AddCollateralProps, ChangeDeptProps, CloseCreditAccountProps, CloseCreditAccountResult, CreditAccountOperationResult, EnableTokensProps, ExecuteSwapProps, GetCreditAccountsOptions, OpenCAProps, PermitResult, PrepareUpdateQuotasProps, Rewards, UpdateQuotasProps } from "./types.js";
 export interface CreditAccountServiceOptions {
     batchSize?: number;
@@ -182,15 +182,13 @@ export declare abstract class AbstractCreditAccountService extends SDKConstruct
      * @returns
      */
     getUpdateForAccounts(accounts: Array<RouterCASlice>): Promise<UpdatePriceFeedsResult>;
-    protected getUpdateForAccount(creditManager: Address, creditAccount: CreditAccountTokensSlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<UpdatePriceFeedsResult>;
+    protected getUpdateForAccount(options: PriceUpdatesOptions): Promise<UpdatePriceFeedsResult>;
     /**
      * Returns account price updates that can be used in credit facade multicall or liquidator calls
-     * @param creditManager
-     * @param creditAccount
-     * @param desiredQuotas
+     * @param options
      * @returns
      */
-    getOnDemandPriceUpdates(creditManager: Address, creditAccount: CreditAccountTokensSlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<OnDemandPriceUpdates<PriceUpdateV310 | PriceUpdateV300>>;
+    getOnDemandPriceUpdates(options: PriceUpdatesOptions): Promise<OnDemandPriceUpdates<PriceUpdateV310 | PriceUpdateV300>>;
     /**
      * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...).
      * - If there are desiredQuotas and creditAccount update quotaBalance > 0 || (balance > 10n && isEnabled). Is used when account has both: balances and quota buys.
@@ -199,7 +197,7 @@ export declare abstract class AbstractCreditAccountService extends SDKConstruct
      * @param acc
      * @returns
      */
-    getPriceUpdatesForFacade(creditManager: Address, creditAccount: CreditAccountTokensSlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<Array<MultiCall>>;
+    getPriceUpdatesForFacade(options: PriceUpdatesOptions): Promise<Array<MultiCall>>;
     protected prepareDisableQuotas(ca: RouterCASlice): Array<MultiCall>;
     protected prepareUpdateQuotas(creditFacade: Address, { averageQuota, minQuota }: PrepareUpdateQuotasProps): Array<MultiCall>;
     protected prepareDecreaseDebt(ca: RouterCASlice): Array<MultiCall>;

package/dist/types/sdk/accounts/types.d.ts

@@ -32,6 +32,12 @@ export interface GetCreditAccountsOptions {
      */
     ignoreReservePrices?: boolean;
 }
+export interface PriceUpdatesOptions {
+    creditManager: Address;
+    creditAccount?: CreditAccountTokensSlice;
+    desiredQuotas?: Asset[];
+    ignoreReservePrices?: boolean;
+}
 export interface CloseCreditAccountResult extends CreditAccountOperationResult {
     routerCloseResult: RouterCloseResult;
 }
@@ -305,6 +311,10 @@ export interface FullyLiquidateProps {
      * List of assets to keep on account after liquidation
      */
     keepAssets?: Address[];
+    /**
+     * If true, will ignore reserve prices
+     */
+    ignoreReservePrices?: boolean;
 }
 export interface PermitResult {
     r: Address;
@@ -518,20 +528,16 @@ export interface ICreditAccountsService extends SDKConstruct {
     getUpdateForAccounts(accounts: Array<RouterCASlice>): Promise<UpdatePriceFeedsResult>;
     /**
      * Returns account price updates that can be used in credit facade multicall or liquidator calls
-     * @param creditManager
-     * @param creditAccount
-     * @param desiredQuotas
+     * @param options
      * @returns
      */
-    getOnDemandPriceUpdates(creditManager: Address, creditAccount: RouterCASlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<OnDemandPriceUpdates<PriceUpdateV310 | PriceUpdateV300>>;
+    getOnDemandPriceUpdates(options: PriceUpdatesOptions): Promise<OnDemandPriceUpdates<PriceUpdateV310 | PriceUpdateV300>>;
     /**
      * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...).
-     * @param creditManager
-     * @param creditAccount
-     * @param desiredQuotas
+     * @param options
      * @returns
      */
-    getPriceUpdatesForFacade(creditManager: Address, creditAccount: CreditAccountTokensSlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<Array<MultiCall>>;
+    getPriceUpdatesForFacade(options: PriceUpdatesOptions): Promise<Array<MultiCall>>;
     /**
      * Withdraws a single collateral from credit account to wallet to and updates quotas;
      * technically can withdraw several tokens at once

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

@@ -36,10 +36,4 @@ export declare class MarketRegister extends SDKConstruct {
     findByPool(address: Address): MarketSuite;
     get marketsMap(): AddressMap<MarketSuite>;
     get markets(): MarketSuite[];
-    /**
-     * Helper to get human-friendly label for address
-     * @param address
-     * @returns
-     */
-    labelAddress(address: Address): string;
 }

package/package.json

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