@gearbox-protocol/sdk 14.12.0-next.10 → 14.12.0-next.12

package/dist/cjs/preview/preview/applyInnerOperations.js

@@ -45,7 +45,7 @@ function applyInnerOperations(sdk, multicall, state) {
         state.balances.inc(op.token, op.amount);
         break;
       case "WithdrawCollateral": {
-        const running = state.balances.get(op.token) ?? 0n;
+        const running = state.balances.getOrZero(op.token);
         const amount = op.amount === import_sdk.MAX_UINT256 ? running > 0n ? running : 0n : op.amount;
         state.balances.dec(op.token, amount);
         state.collateralWithdrawn.inc(op.token, amount);
@@ -113,16 +113,14 @@ function applyQuotaChanges(initialQuotas, changes) {
     if (change === import_sdk.MIN_INT96) {
       final.upsert(token, 0n);
     } else {
-      const next = (final.get(token) ?? 0n) + change;
+      const next = final.getOrZero(token) + change;
       final.upsert(token, next > 0n ? next : 0n);
     }
   }
-  const quotas = final.entries().filter(([, balance]) => balance > 0n).map(([token, balance]) => ({ token, balance }));
-  const quotasChange = final.entries().map(([token, balance]) => ({
-    token,
-    balance: balance - (initialQuotas.get(token) ?? 0n)
-  })).filter(({ balance }) => balance !== 0n);
-  return { quotas, quotasChange };
+  return {
+    quotas: final.toAssets(0n),
+    quotasChange: final.difference(initialQuotas).toAssets()
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/preview/preview/previewAdjustCreditAccount.js

@@ -50,9 +50,7 @@ async function previewAdjustCreditAccount(input, operation, options) {
     }
   }
   const state = (0, import_applyInnerOperations.makeInnerOperationsState)();
-  for (const [token, balance] of initialBalances.entries()) {
-    state.balances.upsert(token, balance);
-  }
+  state.balances = initialBalances.clone();
   state.debt = ca.debt;
   state.totalDebt = ca.debt + ca.accruedInterest + ca.accruedFees;
   (0, import_applyInnerOperations.applyInnerOperations)(sdk, operation.multicall, state);
@@ -65,11 +63,8 @@ async function previewAdjustCreditAccount(input, operation, options) {
     initialQuotas,
     state.quotaChanges
   );
-  const assets = state.balances.toAssets(true);
-  const assetsChange = state.balances.entries().map(([token, balance]) => ({
-    token,
-    balance: balance - (initialBalances.get(token) ?? 0n)
-  })).filter(({ balance }) => balance !== 0n);
+  const assets = state.balances.toAssets(1n);
+  const assetsChange = state.balances.difference(initialBalances).toAssets(1n);
   const totalValue = assets.reduce(
     (acc, { token, balance }) => acc + market.priceOracle.convert(token, market.underlying, balance),
     0n

package/dist/cjs/preview/preview/previewOpenCreditAccount.js

@@ -31,17 +31,15 @@ function previewOpenCreditAccount(input, operation) {
   );
   const state = (0, import_applyInnerOperations.makeInnerOperationsState)();
   (0, import_applyInnerOperations.applyInnerOperations)(sdk, operation.multicall, state);
-  let collateral = state.collateralAdded.toAssets();
-  const collateralValue = collateral.reduce(
-    (acc, { token, balance }) => acc + market.priceOracle.convert(token, market.underlying, balance),
-    0n
+  const collateralValue = state.collateralAdded.sum(
+    (token, balance) => market.priceOracle.convert(token, market.underlying, balance)
   );
-  collateral = (0, import_unwrapNativeCollateral.unwrapNativeCollateral)(
-    collateral,
+  const collateral = (0, import_unwrapNativeCollateral.unwrapNativeCollateral)(
+    state.collateralAdded.toAssets(),
     value,
     sdk.addressProvider.getAddress(import_sdk.AP_WETH_TOKEN, import_sdk.NO_VERSION)
   );
-  const assets = state.balances.entries().filter(([, balance]) => balance > 1n).map(([token, balance]) => ({ token, balance }));
+  const assets = state.balances.toAssets(1n);
   return {
     operation: operation.operation,
     creditManager: operation.creditManager,

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

@@ -620,14 +620,12 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
       creditManager: cm.creditManager,
       slippage
     });
-    const operationCalls = [
-      ...routerCloseResult.calls,
-      ...this.#prepareDisableQuotas(ca),
-      ...this.#prepareDecreaseDebt(ca),
-      ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca.creditFacade, t, import_constants.MAX_UINT256, to)
-      )
-    ];
+    const operationCalls = await this.assembleCloseCreditAccountCalls({
+      creditAccount: ca,
+      routerCalls: routerCloseResult.calls,
+      assetsToWithdraw,
+      to
+    });
     const calls = operation === "close" ? operationCalls : await this.#prependPriceUpdates(ca.creditManager, operationCalls, ca);
     const tx = await this.#closeCreditAccountTx(
       cm,
@@ -637,6 +635,32 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
     );
     return { tx, calls, routerCloseResult, creditFacade: cm.creditFacade };
   }
+  /**
+   * {@inheritDoc ICreditAccountsService.assembleCloseCreditAccountCalls}
+   */
+  async assembleCloseCreditAccountCalls({
+    creditAccount: ca,
+    routerCalls,
+    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),
+      ...this.#prepareDecreaseDebt(ca),
+      ...assetsToWithdraw.map(
+        (t) => this.#prepareWithdrawToken(ca.creditFacade, t, import_constants.MAX_UINT256, to)
+      )
+    ];
+  }
   /**
    * {@inheritDoc ICreditAccountsService.updateQuotas}
    **/
@@ -1306,8 +1330,23 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
   /**
    * {@inheritDoc ICreditAccountsService.repayCreditAccount}
    */
