@gearbox-protocol/sdk 13.0.0-next.21 → 13.0.0-next.22

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

@@ -33,7 +33,6 @@ var import_v300 = require("../../abi/v300.js");
 var import_base = require("../base/index.js");
 var import_chains = require("../chain/chains.js");
 var import_constants = require("../constants/index.js");
-var import_market = require("../market/index.js");
 var import_router = require("../router/index.js");
 var import_sdk_legacy = require("../sdk-legacy/index.js");
 var import_utils = require("../utils/index.js");
@@ -42,6 +41,7 @@ const COMPRESSORS = {
   [import_chains.chains.Mainnet.id]: "0x36F3d0Bb73CBC2E94fE24dF0f26a689409cF9023",
   [import_chains.chains.Monad.id]: "0x36F3d0Bb73CBC2E94fE24dF0f26a689409cF9023"
 };
+const INVESTORS = new import_utils.AddressMap([], "investors");
 function getWithdrawalCompressorAddress(chainId) {
   return COMPRESSORS[chainId];
 }
@@ -103,6 +103,23 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     });
     return cad;
   }
+  /**
+   * Returns credit account data for a single account with the investor address resolved.
+   * Loads CA via getCreditAccountData; for KYC underlyings fetches the investor from the KYC factory's getInvestor(creditAccount), otherwise uses the account owner.
+   * @param account - Credit account address
+   * @param blockNumber - Optional block number for the read
+   * @returns CreditAccountDataWithInvestor (CA data + investor address), or undefined if the account is not found
+   */
+  async getCreditAccountDataWithInvestor(account, blockNumber) {
+    const ca = await this.getCreditAccountData(account, blockNumber);
+    if (!ca) return ca;
+    const marketSuite = this.sdk.marketRegister.findByCreditManager(
+      ca.creditManager
+    );
+    const factory = await marketSuite.getKYCFactory();
+    const investor = factory ? await factory.getInvestor(ca.creditAccount, true) : void 0;
+    return { ...ca, investor: investor ?? ca.owner };
+  }
   /**
    * Methods to get all credit accounts with some optional filtering
    * Performs all necessary price feed updates under the hood
@@ -111,7 +128,7 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
    * @param blockNumber
    * @returns returned credit accounts are sorted by health factor in ascending order
    */
