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

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

@@ -1594,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":
@@ -1634,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) {
@@ -1659,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: {
@@ -1706,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/esm/sdk/accounts/CreditAccountsServiceV310.js

@@ -1589,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":
@@ -1629,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) {
@@ -1654,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: {
@@ -1701,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/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, 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";
+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.
  **/
@@ -218,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

@@ -713,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";
@@ -739,6 +743,9 @@ export type CreditAccountUpdateOperation = {
 };
 /**
  * Input for {@link ICreditAccountsService.assembleCaUpdateCalls}.
+ *
+ * @deprecated Prefer {@link AssembleCaOperationsProps} /
+ * {@link ICreditAccountsService.assembleCaOperations}.
  */
 export type AssembleCaUpdateCallsProps = {
     operations: Array<CreditAccountUpdateOperation>;
@@ -755,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;
     /**
@@ -989,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>;
     /**

package/package.json

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