-  async repayCreditAccount({
-    operation,
+  async repayCreditAccount(props) {
+    const { operation, creditAccount: ca } = props;
+    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    const operationCalls = await this.assembleRepayCreditAccountCalls(props);
+    const calls = operation === "close" ? operationCalls : await this.#prependPriceUpdates(ca.creditManager, operationCalls, ca);
+    const tx = await this.#closeCreditAccountTx(
+      cm,
+      ca.creditAccount,
+      calls,
+      operation
+    );
+    return { tx, calls, creditFacade: cm.creditFacade };
+  }
+  /**
+   * {@inheritDoc ICreditAccountsService.assembleRepayCreditAccountCalls}
+   */
+  async assembleRepayCreditAccountCalls({
     collateralAssets,
     assetsToWithdraw,
     creditAccount: ca,
@@ -1316,7 +1355,6 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
     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) ?? [];
@@ -1335,14 +1373,7 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
         (t) => this.#prepareWithdrawToken(ca.creditFacade, t.token, import_constants.MAX_UINT256, to)
       )
     ];
-    const calls = operation === "close" ? operationCalls : await this.#prependPriceUpdates(ca.creditManager, operationCalls, ca);
-    const tx = await this.#closeCreditAccountTx(
-      cm,
-      ca.creditAccount,
-      calls,
-      operation
-    );
-    return { tx, calls, creditFacade: cm.creditFacade };
+    return operationCalls;
   }
   /**
    * {@inheritDoc ICreditAccountsService.repayAndLiquidateCreditAccount}
@@ -1563,19 +1594,14 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
     );
   }
   /**
-   * {@inheritDoc ICreditAccountsService.assembleCaUpdateCalls}
+   * {@inheritDoc ICreditAccountsService.assembleCaOperations}
    */
-  assembleCaUpdateCalls({
+  assembleCaOperations({
     operations,
-    routerCallGroups,
     creditFacade,
-    withdrawTo,
-    creditAccount,
-    underlyingToken
+    withdrawTo
   }) {
     const calls = [];
-    let swapGroupIndex = 0;
-    let routerGroupsConsumed = 0;
     for (const op of operations) {
       switch (op.type) {
         case "increaseDebt":
@@ -1603,18 +1629,10 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
             )
           );
           break;
-        case "swap": {
-          const routerCalls = routerCallGroups[swapGroupIndex];
-          if (!routerCalls) {
-            throw new Error(
-              `assembleCaUpdateCalls: missing router calls for swap leg ${swapGroupIndex}`
-            );
-          }
-          calls.push(...routerCalls);
-          swapGroupIndex += 1;
-          routerGroupsConsumed += 1;
+        case "swap":
+        case "wrapRwaCollateral":
+          calls.push(...op.calls);
           break;
-        }
         case "changeQuota": {
           const quotaAssets = [...op.quotaIncrease, ...op.quotaDecrease];
           if (quotaAssets.length === 0) {
@@ -1628,43 +1646,110 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
           );
           break;
         }
-        case "closeCreditAccount": {
-          for (const group of routerCallGroups) {
-            calls.push(...group);
-            routerGroupsConsumed += 1;
-          }
+        default: {
+          const _exhaustive = op;
+          throw new Error(
+            `assembleCaOperations: unsupported operation ${JSON.stringify(_exhaustive)}`
+          );
+        }
+      }
+    }
+    return calls;
+  }
+  /**
+   * {@inheritDoc ICreditAccountsService.assembleCaUpdateCalls}
+   * @deprecated Prefer {@link CreditAccountsServiceV310.assembleCaOperations}.
+   */
+  assembleCaUpdateCalls({
+    operations,
+    routerCallGroups,
+    creditFacade,
+    withdrawTo,
+    creditAccount,
+    underlyingToken
+  }) {
+    const calls = [];
+    let swapGroupIndex = 0;
+    let routerGroupsConsumed = 0;
+    const encodableOps = [];
+    let pendingClose = null;
+    const flushEncodable = () => {
+      if (encodableOps.length === 0) {
+        return;
+      }
+      calls.push(
+        ...this.assembleCaOperations({
+          operations: encodableOps.splice(0, encodableOps.length),
+          creditFacade,
+          withdrawTo
+        })
+      );
+    };
+    for (const op of operations) {
+      if (op.type === "closeCreditAccount") {
+        flushEncodable();
+        pendingClose = { routerGroupsStart: routerGroupsConsumed };
+        for (const group of routerCallGroups.slice(routerGroupsConsumed)) {
+          calls.push(...group);
+          routerGroupsConsumed += 1;
+        }
+        calls.push(
+          ...this.#prepareDisableQuotas({
+            creditFacade,
+            tokens: Object.entries(creditAccount.initialQuotas).map(
+              ([token, { quota }]) => ({
+                token,
+                quota
+              })
+            )
+          })
+        );
+        if (creditAccount.debt > 0n) {
           calls.push(
-            ...this.#prepareDisableQuotas({
+            ...this.#prepareDecreaseDebt({
               creditFacade,
-              tokens: Object.entries(creditAccount.initialQuotas).map(
-                ([token, { quota }]) => ({
-                  token,
-                  quota
-                })
-              )
+              debt: creditAccount.debt
             })
           );
-          if (creditAccount.debt > 0n) {
-            calls.push(
-              ...this.#prepareDecreaseDebt({
-                creditFacade,
-                debt: creditAccount.debt
-              })
-            );
-          }
-          const hasAssets = creditAccount.assets.some(
-            (asset) => asset.balance > 0n
+        }
+        const hasAssets = creditAccount.assets.some(
+          (asset) => asset.balance > 0n
+        );
+        if (hasAssets) {
+          calls.push(
+            this.#prepareWithdrawToken(
+              creditFacade,
+              underlyingToken,
+              import_constants.MAX_UINT256,
+              withdrawTo
+            )
           );