-  async getCreditAccounts(options, blockNumber) {
+  async getCreditAccounts(options, blockNumber, priceUpdate) {
     const {
       creditManager,
       includeZeroDebt = false,
@@ -133,7 +150,7 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
       maxHealthFactor,
       reverting: false
     };
-    const { txs: priceUpdateTxs } = await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(
+    const { txs: priceUpdateTxs } = priceUpdate ?? await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(
       ignoreReservePrices ? { main: true } : void 0
     );
     const allCAs = [];
@@ -162,6 +179,75 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     );
     return allCAs.sort((a, b) => Number(a.healthFactor - b.healthFactor));
   }
+  /**
+   * Returns all credit accounts matching the filter, with investor set on each item.
+   * Delegates to getCreditAccounts; when options.owner is set, also loads KYC credit accounts for that owner and merges them into the list. Result is sorted by health factor ascending.
+   * @param options - Filter options (owner, creditManager, health factor, etc.)
+   * @param blockNumber - Optional block number for the read
+   * @returns Array of credit accounts (with investor field), sorted by health factor ascending
+   */
+  async getCreditAccountsWithInvestor(options, blockNumber) {
+    const { owner, ignoreReservePrices = false } = options ?? {};
+    const priceUpdate = await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(
+      ignoreReservePrices ? { main: true } : void 0
+    );
+    const { txs: priceUpdateTxs } = priceUpdate;
+    const [common, kyc] = await Promise.all([
+      this.getCreditAccounts(options, blockNumber),
+      owner ? this.getKYCCreditAccountsOfOwner(owner, priceUpdateTxs, blockNumber) : void 0
+    ]);
+    const allCAs = common.map(
+      (ca) => ({
+        ...ca,
+        investor: owner || ca.owner
+      })
+    );
+    allCAs.push(...kyc || []);
+    return allCAs.sort((a, b) => Number(a.healthFactor - b.healthFactor));
+  }
+  async getKYCCreditAccountsOfOwner(owner, priceUpdateTxs, blockNumber) {
+    const suites = this.marketConfigurators.map((mc) => {
+      const suite = this.sdk.marketRegister.markets.find(
+        (m) => m.configurator.address === mc
+      );
+      return suite;
+    });
+    const kycCAAddresses = await this.getKYCCaOfInvestor(owner, suites);
+    const kycCAs = await this.loadSpecifiedAccounts(
+      kycCAAddresses,
+      priceUpdateTxs,
+      blockNumber
+    );
+    return kycCAs.map((ca) => ({
+      ...ca,
+      investor: owner
+    }));
+  }
+  /**
+   * Loads credit account data for the given addresses using simulateWithPriceUpdates.
+   * Applies the provided price update txs before reading, so returned data is consistent with up-to-date prices.
+   * @param accounts - Credit account addresses to load
+   * @param priceUpdateTxs - Price feed update txs to simulate before the read (e.g. from generatePriceFeedsUpdateTxs)
+   * @param blockNumber - Optional block number for the read
+   * @returns Array of CreditAccountData in the same order as accounts (throws if any getCreditAccountData call reverts)
+   */
+  async loadSpecifiedAccounts(accounts, priceUpdateTxs, blockNumber) {
+    if (accounts.length === 0) return [];
+    const list = await (0, import_viem2.simulateWithPriceUpdates)(this.client, {
+      priceUpdates: priceUpdateTxs,
+      contracts: accounts.map(
+        (account) => ({
+          abi: import_creditAccountCompressor.creditAccountCompressorAbi,
+          address: this.#compressor,
+          functionName: "getCreditAccountData",
+          args: [account]
+        })
+      ),
+      blockNumber,
+      gas: this.sdk.gasLimit
+    });
+    return list;
+  }
   /**
    * Method to get all claimable rewards for credit account (ex. stkUSDS SKY rewards)
      Assosiates rewards by adapter + stakedPhantomToken
@@ -394,6 +480,13 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     closePath
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    await this.sdk.tokensMeta.loadTokenData(cm.underlying);
+    const underlying = this.sdk.tokensMeta.mustGet(cm.underlying);
+    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+      throw new Error(
+        "closeCreditAccount is not supported for KYC underlying credit accounts"
+      );
+    }
     const routerCloseResult = closePath || await this.sdk.routerFor(ca).findBestClosePath({
       creditAccount: ca,
       creditManager: cm.creditManager,
@@ -796,10 +889,9 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
   async getApprovalAddress(options) {
     const { creditManager } = options;
     const suite = this.sdk.marketRegister.findCreditManager(creditManager);
-    await this.sdk.tokensMeta.loadTokenData(suite.underlying);
-    const underlying = this.sdk.tokensMeta.mustGet(suite.underlying);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      const factory = new import_market.SecuritizeKYCFactory(this.sdk, underlying.kycFactory);
+    const marketSuite = this.sdk.marketRegister.findByPool(suite.pool);
+    const factory = await marketSuite.getKYCFactory();
+    if (factory) {
       if ("creditAccount" in options) {
         return factory.getWallet(options.creditAccount);
       }
@@ -955,6 +1047,99 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     );
     return resp;
   }
+  /**
+   * Returns multicall entries to redeem (unwrap) KYC ERC-4626 vault shares into underlying for the given credit manager.
+   * Used when withdrawing debt from a KYC market: redeems adapter vault shares so the underlying can be withdrawn.
+   * Only applies when the credit manager's underlying is KYC-gated and has an ERC-4626 adapter configured.
+   * @param amount - Number of vault shares (adapter tokens) to redeem
+   * @param creditManager - Credit manager address
+   * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not KYC or no adapter is configured
+   */
+  async getKYCUnwrapCalls(amount, creditManager) {
+    const suite = this.sdk.marketRegister.findCreditManager(creditManager);
+    const meta = this.sdk.tokensMeta.mustGet(suite.underlying);
+    if (!this.sdk.tokensMeta.isKYCUnderlying(meta)) {
+      return void 0;
+    }
+    const adapter = suite.creditManager.adapters.get(meta.addr);
+    const adapterAddress = adapter?.address;
+    if (!adapterAddress) {
+      return void 0;
+    }
+    const mc = [
+      {
+        target: adapterAddress,
+        callData: (0, import_viem.encodeFunctionData)({
+          abi: ierc4626AdapterAbi,
+          functionName: "redeem",
+          args: [amount, import_constants.ADDRESS_0X0, import_constants.ADDRESS_0X0]
+        })
+      }
+    ];
+    return mc;
+  }
+  /**
+   * Returns multicall entries to deposit (wrap) underlying into KYC ERC-4626 vault shares for the given credit manager.
+   * Used when adding debt on a KYC market: deposits underlying into the adapter vault so shares are minted on the account.
+   * Only applies when the credit manager's underlying is KYC-gated and has an ERC-4626 adapter configured.
+   * @param amount - Amount of underlying assets to deposit into the vault (in underlying decimals)
+   * @param creditManager - Credit manager address
+   * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not KYC or no adapter is configured
+   */
+  async getKYCWrapCalls(amount, creditManager) {
+    const suite = this.sdk.marketRegister.findCreditManager(creditManager);
+    const meta = this.sdk.tokensMeta.mustGet(suite.underlying);
+    if (!this.sdk.tokensMeta.isKYCUnderlying(meta)) {
+      return void 0;
+    }
+    const adapter = suite.creditManager.adapters.get(meta.addr);
+    const adapterAddress = adapter?.address;
+    if (!adapterAddress) {
+      return void 0;
+    }
+    const mc = [
+      {
+        target: adapterAddress,
+        callData: (0, import_viem.encodeFunctionData)({
+          abi: ierc4626AdapterAbi,
+          functionName: "deposit",
+          args: [amount, import_constants.ADDRESS_0X0]
+        })
+      }
+    ];
+    return mc;
+  }
+  /**
+   * Returns multicall entries to call redeemDiff on the KYC ERC-4626 adapter for the given credit manager.
+   * Redeems the leftover vault shares (e.g. after repaying debt) so the account does not hold excess KYC vault tokens.
+   * Only applies when the credit manager's underlying is KYC-gated and has an ERC-4626 adapter configured.
+   * @param amount - Leftover vault share amount to redeem (in adapter/vault decimals)
+   * @param creditManager - Credit manager address
+   * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not KYC or no adapter is configured
+   */
+  async getRedeemDiffCalls(amount, creditManager) {
+    const suite = this.sdk.marketRegister.findCreditManager(creditManager);
+    const meta = this.sdk.tokensMeta.mustGet(suite.underlying);
+    if (!this.sdk.tokensMeta.isKYCUnderlying(meta)) {
+      return void 0;
+    }
+    const adapter = suite.creditManager.adapters.get(meta.addr);
+    const adapterAddress = adapter?.address;
+    if (!adapterAddress) {
+      return void 0;
+    }
+    const mc = [
+      {
+        target: adapterAddress,
+        callData: (0, import_viem.encodeFunctionData)({
+          abi: ierc4626AdapterAbi,
+          functionName: "redeemDiff",
+          args: [amount]
+        })
+      }
+    ];
+    return mc;
+  }
   /**
    * Returns raw txs that are needed to update all price feeds so that all credit accounts (possibly from different markets) compute
    *
@@ -1221,10 +1406,9 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
    * @returns
    */
   async openCreditAccountTx(suite, to, calls, referralCode) {
-    await this.sdk.tokensMeta.loadTokenData(suite.underlying);
-    const underlying = this.sdk.tokensMeta.mustGet(suite.underlying);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      const factory = new import_market.SecuritizeKYCFactory(this.sdk, underlying.kycFactory);
+    const marketSuite = this.sdk.marketRegister.findByPool(suite.pool);
+    const factory = await marketSuite.getKYCFactory();
+    if (factory) {
       const tokensToRegister = await factory.getDSTokens();
       return factory.openCreditAccount(
         suite.creditManager.address,
@@ -1242,11 +1426,12 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
    * @returns
    */
   async multicallTx(suite, creditAccount, calls) {
-    await this.sdk.tokensMeta.loadTokenData(suite.underlying);
-    const underlying = this.sdk.tokensMeta.mustGet(suite.underlying);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+    const marketSuite = this.sdk.marketRegister.findByCreditManager(
+      suite.creditManager.address
+    );
+    const factory = await marketSuite.getKYCFactory();
+    if (factory) {
       const tokensToRegister = [];
-      const factory = new import_market.SecuritizeKYCFactory(this.sdk, underlying.kycFactory);
       return factory.multicall(creditAccount, calls, tokensToRegister);
     }
     return suite.creditFacade.multicall(creditAccount, calls);
@@ -1260,16 +1445,128 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
    * @returns
    */
   async closeCreditAccountTx(suite, creditAccount, calls, operation) {
-    await this.sdk.tokensMeta.loadTokenData(suite.underlying);
-    const underlying = this.sdk.tokensMeta.mustGet(suite.underlying);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      throw new Error(
-        "KYC underlying is not supported for close credit account"
-      );
+    const marketSuite = this.sdk.marketRegister.findByCreditManager(
+      suite.creditManager.address
+    );
+    const factory = await marketSuite.getKYCFactory();
+    if (operation === "close") {
+      if (factory) {
+        throw new Error(
+          "CloseOptions=close is not supported for KYC underlying credit accounts"
+        );
+      }
+      return suite.creditFacade.closeCreditAccount(creditAccount, calls);
     }
-    return operation === "close" ? suite.creditFacade.closeCreditAccount(creditAccount, calls) : suite.creditFacade.multicall(creditAccount, calls);
+    if (factory) {
+      const tokensToRegister = [];
+      return factory.multicall(creditAccount, calls, tokensToRegister);
+    }
+    return suite.creditFacade.multicall(creditAccount, calls);
+  }
+  /**
+   * Returns all KYC credit account addresses for an investor across the given market suites.
+   * Resolves KYC factory per suite, then multicalls each factory's getCreditAccounts(investor).
+   * @param investor - Owner address to query
+   * @param suites - Market suites (KYC factories are resolved for each; undefined entries are skipped)
+   * @returns Flat array of credit account addresses from all KYC markets
+   */
+  async getKYCCaOfInvestor(investor, suites) {
+    if (suites.length === 0 || investor === import_constants.ADDRESS_0X0) return [];
+    const factories = await Promise.all(
+      suites.map((suite) => suite ? suite.getKYCFactory() : void 0)
+    );
+    const safeFactories = factories.reduce(
+      (acc, v) => {
+        if (v) {
+          acc.push(v);
+        }
+        return acc;
+      },
+      []
+    );
+    const allResp = await this.client.multicall({
+      contracts: [
+        ...safeFactories.map((factory) => {
+          return {
+            abi: factory.abi,
+            address: factory.address,
+            functionName: "getCreditAccounts",
+            args: [investor]
+          };
+        })
+      ],
+      allowFailure: true,
+      batchSize: 0
+    });
+    const caLists = safeFactories.reduce((acc, _, index) => {
+      const response = allResp[index];
+      acc.push(...response.result || []);
+      return acc;
+    }, []);
+    return caLists;
   }
 }
+const ierc4626AdapterAbi = [
+  {
+    inputs: [
+      { name: "assets", type: "uint256", internalType: "uint256" },
+      { name: "receiver", type: "address", internalType: "address" }
+    ],
+    name: "deposit",
+    outputs: [{ name: "useSafePrices", type: "bool", internalType: "bool" }],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      { name: "shares", type: "uint256", internalType: "uint256" },
+      { name: "receiver", type: "address", internalType: "address" },
+      { name: "owner", type: "address", internalType: "address" }
+    ],
+    name: "redeem",
+    outputs: [{ name: "useSafePrices", type: "bool", internalType: "bool" }],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        name: "leftoverAmount",
+        type: "uint256",
+        internalType: "uint256"
+      }
+    ],
+    name: "redeemDiff",
+    outputs: [
+      {
+        name: "useSafePrices",
+        type: "bool",
+        internalType: "bool"
+      }
+    ],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        name: "leftoverAmount",
+        type: "uint256",
+        internalType: "uint256"
+      }
+    ],
+    name: "depositDiff",
+    outputs: [
+      {
+        name: "useSafePrices",
+        type: "bool",
+        internalType: "bool"
+      }
+    ],
+    stateMutability: "nonpayable",
+    type: "function"
+  }
+];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AbstractCreditAccountService,

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

