@gearbox-protocol/sdk 14.12.0-next.14 → 14.12.0-next.16

package/dist/esm/preview/prerequisites/buildPoolPrerequisites.js

@@ -18,8 +18,7 @@ function buildPoolPrerequisites(tx, wallet) {
             new BalancePrerequisite({
               token: tx.tokenIn,
               owner: wallet,
-              required: tx.assets,
-              title: "Sufficient token balance"
+              required: tx.assets
             })
           ];
         }
@@ -27,27 +26,21 @@ function buildPoolPrerequisites(tx, wallet) {
           token: tx.tokenIn,
           owner: wallet,
           spender: tx.zapper,
-          required: tx.assets,
-          allowanceTitle: "Token approved to zapper",
-          balanceTitle: "Sufficient token balance"
+          required: tx.assets
         });
       }
       return allowanceAndBalance({
         token: tx.underlying,
         owner: wallet,
         spender: tx.pool,
-        required: tx.assets,
-        allowanceTitle: "Token approved to pool",
-        balanceTitle: "Sufficient token balance"
+        required: tx.assets
       });
     case "Mint":
       return allowanceAndBalance({
         token: tx.underlying,
         owner: wallet,
         spender: tx.pool,
-        required: tx.shares,
-        allowanceTitle: "Token approved to pool",
-        balanceTitle: "Sufficient token balance"
+        required: tx.shares
       });
     // Redeem and Withdraw both burn LP shares from `owner`; they only differ in
     // which side (shares vs assets) the caller specifies.
@@ -57,15 +50,13 @@ function buildPoolPrerequisites(tx, wallet) {
           new BalancePrerequisite({
             token: tx.tokenIn,
             owner: wallet,
-            required: tx.shares,
-            title: "Sufficient share token balance"
+            required: tx.shares
           }),
           new AllowancePrerequisite({
             token: tx.tokenIn,
             owner: wallet,
             spender: tx.zapper,
-            required: tx.shares,
-            title: "Share token approved to zapper"
+            required: tx.shares
           })
         ];
       }
@@ -79,8 +70,7 @@ function lpSharePrerequisites(pool, owner, required, wallet) {
     new BalancePrerequisite({
       token: pool,
       owner,
-      required,
-      title: "Sufficient LP token balance"
+      required
     })
   ];
   if (!isAddressEqual(owner, wallet)) {
@@ -89,8 +79,7 @@ function lpSharePrerequisites(pool, owner, required, wallet) {
         token: pool,
         owner,
         spender: wallet,
-        required,
-        title: "LP token approved to caller"
+        required
       })
     );
   }

package/dist/esm/preview/prerequisites/buildRWAPrerequisites.js

@@ -18,12 +18,14 @@ function buildRWAPrerequisites(multicall, creditManager, providedArgs, ctx) {
       continue;
     }
     prereqs.push(
-      new RWAOpenRequirementsPrerequisite({
-        token,
-        creditManager,
-        factory: rwaFactory.address,
+      new RWAOpenRequirementsPrerequisite(
+        {
+          token,
+          creditManager,
+          factory: rwaFactory.address
+        },
         providedArgs
-      })
+      )
     );
   }
   return prereqs;

package/dist/esm/preview/prerequisites/checkPrerequisites.js

@@ -1,20 +1,18 @@
-import {
-  parseOperationCalldata
-} from "../parse/parseOperationCalldata.js";
+import { parseOperationCalldata } from "../parse/index.js";
 import { buildCollateralPrerequisites } from "./buildCollateralPrerequisites.js";
 import { buildPartialLiquidationPrerequisites } from "./buildPartialLiquidationPrerequisites.js";
 import { buildPoolPrerequisites } from "./buildPoolPrerequisites.js";
 import { buildRWAPrerequisites } from "./buildRWAPrerequisites.js";
