@morpho-org/bundler-sdk-viem 3.0.0-next.9 → 3.0.1

package/lib/actions.js

@@ -1,27 +1,32 @@
-import { encodeFunctionData, erc20Abi, maxUint256, verifyTypedData, zeroAddress, } from "viem";
-import { ChainId, DEFAULT_SLIPPAGE_TOLERANCE, MathLib, NATIVE_ADDRESS, convexWrapperTokens, erc20WrapperTokens, getChainAddresses, getUnwrappedToken, } from "@morpho-org/blue-sdk";
-import { Time, getValue } from "@morpho-org/morpho-ts";
-import { getCurrent, simulateOperation, } from "@morpho-org/simulation-sdk";
-import { blueAbi, getAuthorizationTypedData, getDaiPermitTypedData, getPermit2PermitTypedData, getPermitTypedData, } from "@morpho-org/blue-sdk-viem";
-import { signTypedData } from "viem/actions";
-import { ActionBundle, ActionBundleRequirements } from "./ActionBundle.js";
-export const APPROVE_ONLY_ONCE_TOKENS = {
-    [ChainId.EthMainnet]: [
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encodeOperation = exports.MAX_TOKEN_APPROVALS = exports.APPROVE_ONLY_ONCE_TOKENS = void 0;
+exports.encodeBundle = encodeBundle;
+const viem_1 = require("viem");
+const blue_sdk_1 = require("@morpho-org/blue-sdk");
+const morpho_ts_1 = require("@morpho-org/morpho-ts");
+const simulation_sdk_1 = require("@morpho-org/simulation-sdk");
+const blue_sdk_viem_1 = require("@morpho-org/blue-sdk-viem");
+const actions_1 = require("viem/actions");
+const ActionBundle_js_1 = require("./ActionBundle.js");
+const errors_js_1 = require("./errors.js");
+exports.APPROVE_ONLY_ONCE_TOKENS = {
+    [blue_sdk_1.ChainId.EthMainnet]: [
         "0xdAC17F958D2ee523a2206206994597C13D831ec7", // USDT
         "0xD533a949740bb3306d119CC777fa900bA034cd52", // CRV
     ],
 };
-export const MAX_TOKEN_APPROVALS = {
-    [ChainId.EthMainnet]: {
-        "0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984": MathLib.maxUint(96), // UNI --> see https://github.com/Uniswap/governance/blob/eabd8c71ad01f61fb54ed6945162021ee419998e/contracts/Uni.sol#L154
+exports.MAX_TOKEN_APPROVALS = {
+    [blue_sdk_1.ChainId.EthMainnet]: {
+        "0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984": blue_sdk_1.MathLib.maxUint(96), // UNI --> see https://github.com/Uniswap/governance/blob/eabd8c71ad01f61fb54ed6945162021ee419998e/contracts/Uni.sol#L154
     },
 };
 const encodeErc20Approval = (token, sender, spender, amount, data) => {
     const { chainId } = data;
-    const { morpho, bundler3: { generalAdapter1 }, permit2, } = getChainAddresses(chainId);
-    amount = MathLib.min(amount, MAX_TOKEN_APPROVALS[chainId]?.[token] ?? maxUint256);
+    const { morpho, bundler3: { generalAdapter1 }, permit2, } = (0, blue_sdk_1.getChainAddresses)(chainId);
+    amount = blue_sdk_1.MathLib.min(amount, exports.MAX_TOKEN_APPROVALS[chainId]?.[token] ?? viem_1.maxUint256);
     const txRequirements = [];
-    if (APPROVE_ONLY_ONCE_TOKENS[chainId]?.includes(token)) {
+    if (exports.APPROVE_ONLY_ONCE_TOKENS[chainId]?.includes(token)) {
         const contract = spender === morpho
             ? "morpho"
             : spender === generalAdapter1
@@ -40,8 +45,8 @@ const encodeErc20Approval = (token, sender, spender, amount, data) => {
                 args: [token, spender, 0n],
                 tx: {
                     to: token,
-                    data: encodeFunctionData({
-                        abi: erc20Abi,
+                    data: (0, viem_1.encodeFunctionData)({
+                        abi: viem_1.erc20Abi,
                         functionName: "approve",
                         args: [spender, 0n],
                     }),
@@ -53,8 +58,8 @@ const encodeErc20Approval = (token, sender, spender, amount, data) => {
         args: [token, spender, amount],
         tx: {
             to: token,
-            data: encodeFunctionData({
-                abi: erc20Abi,
+            data: (0, viem_1.encodeFunctionData)({
+                abi: viem_1.erc20Abi,
                 functionName: "approve",
                 args: [spender, amount],
             }),
@@ -62,28 +67,28 @@ const encodeErc20Approval = (token, sender, spender, amount, data) => {
     });
     return txRequirements;
 };
-export const encodeOperation = (operation, dataBefore, supportsSignature = true, index = 0) => {
+const encodeOperation = (operation, dataBefore, supportsSignature = true, index = 0) => {
     const { chainId } = dataBefore;
-    const deadline = Time.timestamp() + Time.s.from.h(24n);
-    const { morpho, bundler3: { bundler3, generalAdapter1 }, permit2, wNative, dai, wstEth, stEth, } = getChainAddresses(chainId);
+    const deadline = morpho_ts_1.Time.timestamp() + morpho_ts_1.Time.s.from.h(24n);
+    const { morpho, bundler3: { bundler3, generalAdapter1 }, permit2, wNative, dai, wstEth, stEth, } = (0, blue_sdk_1.getChainAddresses)(chainId);
     const actions = [];
-    const requirements = new ActionBundleRequirements();
+    const requirements = new ActionBundle_js_1.ActionBundleRequirements();
     let callbackBundle;
-    const callback = getValue(operation.args, "callback");
+    const callback = (0, morpho_ts_1.getValue)(operation.args, "callback");
     const simulatedOperation = {
         ...operation,
         args: {
             ...operation.args,
             ...(callback && {
                 callback: (dataBefore) => {
-                    callbackBundle = encodeBundle(callback, getCurrent(dataBefore), supportsSignature);
+                    callbackBundle = encodeBundle(callback, (0, simulation_sdk_1.getCurrent)(dataBefore), supportsSignature);
                     return callback;
                 },
             }),
         },
     };
     // Operations with callbacks are encoded recursively as a side-effect of the simulation, within the callback itself.
-    const dataAfter = simulateOperation(simulatedOperation, dataBefore, index);
+    const dataAfter = (0, simulation_sdk_1.simulateOperation)(simulatedOperation, dataBefore, index);
     if (callbackBundle) {
         requirements.txs.push(...callbackBundle.requirements.txs);
         requirements.signatures.push(...callbackBundle.requirements.signatures);
@@ -92,6 +97,9 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
     switch (operation.type) {
         case "Blue_SetAuthorization": {
             const { owner, isAuthorized, authorized } = operation.args;
+            // Never authorize bundler3 otherwise the signature can be used independently.
+            if (authorized === bundler3)
+                throw new errors_js_1.BundlerErrors.UnexpectedSignature(authorized);
             if (supportsSignature) {
                 const ownerData = dataBefore.getUser(owner);
                 const authorization = {
@@ -103,7 +111,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 };
                 const action = {
                     type: "morphoSetAuthorizationWithSig",
-                    args: [authorization, null],
+                    args: [authorization, null, operation.skipRevert],
                 };
                 actions.push(action);
                 requirements.signatures.push({
@@ -112,12 +120,12 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                         let signature = action.args[1];
                         if (signature != null)
                             return signature;
-                        const typedData = getAuthorizationTypedData(authorization, chainId);
-                        signature = await signTypedData(client, {
+                        const typedData = (0, blue_sdk_viem_1.getAuthorizationTypedData)(authorization, chainId);
+                        signature = await (0, actions_1.signTypedData)(client, {
                             ...typedData,
                             account,
                         });
-                        await verifyTypedData({
+                        await (0, viem_1.verifyTypedData)({
                             ...typedData,
                             address: sender, // Verify against the authorization's owner.
                             signature,
@@ -133,8 +141,8 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 args: [authorized, isAuthorized],
                 tx: {
                     to: morpho,
-                    data: encodeFunctionData({
-                        abi: blueAbi,
+                    data: (0, viem_1.encodeFunctionData)({
+                        abi: blue_sdk_viem_1.blueAbi,
                         functionName: "setAuthorization",
                         args: [authorized, isAuthorized],
                     }),
@@ -144,7 +152,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "Erc20_Approve": {
             // Native token cannot be approved.
-            if (address === NATIVE_ADDRESS)
+            if (address === blue_sdk_1.NATIVE_ADDRESS)
                 break;
             const { amount, spender } = operation.args;
             // Signatures are not supported, skip Permit2 approval.
@@ -155,18 +163,36 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "Erc20_Permit": {
             // Native token cannot be permitted.
-            if (address === NATIVE_ADDRESS)
+            if (address === blue_sdk_1.NATIVE_ADDRESS)
                 break;
             const { amount, spender, nonce } = operation.args;
+            // Never permit any other address than the GeneralAdapter1 otherwise
+            // the signature can be used independently.
+            if (spender !== generalAdapter1)
+                throw new errors_js_1.BundlerErrors.UnexpectedSignature(spender);
             if (supportsSignature) {
                 const action = address === dai
                     ? {
                         type: "permitDai",
-                        args: [sender, nonce, deadline, true, null, spender],
+                        args: [
+                            sender,
+                            nonce,
+                            deadline,
+                            true,
+                            null,
+                            operation.skipRevert,
+                        ],
                     }
                     : {
                         type: "permit",
-                        args: [sender, address, amount, deadline, null, spender],
+                        args: [
+                            sender,
+                            address,
+                            amount,
+                            deadline,
+                            null,
+                            operation.skipRevert,
+                        ],
                     };
                 actions.push(action);
                 const tokenData = dataBefore.getToken(address);
@@ -177,25 +203,25 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                         if (signature != null)
                             return signature; // action is already signed
                         if (address === dai) {
-                            const typedData = getDaiPermitTypedData({
+                            const typedData = (0, blue_sdk_viem_1.getDaiPermitTypedData)({
                                 owner: sender,
                                 spender,
                                 allowance: amount,
                                 nonce,
                                 deadline,
                             }, chainId);
-                            signature = await signTypedData(client, {
+                            signature = await (0, actions_1.signTypedData)(client, {
                                 ...typedData,
                                 account,
                             });
-                            await verifyTypedData({
+                            await (0, viem_1.verifyTypedData)({
                                 ...typedData,
                                 address: account.address,
                                 signature,
                             });
                         }
                         else {
-                            const typedData = getPermitTypedData({
+                            const typedData = (0, blue_sdk_viem_1.getPermitTypedData)({
                                 erc20: tokenData,
                                 owner: sender,
                                 spender,
@@ -203,11 +229,11 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                                 nonce,
                                 deadline,
                             }, chainId);
-                            signature = await signTypedData(client, {
+                            signature = await (0, actions_1.signTypedData)(client, {
                                 ...typedData,
                                 account,
                             });
-                            await verifyTypedData({
+                            await (0, viem_1.verifyTypedData)({
                                 ...typedData,
                                 address: sender, // Verify against the permit's owner.
                                 signature,
@@ -224,7 +250,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "Erc20_Permit2": {
             // Native token cannot be permitted.
-            if (address === NATIVE_ADDRESS)
+            if (address === blue_sdk_1.NATIVE_ADDRESS)
                 break;
             const { amount, expiration, nonce } = operation.args;
             if (supportsSignature) {
@@ -239,33 +265,35 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                                 nonce: Number(nonce),
                                 expiration: Number(expiration),
                             },
-                            spender: bundler3,
                             sigDeadline: deadline,
                         },
                         null,
+                        operation.skipRevert,
                     ],
                 };
                 actions.push(action);
                 requirements.signatures.push({
                     action,
                     async sign(client, account = client.account) {
-                        const { details, spender, sigDeadline } = action.args[1];
+                        const { details, sigDeadline } = action.args[1];
                         let signature = action.args[2];
                         if (signature != null)
                             return signature; // action is already signed
-                        const typedData = getPermit2PermitTypedData({
-                            spender,
+                        const typedData = (0, blue_sdk_viem_1.getPermit2PermitTypedData)({
+                            // Never permit any other address than the GeneralAdapter1 otherwise
+                            // the signature can be used independently.
+                            spender: generalAdapter1,
                             allowance: details.amount,
                             erc20: details.token,
                             nonce: details.nonce,
                             deadline: sigDeadline,
                             expiration: details.expiration,
                         }, chainId);
-                        signature = await signTypedData(client, {
+                        signature = await (0, actions_1.signTypedData)(client, {
                             ...typedData,
                             account,
                         });
-                        await verifyTypedData({
+                        await (0, viem_1.verifyTypedData)({
                             ...typedData,
                             address: sender, // Verify against the permit's owner.
                             signature,
@@ -281,10 +309,10 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "Erc20_Transfer": {
             const { amount, from, to } = operation.args;
-            if (address === NATIVE_ADDRESS) {
+            if (address === blue_sdk_1.NATIVE_ADDRESS) {
                 actions.push({
                     type: "nativeTransfer",
-                    args: [from, to, amount],
+                    args: [from, to, amount, operation.skipRevert],
                 });
                 break;
             }
@@ -292,29 +320,29 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             if (from === generalAdapter1) {
                 actions.push({
                     type: "erc20Transfer",
-                    args: [address, to, amount],
+                    args: [address, to, amount, generalAdapter1, operation.skipRevert],
                 });
                 break;
             }
             actions.push({
                 type: "erc20TransferFrom",
-                args: [address, amount, to],
+                args: [address, amount, to, operation.skipRevert],
             });
             break;
         }
         case "Erc20_Transfer2": {
-            const { amount, from, to } = operation.args;
+            const { amount, to } = operation.args;
             if (supportsSignature) {
                 actions.push({
                     type: "transferFrom2",
-                    args: [address, from, amount, to],
+                    args: [address, amount, to, operation.skipRevert],
                 });
                 break;
             }
             // Signatures are not supported, fallback to standard transfer.
             actions.push({
                 type: "erc20TransferFrom",
-                args: [address, amount, to],
+                args: [address, amount, to, operation.skipRevert],
             });
             break;
         }
@@ -324,37 +352,43 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 case wNative: {
                     actions.push({
                         type: "wrapNative",
-                        args: [amount],
+                        args: [amount, generalAdapter1, operation.skipRevert],
                     });
                     break;
                 }
                 case wstEth: {
                     actions.push({
                         type: "wrapStEth",
-                        args: [amount],
+                        args: [amount, generalAdapter1, operation.skipRevert],
                     });
                     break;
                 }
                 case stEth: {
                     actions.push({
                         type: "stakeEth",
-                        args: [amount, MathLib.MAX_UINT_256, zeroAddress],
+                        args: [
+                            amount,
+                            blue_sdk_1.MathLib.MAX_UINT_256,
+                            viem_1.zeroAddress,
+                            generalAdapter1,
+                            operation.skipRevert,
+                        ],
                     });
                     break;
                 }
                 default: {
-                    if (erc20WrapperTokens[chainId]?.has(address)) {
-                        const underlying = getUnwrappedToken(address, chainId);
+                    if (blue_sdk_1.erc20WrapperTokens[chainId]?.has(address)) {
+                        const underlying = (0, blue_sdk_1.getUnwrappedToken)(address, chainId);
                         if (underlying == null)
                             throw Error(`unknown wrapped token: ${address}`);
                         actions.push({
                             type: "erc20WrapperDepositFor",
-                            args: [address, underlying, amount],
+                            args: [address, underlying, amount, operation.skipRevert],
                         });
                         break;
                     }
                     // Convex token wrapping is executed onchain along with supplyCollateral, via depositFor.
-                    if (!convexWrapperTokens[chainId]?.has(address))
+                    if (!blue_sdk_1.convexWrapperTokens[chainId]?.has(address))
                         throw Error(`unexpected token wrap: ${address}`);
                 }
             }
@@ -366,32 +400,35 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 case wNative: {
                     actions.push({
                         type: "unwrapNative",
-                        args: [amount],
+                        args: [amount, generalAdapter1, operation.skipRevert],
                     });
                     break;
                 }
                 case wstEth: {
                     actions.push({
                         type: "unwrapStEth",
-                        args: [amount],
+                        args: [amount, generalAdapter1, operation.skipRevert],
                     });
                     break;
                 }
                 default: {
-                    if (!erc20WrapperTokens[chainId]?.has(address))
+                    if (!blue_sdk_1.erc20WrapperTokens[chainId]?.has(address))
                         throw Error(`unexpected token unwrap: ${address}`);
                     actions.push({
                         type: "erc20WrapperWithdrawTo",
-                        args: [address, receiver, amount],
+                        args: [address, receiver, amount, operation.skipRevert],
                     });
                 }
             }
             break;
         }
         case "Blue_Supply": {
-            const { id, assets = 0n, shares = 0n, onBehalf, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const market = dataBefore.getMarket(id);
-            const maxSharePrice = market.toSupplyAssets(MathLib.wToRay(MathLib.WAD + slippage));
+            const { id, assets = 0n, shares = 0n, onBehalf, slippage = blue_sdk_1.DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
+            // Accrue interest to calculate the expected share price.
+            const market = dataBefore
+                .getMarket(id)
+                .accrueInterest(dataBefore.block.timestamp);
+            const maxSharePrice = market.toSupplyAssets(blue_sdk_1.MathLib.wToRay(blue_sdk_1.MathLib.WAD + slippage));
             actions.push({
                 type: "morphoSupply",
                 args: [
@@ -401,34 +438,58 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                     maxSharePrice,
                     onBehalf,
                     callbackBundle?.actions ?? [],
+                    operation.skipRevert,
                 ],
             });
             break;
         }
         case "Blue_Withdraw": {
-            const { id, assets = 0n, shares = 0n, receiver, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const market = dataBefore.getMarket(id);
-            const minSharePrice = market.toSupplyAssets(MathLib.wToRay(MathLib.WAD - slippage));
+            const { id, assets = 0n, shares = 0n, receiver, slippage = blue_sdk_1.DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
+            // Accrue interest to calculate the expected share price.
+            const market = dataBefore
+                .getMarket(id)
+                .accrueInterest(dataBefore.block.timestamp);
+            const minSharePrice = market.toSupplyAssets(blue_sdk_1.MathLib.wToRay(blue_sdk_1.MathLib.WAD - slippage));
             actions.push({
                 type: "morphoWithdraw",
-                args: [market.params, assets, shares, minSharePrice, receiver],
+                args: [
+                    market.params,
+                    assets,
+                    shares,
+                    minSharePrice,
+                    receiver,
+                    operation.skipRevert,
+                ],
             });
             break;
         }
         case "Blue_Borrow": {
-            const { id, assets = 0n, shares = 0n, receiver, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const market = dataBefore.getMarket(id);
-            const minSharePrice = market.toBorrowAssets(MathLib.wToRay(MathLib.WAD - slippage));
+            const { id, assets = 0n, shares = 0n, receiver, slippage = blue_sdk_1.DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
+            // Accrue interest to calculate the expected share price.
+            const market = dataBefore
+                .getMarket(id)
+                .accrueInterest(dataBefore.block.timestamp);
+            const minSharePrice = market.toBorrowAssets(blue_sdk_1.MathLib.wToRay(blue_sdk_1.MathLib.WAD - slippage));
             actions.push({
                 type: "morphoBorrow",
-                args: [market.params, assets, shares, minSharePrice, receiver],
+                args: [
+                    market.params,
+                    assets,
+                    shares,
+                    minSharePrice,
+                    receiver,
+                    operation.skipRevert,
+                ],
             });
             break;
         }
         case "Blue_Repay": {
-            const { id, assets = 0n, shares = 0n, onBehalf, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const market = dataBefore.getMarket(id);
-            const maxSharePrice = market.toBorrowAssets(MathLib.wToRay(MathLib.WAD + slippage));
+            const { id, assets = 0n, shares = 0n, onBehalf, slippage = blue_sdk_1.DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
+            // Accrue interest to calculate the expected share price.
+            const market = dataBefore
+                .getMarket(id)
+                .accrueInterest(dataBefore.block.timestamp);
+            const maxSharePrice = market.toBorrowAssets(blue_sdk_1.MathLib.wToRay(blue_sdk_1.MathLib.WAD + slippage));
             actions.push({
                 type: "morphoRepay",
                 args: [
@@ -438,6 +499,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                     maxSharePrice,
                     onBehalf,
                     callbackBundle?.actions ?? [],
+                    operation.skipRevert,
                 ],
             });
             break;
@@ -445,19 +507,30 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         case "Blue_SupplyCollateral": {
             const { id, assets, onBehalf } = operation.args;
             const { params } = dataBefore.getMarket(id);
-            if (convexWrapperTokens[chainId]?.has(params.collateralToken)) {
-                const underlying = getUnwrappedToken(address, chainId);
+            if (blue_sdk_1.convexWrapperTokens[chainId]?.has(params.collateralToken)) {
+                const underlying = (0, blue_sdk_1.getUnwrappedToken)(address, chainId);
                 if (underlying == null)
                     throw Error(`unknown wrapped token: ${address}`);
                 actions.push({
                     type: "erc20WrapperDepositFor",
-                    args: [params.collateralToken, underlying, assets],
+                    args: [
+                        params.collateralToken,
+                        underlying,
+                        assets,
+                        operation.skipRevert,
+                    ],
                 });
                 break;
             }
             actions.push({
                 type: "morphoSupplyCollateral",
-                args: [params, assets, onBehalf, callbackBundle?.actions ?? []],
+                args: [
+                    params,
+                    assets,
+                    onBehalf,
+                    callbackBundle?.actions ?? [],
+                    operation.skipRevert,
+                ],
             });
             break;
         }
@@ -466,39 +539,59 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             const { params } = dataBefore.getMarket(id);
             actions.push({
                 type: "morphoWithdrawCollateral",
-                args: [params, assets, receiver],
+                args: [params, assets, receiver, operation.skipRevert],
             });
             break;
         }
         case "MetaMorpho_Deposit": {
-            const { assets = 0n, shares = 0n, owner, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const vault = dataBefore.getVault(address);
-            const maxSharePrice = vault.toAssets(MathLib.wToRay(MathLib.WAD + slippage));
+            const { assets = 0n, shares = 0n, owner, slippage = blue_sdk_1.DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
+            // Accrue interest to calculate the expected share price.
+            const vault = dataBefore
+                .getAccrualVault(address)
+                .accrueInterest(dataBefore.block.timestamp);
+            const maxSharePrice = vault.toAssets(blue_sdk_1.MathLib.wToRay(blue_sdk_1.MathLib.WAD + slippage));
             if (shares === 0n)
                 actions.push({
                     type: "erc4626Deposit",
-                    args: [address, assets, maxSharePrice, owner],
+                    args: [address, assets, maxSharePrice, owner, operation.skipRevert],
                 });
             else
                 actions.push({
                     type: "erc4626Mint",
-                    args: [address, shares, maxSharePrice, owner],
+                    args: [address, shares, maxSharePrice, owner, operation.skipRevert],
                 });
             break;
         }
         case "MetaMorpho_Withdraw": {
-            const { assets = 0n, shares = 0n, owner, receiver, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const vault = dataBefore.getVault(address);
-            const minSharePrice = vault.toAssets(MathLib.wToRay(MathLib.WAD - slippage));
+            const { assets = 0n, shares = 0n, owner, receiver, slippage = blue_sdk_1.DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
+            // Accrue interest to calculate the expected share price.
+            const vault = dataBefore
+                .getAccrualVault(address)
+                .accrueInterest(dataBefore.block.timestamp);
+            const minSharePrice = vault.toAssets(blue_sdk_1.MathLib.wToRay(blue_sdk_1.MathLib.WAD - slippage));
             if (assets > 0n)
                 actions.push({
                     type: "erc4626Withdraw",
-                    args: [address, assets, minSharePrice, receiver, owner],
+                    args: [
+                        address,
+                        assets,
+                        minSharePrice,
+                        receiver,
+                        owner,
+                        operation.skipRevert,
+                    ],
                 });
             else
                 actions.push({
                     type: "erc4626Redeem",
-                    args: [address, shares, minSharePrice, receiver, owner],
+                    args: [
+                        address,
+                        shares,
+                        minSharePrice,
+                        receiver,
+                        owner,
+                        operation.skipRevert,
+                    ],
                 });
             break;
         }
@@ -516,6 +609,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                         amount: assets,
                     })),
                     dataBefore.getMarket(supplyMarketId).params,
+                    operation.skipRevert,
                 ],
             });
             break;
@@ -527,10 +621,11 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         requirements,
     };
 };
-export function encodeBundle(operations, startData, supportsSignature = true) {
-    const bundle = new ActionBundle([startData]);
+exports.encodeOperation = encodeOperation;
+function encodeBundle(operations, startData, supportsSignature = true) {
+    const bundle = new ActionBundle_js_1.ActionBundle([startData]);
     for (let index = 0; index < operations.length; ++index) {
-        const { dataAfter, actions, requirements } = encodeOperation(operations[index], bundle.steps[index], supportsSignature, index);
+        const { dataAfter, actions, requirements } = (0, exports.encodeOperation)(operations[index], bundle.steps[index], supportsSignature, index);
         bundle.steps.push(dataAfter);
         bundle.actions.push(...actions);
         bundle.requirements.signatures.push(...requirements.signatures);

package/lib/bundle.js

@@ -1,11 +1,15 @@
-import { encodeBundle } from "./actions.js";
-import { finalizeBundle, populateBundle, } from "./operations.js";
-export const setupBundle = (inputOperations, startData, receiver, { supportsSignature, unwrapTokens, unwrapSlippage, ...options } = {}) => {
-    let { operations } = populateBundle(inputOperations, startData, options);
-    operations = finalizeBundle(operations, startData, receiver, unwrapTokens, unwrapSlippage);
-    const bundle = encodeBundle(operations, startData, supportsSignature);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupBundle = void 0;
+const actions_js_1 = require("./actions.js");
+const operations_js_1 = require("./operations.js");
+const setupBundle = (inputOperations, startData, receiver, { supportsSignature, unwrapTokens, unwrapSlippage, ...options } = {}) => {
+    let { operations } = (0, operations_js_1.populateBundle)(inputOperations, startData, options);
+    operations = (0, operations_js_1.finalizeBundle)(operations, startData, receiver, unwrapTokens, unwrapSlippage);
+    const bundle = (0, actions_js_1.encodeBundle)(operations, startData, supportsSignature);
     return {
         operations,
         bundle,
     };
 };
+exports.setupBundle = setupBundle;