@@ -113,11 +113,13 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
     creditAccount: ca,
     permits,
     to,
-    tokensToClaim
+    tokensToClaim,
+    calls: wrapCalls = []
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const router = this.sdk.routerFor(ca);
+    const unwrapCalls = await this.getRedeemDiffCalls(1n, ca.creditManager) ?? [];
     const claimPath = await router.findClaimAllRewards({
       calls: [],
       tokensToClaim,
@@ -130,8 +132,10 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
     const calls = [
       ...operation === "close" ? [] : priceUpdates,
       ...this.prepareAddCollateral(ca.creditFacade, addCollateral, permits),
+      ...wrapCalls,
       ...this.prepareDisableQuotas(ca),
       ...this.prepareDecreaseDebt(ca),
+      ...unwrapCalls,
       ...claimPath.calls,
       ...this.prepareDisableTokens(ca),
       ...assetsToWithdraw.map(

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

@@ -23,8 +23,10 @@ __export(SecuritizeKYCFactory_exports, {
 module.exports = __toCommonJS(SecuritizeKYCFactory_exports);
 var import_iSecuritizeKYCFactory = require("../../../abi/310/iSecuritizeKYCFactory.js");
 var import_base = require("../../base/index.js");
+var import__ = require("../../index.js");
 const abi = import_iSecuritizeKYCFactory.iSecuritizeKYCFactoryAbi;
 class SecuritizeKYCFactory extends import_base.BaseContract {
+  investorCache;
   constructor(options, address) {
     super(options, {
       addr: address,
@@ -41,6 +43,24 @@ class SecuritizeKYCFactory extends import_base.BaseContract {
   async getWallet(creditAccount) {
     return this.contract.read.getWallet([creditAccount]);
   }
+  /**
+   * Returns the investor address for a credit account.
+   * @param creditAccount - Credit account address
+   * @param fromCache - If true, use and update an in-memory cache (creditAccount -> investor). On cache miss, loads from contract and stores the result for future calls.
+   */
+  async getInvestor(creditAccount, fromCache) {
+    if (fromCache && this.investorCache?.has(creditAccount)) {
+      return this.investorCache.get(creditAccount);
+    }
+    const investor = await this.contract.read.getInvestor([creditAccount]);
+    if (fromCache) {
+      if (!this.investorCache) {
+        this.investorCache = new import__.AddressMap();
+      }
+      this.investorCache.upsert(creditAccount, investor);
+    }
+    return investor;
+  }
   async getDSTokens() {
     const tokens = await this.contract.read.getDSTokens();
     return [...tokens];

package/dist/cjs/sdk/sdk-legacy/core/creditAccount.js

@@ -38,6 +38,7 @@ class CreditAccountData_Legacy {
   underlying;
   expirationDate;
   version;
+  investor;
   enabledTokensMask;
   healthFactor;
   baseBorrowRateWithoutFee;
@@ -67,6 +68,7 @@ class CreditAccountData_Legacy {
     this.underlying = payload.underlying.toLowerCase();
     this.expirationDate = Number(payload.expirationDate);
     this.version = Number(payload.cfVersion);
+    this.investor = payload.investor.toLowerCase();
     this.healthFactor = Number(
       (payload.healthFactor || 0n) * import_constants.PERCENTAGE_FACTOR / import_constants.WAD
     );

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

@@ -23,9 +23,6 @@ import {
   RAY,
   VERSION_RANGE_310
 } from "../constants/index.js";
-import {
-  SecuritizeKYCFactory
-} from "../market/index.js";
 import { assetsMap } from "../router/index.js";
 import { BigIntMath } from "../sdk-legacy/index.js";
 import { AddressMap } from "../utils/index.js";
@@ -34,6 +31,7 @@ const COMPRESSORS = {
   [chains.Mainnet.id]: "0x36F3d0Bb73CBC2E94fE24dF0f26a689409cF9023",
   [chains.Monad.id]: "0x36F3d0Bb73CBC2E94fE24dF0f26a689409cF9023"
 };
+const INVESTORS = new AddressMap([], "investors");
 function getWithdrawalCompressorAddress(chainId) {
   return COMPRESSORS[chainId];
 }
@@ -95,6 +93,23 @@ class AbstractCreditAccountService extends SDKConstruct {
     });
     return cad;
   }
+  /**
+   * Returns credit account data for a single account with the investor address resolved.
+   * Loads CA via getCreditAccountData; for KYC underlyings fetches the investor from the KYC factory's getInvestor(creditAccount), otherwise uses the account owner.
+   * @param account - Credit account address
+   * @param blockNumber - Optional block number for the read
+   * @returns CreditAccountDataWithInvestor (CA data + investor address), or undefined if the account is not found
+   */
+  async getCreditAccountDataWithInvestor(account, blockNumber) {
+    const ca = await this.getCreditAccountData(account, blockNumber);
+    if (!ca) return ca;
+    const marketSuite = this.sdk.marketRegister.findByCreditManager(
+      ca.creditManager
+    );
+    const factory = await marketSuite.getKYCFactory();
+    const investor = factory ? await factory.getInvestor(ca.creditAccount, true) : void 0;
+    return { ...ca, investor: investor ?? ca.owner };
+  }
   /**
    * Methods to get all credit accounts with some optional filtering
    * Performs all necessary price feed updates under the hood
@@ -103,7 +118,7 @@ class AbstractCreditAccountService extends SDKConstruct {
    * @param blockNumber
    * @returns returned credit accounts are sorted by health factor in ascending order
    */
-  async getCreditAccounts(options, blockNumber) {
+  async getCreditAccounts(options, blockNumber, priceUpdate) {
     const {
       creditManager,
       includeZeroDebt = false,
@@ -125,7 +140,7 @@ class AbstractCreditAccountService extends SDKConstruct {
       maxHealthFactor,
       reverting: false
     };
-    const { txs: priceUpdateTxs } = await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(
+    const { txs: priceUpdateTxs } = priceUpdate ?? await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(
       ignoreReservePrices ? { main: true } : void 0
     );
     const allCAs = [];
@@ -154,6 +169,75 @@ class AbstractCreditAccountService extends SDKConstruct {
     );
     return allCAs.sort((a, b) => Number(a.healthFactor - b.healthFactor));
   }
+  /**
+   * Returns all credit accounts matching the filter, with investor set on each item.
+   * Delegates to getCreditAccounts; when options.owner is set, also loads KYC credit accounts for that owner and merges them into the list. Result is sorted by health factor ascending.
+   * @param options - Filter options (owner, creditManager, health factor, etc.)
+   * @param blockNumber - Optional block number for the read
+   * @returns Array of credit accounts (with investor field), sorted by health factor ascending
+   */
+  async getCreditAccountsWithInvestor(options, blockNumber) {
+    const { owner, ignoreReservePrices = false } = options ?? {};
+    const priceUpdate = await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(
+      ignoreReservePrices ? { main: true } : void 0
+    );
+    const { txs: priceUpdateTxs } = priceUpdate;
+    const [common, kyc] = await Promise.all([
+      this.getCreditAccounts(options, blockNumber),
+      owner ? this.getKYCCreditAccountsOfOwner(owner, priceUpdateTxs, blockNumber) : void 0
+    ]);
+    const allCAs = common.map(
+      (ca) => ({
+        ...ca,
+        investor: owner || ca.owner
+      })
+    );
+    allCAs.push(...kyc || []);
+    return allCAs.sort((a, b) => Number(a.healthFactor - b.healthFactor));
+  }
+  async getKYCCreditAccountsOfOwner(owner, priceUpdateTxs, blockNumber) {
+    const suites = this.marketConfigurators.map((mc) => {
+      const suite = this.sdk.marketRegister.markets.find(
+        (m) => m.configurator.address === mc
+      );
+      return suite;
+    });
+    const kycCAAddresses = await this.getKYCCaOfInvestor(owner, suites);
+    const kycCAs = await this.loadSpecifiedAccounts(
+      kycCAAddresses,
+      priceUpdateTxs,
+      blockNumber
+    );
+    return kycCAs.map((ca) => ({
+      ...ca,
+      investor: owner
+    }));
+  }
+  /**
+   * Loads credit account data for the given addresses using simulateWithPriceUpdates.
+   * Applies the provided price update txs before reading, so returned data is consistent with up-to-date prices.
+   * @param accounts - Credit account addresses to load
+   * @param priceUpdateTxs - Price feed update txs to simulate before the read (e.g. from generatePriceFeedsUpdateTxs)
+   * @param blockNumber - Optional block number for the read
+   * @returns Array of CreditAccountData in the same order as accounts (throws if any getCreditAccountData call reverts)
+   */
+  async loadSpecifiedAccounts(accounts, priceUpdateTxs, blockNumber) {
+    if (accounts.length === 0) return [];
+    const list = await simulateWithPriceUpdates(this.client, {
+      priceUpdates: priceUpdateTxs,
+      contracts: accounts.map(
+        (account) => ({
+          abi: creditAccountCompressorAbi,
+          address: this.#compressor,
+          functionName: "getCreditAccountData",
+          args: [account]
+        })
+      ),
+      blockNumber,
+      gas: this.sdk.gasLimit
+    });
+    return list;
+  }
   /**
    * Method to get all claimable rewards for credit account (ex. stkUSDS SKY rewards)
      Assosiates rewards by adapter + stakedPhantomToken
@@ -386,6 +470,13 @@ class AbstractCreditAccountService extends SDKConstruct {
     closePath
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    await this.sdk.tokensMeta.loadTokenData(cm.underlying);
+    const underlying = this.sdk.tokensMeta.mustGet(cm.underlying);
+    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+      throw new Error(
+        "closeCreditAccount is not supported for KYC underlying credit accounts"
+      );
+    }
     const routerCloseResult = closePath || await this.sdk.routerFor(ca).findBestClosePath({
       creditAccount: ca,
       creditManager: cm.creditManager,
@@ -788,10 +879,9 @@ class AbstractCreditAccountService extends SDKConstruct {
   async getApprovalAddress(options) {
     const { creditManager } = options;
     const suite = this.sdk.marketRegister.findCreditManager(creditManager);
-    await this.sdk.tokensMeta.loadTokenData(suite.underlying);
-    const underlying = this.sdk.tokensMeta.mustGet(suite.underlying);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      const factory = new SecuritizeKYCFactory(this.sdk, underlying.kycFactory);
+    const marketSuite = this.sdk.marketRegister.findByPool(suite.pool);
+    const factory = await marketSuite.getKYCFactory();
+    if (factory) {
       if ("creditAccount" in options) {
         return factory.getWallet(options.creditAccount);
       }
@@ -947,6 +1037,99 @@ class AbstractCreditAccountService extends SDKConstruct {
     );
     return resp;
   }
+  /**
+   * Returns multicall entries to redeem (unwrap) KYC ERC-4626 vault shares into underlying for the given credit manager.
+   * Used when withdrawing debt from a KYC market: redeems adapter vault shares so the underlying can be withdrawn.
+   * Only applies when the credit manager's underlying is KYC-gated and has an ERC-4626 adapter configured.
+   * @param amount - Number of vault shares (adapter tokens) to redeem
+   * @param creditManager - Credit manager address
+   * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not KYC or no adapter is configured
+   */
+  async getKYCUnwrapCalls(amount, creditManager) {
+    const suite = this.sdk.marketRegister.findCreditManager(creditManager);
+    const meta = this.sdk.tokensMeta.mustGet(suite.underlying);
+    if (!this.sdk.tokensMeta.isKYCUnderlying(meta)) {
+      return void 0;
+    }
+    const adapter = suite.creditManager.adapters.get(meta.addr);
+    const adapterAddress = adapter?.address;
+    if (!adapterAddress) {
+      return void 0;
+    }
+    const mc = [
+      {
+        target: adapterAddress,
+        callData: encodeFunctionData({
+          abi: ierc4626AdapterAbi,
+          functionName: "redeem",
+          args: [amount, ADDRESS_0X0, ADDRESS_0X0]
+        })
+      }
+    ];
+    return mc;
+  }
+  /**
+   * Returns multicall entries to deposit (wrap) underlying into KYC ERC-4626 vault shares for the given credit manager.
+   * Used when adding debt on a KYC market: deposits underlying into the adapter vault so shares are minted on the account.
+   * Only applies when the credit manager's underlying is KYC-gated and has an ERC-4626 adapter configured.
+   * @param amount - Amount of underlying assets to deposit into the vault (in underlying decimals)
+   * @param creditManager - Credit manager address
+   * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not KYC or no adapter is configured
+   */
+  async getKYCWrapCalls(amount, creditManager) {
+    const suite = this.sdk.marketRegister.findCreditManager(creditManager);
+    const meta = this.sdk.tokensMeta.mustGet(suite.underlying);
+    if (!this.sdk.tokensMeta.isKYCUnderlying(meta)) {
+      return void 0;
+    }
+    const adapter = suite.creditManager.adapters.get(meta.addr);
+    const adapterAddress = adapter?.address;
+    if (!adapterAddress) {
+      return void 0;
+    }
+    const mc = [
+      {
+        target: adapterAddress,
+        callData: encodeFunctionData({
+          abi: ierc4626AdapterAbi,
+          functionName: "deposit",
+          args: [amount, ADDRESS_0X0]
+        })
+      }
+    ];
+    return mc;
+  }
+  /**
+   * Returns multicall entries to call redeemDiff on the KYC ERC-4626 adapter for the given credit manager.
+   * Redeems the leftover vault shares (e.g. after repaying debt) so the account does not hold excess KYC vault tokens.
+   * Only applies when the credit manager's underlying is KYC-gated and has an ERC-4626 adapter configured.
+   * @param amount - Leftover vault share amount to redeem (in adapter/vault decimals)
+   * @param creditManager - Credit manager address
+   * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not KYC or no adapter is configured
+   */
+  async getRedeemDiffCalls(amount, creditManager) {
+    const suite = this.sdk.marketRegister.findCreditManager(creditManager);
+    const meta = this.sdk.tokensMeta.mustGet(suite.underlying);
+    if (!this.sdk.tokensMeta.isKYCUnderlying(meta)) {
+      return void 0;
+    }
+    const adapter = suite.creditManager.adapters.get(meta.addr);
+    const adapterAddress = adapter?.address;
+    if (!adapterAddress) {
+      return void 0;
+    }
+    const mc = [
+      {
+        target: adapterAddress,
+        callData: encodeFunctionData({
+          abi: ierc4626AdapterAbi,
+          functionName: "redeemDiff",
+          args: [amount]
+        })
+      }
+    ];
+    return mc;
+  }
   /**
    * Returns raw txs that are needed to update all price feeds so that all credit accounts (possibly from different markets) compute
    *
@@ -1213,10 +1396,9 @@ class AbstractCreditAccountService extends SDKConstruct {
    * @returns
    */
   async openCreditAccountTx(suite, to, calls, referralCode) {
-    await this.sdk.tokensMeta.loadTokenData(suite.underlying);
-    const underlying = this.sdk.tokensMeta.mustGet(suite.underlying);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      const factory = new SecuritizeKYCFactory(this.sdk, underlying.kycFactory);
+    const marketSuite = this.sdk.marketRegister.findByPool(suite.pool);
+    const factory = await marketSuite.getKYCFactory();
+    if (factory) {
       const tokensToRegister = await factory.getDSTokens();
       return factory.openCreditAccount(
         suite.creditManager.address,
@@ -1234,11 +1416,12 @@ class AbstractCreditAccountService extends SDKConstruct {
    * @returns
    */
   async multicallTx(suite, creditAccount, calls) {
-    await this.sdk.tokensMeta.loadTokenData(suite.underlying);
-    const underlying = this.sdk.tokensMeta.mustGet(suite.underlying);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+    const marketSuite = this.sdk.marketRegister.findByCreditManager(
+      suite.creditManager.address
+    );
+    const factory = await marketSuite.getKYCFactory();
+    if (factory) {
       const tokensToRegister = [];
-      const factory = new SecuritizeKYCFactory(this.sdk, underlying.kycFactory);
       return factory.multicall(creditAccount, calls, tokensToRegister);
     }
     return suite.creditFacade.multicall(creditAccount, calls);
@@ -1252,16 +1435,128 @@ class AbstractCreditAccountService extends SDKConstruct {
    * @returns
    */
   async closeCreditAccountTx(suite, creditAccount, calls, operation) {
-    await this.sdk.tokensMeta.loadTokenData(suite.underlying);
-    const underlying = this.sdk.tokensMeta.mustGet(suite.underlying);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      throw new Error(
-        "KYC underlying is not supported for close credit account"
-      );
+    const marketSuite = this.sdk.marketRegister.findByCreditManager(
+      suite.creditManager.address
+    );
+    const factory = await marketSuite.getKYCFactory();
+    if (operation === "close") {
+      if (factory) {
+        throw new Error(
+          "CloseOptions=close is not supported for KYC underlying credit accounts"
+        );
+      }
+      return suite.creditFacade.closeCreditAccount(creditAccount, calls);
     }
-    return operation === "close" ? suite.creditFacade.closeCreditAccount(creditAccount, calls) : suite.creditFacade.multicall(creditAccount, calls);
+    if (factory) {
+      const tokensToRegister = [];
+      return factory.multicall(creditAccount, calls, tokensToRegister);
+    }
+    return suite.creditFacade.multicall(creditAccount, calls);
+  }
+  /**
+   * Returns all KYC credit account addresses for an investor across the given market suites.
+   * Resolves KYC factory per suite, then multicalls each factory's getCreditAccounts(investor).
+   * @param investor - Owner address to query
+   * @param suites - Market suites (KYC factories are resolved for each; undefined entries are skipped)
+   * @returns Flat array of credit account addresses from all KYC markets
+   */
+  async getKYCCaOfInvestor(investor, suites) {
+    if (suites.length === 0 || investor === ADDRESS_0X0) return [];
+    const factories = await Promise.all(
+      suites.map((suite) => suite ? suite.getKYCFactory() : void 0)
+    );
+    const safeFactories = factories.reduce(
+      (acc, v) => {
+        if (v) {
+          acc.push(v);
+        }
+        return acc;
+      },
+      []
+    );
+    const allResp = await this.client.multicall({
+      contracts: [
+        ...safeFactories.map((factory) => {
+          return {
+            abi: factory.abi,
+            address: factory.address,
+            functionName: "getCreditAccounts",
+            args: [investor]
+          };
+        })
+      ],
+      allowFailure: true,
+      batchSize: 0
+    });
+    const caLists = safeFactories.reduce((acc, _, index) => {
+      const response = allResp[index];
+      acc.push(...response.result || []);
+      return acc;
+    }, []);
+    return caLists;
   }
 }
+const ierc4626AdapterAbi = [
+  {
+    inputs: [
+      { name: "assets", type: "uint256", internalType: "uint256" },
+      { name: "receiver", type: "address", internalType: "address" }
+    ],
+    name: "deposit",
+    outputs: [{ name: "useSafePrices", type: "bool", internalType: "bool" }],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      { name: "shares", type: "uint256", internalType: "uint256" },
+      { name: "receiver", type: "address", internalType: "address" },
+      { name: "owner", type: "address", internalType: "address" }
+    ],
+    name: "redeem",
+    outputs: [{ name: "useSafePrices", type: "bool", internalType: "bool" }],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        name: "leftoverAmount",
+        type: "uint256",
+        internalType: "uint256"
+      }
+    ],
+    name: "redeemDiff",
+    outputs: [
+      {
+        name: "useSafePrices",
+        type: "bool",
+        internalType: "bool"
+      }
+    ],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        name: "leftoverAmount",
+        type: "uint256",
+        internalType: "uint256"
+      }
+    ],
+    name: "depositDiff",
+    outputs: [
+      {
+        name: "useSafePrices",
+        type: "bool",
+        internalType: "bool"
+      }
+    ],
+    stateMutability: "nonpayable",
+    type: "function"
+  }
+];
 export {
   AbstractCreditAccountService,
   getWithdrawalCompressorAddress

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

@@ -90,11 +90,13 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
     creditAccount: ca,
     permits,
     to,
-    tokensToClaim
+    tokensToClaim,
+    calls: wrapCalls = []
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const router = this.sdk.routerFor(ca);
+    const unwrapCalls = await this.getRedeemDiffCalls(1n, ca.creditManager) ?? [];
     const claimPath = await router.findClaimAllRewards({
       calls: [],
       tokensToClaim,
@@ -107,8 +109,10 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
     const calls = [
       ...operation === "close" ? [] : priceUpdates,
       ...this.prepareAddCollateral(ca.creditFacade, addCollateral, permits),
+      ...wrapCalls,
       ...this.prepareDisableQuotas(ca),
       ...this.prepareDecreaseDebt(ca),
+      ...unwrapCalls,
       ...claimPath.calls,
       ...this.prepareDisableTokens(ca),
       ...assetsToWithdraw.map(

package/dist/esm/sdk/market/pool/SecuritizeKYCFactory.js

@@ -1,7 +1,9 @@
 import { iSecuritizeKYCFactoryAbi } from "../../../abi/310/iSecuritizeKYCFactory.js";
 import { BaseContract } from "../../base/index.js";
+import { AddressMap } from "../../index.js";
 const abi = iSecuritizeKYCFactoryAbi;
 class SecuritizeKYCFactory extends BaseContract {
+  investorCache;
   constructor(options, address) {
     super(options, {
       addr: address,
@@ -18,6 +20,24 @@ class SecuritizeKYCFactory extends BaseContract {
   async getWallet(creditAccount) {
     return this.contract.read.getWallet([creditAccount]);
   }
+  /**
+   * Returns the investor address for a credit account.
+   * @param creditAccount - Credit account address
+   * @param fromCache - If true, use and update an in-memory cache (creditAccount -> investor). On cache miss, loads from contract and stores the result for future calls.
+   */
+  async getInvestor(creditAccount, fromCache) {
+    if (fromCache && this.investorCache?.has(creditAccount)) {
+      return this.investorCache.get(creditAccount);
+    }
+    const investor = await this.contract.read.getInvestor([creditAccount]);
+    if (fromCache) {
+      if (!this.investorCache) {
+        this.investorCache = new AddressMap();
+      }
+      this.investorCache.upsert(creditAccount, investor);
+    }
+    return investor;
+  }
   async getDSTokens() {
     const tokens = await this.contract.read.getDSTokens();
     return [...tokens];

package/dist/esm/sdk/sdk-legacy/core/creditAccount.js

@@ -24,6 +24,7 @@ class CreditAccountData_Legacy {
   underlying;
   expirationDate;
   version;
+  investor;
   enabledTokensMask;
   healthFactor;
   baseBorrowRateWithoutFee;
@@ -53,6 +54,7 @@ class CreditAccountData_Legacy {
     this.underlying = payload.underlying.toLowerCase();
     this.expirationDate = Number(payload.expirationDate);
     this.version = Number(payload.cfVersion);
+    this.investor = payload.investor.toLowerCase();
     this.healthFactor = Number(
       (payload.healthFactor || 0n) * PERCENTAGE_FACTOR / WAD
     );

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

@@ -2,10 +2,10 @@ import type { Address } from "viem";
 import type { CreditAccountData } from "../base/index.js";
 import { SDKConstruct } from "../base/index.js";
 import type { GearboxSDK } from "../GearboxSDK.js";
-import { type CreditSuite, type OnDemandPriceUpdates, type PriceUpdateV300, type PriceUpdateV310, type UpdatePriceFeedsResult } from "../market/index.js";
+import type { CreditSuite, MarketSuite, OnDemandPriceUpdates, PriceUpdateV300, PriceUpdateV310, UpdatePriceFeedsResult } from "../market/index.js";
 import { type Asset, type RouterCASlice } from "../router/index.js";
-import type { MultiCall, RawTx } from "../types/index.js";
-import type { AccountToCheck, AddCollateralProps, ChangeDeptProps, ClaimDelayedProps, CloseCreditAccountProps, CloseCreditAccountResult, CloseOptions, CreditAccountOperationResult, EnableTokensProps, ExecuteSwapProps, FullyLiquidateProps, FullyLiquidateResult, GetApprovalAddressProps, GetConnectedBotsResult, GetConnectedMigrationBotsResult, GetCreditAccountsOptions, GetPendingWithdrawalsProps, GetPendingWithdrawalsResult, OpenCAProps, PermitResult, PrepareUpdateQuotasProps, PreviewDelayedWithdrawalProps, PreviewDelayedWithdrawalResult, PriceUpdatesOptions, Rewards, StartDelayedWithdrawalProps, UpdateQuotasProps } from "./types.js";
+import type { IPriceUpdateTx, MultiCall, RawTx } from "../types/index.js";
+import type { AccountToCheck, AddCollateralProps, ChangeDeptProps, ClaimDelayedProps, CloseCreditAccountProps, CloseCreditAccountResult, CloseOptions, CreditAccountDataWithInvestor, CreditAccountOperationResult, EnableTokensProps, ExecuteSwapProps, FullyLiquidateProps, FullyLiquidateResult, GetApprovalAddressProps, GetConnectedBotsResult, GetConnectedMigrationBotsResult, GetCreditAccountsOptions, GetPendingWithdrawalsProps, GetPendingWithdrawalsResult, OpenCAProps, PermitResult, PrepareUpdateQuotasProps, PreviewDelayedWithdrawalProps, PreviewDelayedWithdrawalResult, PriceUpdatesOptions, Rewards, StartDelayedWithdrawalProps, UpdateQuotasProps } from "./types.js";
 export interface CreditAccountServiceOptions {
     batchSize?: number;
 }
@@ -21,6 +21,14 @@ export declare abstract class AbstractCreditAccountService extends SDKConstruct
      * @returns
      */
     getCreditAccountData(account: Address, blockNumber?: bigint): Promise<CreditAccountData | undefined>;
+    /**
+     * Returns credit account data for a single account with the investor address resolved.
+     * Loads CA via getCreditAccountData; for KYC underlyings fetches the investor from the KYC factory's getInvestor(creditAccount), otherwise uses the account owner.
+     * @param account - Credit account address
+     * @param blockNumber - Optional block number for the read
+     * @returns CreditAccountDataWithInvestor (CA data + investor address), or undefined if the account is not found
+     */
+    getCreditAccountDataWithInvestor(account: Address, blockNumber?: bigint): Promise<CreditAccountDataWithInvestor | undefined>;
     /**
      * Methods to get all credit accounts with some optional filtering
      * Performs all necessary price feed updates under the hood
@@ -29,7 +37,31 @@ export declare abstract class AbstractCreditAccountService extends SDKConstruct
      * @param blockNumber
      * @returns returned credit accounts are sorted by health factor in ascending order
      */
-    getCreditAccounts(options?: GetCreditAccountsOptions, blockNumber?: bigint): Promise<Array<CreditAccountData>>;
+    getCreditAccounts(options?: GetCreditAccountsOptions, blockNumber?: bigint, priceUpdate?: UpdatePriceFeedsResult): Promise<Array<CreditAccountData>>;
+    /**
+     * Returns all credit accounts matching the filter, with investor set on each item.
+     * Delegates to getCreditAccounts; when options.owner is set, also loads KYC credit accounts for that owner and merges them into the list. Result is sorted by health factor ascending.
+     * @param options - Filter options (owner, creditManager, health factor, etc.)
+     * @param blockNumber - Optional block number for the read
+     * @returns Array of credit accounts (with investor field), sorted by health factor ascending
+     */
+    getCreditAccountsWithInvestor(options?: GetCreditAccountsOptions, blockNumber?: bigint): Promise<Array<CreditAccountDataWithInvestor>>;
+    protected getKYCCreditAccountsOfOwner(owner: Address, priceUpdateTxs: IPriceUpdateTx<{
+        priceFeed: `0x${string}`;
+        timestamp: number;
+    }>[], blockNumber?: bigint): Promise<Array<CreditAccountDataWithInvestor>>;
+    /**
+     * Loads credit account data for the given addresses using simulateWithPriceUpdates.
+     * Applies the provided price update txs before reading, so returned data is consistent with up-to-date prices.
+     * @param accounts - Credit account addresses to load
+     * @param priceUpdateTxs - Price feed update txs to simulate before the read (e.g. from generatePriceFeedsUpdateTxs)
+     * @param blockNumber - Optional block number for the read
+     * @returns Array of CreditAccountData in the same order as accounts (throws if any getCreditAccountData call reverts)
+     */
+    loadSpecifiedAccounts(accounts: Address[], priceUpdateTxs: IPriceUpdateTx<{
+        priceFeed: `0x${string}`;
+        timestamp: number;
+    }>[], blockNumber?: bigint): Promise<Array<CreditAccountData>>;
     /**
      * Method to get all claimable rewards for credit account (ex. stkUSDS SKY rewards)
        Assosiates rewards by adapter + stakedPhantomToken
@@ -179,6 +211,33 @@ export declare abstract class AbstractCreditAccountService extends SDKConstruct
      * @param ca
      */
     getOptimalHFForPartialLiquidation(ca: CreditAccountData): bigint;
+    /**
+     * Returns multicall entries to redeem (unwrap) KYC ERC-4626 vault shares into underlying for the given credit manager.
+     * Used when withdrawing debt from a KYC market: redeems adapter vault shares so the underlying can be withdrawn.
+     * Only applies when the credit manager's underlying is KYC-gated and has an ERC-4626 adapter configured.
+     * @param amount - Number of vault shares (adapter tokens) to redeem
+     * @param creditManager - Credit manager address
+     * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not KYC or no adapter is configured
+     */
+    getKYCUnwrapCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
+    /**
+     * Returns multicall entries to deposit (wrap) underlying into KYC ERC-4626 vault shares for the given credit manager.
+     * Used when adding debt on a KYC market: deposits underlying into the adapter vault so shares are minted on the account.
+     * Only applies when the credit manager's underlying is KYC-gated and has an ERC-4626 adapter configured.
+     * @param amount - Amount of underlying assets to deposit into the vault (in underlying decimals)
+     * @param creditManager - Credit manager address
+     * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not KYC or no adapter is configured
+     */
+    getKYCWrapCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
+    /**
+     * Returns multicall entries to call redeemDiff on the KYC ERC-4626 adapter for the given credit manager.
+     * Redeems the leftover vault shares (e.g. after repaying debt) so the account does not hold excess KYC vault tokens.
+     * Only applies when the credit manager's underlying is KYC-gated and has an ERC-4626 adapter configured.
+     * @param amount - Leftover vault share amount to redeem (in adapter/vault decimals)
+     * @param creditManager - Credit manager address
+     * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not KYC or no adapter is configured
+     */
+    getRedeemDiffCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
     /**
      * Returns raw txs that are needed to update all price feeds so that all credit accounts (possibly from different markets) compute
      *
@@ -242,4 +301,12 @@ export declare abstract class AbstractCreditAccountService extends SDKConstruct
      * @returns
      */
     protected closeCreditAccountTx(suite: CreditSuite, creditAccount: Address, calls: MultiCall[], operation: CloseOptions): Promise<RawTx>;
+    /**
+     * Returns all KYC credit account addresses for an investor across the given market suites.
+     * Resolves KYC factory per suite, then multicalls each factory's getCreditAccounts(investor).
+     * @param investor - Owner address to query
+     * @param suites - Market suites (KYC factories are resolved for each; undefined entries are skipped)
+     * @returns Flat array of credit account addresses from all KYC markets
+     */
+    protected getKYCCaOfInvestor(investor: Address, suites: Array<MarketSuite | undefined>): Promise<`0x${string}`[]>;
 }

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

@@ -12,7 +12,7 @@ export declare class CreditAccountServiceV310 extends AbstractCreditAccountServi
     /**
      * Implements {@link ICreditAccountsService.repayCreditAccount}
      */
-    repayCreditAccount({ operation, collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, tokensToClaim, }: RepayCreditAccountProps): Promise<CreditAccountOperationResult>;
+    repayCreditAccount({ operation, collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, tokensToClaim, calls: wrapCalls, }: RepayCreditAccountProps): Promise<CreditAccountOperationResult>;
     /**
      * Implements {@link ICreditAccountsService.repayAndLiquidateCreditAccount}
      */

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

@@ -5,7 +5,7 @@ import type { ConnectedBotData, Construct, CreditAccountData } from "../base/ind
 import type { GearboxSDK } from "../GearboxSDK.js";
 import type { CreditSuite, OnDemandPriceUpdates, PriceUpdateV300, PriceUpdateV310, UpdatePriceFeedsResult } from "../market/index.js";
 import type { Asset, CreditAccountTokensSlice, RouterCASlice, RouterCloseResult } from "../router/index.js";
-import type { MultiCall, RawTx } from "../types/index.js";
+import type { IPriceUpdateTx, MultiCall, RawTx } from "../types/index.js";
 export type GetCreditAccountsArgs = ContractFunctionArgs<typeof creditAccountCompressorAbi, "pure" | "view", "getCreditAccounts">;
 export interface CreditAccountFilter {
     owner: Address;
@@ -83,6 +83,10 @@ export interface CloseCreditAccountProps {
     closePath?: RouterCloseResult;
 }
 export interface RepayCreditAccountProps extends RepayAndLiquidateCreditAccountProps {
+    /**
+     * Swap calls for repay
+     */
+    calls?: Array<MultiCall>;
     /**
      * close or zeroDebt
      */
@@ -454,6 +458,9 @@ export type GetApprovalAddressProps = {
     creditManager: Address;
     creditAccount: Address;
 };
+export type CreditAccountDataWithInvestor = CreditAccountData & {
+    investor: Address;
+};
 export interface ICreditAccountsService extends Construct {
     sdk: GearboxSDK;
     /**
@@ -464,15 +471,41 @@ export interface ICreditAccountsService extends Construct {
      * @returns
      */
     getCreditAccountData(account: Address, blockNumber?: bigint): Promise<CreditAccountData | undefined>;
+    /**
+     * Returns credit account data for a single account with the investor address resolved (from KYC factory when applicable).
+     * @param account - Credit account address
+     * @param blockNumber - Optional block number for the read
+     * @returns CreditAccountDataWithInvestor, or undefined if the account is not found
+     */
+    getCreditAccountDataWithInvestor(account: Address, blockNumber?: bigint): Promise<CreditAccountDataWithInvestor | undefined>;
     /**
      * Methods to get all credit accounts with some optional filtering
      * Performs all necessary price feed updates under the hood
      *
      * @param options
      * @param blockNumber
-     * @returns returned credit accounts are sorted by health factor in ascending order
+     * @param priceUpdate - Optional pre-computed price feed update (e.g. from generatePriceFeedsUpdateTxs)
+     * @returns Credit accounts sorted by health factor ascending
+     */
+    getCreditAccounts(options?: GetCreditAccountsOptions, blockNumber?: bigint, priceUpdate?: UpdatePriceFeedsResult): Promise<Array<CreditAccountData>>;
+    /**
+     * Returns all credit accounts matching the filter with investor set on each; when options.owner is set, includes KYC CAs for that owner.
+     * @param options - Filter options (owner, creditManager, health factor, etc.)
+     * @param blockNumber - Optional block number for the read
+     * @returns Credit accounts (with investor) sorted by health factor ascending
+     */
+    getCreditAccountsWithInvestor(options?: GetCreditAccountsOptions, blockNumber?: bigint): Promise<Array<CreditAccountDataWithInvestor>>;
+    /**
+     * Loads credit account data for the given addresses using simulateWithPriceUpdates (with price updates applied before the read).
+     * @param accounts - Credit account addresses to load
+     * @param priceUpdateTxs - Price feed update txs to simulate before the read (e.g. from generatePriceFeedsUpdateTxs)
+     * @param blockNumber - Optional block number for the read
+     * @returns Array of CreditAccountData in the same order as accounts
      */
-    getCreditAccounts(options?: GetCreditAccountsOptions, blockNumber?: bigint): Promise<Array<CreditAccountData>>;
+    loadSpecifiedAccounts(accounts: Address[], priceUpdateTxs: IPriceUpdateTx<{
+        priceFeed: `0x${string}`;
+        timestamp: number;
+    }>[], blockNumber?: bigint): Promise<Array<CreditAccountData>>;
     /**
      * Method to get all claimable rewards for credit account (ex. stkUSDS SKY rewards)
      * Assosiates rewards by adapter + stakedPhantomToken
@@ -501,9 +534,9 @@ export interface ICreditAccountsService extends Construct {
     /**
      * Generates transaction to liquidate credit account
      * @param props - {@link FullyLiquidateProps}
-     * @returns
+     * @returns Transaction data and optional loss policy data
      */
-    fullyLiquidate(props: FullyLiquidateProps): Promise<CloseCreditAccountResult>;
+    fullyLiquidate(props: FullyLiquidateProps): Promise<FullyLiquidateResult>;
     /**
      * Closes credit account or closes credit account and keeps it open with zero debt.
      * - Ca is closed in the following order: price update -> close path to swap all tokens into underlying ->
@@ -623,6 +656,33 @@ export interface ICreditAccountsService extends Construct {
      * @returns
      */
     getPriceUpdatesForFacade(options: PriceUpdatesOptions): Promise<Array<MultiCall>>;
+    /**
+     * Returns multicall entries to redeem (unwrap) KYC ERC-4626 vault shares into underlying for the given credit manager.
+     * Used when withdrawing debt from a KYC market: redeems adapter vault shares so the underlying can be withdrawn.
+     * Only applies when the credit manager's underlying is KYC-gated and has an ERC-4626 adapter configured.
+     * @param amount - Number of vault shares (adapter tokens) to redeem
+     * @param creditManager - Credit manager address
+     * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not KYC or no adapter is configured
+     */
+    getKYCUnwrapCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
+    /**
+     * Returns multicall entries to deposit (wrap) underlying into KYC ERC-4626 vault shares for the given credit manager.
+     * Used when adding debt on a KYC market: deposits underlying into the adapter vault so shares are minted on the account.
+     * Only applies when the credit manager's underlying is KYC-gated and has an ERC-4626 adapter configured.
+     * @param amount - Amount of underlying assets to deposit into the vault (in underlying decimals)
+     * @param creditManager - Credit manager address
+     * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not KYC or no adapter is configured
+     */
+    getKYCWrapCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
+    /**
+     * Returns multicall entries to call redeemDiff on the KYC ERC-4626 adapter for the given credit manager.
+     * Redeems the leftover vault shares (e.g. after repaying debt) so the account does not hold excess KYC vault tokens.
+     * Only applies when the credit manager's underlying is KYC-gated and has an ERC-4626 adapter configured.
+     * @param amount - Leftover vault share amount to redeem (in adapter/vault decimals)
+     * @param creditManager - Credit manager address
+     * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not KYC or no adapter is configured
+     */
+    getRedeemDiffCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
     /**
      * 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/pool/SecuritizeKYCFactory.d.ts

@@ -435,9 +435,16 @@ declare const abi: readonly [{
 }];
 type abi = typeof abi;
 export declare class SecuritizeKYCFactory extends BaseContract<abi> {
+    private investorCache;
     constructor(options: ConstructOptions, address: Address);
     precomputeWalletAddress(creditManager: Address, investor: Address): Promise<Address>;
     getWallet(creditAccount: Address): Promise<Address>;
+    /**
+     * Returns the investor address for a credit account.
+     * @param creditAccount - Credit account address
+     * @param fromCache - If true, use and update an in-memory cache (creditAccount -> investor). On cache miss, loads from contract and stores the result for future calls.
+     */
+    getInvestor(creditAccount: Address, fromCache?: boolean): Promise<Address>;
     getDSTokens(): Promise<Address[]>;
     multicall(creditAccount: Address, calls: MultiCall[], tokensToRegister: Address[]): RawTx;
     openCreditAccount(creditManager: Address, calls: MultiCall[], tokensToRegister: Address[]): RawTx;

package/dist/types/sdk/sdk-legacy/core/creditAccount.d.ts

@@ -103,6 +103,7 @@ export declare class CreditAccountData_Legacy {
     readonly underlying: Address;
     readonly expirationDate: number;
     readonly version: number;
+    readonly investor: Address;
     readonly enabledTokensMask: bigint;
     readonly healthFactor: number;
     readonly baseBorrowRateWithoutFee: number;

package/dist/types/sdk/sdk-legacy/payload/creditAccount.d.ts

@@ -14,6 +14,7 @@ export interface CaTokenBalance {
 export interface CreditAccountDataPayload {
     isSuccessful: boolean;
     addr: Address;
+    investor: Address;
     borrower: Address;
     creditManager: Address;
     creditFacade: Address;

package/package.json

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