-          if (hasAssets) {
-            calls.push(
-              this.#prepareWithdrawToken(
-                creditFacade,
-                underlyingToken,
-                import_constants.MAX_UINT256,
-                withdrawTo
-              )
+        }
+        continue;
+      }
+      if (pendingClose !== null) {
+        throw new Error(
+          "assembleCaUpdateCalls: operations after closeCreditAccount are not supported"
+        );
+      }
+      switch (op.type) {
+        case "increaseDebt":
+        case "decreaseDebt":
+        case "addCollateral":
+        case "withdrawCollateral":
+        case "changeQuota":
+          encodableOps.push(op);
+          break;
+        case "swap": {
+          const routerCalls = routerCallGroups[swapGroupIndex];
+          if (!routerCalls) {
+            throw new Error(
+              `assembleCaUpdateCalls: missing router calls for swap leg ${swapGroupIndex}`
             );
           }
+          encodableOps.push({ type: "swap", calls: routerCalls });
+          swapGroupIndex += 1;
+          routerGroupsConsumed += 1;
           break;
         }
         default: {
@@ -1675,6 +1760,7 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
         }
       }
     }
+    flushEncodable();
     if (routerGroupsConsumed !== routerCallGroups.length) {
       throw new Error(
         `assembleCaUpdateCalls: router call group mismatch (consumed ${routerGroupsConsumed}, got ${routerCallGroups.length})`

package/dist/cjs/sdk/utils/AssetsMap.js

@@ -33,11 +33,17 @@ class AssetsMap extends import_AddressMap.AddressMap {
       name
     );
   }
+  /**
+   * Looks up a token balance, treating a missing key as `0n`.
+   */
+  getOrZero(address) {
+    return this.get(address) ?? 0n;
+  }
   /**
    * Adds `amount` to the token balance, treating a missing key as `0n`.
    */
   inc(address, amount) {
-    this.upsert(address, (this.get(address) ?? 0n) + amount);
+    this.upsert(address, this.getOrZero(address) + amount);
   }
   /**
    * Subtracts `amount` from the token balance, treating a missing key as `0n`.
@@ -45,12 +51,41 @@ class AssetsMap extends import_AddressMap.AddressMap {
   dec(address, amount) {
     this.inc(address, -amount);
   }
+  /**
+   * Per-token difference `this - before`, non-zero entries only.
+   *
+   * Assumes this map's keys are a superset of `before`'s keys; tokens present
+   * only in `before` are not reported.
+   */
+  difference(before) {
+    const result = new AssetsMap();
+    for (const [token, balance] of this.entries()) {
+      const change = balance - before.getOrZero(token);
+      if (change !== 0n) {
+        result.upsert(token, change);
+      }
+    }
+    return result;
+  }
+  /**
+   * Sums `fn` over all entries.
+   */
+  sum(fn) {
+    return this.entries().reduce(
+      (acc, [token, balance]) => acc + fn(token, balance),
+      0n
+    );
+  }
   /**
    * Converts the map to an array of {@link Asset} objects.
-   * @param filterDust - If true, filters out assets with a balance less than 1.
+   * @param minBalance - If provided, keeps only entries with a balance
+   * strictly greater than this threshold (e.g. `1n` to filter out dust).
    */
-  toAssets(filterDust = false) {
-    return this.entries().filter(filterDust ? ([, balance]) => balance > 1n : () => true).map(([token, balance]) => ({ token, balance }));
+  toAssets(minBalance) {
+    const abs = (balance) => balance > 0n ? balance : -balance;
+    return this.entries().filter(
+      ([, balance]) => minBalance === void 0 || abs(balance) > minBalance
+    ).map(([token, balance]) => ({ token, balance }));
   }
   clone() {
     return new AssetsMap(this.entries(), this.name);

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

@@ -24,7 +24,7 @@ function applyInnerOperations(sdk, multicall, state) {
         state.balances.inc(op.token, op.amount);
         break;
       case "WithdrawCollateral": {
-        const running = state.balances.get(op.token) ?? 0n;
+        const running = state.balances.getOrZero(op.token);
         const amount = op.amount === MAX_UINT256 ? running > 0n ? running : 0n : op.amount;
         state.balances.dec(op.token, amount);
         state.collateralWithdrawn.inc(op.token, amount);
@@ -92,16 +92,14 @@ function applyQuotaChanges(initialQuotas, changes) {
     if (change === MIN_INT96) {
       final.upsert(token, 0n);
     } else {
-      const next = (final.get(token) ?? 0n) + change;
+      const next = final.getOrZero(token) + change;
       final.upsert(token, next > 0n ? next : 0n);
     }
   }
-  const quotas = final.entries().filter(([, balance]) => balance > 0n).map(([token, balance]) => ({ token, balance }));
-  const quotasChange = final.entries().map(([token, balance]) => ({
-    token,
-    balance: balance - (initialQuotas.get(token) ?? 0n)
-  })).filter(({ balance }) => balance !== 0n);
-  return { quotas, quotasChange };
+  return {
+    quotas: final.toAssets(0n),
+    quotasChange: final.difference(initialQuotas).toAssets()
+  };
 }
 export {
   applyInnerOperations,

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

@@ -35,9 +35,7 @@ async function previewAdjustCreditAccount(input, operation, options) {
     }
   }
   const state = makeInnerOperationsState();
-  for (const [token, balance] of initialBalances.entries()) {
-    state.balances.upsert(token, balance);
-  }
+  state.balances = initialBalances.clone();
   state.debt = ca.debt;
   state.totalDebt = ca.debt + ca.accruedInterest + ca.accruedFees;
   applyInnerOperations(sdk, operation.multicall, state);
@@ -50,11 +48,8 @@ async function previewAdjustCreditAccount(input, operation, options) {
     initialQuotas,
     state.quotaChanges
   );
-  const assets = state.balances.toAssets(true);
-  const assetsChange = state.balances.entries().map(([token, balance]) => ({
-    token,
-    balance: balance - (initialBalances.get(token) ?? 0n)
-  })).filter(({ balance }) => balance !== 0n);
+  const assets = state.balances.toAssets(1n);
+  const assetsChange = state.balances.difference(initialBalances).toAssets(1n);
   const totalValue = assets.reduce(
     (acc, { token, balance }) => acc + market.priceOracle.convert(token, market.underlying, balance),
     0n

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

@@ -14,17 +14,15 @@ function previewOpenCreditAccount(input, operation) {
   );
   const state = makeInnerOperationsState();
   applyInnerOperations(sdk, operation.multicall, state);
-  let collateral = state.collateralAdded.toAssets();
-  const collateralValue = collateral.reduce(
-    (acc, { token, balance }) => acc + market.priceOracle.convert(token, market.underlying, balance),
-    0n
+  const collateralValue = state.collateralAdded.sum(
+    (token, balance) => market.priceOracle.convert(token, market.underlying, balance)
   );
-  collateral = unwrapNativeCollateral(
-    collateral,
+  const collateral = unwrapNativeCollateral(
+    state.collateralAdded.toAssets(),
     value,
     sdk.addressProvider.getAddress(AP_WETH_TOKEN, NO_VERSION)
   );
-  const assets = state.balances.entries().filter(([, balance]) => balance > 1n).map(([token, balance]) => ({ token, balance }));
+  const assets = state.balances.toAssets(1n);
   return {
     operation: operation.operation,
     creditManager: operation.creditManager,

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

@@ -615,14 +615,12 @@ class CreditAccountsServiceV310 extends SDKConstruct {
       creditManager: cm.creditManager,
       slippage
     });
-    const operationCalls = [
-      ...routerCloseResult.calls,
-      ...this.#prepareDisableQuotas(ca),
-      ...this.#prepareDecreaseDebt(ca),
-      ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca.creditFacade, t, MAX_UINT256, to)
-      )
-    ];
+    const operationCalls = await this.assembleCloseCreditAccountCalls({
+      creditAccount: ca,
+      routerCalls: routerCloseResult.calls,
+      assetsToWithdraw,
+      to
+    });
     const calls = operation === "close" ? operationCalls : await this.#prependPriceUpdates(ca.creditManager, operationCalls, ca);
     const tx = await this.#closeCreditAccountTx(
       cm,
@@ -632,6 +630,32 @@ class CreditAccountsServiceV310 extends SDKConstruct {
     );
     return { tx, calls, routerCloseResult, creditFacade: cm.creditFacade };
   }
+  /**
+   * {@inheritDoc ICreditAccountsService.assembleCloseCreditAccountCalls}
+   */
+  async assembleCloseCreditAccountCalls({
+    creditAccount: ca,
+    routerCalls,
+    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),
+      ...this.#prepareDecreaseDebt(ca),
+      ...assetsToWithdraw.map(
+        (t) => this.#prepareWithdrawToken(ca.creditFacade, t, MAX_UINT256, to)
+      )
+    ];
+  }
   /**
    * {@inheritDoc ICreditAccountsService.updateQuotas}
    **/
@@ -1301,8 +1325,23 @@ class CreditAccountsServiceV310 extends SDKConstruct {
   /**
    * {@inheritDoc ICreditAccountsService.repayCreditAccount}
    */
-  async repayCreditAccount({
-    operation,
+  async repayCreditAccount(props) {
+    const { operation, creditAccount: ca } = props;
+    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    const operationCalls = await this.assembleRepayCreditAccountCalls(props);
+    const calls = operation === "close" ? operationCalls : await this.#prependPriceUpdates(ca.creditManager, operationCalls, ca);
+    const tx = await this.#closeCreditAccountTx(
+      cm,
+      ca.creditAccount,
+      calls,
+      operation
+    );
+    return { tx, calls, creditFacade: cm.creditFacade };
+  }
+  /**
+   * {@inheritDoc ICreditAccountsService.assembleRepayCreditAccountCalls}
+   */
+  async assembleRepayCreditAccountCalls({
     collateralAssets,
     assetsToWithdraw,
     creditAccount: ca,
@@ -1311,7 +1350,6 @@ class CreditAccountsServiceV310 extends SDKConstruct {
     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) ?? [];
@@ -1330,14 +1368,7 @@ class CreditAccountsServiceV310 extends SDKConstruct {
         (t) => this.#prepareWithdrawToken(ca.creditFacade, t.token, MAX_UINT256, to)
       )
     ];
-    const calls = operation === "close" ? operationCalls : await this.#prependPriceUpdates(ca.creditManager, operationCalls, ca);
-    const tx = await this.#closeCreditAccountTx(
-      cm,
-      ca.creditAccount,
-      calls,
-      operation
-    );
-    return { tx, calls, creditFacade: cm.creditFacade };
+    return operationCalls;
   }
   /**
    * {@inheritDoc ICreditAccountsService.repayAndLiquidateCreditAccount}
@@ -1558,19 +1589,14 @@ class CreditAccountsServiceV310 extends SDKConstruct {
     );
   }
   /**
-   * {@inheritDoc ICreditAccountsService.assembleCaUpdateCalls}
+   * {@inheritDoc ICreditAccountsService.assembleCaOperations}
    */
-  assembleCaUpdateCalls({
+  assembleCaOperations({
     operations,
-    routerCallGroups,
     creditFacade,
-    withdrawTo,
-    creditAccount,
-    underlyingToken
+    withdrawTo
   }) {
     const calls = [];
-    let swapGroupIndex = 0;
-    let routerGroupsConsumed = 0;
     for (const op of operations) {
       switch (op.type) {
         case "increaseDebt":
@@ -1598,18 +1624,10 @@ class CreditAccountsServiceV310 extends SDKConstruct {
             )
           );
           break;
-        case "swap": {
-          const routerCalls = routerCallGroups[swapGroupIndex];
-          if (!routerCalls) {
-            throw new Error(
-              `assembleCaUpdateCalls: missing router calls for swap leg ${swapGroupIndex}`
-            );
-          }
-          calls.push(...routerCalls);
-          swapGroupIndex += 1;
-          routerGroupsConsumed += 1;
+        case "swap":
+        case "wrapRwaCollateral":
+          calls.push(...op.calls);
           break;
-        }
         case "changeQuota": {
           const quotaAssets = [...op.quotaIncrease, ...op.quotaDecrease];
           if (quotaAssets.length === 0) {
@@ -1623,43 +1641,110 @@ class CreditAccountsServiceV310 extends SDKConstruct {
           );
           break;
         }
-        case "closeCreditAccount": {
-          for (const group of routerCallGroups) {
-            calls.push(...group);
-            routerGroupsConsumed += 1;
-          }
+        default: {
+          const _exhaustive = op;
+          throw new Error(
+            `assembleCaOperations: unsupported operation ${JSON.stringify(_exhaustive)}`
+          );
+        }
+      }
+    }
+    return calls;
+  }
+  /**
+   * {@inheritDoc ICreditAccountsService.assembleCaUpdateCalls}
+   * @deprecated Prefer {@link CreditAccountsServiceV310.assembleCaOperations}.
+   */
+  assembleCaUpdateCalls({
+    operations,
+    routerCallGroups,
+    creditFacade,
+    withdrawTo,
+    creditAccount,
+    underlyingToken
+  }) {
+    const calls = [];
+    let swapGroupIndex = 0;
+    let routerGroupsConsumed = 0;
+    const encodableOps = [];
+    let pendingClose = null;
+    const flushEncodable = () => {
+      if (encodableOps.length === 0) {
+        return;
+      }
+      calls.push(
+        ...this.assembleCaOperations({
+          operations: encodableOps.splice(0, encodableOps.length),
+          creditFacade,
+          withdrawTo
+        })
+      );
+    };
+    for (const op of operations) {
+      if (op.type === "closeCreditAccount") {
+        flushEncodable();
+        pendingClose = { routerGroupsStart: routerGroupsConsumed };
+        for (const group of routerCallGroups.slice(routerGroupsConsumed)) {
+          calls.push(...group);
+          routerGroupsConsumed += 1;
+        }
+        calls.push(
+          ...this.#prepareDisableQuotas({
+            creditFacade,
+            tokens: Object.entries(creditAccount.initialQuotas).map(
+              ([token, { quota }]) => ({
+                token,
+                quota
+              })
+            )
+          })
+        );
+        if (creditAccount.debt > 0n) {
           calls.push(
-            ...this.#prepareDisableQuotas({
+            ...this.#prepareDecreaseDebt({
               creditFacade,
-              tokens: Object.entries(creditAccount.initialQuotas).map(
-                ([token, { quota }]) => ({
-                  token,
-                  quota
-                })
-              )
+              debt: creditAccount.debt
             })
           );
-          if (creditAccount.debt > 0n) {
-            calls.push(
-              ...this.#prepareDecreaseDebt({
-                creditFacade,
-                debt: creditAccount.debt
-              })
-            );
-          }
-          const hasAssets = creditAccount.assets.some(
-            (asset) => asset.balance > 0n
+        }
+        const hasAssets = creditAccount.assets.some(
+          (asset) => asset.balance > 0n
+        );
+        if (hasAssets) {
+          calls.push(
+            this.#prepareWithdrawToken(
+              creditFacade,
+              underlyingToken,
+              MAX_UINT256,
+              withdrawTo
+            )
           );
-          if (hasAssets) {
-            calls.push(
-              this.#prepareWithdrawToken(
-                creditFacade,
-                underlyingToken,
-                MAX_UINT256,
-                withdrawTo
-              )
+        }
+        continue;
+      }
+      if (pendingClose !== null) {
+        throw new Error(
+          "assembleCaUpdateCalls: operations after closeCreditAccount are not supported"
+        );
+      }
+      switch (op.type) {
+        case "increaseDebt":
+        case "decreaseDebt":
+        case "addCollateral":
+        case "withdrawCollateral":
+        case "changeQuota":
+          encodableOps.push(op);
+          break;
+        case "swap": {
+          const routerCalls = routerCallGroups[swapGroupIndex];
+          if (!routerCalls) {
+            throw new Error(
+              `assembleCaUpdateCalls: missing router calls for swap leg ${swapGroupIndex}`
             );
           }
+          encodableOps.push({ type: "swap", calls: routerCalls });
+          swapGroupIndex += 1;
+          routerGroupsConsumed += 1;
           break;
         }
         default: {
@@ -1670,6 +1755,7 @@ class CreditAccountsServiceV310 extends SDKConstruct {
         }
       }
     }
+    flushEncodable();
     if (routerGroupsConsumed !== routerCallGroups.length) {
       throw new Error(
         `assembleCaUpdateCalls: router call group mismatch (consumed ${routerGroupsConsumed}, got ${routerCallGroups.length})`

package/dist/esm/sdk/utils/AssetsMap.js

@@ -10,11 +10,17 @@ class AssetsMap extends AddressMap {
       name
     );
   }
+  /**
+   * Looks up a token balance, treating a missing key as `0n`.
+   */
+  getOrZero(address) {
+    return this.get(address) ?? 0n;
+  }
   /**
    * Adds `amount` to the token balance, treating a missing key as `0n`.
    */
   inc(address, amount) {
-    this.upsert(address, (this.get(address) ?? 0n) + amount);
+    this.upsert(address, this.getOrZero(address) + amount);
   }
   /**
    * Subtracts `amount` from the token balance, treating a missing key as `0n`.
@@ -22,12 +28,41 @@ class AssetsMap extends AddressMap {
   dec(address, amount) {
     this.inc(address, -amount);
   }
+  /**
+   * Per-token difference `this - before`, non-zero entries only.
+   *
+   * Assumes this map's keys are a superset of `before`'s keys; tokens present
+   * only in `before` are not reported.
+   */
+  difference(before) {
+    const result = new AssetsMap();
+    for (const [token, balance] of this.entries()) {
+      const change = balance - before.getOrZero(token);
+      if (change !== 0n) {
+        result.upsert(token, change);
+      }
+    }
+    return result;
+  }
+  /**
+   * Sums `fn` over all entries.
+   */
+  sum(fn) {
+    return this.entries().reduce(
+      (acc, [token, balance]) => acc + fn(token, balance),
+      0n
+    );
+  }
   /**
    * Converts the map to an array of {@link Asset} objects.
-   * @param filterDust - If true, filters out assets with a balance less than 1.
+   * @param minBalance - If provided, keeps only entries with a balance
+   * strictly greater than this threshold (e.g. `1n` to filter out dust).
    */
-  toAssets(filterDust = false) {
-    return this.entries().filter(filterDust ? ([, balance]) => balance > 1n : () => true).map(([token, balance]) => ({ token, balance }));
+  toAssets(minBalance) {
+    const abs = (balance) => balance > 0n ? balance : -balance;
+    return this.entries().filter(
+      ([, balance]) => minBalance === void 0 || abs(balance) > minBalance
+    ).map(([token, balance]) => ({ token, balance }));
   }
   clone() {
     return new AssetsMap(this.entries(), this.name);

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

@@ -6,7 +6,7 @@ import type { RWAOpenAccountRequirements } from "../market/rwa/index.js";
 import type { OnchainSDK } from "../OnchainSDK.js";
 import type { RouterCASlice } from "../router/index.js";
 import type { MultiCall, RawTx } from "../types/index.js";
-import type { AccountToCheck, AddCollateralProps, AssembleCaUpdateCallsProps, ChangeDeptProps, ClaimDelayedProps, ClaimFarmRewardsProps, CloseCreditAccountProps, CloseCreditAccountResult, CreditAccountOperationResult, CreditAccountTokensSlice, CreditManagerOperationResult, DefaultPartialLiquidationParams, ExecuteSwapProps, FullyLiquidateProps, FullyLiquidateResult, GetApprovalAddressProps, GetConnectedBotsResult, GetConnectedMigrationBotsResult, GetCreditAccountsOptions, GetOpenAccountRequirementsProps, GetPendingWithdrawalsProps, GetPendingWithdrawalsResult, ICreditAccountsService, OpenCAProps, PartiallyLiquidateProps, PreviewDelayedWithdrawalProps, PreviewDelayedWithdrawalResult, RepayAndLiquidateCreditAccountProps, RepayCreditAccountProps, Rewards, SetBotProps, StartDelayedWithdrawalProps, UpdateQuotasProps, WithdrawCollateralProps } from "./types.js";
+import type { AccountToCheck, AddCollateralProps, AssembleCaOperationsProps, AssembleCaUpdateCallsProps, AssembleCloseCreditAccountCallsProps, AssembleRepayCreditAccountCallsProps, ChangeDeptProps, ClaimDelayedProps, ClaimFarmRewardsProps, CloseCreditAccountProps, CloseCreditAccountResult, CreditAccountOperationResult, CreditAccountTokensSlice, CreditManagerOperationResult, DefaultPartialLiquidationParams, ExecuteSwapProps, FullyLiquidateProps, FullyLiquidateResult, GetApprovalAddressProps, GetConnectedBotsResult, GetConnectedMigrationBotsResult, GetCreditAccountsOptions, GetOpenAccountRequirementsProps, GetPendingWithdrawalsProps, GetPendingWithdrawalsResult, ICreditAccountsService, OpenCAProps, PartiallyLiquidateProps, PreviewDelayedWithdrawalProps, PreviewDelayedWithdrawalResult, RepayAndLiquidateCreditAccountProps, RepayCreditAccountProps, Rewards, SetBotProps, StartDelayedWithdrawalProps, UpdateQuotasProps, WithdrawCollateralProps } from "./types.js";
 /**
  * Options for configuring the credit account service.
  **/
@@ -79,6 +79,10 @@ export declare class CreditAccountsServiceV310 extends SDKConstruct implements I
      * {@inheritDoc ICreditAccountsService.closeCreditAccount}
      **/
     closeCreditAccount({ operation, assetsToWithdraw, creditAccount: ca, to, slippage, closePath, }: CloseCreditAccountProps): Promise<CloseCreditAccountResult>;
+    /**
+     * {@inheritDoc ICreditAccountsService.assembleCloseCreditAccountCalls}
+     */
+    assembleCloseCreditAccountCalls({ creditAccount: ca, routerCalls, assetsToWithdraw, to, }: AssembleCloseCreditAccountCallsProps): Promise<Array<MultiCall>>;
     /**
      * {@inheritDoc ICreditAccountsService.updateQuotas}
      **/
@@ -178,7 +182,11 @@ export declare class CreditAccountsServiceV310 extends SDKConstruct implements I
     /**
      * {@inheritDoc ICreditAccountsService.repayCreditAccount}
      */
-    repayCreditAccount({ operation, collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, tokensToClaim, calls: wrapCalls, }: RepayCreditAccountProps): Promise<CreditAccountOperationResult>;
+    repayCreditAccount(props: RepayCreditAccountProps): Promise<CreditAccountOperationResult>;
+    /**
+     * {@inheritDoc ICreditAccountsService.assembleRepayCreditAccountCalls}
+     */
+    assembleRepayCreditAccountCalls({ collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, tokensToClaim, calls: wrapCalls, }: AssembleRepayCreditAccountCallsProps): Promise<Array<MultiCall>>;
     /**
      * {@inheritDoc ICreditAccountsService.repayAndLiquidateCreditAccount}
      */
@@ -210,8 +218,13 @@ export declare class CreditAccountsServiceV310 extends SDKConstruct implements I
     prependPriceUpdates(creditManager: Address, calls: MultiCall[], creditAccount?: RouterCASlice, options?: {
         ignoreReservePrices?: boolean;
     }): Promise<MultiCall[]>;
+    /**
+     * {@inheritDoc ICreditAccountsService.assembleCaOperations}
+     */
+    assembleCaOperations({ operations, creditFacade, withdrawTo, }: AssembleCaOperationsProps): MultiCall[];
     /**
      * {@inheritDoc ICreditAccountsService.assembleCaUpdateCalls}
+     * @deprecated Prefer {@link CreditAccountsServiceV310.assembleCaOperations}.
      */
     assembleCaUpdateCalls({ operations, routerCallGroups, creditFacade, withdrawTo, creditAccount, underlyingToken, }: AssembleCaUpdateCallsProps): MultiCall[];
     /**

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

@@ -182,16 +182,27 @@ export interface CloseCreditAccountProps {
      */
     closePath?: RouterCloseResult;
 }
-export interface RepayCreditAccountProps extends RepayAndLiquidateCreditAccountProps {
+/**
+ * Input for {@link ICreditAccountsService.assembleCloseCreditAccountCalls}.
+ */
+export type AssembleCloseCreditAccountCallsProps = {
     /**
-     * Swap calls for repay
+     * Minimal credit account data on which operation is performed.
      */
-    calls?: Array<MultiCall>;
+    creditAccount: RouterCASlice;
     /**
-     * close or zeroDebt
+     * Pathfinder close router calls (`closePath.calls`).
      */
-    operation: CloseOptions;
-}
+    routerCalls: Array<MultiCall>;
+    /**
+     * Tokens to withdraw from credit account after close path swaps.
+     */
+    assetsToWithdraw: Array<Address>;
+    /**
+     * Wallet address to withdraw tokens to.
+     */
+    to: Address;
+};
 export interface RepayAndLiquidateCreditAccountProps {
     /**
      * Tokens to repay debt.
@@ -220,6 +231,31 @@ export interface RepayAndLiquidateCreditAccountProps {
     permits: Record<string, PermitResult>;
     tokensToClaim: Asset[];
 }
+/**
+ * Input for {@link ICreditAccountsService.assembleRepayCreditAccountCalls}.
+ */
+export type AssembleRepayCreditAccountCallsProps = {
+    collateralAssets: Array<Asset>;
+    assetsToWithdraw: Array<Asset>;
+    creditAccount: RouterCASlice;
+    to: Address;
+    permits: Record<string, PermitResult>;
+    tokensToClaim: Asset[];
+    /**
+     * RWA wrap multicall entries (from getRWAWrapCalls).
+     */
+    calls?: Array<MultiCall>;
+};
+export interface RepayCreditAccountProps extends RepayAndLiquidateCreditAccountProps {
+    /**
+     * RWA wrap multicall entries (from getRWAWrapCalls).
+     */
+    calls?: Array<MultiCall>;
+    /**
+     * close or zeroDebt
+     */
+    operation: CloseOptions;
+}
 export interface PrepareUpdateQuotasProps {
     /**
      * average quota for desired token
@@ -677,6 +713,10 @@ export type GetApprovalAddressProps = {
  *
  * Used by {@link ICreditAccountsService.assembleCaUpdateCalls} to build the
  * underlying credit facade multicall calls.
+ *
+ * @deprecated Prefer {@link EncodableCreditAccountOperation} with
+ * {@link ICreditAccountsService.assembleCaOperations}. Close stays on dedicated
+ * assemblers / this deprecated path only.
  */
 export type CreditAccountUpdateOperation = {
     type: "increaseDebt";
@@ -703,6 +743,9 @@ export type CreditAccountUpdateOperation = {
 };
 /**
  * Input for {@link ICreditAccountsService.assembleCaUpdateCalls}.
+ *
+ * @deprecated Prefer {@link AssembleCaOperationsProps} /
+ * {@link ICreditAccountsService.assembleCaOperations}.
  */
 export type AssembleCaUpdateCallsProps = {
     operations: Array<CreditAccountUpdateOperation>;
@@ -719,6 +762,47 @@ export type AssembleCaUpdateCallsProps = {
     };
     underlyingToken: Address;
 };
+/**
+ * An enriched credit-account operation ready for encoding.
+ * Each op carries everything needed to build facade / adapter multicalls —
+ * swap and wrap attach concrete `calls` (no external routerCallGroups).
+ *
+ * Used by {@link ICreditAccountsService.assembleCaOperations}. Does not include
+ * close / repay (use dedicated assemblers).
+ */
+export type EncodableCreditAccountOperation = {
+    type: "increaseDebt";
+    amount: bigint;
+} | {
+    type: "decreaseDebt";
+    amount: bigint;
+} | {
+    type: "addCollateral";
+    token: Address;
+    amount: bigint;
+} | {
+    type: "withdrawCollateral";
+    token: Address;
+    amount: bigint;
+} | {
+    type: "swap";
+    calls: Array<MultiCall>;
+} | {
+    type: "wrapRwaCollateral";
+    calls: Array<MultiCall>;
+} | {
+    type: "changeQuota";
+    quotaIncrease: Array<Asset>;
+    quotaDecrease: Array<Asset>;
+};
+/**
+ * Input for {@link ICreditAccountsService.assembleCaOperations}.
+ */
+export type AssembleCaOperationsProps = {
+    operations: Array<EncodableCreditAccountOperation>;
+    creditFacade: Address;
+    withdrawTo: Address;
+};
 export interface ICreditAccountsService extends Construct {
     sdk: OnchainSDK;
     /**
@@ -798,6 +882,17 @@ export interface ICreditAccountsService extends Construct {
      * @returns Raw transaction ready to be signed and sent
      */
     partiallyLiquidate(props: PartiallyLiquidateProps): Promise<RawTx>;
+    /**
+     * Builds close multicall calls without price feed updates.
+     *
+     * Same operation sequence as {@link closeCreditAccount} (close path swaps,
+     * disable quotas, decrease debt, withdraw assets), but does not prepend
+     * price updates and does not build the facade transaction.
+     *
+     * @param props - {@link AssembleCloseCreditAccountCallsProps}
+     * @returns Raw facade multicall payload for close (before price feed updates)
+     */
+    assembleCloseCreditAccountCalls(props: AssembleCloseCreditAccountCallsProps): Promise<Array<MultiCall>>;
     /**
      * 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 ->
@@ -942,11 +1037,26 @@ export interface ICreditAccountsService extends Construct {
     prependPriceUpdates(creditManager: Address, calls: Array<MultiCall>, creditAccount?: RouterCASlice, options?: {
         ignoreReservePrices?: boolean;
     }): Promise<Array<MultiCall>>;
+    /**
+     * Builds credit facade multicall calls from an enriched operation list.
+     * Each operation must already carry concrete encoding data (e.g. swap/wrap
+     * `calls`). Unknown operation types throw.
+     *
+     * Does not handle close or repay — use
+     * {@link ICreditAccountsService.assembleCloseCreditAccountCalls} /
+     * {@link ICreditAccountsService.assembleRepayCreditAccountCalls}.
+     *
+     * @param props - Encodable operations and account context
+     * @returns Array of facade / adapter multicall calls (without price feed updates)
+     */
+    assembleCaOperations(props: AssembleCaOperationsProps): Array<MultiCall>;
     /**
      * Builds the credit facade multicall calls for a chain of update operations.
      *
      * @param props - Operation chain, router call groups and account context
      * @returns Array of facade multicall calls (without price feed updates)
+     * @deprecated Prefer {@link ICreditAccountsService.assembleCaOperations}. Close
+     * remains on this method / dedicated close assembler only.
      */
     assembleCaUpdateCalls(props: AssembleCaUpdateCallsProps): Array<MultiCall>;
     /**
@@ -1009,6 +1119,17 @@ export interface ICreditAccountsService extends Construct {
      * @return All necessary data to execute the transaction (call, credit facade)
      */
     withdrawCollateral(props: WithdrawCollateralProps): Promise<CreditAccountOperationResult>;
+    /**
+     * Builds repay multicall calls without price feed updates.
+     *
+     * Same operation sequence as {@link repayCreditAccount} (add collateral, wrap calls,
+     * disable quotas, decrease debt, redeem/unwrap, claim rewards, withdraw assets),
+     * but does not prepend price updates and does not build the facade transaction.
+     *
+     * @param props - {@link AssembleRepayCreditAccountCallsProps}
+     * @returns Raw facade multicall payload for repay (before price feed updates)
+     */
+    assembleRepayCreditAccountCalls(props: AssembleRepayCreditAccountCallsProps): Promise<Array<MultiCall>>;
     /**
      * Fully repays credit account or repays credit account and keeps it open with zero debt
      * - Repays in the following order: price update -> add collateral to cover the debt ->

package/dist/types/sdk/utils/AssetsMap.d.ts

@@ -1,3 +1,4 @@
+import type { Address } from "viem";
 import type { Asset } from "../base/types.js";
 import { AddressMap } from "./AddressMap.js";
 /**
@@ -10,6 +11,10 @@ export declare class AssetsMap extends AddressMap<bigint> {
      * @param name - Optional label used in error messages when a lookup fails.
      */
     constructor(entries?: Array<[string, bigint] | Asset>, name?: string);
+    /**
+     * Looks up a token balance, treating a missing key as `0n`.
+     */
+    getOrZero(address: string): bigint;
     /**
      * Adds `amount` to the token balance, treating a missing key as `0n`.
      */
@@ -18,10 +23,22 @@ export declare class AssetsMap extends AddressMap<bigint> {
      * Subtracts `amount` from the token balance, treating a missing key as `0n`.
      */
     dec(address: string, amount: bigint): void;
+    /**
+     * Per-token difference `this - before`, non-zero entries only.
+     *
+     * Assumes this map's keys are a superset of `before`'s keys; tokens present
+     * only in `before` are not reported.
+     */
+    difference(before: AssetsMap): AssetsMap;
+    /**
+     * Sums `fn` over all entries.
+     */
+    sum(fn: (token: Address, balance: bigint) => bigint): bigint;
     /**
      * Converts the map to an array of {@link Asset} objects.
-     * @param filterDust - If true, filters out assets with a balance less than 1.
+     * @param minBalance - If provided, keeps only entries with a balance
+     * strictly greater than this threshold (e.g. `1n` to filter out dust).
      */
-    toAssets(filterDust?: boolean): Asset[];
+    toAssets(minBalance?: bigint): Asset[];
     clone(): AssetsMap;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "14.12.0-next.10",
+  "version": "14.12.0-next.12",
   "description": "Gearbox SDK",
   "license": "MIT",
   "repository": {