-async function checkPrerequisites(input) {
-  const { sdk, sender: wallet, blockNumber } = input;
+async function checkPrerequisites(input, options) {
+  const { sdk, sender: wallet } = input;
   const tx = parseOperationCalldata(input);
-  const ctx = { sdk, wallet, blockNumber };
+  const ctx = {
+    sdk,
+    wallet,
+    blockNumber: options?.blockNumber
+  };
   const prereqs = await buildPrerequisites(tx, ctx);
-  return Promise.all(
-    // Each prereq pairs its own kind with its detail, so the widened
-    // `verify` return is safe to narrow back to the discriminated union.
-    prereqs.map((p) => p.verify(ctx))
-  );
+  return Promise.all(prereqs.map((p) => p.verify(ctx)));
 }
 async function buildPrerequisites(tx, ctx) {
   const { wallet } = ctx;

package/dist/esm/preview/prerequisites/helpers.js

@@ -1,21 +1,12 @@
-import { AllowancePrerequisite } from "./AllowancePrerequisite.js";
+import {
+  AllowancePrerequisite
+} from "./AllowancePrerequisite.js";
 import { BalancePrerequisite } from "./BalancePrerequisite.js";
 function allowanceAndBalance(props) {
   const { token, owner, spender, required } = props;
   return [
-    new AllowancePrerequisite({
-      token,
-      owner,
-      spender,
-      required,
-      title: props.allowanceTitle
-    }),
-    new BalancePrerequisite({
-      token,
-      owner,
-      required,
-      title: props.balanceTitle
-    })
+    new AllowancePrerequisite({ token, owner, spender, required }),
+    new BalancePrerequisite({ token, owner, required })
   ];
 }
 export {

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

@@ -1,9 +1,13 @@
-import { AbstractAdapterContract } from "../../plugins/adapters/index.js";
+import {
+  AbstractAdapterContract,
+  ERC4626AdapterContract
+} from "../../plugins/adapters/index.js";
 import {
   AssetsMap,
   MAX_UINT256,
   MIN_INT96
 } from "../../sdk/index.js";
+import { applyRWAWrapUnwrap } from "./applyRWAWrapUnwrap.js";
 function makeInnerOperationsState() {
   return {
     balances: new AssetsMap(),
@@ -67,17 +71,20 @@ function applyInnerOperations(sdk, multicall, state) {
         }
         inBracket = false;
         break;
-      case "Execute":
+      case "Execute": {
+        const adapter = sdk.getContract(op.adapter);
         if (inBracket) {
-          const adapter = sdk.getContract(op.adapter);
           if (!(adapter instanceof AbstractAdapterContract)) {
             throw new Error(
               `call to ${op.adapter} between storeExpectedBalances and compareBalances is not an adapter call`
             );
           }
           adapter.previewBalanceChanges(state.balances, op.calldata);
+        } else if (isRWAShare(sdk, adapter)) {
+          applyRWAWrapUnwrap(adapter, op.calldata, state.balances);
         }
         break;
+      }
     }
   }
   if (inBracket) {
@@ -86,6 +93,13 @@ function applyInnerOperations(sdk, multicall, state) {
     );
   }
 }
+function isRWAShare(sdk, adapter) {
+  if (adapter instanceof ERC4626AdapterContract) {
+    const meta = sdk.tokensMeta.get(adapter.share);
+    return !!meta && sdk.tokensMeta.isRWAUnderlying(meta);
+  }
+  return false;
+}
 function applyQuotaChanges(initialQuotas, changes) {
   const final = initialQuotas.clone();
   for (const { token, balance: change } of changes) {

package/dist/esm/preview/preview/applyRWAWrapUnwrap.js

@@ -0,0 +1,50 @@
+import { decodeFunctionData } from "viem";
+import { ierc4626AdapterAbi } from "../../abi/ierc4626Adapter.js";
+function resolveWrapUnwrap(adapter, calldata, balances) {
+  const decoded = decodeFunctionData({
+    abi: ierc4626AdapterAbi,
+    data: calldata
+  });
+  const { asset, share } = adapter;
+  switch (decoded.functionName) {
+    case "deposit":
+      return { tokenIn: asset, tokenOut: share, amountIn: decoded.args[0] };
+    case "depositDiff": {
+      const [leftoverAmount] = decoded.args;
+      const running = balances.getOrZero(asset);
+      return {
+        tokenIn: asset,
+        tokenOut: share,
+        amountIn: running > leftoverAmount ? running - leftoverAmount : 0n
+      };
+    }
+    case "redeem":
+      return { tokenIn: share, tokenOut: asset, amountIn: decoded.args[0] };
+    case "redeemDiff": {
+      const [leftoverAmount] = decoded.args;
+      const running = balances.getOrZero(share);
+      return {
+        tokenIn: share,
+        tokenOut: asset,
+        amountIn: running > leftoverAmount ? running - leftoverAmount : 0n
+      };
+    }
+    default:
+      return void 0;
+  }
+}
+function applyRWAWrapUnwrap(adapter, calldata, balances) {
+  const resolved = resolveWrapUnwrap(adapter, calldata, balances);
+  if (!resolved) {
+    return;
+  }
+  const { tokenIn, tokenOut, amountIn } = resolved;
+  if (amountIn === 0n) {
+    return;
+  }
+  balances.dec(tokenIn, amountIn);
+  balances.inc(tokenOut, amountIn);
+}
+export {
+  applyRWAWrapUnwrap
+};

package/dist/esm/preview/preview/index.js

@@ -2,6 +2,6 @@ export * from "./applyInnerOperations.js";
 export * from "./detectCloseOrRepay.js";
 export * from "./errors.js";
 export * from "./previewAdjustCreditAccount.js";
-export * from "./previewCloseOrRepay.js";
+export * from "./previewCloseOrRepayCreditAccount.js";
 export * from "./previewOperation.js";
 export * from "./types.js";

package/dist/esm/preview/preview/{previewCloseOrRepay.js → previewCloseOrRepayCreditAccount.js}

@@ -8,7 +8,7 @@ import {
 } from "./applyInnerOperations.js";
 import { classifyCloseOrRepay } from "./detectCloseOrRepay.js";
 import { unwrapNativeCollateral } from "./unwrapNativeCollateral.js";
-async function previewCloseOrRepay(input, operation, permanent, options) {
+async function previewCloseOrRepayCreditAccount(input, operation, permanent, options) {
   const { sdk } = input;
   const market = sdk.marketRegister.findByCreditManager(
     operation.creditManager
@@ -72,5 +72,5 @@ async function replayMulticall(sdk, operation, options) {
   return { ca, state };
 }
 export {
-  previewCloseOrRepay
+  previewCloseOrRepayCreditAccount
 };

package/dist/esm/preview/preview/previewOperation.js

@@ -2,7 +2,7 @@ import { isPoolOperation, parseOperationCalldata } from "../parse/index.js";
 import { isCloseOrRepay } from "./detectCloseOrRepay.js";
 import { UnsupportedOperationError } from "./errors.js";
 import { previewAdjustCreditAccount } from "./previewAdjustCreditAccount.js";
-import { previewCloseOrRepay } from "./previewCloseOrRepay.js";
+import { previewCloseOrRepayCreditAccount } from "./previewCloseOrRepayCreditAccount.js";
 import { previewOpenCreditAccount } from "./previewOpenCreditAccount.js";
 import { previewPoolOperation } from "./previewPoolOperation.js";
 async function previewOperation(input, options) {
@@ -14,11 +14,11 @@ async function previewOperation(input, options) {
     return previewOpenCreditAccount(input, operation);
   }
   if (operation.operation === "CloseCreditAccount") {
-    return previewCloseOrRepay(input, operation, true, options);
+    return previewCloseOrRepayCreditAccount(input, operation, true, options);
   }
   if (operation.operation === "MultiCall" || operation.operation === "BotMulticall" || operation.operation === "RWAMulticall") {
     if (isCloseOrRepay(operation.multicall)) {
-      return previewCloseOrRepay(input, operation, false, options);
+      return previewCloseOrRepayCreditAccount(input, operation, false, options);
     }
     return previewAdjustCreditAccount(input, operation, options);
   }

package/dist/esm/preview/preview/previewPoolOperation.js

@@ -1,6 +1,4 @@
-import {
-  simulatePoolOperation
-} from "../simulate/index.js";
+import { simulatePoolOperation } from "../simulate/index.js";
 async function previewPoolOperation(input, operation, options) {
   const { sdk, to, calldata } = input;
   const { tokenIn, tokenOut } = operation;
@@ -8,45 +6,12 @@ async function previewPoolOperation(input, operation, options) {
     { sdk, operation, to, calldata },
     options
   );
-  if (sim.status === "success") {
-    return {
-      operation: operation.operation,
-      pool: operation.pool,
-      tokenIn: { token: tokenIn, balance: sim.amountIn },
-      tokenOut: { token: tokenOut, balance: sim.amountOut }
-    };
-  }
-  const { error } = sim;
-  switch (operation.operation) {
-    case "Deposit":
-      return {
-        operation: "Deposit",
-        pool: operation.pool,
-        tokenIn: { token: tokenIn, balance: operation.assets },
-        tokenOut: { token: tokenOut, error }
-      };
-    case "Mint":
-      return {
-        operation: "Mint",
-        pool: operation.pool,
-        tokenIn: { token: tokenIn, error },
-        tokenOut: { token: tokenOut, balance: operation.shares }
-      };
-    case "Withdraw":
-      return {
-        operation: "Withdraw",
-        pool: operation.pool,
-        tokenIn: { token: tokenIn, error },
-        tokenOut: { token: tokenOut, balance: operation.assets }
-      };
-    case "Redeem":
-      return {
-        operation: "Redeem",
-        pool: operation.pool,
-        tokenIn: { token: tokenIn, balance: operation.shares },
-        tokenOut: { token: tokenOut, error }
-      };
-  }
+  return {
+    operation: operation.operation,
+    pool: operation.pool,
+    tokenIn: { token: tokenIn, balance: sim.amountIn },
+    tokenOut: { token: tokenOut, balance: sim.amountOut }
+  };
 }
 export {
   previewPoolOperation

package/dist/esm/preview/simulate/simulateOperation.js

@@ -1,7 +1,4 @@
-import {
-  isPoolOperation,
-  isRWAOperation
-} from "../parse/index.js";
+import { isPoolOperation, isRWAOperation } from "../parse/index.js";
 import { simulateFacadeOperation } from "./simulateFacadeOperation.js";
 import { simulatePoolOperation } from "./simulatePoolOperation.js";
 import { simulateRWAOperation } from "./simulateRWAOperation.js";

package/dist/esm/preview/simulate/simulatePoolOperation.js

@@ -52,14 +52,11 @@ async function simulatePoolOperation(input, options = {}) {
       blockNumber,
       ...previewContract(operation)
     });
-    return {
-      status: "success",
-      ...amountsInOut(operation, previewAmount)
-    };
+    return amountsInOut(operation, previewAmount);
   } catch (cause) {
     const error = asPreviewSimulationError(cause, "multicall");
     logger?.error(error, "pool operation simulation failed");
-    return { status: "failure", error };
+    throw error;
   }
 }
 export {

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

@@ -1,4 +1,3 @@
-import { ierc4626AdapterAbi } from "@gearbox-protocol/integrations-v3";
 import { encodeFunctionData, getContract } from "viem";
 import {
   iBotListV310Abi,
@@ -10,6 +9,7 @@ import { rewardsCompressorAbi } from "../../abi/compressors/rewardsCompressor.js
 import { iWithdrawalCompressorV310Abi } from "../../abi/IWithdrawalCompressorV310.js";
 import { iWithdrawalCompressorV311Abi } from "../../abi/IWithdrawalCompressorV311.js";
 import { iBaseRewardPoolAbi } from "../../abi/iBaseRewardPool.js";
+import { ierc4626AdapterAbi } from "../../abi/ierc4626Adapter.js";
 import { iRWAFactoryAbi } from "../../abi/rwa/iRWAFactory.js";
 import { SDKConstruct } from "../base/index.js";
 import { chains } from "../chain/chains.js";
@@ -1626,6 +1626,7 @@ class CreditAccountsServiceV310 extends SDKConstruct {
           break;
         case "swap":
         case "wrapRwaCollateral":
+        case "unwrapRwaCollateral":
           calls.push(...op.calls);
           break;
         case "changeQuota": {
@@ -1651,118 +1652,6 @@ class CreditAccountsServiceV310 extends SDKConstruct {
     }
     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.#prepareDecreaseDebt({
-              creditFacade,
-              debt: creditAccount.debt
-            })
-          );
-        }
-        const hasAssets = creditAccount.assets.some(
-          (asset) => asset.balance > 0n
-        );
-        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: {
-          const _exhaustive = op;
-          throw new Error(
-            `assembleCaUpdateCalls: unsupported operation ${_exhaustive}`
-          );
-        }
-      }
-    }
-    flushEncodable();
-    if (routerGroupsConsumed !== routerCallGroups.length) {
-      throw new Error(
-        `assembleCaUpdateCalls: router call group mismatch (consumed ${routerGroupsConsumed}, got ${routerCallGroups.length})`
-      );
-    }
-    return calls;
-  }
   /**
    * {@inheritDoc ICreditAccountsService.executeCaUpdate}
    */