@gearbox-protocol/sdk 14.12.0-next.25 → 14.12.0-next.27

package/dist/esm/plugins/adapters/contracts/SecuritizeRedemptionGatewayAdapterContract.js

@@ -13,8 +13,8 @@ class SecuritizeRedemptionGatewayAdapterContract extends AbstractAdapterContract
   #dsToken;
   #stableCoinToken;
   #redemptionPhantomToken;
-  constructor(options, args) {
-    super(options, { ...args, abi, protocolAbi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi, protocolAbi });
     if (args.baseParams.serializedParams) {
       const decoded = decodeAbiParameters(
         [
@@ -53,11 +53,12 @@ class SecuritizeRedemptionGatewayAdapterContract extends AbstractAdapterContract
       redemptionPhantomToken: this.#redemptionPhantomToken ? this.labelAddress(this.#redemptionPhantomToken) : void 0
     };
   }
-  applyBalanceChanges(balances, decoded) {
+  async applyBalanceChanges(balances, decoded) {
     switch (decoded.functionName) {
+      // no-op:
+      // `redeem` is only emitted by the withdrawal compressor, and
+      // sdk now encodes the spent DS token amount as a negative storeExpectedBalances delta
       case "redeem": {
-        const [dsTokenAmount] = decoded.args;
-        this.spendExact(balances, this.dsToken, dsTokenAmount);
         break;
       }
       // diff-style redemption: spends the DS token down to the leftover
@@ -66,16 +67,15 @@ class SecuritizeRedemptionGatewayAdapterContract extends AbstractAdapterContract
         this.setLeftover(balances, this.dsToken, leftoverAmount);
         break;
       }
-      // TODO:
-      // `claim(address[] redeemers)` (the claim call emitted by the
-      // withdrawal compressor) cannot be previewed offline: the redemption
-      // phantom token burn (the compressor's `withdrawalTokenSpent`, i.e.
-      // each redeemer's `getRedemptionAmount()`) lives in per-redeemer clone
-      // contracts and is not recoverable from calldata. For claimable
-      // redeemers it equals the stablecoin credit, but that value is not in
-      // calldata either.
+      // no-op:
+      // the redemption phantom token burn of a `claim(address[])` is
+      // not recoverable from calldata (it lives in per-redeemer clone
+      // contracts, `SecuritizeRedeemer.getRedemptionAmount()`); instead,
+      // sdk now encodes it as a negative storeExpectedBalances delta.
+      case "claim":
+        break;
       default:
-        super.applyBalanceChanges(balances, decoded);
+        await super.applyBalanceChanges(balances, decoded);
     }
   }
 }

package/dist/esm/plugins/adapters/contracts/StakingRewardsAdapterContract.js

@@ -14,8 +14,8 @@ class StakingRewardsAdapterContract extends AbstractAdapterContract {
   #rewardsToken;
   #stakedPhantomToken;
   #referral;
-  constructor(options, args) {
-    super(options, { ...args, abi, protocolAbi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi, protocolAbi });
     if (args.baseParams.serializedParams) {
       const version = Number(args.baseParams.version);
       if (version <= 311) {
@@ -81,7 +81,7 @@ class StakingRewardsAdapterContract extends AbstractAdapterContract {
       referral: this.#referral
     };
   }
-  applyBalanceChanges(balances, decoded) {
+  async applyBalanceChanges(balances, decoded) {
     switch (decoded.functionName) {
       case "stakeDiff": {
         const [leftoverAmount] = decoded.args;
@@ -97,7 +97,7 @@ class StakingRewardsAdapterContract extends AbstractAdapterContract {
       case "getReward":
         break;
       default:
-        super.applyBalanceChanges(balances, decoded);
+        await super.applyBalanceChanges(balances, decoded);
     }
   }
 }

package/dist/esm/plugins/adapters/contracts/TraderJoeRouterAdapterContract.js

@@ -16,8 +16,8 @@ const abi = iTraderJoeRouterAdapterAbi;
 const protocolAbi = iTraderJoeRouterAbi;
 class TraderJoeRouterAdapterContract extends AbstractAdapterContract {
   #supportedPools;
-  constructor(options, args) {
-    super(options, { ...args, abi, protocolAbi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi, protocolAbi });
     if (args.baseParams.serializedParams) {
       const decoded = decodeAbiParameters(
         [
@@ -60,7 +60,7 @@ class TraderJoeRouterAdapterContract extends AbstractAdapterContract {
       }))
     };
   }
-  applyBalanceChanges(balances, decoded) {
+  async applyBalanceChanges(balances, decoded) {
     switch (decoded.functionName) {
       case "swapDiffTokensForTokens": {
         const [leftoverAmount, , path] = decoded.args;
@@ -68,7 +68,7 @@ class TraderJoeRouterAdapterContract extends AbstractAdapterContract {
         break;
       }
       default:
-        super.applyBalanceChanges(balances, decoded);
+        await super.applyBalanceChanges(balances, decoded);
     }
   }
 }

package/dist/esm/plugins/adapters/contracts/UniswapV2AdapterContract.js

@@ -10,8 +10,8 @@ const abi = iUniswapV2AdapterAbi;
 const protocolAbi = iUniswapV2Router02Abi;
 class UniswapV2AdapterContract extends AbstractAdapterContract {
   #supportedPairs;
-  constructor(options, args) {
-    super(options, { ...args, abi, protocolAbi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi, protocolAbi });
     if (args.baseParams.serializedParams) {
       const decoded = decodeAbiParameters(
         [
@@ -72,7 +72,7 @@ class UniswapV2AdapterContract extends AbstractAdapterContract {
   classifyLegacyOperation(_parsed, transfers) {
     return { operation: "UniswapSwap", ...swapFromTransfers(transfers) };
   }
-  applyBalanceChanges(balances, decoded) {
+  async applyBalanceChanges(balances, decoded) {
     switch (decoded.functionName) {
       case "swapDiffTokensForTokens": {
         const [leftoverAmount, , path] = decoded.args;
@@ -80,7 +80,7 @@ class UniswapV2AdapterContract extends AbstractAdapterContract {
         break;
       }
       default:
-        super.applyBalanceChanges(balances, decoded);
+        await super.applyBalanceChanges(balances, decoded);
     }
   }
 }

package/dist/esm/plugins/adapters/contracts/UniswapV3AdapterContract.js

@@ -9,8 +9,8 @@ const abi = iUniswapV3AdapterAbi;
 const protocolAbi = iUniswapV3Abi;
 class UniswapV3AdapterContract extends AbstractAdapterContract {
   #supportedPools;
-  constructor(options, args) {
-    super(options, { ...args, abi, protocolAbi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi, protocolAbi });
     if (args.baseParams.serializedParams) {
       const decoded = decodeAbiParameters(
         [
@@ -50,7 +50,7 @@ class UniswapV3AdapterContract extends AbstractAdapterContract {
       }))
     };
   }
-  applyBalanceChanges(balances, decoded) {
+  async applyBalanceChanges(balances, decoded) {
     switch (decoded.functionName) {
       case "exactDiffInputSingle": {
         const [params] = decoded.args;
@@ -64,7 +64,7 @@ class UniswapV3AdapterContract extends AbstractAdapterContract {
         break;
       }
       default:
-        super.applyBalanceChanges(balances, decoded);
+        await super.applyBalanceChanges(balances, decoded);
     }
   }
   stringifyFunctionParams(params) {

package/dist/esm/plugins/adapters/contracts/UniswapV4AdapterContract.js

@@ -12,8 +12,8 @@ const abi = iUniswapV4AdapterAbi;
 const protocolAbi = iUniswapV4GatewayAbi;
 class UniswapV4AdapterContract extends AbstractAdapterContract {
   #supportedPoolKeys;
-  constructor(options, args) {
-    super(options, { ...args, abi, protocolAbi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi, protocolAbi });
     if (args.baseParams.serializedParams) {
       const decoded = decodeAbiParameters(
         [
@@ -63,7 +63,7 @@ class UniswapV4AdapterContract extends AbstractAdapterContract {
   classifyLegacyOperation(_parsed, transfers) {
     return { operation: "UniswapSwap", ...swapFromTransfers(transfers) };
   }
-  applyBalanceChanges(balances, decoded) {
+  async applyBalanceChanges(balances, decoded) {
     switch (decoded.functionName) {
       case "swapExactInputSingleDiff": {
         const [poolKey, zeroForOne, leftoverAmount] = decoded.args;
@@ -75,7 +75,7 @@ class UniswapV4AdapterContract extends AbstractAdapterContract {
         break;
       }
       default:
-        super.applyBalanceChanges(balances, decoded);
+        await super.applyBalanceChanges(balances, decoded);
     }
   }
 }

package/dist/esm/plugins/adapters/contracts/UpshiftVaultAdapterContract.js

@@ -15,8 +15,8 @@ class UpshiftVaultAdapterContract extends AbstractAdapterContract {
   #vault;
   #asset;
   #stakedPhantomToken;
-  constructor(options, args) {
-    super(options, { ...args, abi, protocolAbi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi, protocolAbi });
     if (args.baseParams.serializedParams) {
       const decoded = decodeAbiParameters(
         [
@@ -54,7 +54,7 @@ class UpshiftVaultAdapterContract extends AbstractAdapterContract {
       stakedPhantomToken: this.#stakedPhantomToken ? this.labelAddress(this.#stakedPhantomToken) : void 0
     };
   }
-  applyBalanceChanges(balances, decoded) {
+  async applyBalanceChanges(balances, decoded) {
     switch (decoded.functionName) {
       case "depositDiff": {
         const [leftoverAmount] = decoded.args;
@@ -67,7 +67,7 @@ class UpshiftVaultAdapterContract extends AbstractAdapterContract {
         break;
       }
       default:
-        super.applyBalanceChanges(balances, decoded);
+        await super.applyBalanceChanges(balances, decoded);
     }
   }
 }

package/dist/esm/plugins/adapters/contracts/VelodromeV2AdapterContract.js

@@ -9,8 +9,8 @@ const abi = iVelodromeV2RouterAdapterAbi;
 const protocolAbi = iVelodromeV2RouterAbi;
 class VelodromeV2RouterAdapterContract extends AbstractAdapterContract {
   #supportedPools;
-  constructor(options, args) {
-    super(options, { ...args, abi, protocolAbi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi, protocolAbi });
     if (args.baseParams.serializedParams) {
       const decoded = decodeAbiParameters(
         [
@@ -53,7 +53,7 @@ class VelodromeV2RouterAdapterContract extends AbstractAdapterContract {
       }))
     };
   }
-  applyBalanceChanges(balances, decoded) {
+  async applyBalanceChanges(balances, decoded) {
     switch (decoded.functionName) {
       case "swapDiffTokensForTokens": {
         const [leftoverAmount, , routes] = decoded.args;
@@ -61,7 +61,7 @@ class VelodromeV2RouterAdapterContract extends AbstractAdapterContract {
         break;
       }
       default:
-        super.applyBalanceChanges(balances, decoded);
+        await super.applyBalanceChanges(balances, decoded);
     }
   }
 }

package/dist/esm/plugins/adapters/contracts/WstETHV1AdapterContract.js

@@ -12,8 +12,8 @@ const abi = iwstEthv1AdapterAbi;
 const protocolAbi = iwstETHAbi;
 class WstETHV1AdapterContract extends AbstractAdapterContract {
   #stETH;
-  constructor(options, args) {
-    super(options, { ...args, abi, protocolAbi });
+  constructor(sdk, args) {
+    super(sdk, { ...args, abi, protocolAbi });
     if (args.baseParams.serializedParams) {
       const decoded = decodeAbiParameters(
         [
@@ -46,7 +46,7 @@ class WstETHV1AdapterContract extends AbstractAdapterContract {
     }
     return super.classifyLegacyOperation(parsed, transfers);
   }
-  applyBalanceChanges(balances, decoded) {
+  async applyBalanceChanges(balances, decoded) {
     switch (decoded.functionName) {
       case "wrapDiff": {
         const [leftoverAmount] = decoded.args;
@@ -60,7 +60,7 @@ class WstETHV1AdapterContract extends AbstractAdapterContract {
         break;
       }
       default:
-        super.applyBalanceChanges(balances, decoded);
+        await super.applyBalanceChanges(balances, decoded);
     }
   }
 }

package/dist/esm/plugins/adapters/createAdapter.js

@@ -41,93 +41,93 @@ import {
 import { SecuritizeOnRampAdapterContract } from "./contracts/SecuritizeOnRampAdapterContract.js";
 import { SecuritizeRedemptionGatewayAdapterContract } from "./contracts/SecuritizeRedemptionGatewayAdapterContract.js";
 import { UniswapV4AdapterContract } from "./contracts/UniswapV4AdapterContract.js";
-function createAdapter(options, data, strict) {
+function createAdapter(sdk, data, strict) {
   const contractType = data.baseParams.contractType;
   const adapterType = isHex(contractType) ? bytes32ToString(contractType) : contractType;
   switch (adapterType) {
     case "ADAPTER::ACCOUNT_MIGRATOR":
-      return new AccountMigratorAdapterContract(options, data);
+      return new AccountMigratorAdapterContract(sdk, data);
     case "ADAPTER::BALANCER_V3_ROUTER":
-      return new BalancerV3RouterAdapterContract(options, data);
+      return new BalancerV3RouterAdapterContract(sdk, data);
     case "ADAPTER::BALANCER_V3_WRAPPER":
-      return new BalancerV3WrapperAdapterContract(options, data);
+      return new BalancerV3WrapperAdapterContract(sdk, data);
     case "ADAPTER::CAMELOT_V3_ROUTER":
-      return new CamelotV3AdapterContract(options, data);
+      return new CamelotV3AdapterContract(sdk, data);
     case "ADAPTER::CURVE_STABLE_NG":
-      return new CurveV1StableNGAdapterContract(options, data);
+      return new CurveV1StableNGAdapterContract(sdk, data);
     case "ADAPTER::CURVE_V1_2ASSETS":
-      return new Curve2AssetsAdapterContract(options, data);
+      return new Curve2AssetsAdapterContract(sdk, data);
     case "ADAPTER::CURVE_V1_3ASSETS":
-      return new Curve3AssetsAdapterContract(options, data);
+      return new Curve3AssetsAdapterContract(sdk, data);
     case "ADAPTER::CURVE_V1_4ASSETS":
-      return new Curve4AssetsAdapterContract(options, data);
+      return new Curve4AssetsAdapterContract(sdk, data);
     case "ADAPTER::CURVE_V1_STECRV_POOL":
-      return new CurveV1AdapterStETHContract(options, data);
+      return new CurveV1AdapterStETHContract(sdk, data);
     case "ADAPTER::CVX_V1_BASE_REWARD_POOL":
-      return new ConvexV1BaseRewardPoolAdapterContract(options, data);
+      return new ConvexV1BaseRewardPoolAdapterContract(sdk, data);
     case "ADAPTER::CVX_V1_BOOSTER":
-      return new ConvexV1BoosterAdapterContract(options, data);
+      return new ConvexV1BoosterAdapterContract(sdk, data);
     case "ADAPTER::DAI_USDS_EXCHANGE":
-      return new DaiUsdsAdapterContract(options, data);
+      return new DaiUsdsAdapterContract(sdk, data);
     case "ADAPTER::ERC4626_VAULT":
-      return new ERC4626AdapterContract(options, data);
+      return new ERC4626AdapterContract(sdk, data);
     case "ADAPTER::ERC4626_VAULT_REFERRAL":
-      return new ERC4626ReferralAdapterContract(options, data);
+      return new ERC4626ReferralAdapterContract(sdk, data);
     case "ADAPTER::FLUID_DEX":
-      return new FluidDexAdapterContract(options, data);
+      return new FluidDexAdapterContract(sdk, data);
     case "ADAPTER::INFINIFI_GATEWAY":
-      return new InfinifiGatewayAdapterContract(options, data);
+      return new InfinifiGatewayAdapterContract(sdk, data);
     case "ADAPTER::INFINIFI_UNWINDING":
-      return new InfinifiUnwindingGatewayAdapterContract(options, data);
+      return new InfinifiUnwindingGatewayAdapterContract(sdk, data);
     case "ADAPTER::KELP_DEPOSIT_POOL":
-      return new KelpLRTDepositPoolAdapterContract(options, data);
+      return new KelpLRTDepositPoolAdapterContract(sdk, data);
     case "ADAPTER::KELP_WITHDRAWAL":
-      return new KelpLRTWithdrawalManagerAdapterContract(options, data);
+      return new KelpLRTWithdrawalManagerAdapterContract(sdk, data);
     case "ADAPTER::LIDO_V1":
-      return new LidoV1AdapterContract(options, data);
+      return new LidoV1AdapterContract(sdk, data);
     case "ADAPTER::LIDO_WSTETH_V1":
-      return new WstETHV1AdapterContract(options, data);
+      return new WstETHV1AdapterContract(sdk, data);
     case "ADAPTER::MELLOW_CLAIMER":
-      return new MellowClaimerAdapterContract(options, data);
+      return new MellowClaimerAdapterContract(sdk, data);
     case "ADAPTER::MELLOW_DVV":
-      return new MellowDVVAdapterContract(options, data);
+      return new MellowDVVAdapterContract(sdk, data);
     case "ADAPTER::MELLOW_ERC4626_VAULT":
-      return new MellowERC4626VaultAdapterContract(options, data);
+      return new MellowERC4626VaultAdapterContract(sdk, data);
     case "ADAPTER::MELLOW_WRAPPER":
-      return new MellowWrapperAdapterContract(options, data);
+      return new MellowWrapperAdapterContract(sdk, data);
     case "ADAPTER::MIDAS_GATEWAY":
-      return new MidasGatewayAdapterContract(options, data);
+      return new MidasGatewayAdapterContract(sdk, data);
     case "ADAPTER::MIDAS_ISSUANCE_VAULT":
-      return new MidasIssuanceVaultAdapterContract(options, data);
+      return new MidasIssuanceVaultAdapterContract(sdk, data);
     case "ADAPTER::MIDAS_REDEMPTION_VAULT":
-      return new MidasRedemptionVaultAdapterContract(options, data);
+      return new MidasRedemptionVaultAdapterContract(sdk, data);
     case "ADAPTER::PENDLE_ROUTER":
-      return new PendleRouterAdapterContract(options, data);
+      return new PendleRouterAdapterContract(sdk, data);
     case "ADAPTER::SECURITIZE_ONRAMP":
-      return new SecuritizeOnRampAdapterContract(options, data);
+      return new SecuritizeOnRampAdapterContract(sdk, data);
     case "ADAPTER::SECURITIZE_REDEMPTION":
-      return new SecuritizeRedemptionGatewayAdapterContract(options, data);
+      return new SecuritizeRedemptionGatewayAdapterContract(sdk, data);
     case "ADAPTER::STAKING_REWARDS":
-      return new StakingRewardsAdapterContract(options, data);
+      return new StakingRewardsAdapterContract(sdk, data);
     case "ADAPTER::TRADERJOE_ROUTER":
-      return new TraderJoeRouterAdapterContract(options, data);
+      return new TraderJoeRouterAdapterContract(sdk, data);
     case "ADAPTER::UNISWAP_V2_ROUTER":
-      return new UniswapV2AdapterContract(options, data);
+      return new UniswapV2AdapterContract(sdk, data);
     case "ADAPTER::UNISWAP_V3_ROUTER":
-      return new UniswapV3AdapterContract(options, data);
+      return new UniswapV3AdapterContract(sdk, data);
     case "ADAPTER::UNISWAP_V4_GATEWAY":
-      return new UniswapV4AdapterContract(options, data);
+      return new UniswapV4AdapterContract(sdk, data);
     case "ADAPTER::UPSHIFT_VAULT":
-      return new UpshiftVaultAdapterContract(options, data);
+      return new UpshiftVaultAdapterContract(sdk, data);
     case "ADAPTER::VELODROME_V2_ROUTER":
-      return new VelodromeV2RouterAdapterContract(options, data);
+      return new VelodromeV2RouterAdapterContract(sdk, data);
     default: {
       if (strict) {
         throw new Error(
           `Adapter type ${adapterType} not supported for adapter at ${data.baseParams.addr}`
         );
       }
-      return new AbstractAdapterContract(options, {
+      return new AbstractAdapterContract(sdk, {
         ...data,
         abi: [],
         protocolAbi: []

package/dist/esm/preview/preview/applyInnerOperations.js

@@ -24,7 +24,7 @@ function makeInnerOperationsState() {
     quotaChanges: []
   };
 }
-function applyInnerOperations(sdk, multicall, state) {
+async function applyInnerOperations(sdk, multicall, state) {
   let inBracket = false;
   let storeSeen = false;
   let error;
@@ -69,7 +69,7 @@ function applyInnerOperations(sdk, multicall, state) {
         inBracket = false;
         break;
       case "Execute":
-        opError = applyExecute(sdk, op, inBracket, state.balances);
+        opError = await applyExecute(sdk, op, inBracket, state.balances);
         break;
     }
     error ??= opError;
@@ -105,7 +105,7 @@ function applyDecreaseDebt(state, op) {
     state.debt = state.totalDebt;
   }
 }
-function applyExecute(sdk, op, inBracket, balances) {
+async function applyExecute(sdk, op, inBracket, balances) {
   const adapter = sdk.getContract(op.adapter);
   if (!inBracket) {
     if (!isRWAShare(sdk, adapter)) {
@@ -131,7 +131,7 @@ function applyExecute(sdk, op, inBracket, balances) {
     };
   }
   try {
-    adapter.previewBalanceChanges(balances, op.calldata);
+    await adapter.previewBalanceChanges(balances, op.calldata);
     return void 0;
   } catch (e) {
     return {

package/dist/esm/preview/preview/previewAdjustCreditAccount.js

@@ -41,7 +41,7 @@ async function previewAdjustCreditAccount(input, operation, options) {
   state.balances = initialBalances.clone();
   state.debt = ca.debt;
   state.totalDebt = ca.debt + ca.accruedInterest + ca.accruedFees;
-  let error = applyInnerOperations(sdk, operation.multicall, state);
+  let error = await applyInnerOperations(sdk, operation.multicall, state);
   const { assets: collateralAdded, error: unwrapError } = unwrapNativeCollateral(
     state.collateralAdded.toAssets(),
     value,

package/dist/esm/preview/preview/previewCloseOrRepayCreditAccount.js

@@ -79,7 +79,7 @@ async function replayMulticall(sdk, operation, options) {
   }
   state.debt = ca.debt;
   state.totalDebt = ca.debt + ca.accruedInterest + ca.accruedFees;
-  const error = applyInnerOperations(sdk, operation.multicall, state);
+  const error = await applyInnerOperations(sdk, operation.multicall, state);
   return { ca, state, error };
 }
 export {

package/dist/esm/preview/preview/previewOpenCreditAccount.js

@@ -10,13 +10,13 @@ import {
   ERROR_UNPRICEABLE_TOKEN
 } from "./types.js";
 import { unwrapNativeCollateral } from "./unwrapNativeCollateral.js";
-function previewOpenCreditAccount(input, operation) {
+async function previewOpenCreditAccount(input, operation) {
   const { sdk, value = 0n } = input;
   const market = sdk.marketRegister.findByCreditManager(
     operation.creditManager
   );
   const state = makeInnerOperationsState();
-  let error = applyInnerOperations(sdk, operation.multicall, state);
+  let error = await applyInnerOperations(sdk, operation.multicall, state);
   let priceError;
   const collateralValue = state.collateralAdded.sum((token, balance) => {
     try {

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

@@ -587,13 +587,6 @@ class CreditAccountsServiceV310 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.isRWAUnderlying(underlying)) {
-      throw new Error(
-        "closeCreditAccount is not supported for RWA underlying credit accounts"
-      );
-    }
     const routerCloseResult = closePath || await this.sdk.routerFor(ca).findBestClosePath({
       creditAccount: ca,
       creditManager: cm.creditManager,
@@ -623,14 +616,6 @@ class CreditAccountsServiceV310 extends SDKConstruct {
     assetsToWithdraw,
     to
   }) {
-    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.isRWAUnderlying(underlying)) {
-      throw new Error(
-        "closeCreditAccount is not supported for RWA underlying credit accounts"
-      );
-    }
     return [
       ...routerCalls,
       ...this.#prepareDisableQuotas(ca),
@@ -814,17 +799,21 @@ class CreditAccountsServiceV310 extends SDKConstruct {
       return acc;
     }, {});
     const balances = Object.entries(record).filter(([, a]) => a > 10n);
+    const deltas = balances.map(
+      ([token, amount]) => ({
+        token,
+        amount: amount > 10n ? amount - 10n : 0n
+      })
+    );
+    if (preview.amountIn > 0n) {
+      deltas.push({ token: preview.token, amount: -preview.amountIn });
+    }
     const storeExpectedBalances = {
       target: creditFacade,
       callData: encodeFunctionData({
         abi: iCreditFacadeMulticallV310Abi,
         functionName: "storeExpectedBalances",
-        args: [
-          balances.map(([token, amount]) => ({
-            token,
-            amount: amount > 10n ? amount - 10n : 0n
-          }))
-        ]
+        args: [deltas]
       })
     };
     const compareBalances = {
@@ -853,17 +842,24 @@ class CreditAccountsServiceV310 extends SDKConstruct {
       {}
     );
     const balances = Object.entries(record).filter(([, a]) => a > 10n);
+    const deltas = balances.map(
+      ([token, amount]) => ({
+        token,
+        amount: amount > 10n ? amount - 10n : 0n
+      })
+    );
+    if (claimableNow.withdrawalTokenSpent > 0n) {
+      deltas.push({
+        token: claimableNow.withdrawalPhantomToken,
+        amount: -claimableNow.withdrawalTokenSpent
+      });
+    }
     const storeExpectedBalances = {
       target: creditFacade,
       callData: encodeFunctionData({
         abi: iCreditFacadeMulticallV310Abi,
         functionName: "storeExpectedBalances",
-        args: [
-          balances.map(([token, amount]) => ({
-            token,
-            amount: amount > 10n ? amount - 10n : 0n
-          }))
-        ]
+        args: [deltas]
       })
     };
     const compareBalances = {

package/dist/esm/sdk/accounts/withdrawal-compressor/AbstractWithdrawalCompressorContract.js

@@ -59,6 +59,19 @@ class AbstractWithdrawalCompressorContract extends BaseContract {
       return r.result.map((a) => toWithdrawableAsset(a, cms[i]));
     });
   }
+  /**
+   * {@inheritDoc IWithdrawalCompressorContract.getWithdrawalPhantomToken}
+   **/
+  async getWithdrawalPhantomToken(creditManager, token) {
+    const assets = await this.getWithdrawableAssets(creditManager);
+    const asset = assets.find((a) => isAddressEqual(a.token, token));
+    if (!asset) {
+      throw new Error(
+        `token ${token} is not withdrawable from credit manager ${creditManager}`
+      );
+    }
+    return asset.withdrawalPhantomToken;
+  }
   /**
    * {@inheritDoc IWithdrawalCompressorContract.getCurrentWithdrawals}
    **/
@@ -139,19 +152,14 @@ class AbstractWithdrawalCompressorContract extends BaseContract {
       abi: iCreditAccountAbi,
       functionName: "creditManager"
     });
-    const assets = await this.common.read.getWithdrawableAssets([
-      creditManager
-    ]);
-    const asset = assets.find((a) => isAddressEqual(a.token, token));
-    if (!asset) {
-      throw new Error(
-        `token ${token} is not withdrawable from credit manager ${creditManager}`
-      );
-    }
+    const withdrawalPhantomToken = await this.getWithdrawalPhantomToken(
+      creditManager,
+      token
+    );
     return this.common.read.getWithdrawalRequestResult([
       creditAccount,
       token,
-      asset.withdrawalPhantomToken,
+      withdrawalPhantomToken,
       amount,
       extraData
     ]);

package/dist/types/history/populateContractsRegister.d.ts

@@ -1,5 +1,5 @@
 import { type Address, type Chain, type PublicClient, type Transport } from "viem";
-import { ChainContractsRegister, type ILogger, type TokenMetaData, TokensMeta } from "../sdk/index.js";
+import { type ChainContractsRegister, type ILogger, type TokenMetaData, TokensMeta } from "../sdk/index.js";
 export type DeploymentLike = {
     address: Address;
     version: number;