@morpho-org/bundler-sdk-viem 3.3.0-next.0 → 3.3.1

package/lib/actions.js

@@ -210,7 +210,11 @@ const encodeOperation = (operation, dataBefore, supportsSignature = true, index
                 break;
             }
             // Simple permit is not supported, fallback to standard approval.
-            requirements.txs.push(...encodeErc20Approval(operation.address, spender, amount, dataBefore));
+            // Ignore zero permits used to reset allowances at the end of a bundle
+            // when the signer does not support signatures, as they cannot be bundled.
+            // Currently only used by DAI-specific permit which does not support specific amounts.
+            if (amount > 0n)
+                requirements.txs.push(...encodeErc20Approval(operation.address, spender, amount, dataBefore));
             break;
         }
         case "Erc20_Permit2": {
@@ -749,76 +753,6 @@ const encodeOperation = (operation, dataBefore, supportsSignature = true, index
             });
             break;
         }
-        case "VaultV2_Deposit": {
-            const { assets = 0n, shares = 0n, onBehalf, slippage = blue_sdk_1.DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            // Accrue interest to calculate the expected share price.
-            const { vault } = dataBefore
-                .getAccrualVaultV2(operation.address)
-                .accrueInterest(dataBefore.block.timestamp);
-            if (shares === 0n) {
-                const maxSharePrice = blue_sdk_1.MathLib.mulDivUp(assets, blue_sdk_1.MathLib.wToRay(blue_sdk_1.MathLib.WAD + slippage), vault.toShares(assets));
-                actions.push({
-                    type: "erc4626Deposit",
-                    args: [
-                        operation.address,
-                        assets,
-                        maxSharePrice,
-                        onBehalf,
-                        operation.skipRevert,
-                    ],
-                });
-            }
-            else {
-                const maxSharePrice = blue_sdk_1.MathLib.mulDivUp(vault.toAssets(shares), blue_sdk_1.MathLib.wToRay(blue_sdk_1.MathLib.WAD + slippage), shares);
-                actions.push({
-                    type: "erc4626Mint",
-                    args: [
-                        operation.address,
-                        shares,
-                        maxSharePrice,
-                        onBehalf,
-                        operation.skipRevert,
-                    ],
-                });
-            }
-            break;
-        }
-        case "VaultV2_Withdraw": {
-            const { assets = 0n, shares = 0n, onBehalf, receiver, slippage = blue_sdk_1.DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            // Accrue interest to calculate the expected share price.
-            const { vault } = dataBefore
-                .getAccrualVaultV2(operation.address)
-                .accrueInterest(dataBefore.block.timestamp);
-            if (shares === 0n) {
-                const minSharePrice = blue_sdk_1.MathLib.mulDivDown(assets, blue_sdk_1.MathLib.wToRay(blue_sdk_1.MathLib.WAD - slippage), vault.toShares(assets));
-                actions.push({
-                    type: "erc4626Withdraw",
-                    args: [
-                        operation.address,
-                        assets,
-                        minSharePrice,
-                        receiver,
-                        onBehalf,
-                        operation.skipRevert,
-                    ],
-                });
-            }
-            else {
-                const minSharePrice = blue_sdk_1.MathLib.mulDivDown(vault.toAssets(shares), blue_sdk_1.MathLib.wToRay(blue_sdk_1.MathLib.WAD - slippage), shares);
-                actions.push({
-                    type: "erc4626Redeem",
-                    args: [
-                        operation.address,
-                        shares,
-                        minSharePrice,
-                        receiver,
-                        onBehalf,
-                        operation.skipRevert,
-                    ],
-                });
-            }
-            break;
-        }
     }
     return {
         dataAfter,

package/lib/errors.d.ts

@@ -1,4 +1,4 @@
-import type { SimulationResult } from "@morpho-org/simulation-sdk";
+import type { OperationType, SimulationResult } from "@morpho-org/simulation-sdk";
 import type { Address } from "viem";
 import type { ActionType, InputBundlerOperation } from "./types/index.js";
 export declare namespace BundlerErrors {
@@ -21,4 +21,10 @@ export declare namespace BundlerErrors {
     class UnexpectedSignature extends Error {
         constructor(spender: Address);
     }
+    class MissingSkimHandler extends Error {
+        constructor(type: OperationType);
+    }
+    class UnskimedToken extends Error {
+        constructor(token: Address);
+    }
 }

package/lib/errors.js

@@ -42,4 +42,16 @@ var BundlerErrors;
         }
     }
     BundlerErrors.UnexpectedSignature = UnexpectedSignature;
+    class MissingSkimHandler extends Error {
+        constructor(type) {
+            super(`missing skim handler for operation "${type}"`);
+        }
+    }
+    BundlerErrors.MissingSkimHandler = MissingSkimHandler;
+    class UnskimedToken extends Error {
+        constructor(token) {
+            super(`missing final skim for token "${token}"`);
+        }
+    }
+    BundlerErrors.UnskimedToken = UnskimedToken;
 })(BundlerErrors || (exports.BundlerErrors = BundlerErrors = {}));

package/lib/operations.d.ts

@@ -42,7 +42,7 @@ export declare const populateInputTransfer: ({ address, args: { amount, from } }
 export declare const populateSubBundle: (inputOperation: InputBundlerOperation, data: MaybeDraft<SimulationState>, options?: BundlingOptions) => BundlerOperation[];
 /**
  * Merges unnecessary duplicate `Erc20_Approve`, `Erc20_Transfer` and `Erc20_Wrap`.
- * Also redirects `Blue_Borrow|Withdraw|WithdrawCollateral` & `MetaMorpho_Withdraw` & `VaultV2_Withdraw` operations from the bundler to the receiver,
+ * Also redirects `Blue_Borrow|Withdraw|WithdrawCollateral` & `MetaMorpho_Withdraw` operations from the bundler to the receiver,
  * as long as the tokens received (possibly ERC4626 shares) are not used afterwards in the bundle.
  * For all the other remaining tokens, appends `Erc20_Transfer` operations to the bundle, from the bundler to the receiver.
  * @param operations The bundle to optimize.

package/lib/operations.js

@@ -45,7 +45,6 @@ const populateInputTransfer = ({ address, args: { amount, from } }, data, { hasS
     // Try using simple permit.
     const useSimplePermit = erc2612Nonce != null &&
         (data.tryGetVault(address) != null || // MetaMorpho vaults implement EIP-2612.
-            data.tryGetVaultV2(address) != null || // Vaults V2 implement EIP-2612.
             hasSimplePermit);
     const useSimpleTransfer = permit2 == null ||
         // Token is permissioned and Permit2 may not be authorized so Permit2 cannot be used.
@@ -181,18 +180,10 @@ const populateSubBundle = (inputOperation, data, options = {}) => {
                     if (isErc20Wrapper)
                         break;
                 case "MetaMorpho_Deposit":
-                case "MetaMorpho_Withdraw": {
+                case "MetaMorpho_Withdraw":
                     // Only if sender is owner otherwise the owner would be lost.
                     if (draft.args.owner === sender)
                         draft.args.owner = generalAdapter1;
-                    break;
-                }
-                case "VaultV2_Deposit":
-                case "VaultV2_Withdraw": {
-                    // Only if sender is owner otherwise the owner would be lost.
-                    if (draft.args.onBehalf === sender)
-                        draft.args.onBehalf = generalAdapter1;
-                }
             }
             // Redirect operation targets.
             switch (draft.type) {
@@ -201,7 +192,6 @@ const populateSubBundle = (inputOperation, data, options = {}) => {
                 case "Blue_WithdrawCollateral":
                     draft.args.onBehalf = sender;
                 case "MetaMorpho_Withdraw":
-                case "VaultV2_Withdraw":
                 case "Paraswap_Buy":
                 case "Paraswap_Sell":
                 case "Blue_Paraswap_BuyDebt":
@@ -357,8 +347,6 @@ const populateSubBundle = (inputOperation, data, options = {}) => {
         ("shares" in mainOperation.args && mainOperation.args.shares === viem_1.maxUint256)) {
         if (mainOperation.type === "MetaMorpho_Withdraw")
             mainOperation.args.owner = generalAdapter1;
-        if (mainOperation.type === "VaultV2_Withdraw")
-            mainOperation.args.onBehalf = generalAdapter1;
         return allOperations;
     }
     const requirementOperations = getRequirementOperations?.(requiredTokenAmounts) ?? [];
@@ -383,7 +371,7 @@ const populateSubBundle = (inputOperation, data, options = {}) => {
 exports.populateSubBundle = populateSubBundle;
 /**
  * Merges unnecessary duplicate `Erc20_Approve`, `Erc20_Transfer` and `Erc20_Wrap`.
- * Also redirects `Blue_Borrow|Withdraw|WithdrawCollateral` & `MetaMorpho_Withdraw` & `VaultV2_Withdraw` operations from the bundler to the receiver,
+ * Also redirects `Blue_Borrow|Withdraw|WithdrawCollateral` & `MetaMorpho_Withdraw` operations from the bundler to the receiver,
  * as long as the tokens received (possibly ERC4626 shares) are not used afterwards in the bundle.
  * For all the other remaining tokens, appends `Erc20_Transfer` operations to the bundle, from the bundler to the receiver.
  * @param operations The bundle to optimize.
@@ -501,20 +489,9 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
     let steps = (0, exports.simulateBundlerOperations)(operations, startData);
     // Redirect MetaMorpho deposits.
     operations.forEach((operation, index) => {
-        switch (operation.type) {
-            case "MetaMorpho_Deposit": {
-                if (operation.args.owner !== generalAdapter1)
-                    return;
-                break;
-            }
-            case "VaultV2_Deposit": {
-                if (operation.args.onBehalf !== generalAdapter1)
-                    return;
-                break;
-            }
-            default:
-                return;
-        }
+        if (operation.type !== "MetaMorpho_Deposit" ||
+            operation.args.owner !== generalAdapter1)
+            return;
         const token = operation.address;
         // shares are not defined when depositing assets, so we rely on simulation steps.
         const shares = steps[index + 1].getHolding(generalAdapter1, token).balance -
@@ -524,12 +501,9 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
             .some((step) => step.getHolding(generalAdapter1, token).balance < shares))
             // If the bundler's balance is at least once lower than assets, the bundler does need these assets.
             return;
-        if (operation.type === "MetaMorpho_Deposit")
-            operation.args.owner = receiver;
-        if (operation.type === "VaultV2_Deposit")
-            operation.args.onBehalf = receiver;
+        operation.args.owner = receiver;
     });
-    // Redirect borrows, withdrawals, MetaMorpho withdrawals & Vault V2 withdrawals.
+    // Redirect borrows, withdrawals & MetaMorpho withdrawals.
     operations.forEach((operation, index) => {
         let token;
         switch (operation.type) {
@@ -543,9 +517,6 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
             case "MetaMorpho_Withdraw":
                 token = startData.getVault(operation.address).asset;
                 break;
-            case "VaultV2_Withdraw":
-                token = startData.getVaultV2(operation.address).asset;
-                break;
             default:
                 return;
         }
@@ -563,20 +534,9 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
     });
     // Simplify Erc20_Transfer(sender = bundler, to = bundler) + MetaMorpho_Withdraw(owner = bundler) = MetaMorpho_Withdraw(owner = from).
     operations.forEach((operation, index) => {
-        switch (operation.type) {
-            case "MetaMorpho_Withdraw": {
-                if (operation.args.owner !== generalAdapter1)
-                    return;
-                break;
-            }
-            case "VaultV2_Withdraw": {
-                if (operation.args.onBehalf !== generalAdapter1)
-                    return;
-                break;
-            }
-            default:
-                return;
-        }
+        if (operation.type !== "MetaMorpho_Withdraw" ||
+            operation.args.owner !== generalAdapter1)
+            return;
         // shares are not defined when using assets, so we rely on simulation steps.
         const shares = steps[index].getHolding(generalAdapter1, operation.address).balance -
             steps[index + 1].getHolding(generalAdapter1, operation.address).balance;
@@ -589,10 +549,7 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
             return;
         const inputTransfer = operations[inputTransferIndex];
         inputTransfer.args.amount -= shares;
-        if (operation.type === "MetaMorpho_Withdraw")
-            operation.args.owner = inputTransfer.args.from;
-        if (operation.type === "VaultV2_Withdraw")
-            operation.args.onBehalf = inputTransfer.args.from;
+        operation.args.owner = inputTransfer.args.from;
     });
     // Filter out useless input transfers.
     operations = operations.filter((operation, index) => {
@@ -657,29 +614,66 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
     }
     // Skim any token expected to be left on the bundler.
     const skims = [];
-    const startBundlerTokenData = steps[0].holdings[generalAdapter1] ?? {};
-    const uniqueSkimTokens = new Set((0, morpho_ts_1.entries)(endBundlerTokenData)
-        .filter(([token, holding]) => holding != null &&
-        holding.balance - (startBundlerTokenData[token]?.balance ?? 0n) > 5n)
-        .map(([address]) => address));
-    const pushCustomSkim = (operation) => {
+    const uniqueSkimTokens = new Set();
+    const pushSkim = (operation) => {
         // Paraswap does not guarantee that the amount effectively bought (resp. sold) corresponds to
         // the requested amount to buy (resp. sell), so we force skim the possible surplus of bought (resp. sold) token.
         switch (operation.type) {
+            case "Blue_Borrow":
+            case "Blue_Repay":
+            case "Blue_Supply":
+            case "Blue_Withdraw":
+                uniqueSkimTokens.add(startData.getMarket(operation.args.id).params.loanToken);
+                break;
+            case "Blue_WithdrawCollateral":
+            case "Blue_SupplyCollateral":
+                uniqueSkimTokens.add(startData.getMarket(operation.args.id).params.collateralToken);
+                break;
+            case "Blue_FlashLoan":
+                uniqueSkimTokens.add(operation.args.token);
+                break;
             case "Paraswap_Buy":
-            case "Paraswap_Sell":
                 uniqueSkimTokens.add(operation.address);
+                uniqueSkimTokens.add(operation.args.srcToken);
                 break;
             case "Blue_Paraswap_BuyDebt":
                 uniqueSkimTokens.add(startData.getMarket(operation.args.id).params.loanToken);
+                uniqueSkimTokens.add(operation.args.srcToken);
                 break;
-            default:
+            case "Paraswap_Sell":
+                uniqueSkimTokens.add(operation.address);
+                uniqueSkimTokens.add(operation.args.dstToken);
                 break;
+            case "Erc20_Transfer":
+            case "Erc20_Transfer2":
+                uniqueSkimTokens.add(operation.address);
+                break;
+            case "Blue_SetAuthorization":
+            case "Erc20_Approve":
+            case "Erc20_Permit":
+            case "Erc20_Permit2":
+                break;
+            case "Erc20_Wrap":
+            case "Erc20_Unwrap":
+                uniqueSkimTokens.add(operation.address);
+                uniqueSkimTokens.add(startData.getWrappedToken(operation.address).underlying);
+                break;
+            case "MetaMorpho_Deposit":
+            case "MetaMorpho_Withdraw":
+                uniqueSkimTokens.add(operation.address);
+                uniqueSkimTokens.add(startData.getVault(operation.address).asset);
+                break;
+            case "MetaMorpho_PublicReallocate":
+                uniqueSkimTokens.add(blue_sdk_1.NATIVE_ADDRESS);
+                break;
+            default:
+                //@ts-ignore This is dead code but acts as a guard in case a new operation is added
+                throw new errors_js_1.BundlerErrors.MissingSkimHandler(operation.type);
         }
         if ("callback" in operation.args)
-            operation.args.callback?.forEach(pushCustomSkim);
+            operation.args.callback?.forEach(pushSkim);
     };
-    operations.forEach(pushCustomSkim);
+    operations.concat(unwraps).forEach(pushSkim);
     skims.push(...Array.from(uniqueSkimTokens, (address) => ({
         type: "Erc20_Transfer",
         address,
@@ -690,7 +684,15 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
             to: receiver,
         },
     })));
-    return operations.concat(unwraps, skims);
+    const finalizedOperations = operations.concat(unwraps, skims);
+    const finalizedSteps = (0, exports.simulateBundlerOperations)(finalizedOperations, startData);
+    for (const holding of (0, morpho_ts_1.values)((0, morpho_ts_1.getLast)(finalizedSteps).holdings[generalAdapter1])) {
+        if (!holding)
+            continue;
+        if (holding.balance > 0n)
+            throw new errors_js_1.BundlerErrors.UnskimedToken(holding.token);
+    }
+    return finalizedOperations;
 };
 exports.finalizeBundle = finalizeBundle;
 const populateBundle = (inputOperations, data, options) => {
@@ -767,8 +769,6 @@ const getSimulatedBundlerOperation = (operation, { slippage } = {}) => {
             case "Blue_Repay":
             case "MetaMorpho_Deposit":
             case "MetaMorpho_Withdraw":
-            case "VaultV2_Deposit":
-            case "VaultV2_Withdraw":
             case "Paraswap_Buy":
             case "Paraswap_Sell":
             case "Blue_Paraswap_BuyDebt":

package/lib/types/operations.d.ts

@@ -1,4 +1,4 @@
-import { type BlueOperationArgs, CALLBACK_OPERATIONS, type CallbackOperationType, type Erc20OperationArgs, type MetaMorphoOperationArgs, type OperationArgs, type OperationType, type ParaswapOperationArgs, type VaultV2OperationArgs, type WithOperationArgs } from "@morpho-org/simulation-sdk";
+import { type BlueOperationArgs, CALLBACK_OPERATIONS, type CallbackOperationType, type Erc20OperationArgs, type MetaMorphoOperationArgs, type OperationArgs, type OperationType, type ParaswapOperationArgs, type WithOperationArgs } from "@morpho-org/simulation-sdk";
 import type { UnionOmit } from "viem";
 export declare const BLUE_BUNDLER_OPERATIONS: readonly ["Blue_SetAuthorization", "Blue_Borrow", "Blue_Repay", "Blue_Supply", "Blue_SupplyCollateral", "Blue_Withdraw", "Blue_WithdrawCollateral", "Blue_FlashLoan", "Blue_Paraswap_BuyDebt"];
 export type BlueBundlerOperationType = (typeof BLUE_BUNDLER_OPERATIONS)[number];
@@ -32,18 +32,12 @@ export type Erc20BundlerOperations = {
     [OperationType in Erc20BundlerOperationType]: WithOperationArgs<OperationType, Erc20OperationArgs>;
 };
 export type Erc20BundlerOperation = Erc20BundlerOperations[Erc20BundlerOperationType];
-export declare const VAULT_V2_BUNDLER_OPERATIONS: readonly ["VaultV2_Deposit", "VaultV2_Withdraw"];
-export type VaultV2BundlerOperationType = (typeof VAULT_V2_BUNDLER_OPERATIONS)[number];
-export type VaultV2BundlerOperations = {
-    [OperationType in VaultV2BundlerOperationType]: WithOperationArgs<OperationType, VaultV2OperationArgs>;
-};
-export type VaultV2BundlerOperation = VaultV2BundlerOperations[VaultV2BundlerOperationType];
-export interface BundlerOperationArgs extends BlueOperationArgs, MetaMorphoOperationArgs, ParaswapOperationArgs, Erc20OperationArgs, VaultV2OperationArgs {
+export interface BundlerOperationArgs extends BlueOperationArgs, MetaMorphoOperationArgs, ParaswapOperationArgs, Erc20OperationArgs {
 }
-export type BundlerOperations = BlueBundlerOperations & MetaMorphoBundlerOperations & ParaswapBundlerOperations & Erc20BundlerOperations & VaultV2BundlerOperations;
-export type BundlerOperationType = BlueBundlerOperationType | MetaMorphoBundlerOperationType | ParaswapBundlerOperationType | Erc20BundlerOperationType | VaultV2BundlerOperationType;
-export type BundlerOperation = BlueBundlerOperation | MetaMorphoBundlerOperation | ParaswapBundlerOperation | Erc20BundlerOperation | VaultV2BundlerOperation;
-export declare const BUNDLER_OPERATIONS: readonly ["Blue_SetAuthorization", "Blue_Borrow", "Blue_Repay", "Blue_Supply", "Blue_SupplyCollateral", "Blue_Withdraw", "Blue_WithdrawCollateral", "Blue_FlashLoan", "Blue_Paraswap_BuyDebt", "MetaMorpho_Deposit", "MetaMorpho_Withdraw", "MetaMorpho_PublicReallocate", "Erc20_Approve", "Erc20_Permit", "Erc20_Permit2", "Erc20_Transfer", "Erc20_Transfer2", "Erc20_Wrap", "Erc20_Unwrap", "VaultV2_Deposit", "VaultV2_Withdraw"];
+export type BundlerOperations = BlueBundlerOperations & MetaMorphoBundlerOperations & ParaswapBundlerOperations & Erc20BundlerOperations;
+export type BundlerOperationType = BlueBundlerOperationType | MetaMorphoBundlerOperationType | ParaswapBundlerOperationType | Erc20BundlerOperationType;
+export type BundlerOperation = BlueBundlerOperation | MetaMorphoBundlerOperation | ParaswapBundlerOperation | Erc20BundlerOperation;
+export declare const BUNDLER_OPERATIONS: readonly ["Blue_SetAuthorization", "Blue_Borrow", "Blue_Repay", "Blue_Supply", "Blue_SupplyCollateral", "Blue_Withdraw", "Blue_WithdrawCollateral", "Blue_FlashLoan", "Blue_Paraswap_BuyDebt", "MetaMorpho_Deposit", "MetaMorpho_Withdraw", "MetaMorpho_PublicReallocate", "Erc20_Approve", "Erc20_Permit", "Erc20_Permit2", "Erc20_Transfer", "Erc20_Transfer2", "Erc20_Wrap", "Erc20_Unwrap"];
 export type CallbackBundlerOperationType = (typeof CALLBACK_OPERATIONS)[number];
 export type CallbackBundlerOperations = Pick<BundlerOperations, CallbackBundlerOperationType>;
 export type CallbackBundlerOperation = CallbackBundlerOperations[CallbackBundlerOperationType];
@@ -51,7 +45,6 @@ export declare const isBlueBundlerOperation: (operation: BundlerOperation) => op
 export declare const isMetaMorphoBundlerOperation: (operation: BundlerOperation) => operation is MetaMorphoBundlerOperation;
 export declare const isErc20BundlerOperation: (operation: BundlerOperation) => operation is Erc20BundlerOperation;
 export declare const isCallbackBundlerOperation: (operation: BundlerOperation) => operation is CallbackBundlerOperation;
-export declare const isVaultV2BundlerOperation: (operation: BundlerOperation) => operation is VaultV2BundlerOperation;
 export declare const BLUE_INPUT_OPERATIONS: readonly ["Blue_SetAuthorization", "Blue_Borrow", "Blue_Repay", "Blue_Supply", "Blue_SupplyCollateral", "Blue_Withdraw", "Blue_WithdrawCollateral", "Blue_FlashLoan", "Blue_Paraswap_BuyDebt"];
 export type BlueInputBundlerOperationType = (typeof BLUE_INPUT_OPERATIONS)[number];
 export type BlueInputBundlerOperationArgs = Omit<OperationArgs, (typeof CALLBACK_OPERATIONS)[number]> & {
@@ -75,13 +68,10 @@ export type ParaswapInputBundlerOperation = BundlerOperations[ParaswapInputBundl
 export declare const ERC20_INPUT_OPERATIONS: readonly ["Erc20_Approve", "Erc20_Permit", "Erc20_Permit2", "Erc20_Transfer", "Erc20_Transfer2", "Erc20_Wrap", "Erc20_Unwrap"];
 export type Erc20InputBundlerOperationType = (typeof ERC20_INPUT_OPERATIONS)[number];
 export type Erc20InputBundlerOperation = Erc20BundlerOperations[Erc20InputBundlerOperationType];
-export declare const VAULT_V2_INPUT_OPERATIONS: readonly ["VaultV2_Deposit", "VaultV2_Withdraw"];
-export type VaultV2InputBundlerOperationType = (typeof VAULT_V2_INPUT_OPERATIONS)[number];
-export type VaultV2InputBundlerOperation = VaultV2BundlerOperations[VaultV2InputBundlerOperationType];
-export interface InputBundlerOperationArgs extends BlueOperationArgs, MetaMorphoOperationArgs, ParaswapOperationArgs, Erc20OperationArgs, VaultV2OperationArgs {
+export interface InputBundlerOperationArgs extends BlueOperationArgs, MetaMorphoOperationArgs, ParaswapOperationArgs, Erc20OperationArgs {
 }
-export type InputBundlerOperationType = BlueInputBundlerOperationType | MetaMorphoInputBundlerOperationType | ParaswapInputBundlerOperationType | Erc20InputBundlerOperationType | VaultV2InputBundlerOperationType;
-export type InputBundlerOperation = BlueInputBundlerOperation | MetaMorphoInputBundlerOperation | ParaswapInputBundlerOperation | Erc20InputBundlerOperation | VaultV2InputBundlerOperation;
+export type InputBundlerOperationType = BlueInputBundlerOperationType | MetaMorphoInputBundlerOperationType | ParaswapInputBundlerOperationType | Erc20InputBundlerOperationType;
+export type InputBundlerOperation = BlueInputBundlerOperation | MetaMorphoInputBundlerOperation | ParaswapInputBundlerOperation | Erc20InputBundlerOperation;
 export declare const isBlueInputBundlerOperation: (operation: {
     type: OperationType;
 }) => operation is BlueInputBundlerOperation;
@@ -94,6 +84,3 @@ export declare const isErc20InputBundlerOperation: (operation: {
 export declare const isParaswapInputBundlerOperation: (operation: {
     type: OperationType;
 }) => operation is ParaswapInputBundlerOperation;
-export declare const isVaultV2InputBundlerOperation: (operation: {
-    type: OperationType;
-}) => operation is VaultV2InputBundlerOperation;

package/lib/types/operations.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVaultV2InputBundlerOperation = exports.isParaswapInputBundlerOperation = exports.isErc20InputBundlerOperation = exports.isMetaMorphoInputBundlerOperation = exports.isBlueInputBundlerOperation = exports.VAULT_V2_INPUT_OPERATIONS = exports.ERC20_INPUT_OPERATIONS = exports.PARASWAP_INPUT_OPERATIONS = exports.METAMORPHO_INPUT_OPERATIONS = exports.BLUE_INPUT_OPERATIONS = exports.isVaultV2BundlerOperation = exports.isCallbackBundlerOperation = exports.isErc20BundlerOperation = exports.isMetaMorphoBundlerOperation = exports.isBlueBundlerOperation = exports.BUNDLER_OPERATIONS = exports.VAULT_V2_BUNDLER_OPERATIONS = exports.ERC20_BUNDLER_OPERATIONS = exports.PARASWAP_BUNDLER_OPERATIONS = exports.METAMORPHO_BUNDLER_OPERATIONS = exports.BLUE_BUNDLER_OPERATIONS = void 0;
+exports.isParaswapInputBundlerOperation = exports.isErc20InputBundlerOperation = exports.isMetaMorphoInputBundlerOperation = exports.isBlueInputBundlerOperation = exports.ERC20_INPUT_OPERATIONS = exports.PARASWAP_INPUT_OPERATIONS = exports.METAMORPHO_INPUT_OPERATIONS = exports.BLUE_INPUT_OPERATIONS = exports.isCallbackBundlerOperation = exports.isErc20BundlerOperation = exports.isMetaMorphoBundlerOperation = exports.isBlueBundlerOperation = exports.BUNDLER_OPERATIONS = exports.ERC20_BUNDLER_OPERATIONS = exports.PARASWAP_BUNDLER_OPERATIONS = exports.METAMORPHO_BUNDLER_OPERATIONS = exports.BLUE_BUNDLER_OPERATIONS = void 0;
 const simulation_sdk_1 = require("@morpho-org/simulation-sdk");
 exports.BLUE_BUNDLER_OPERATIONS = [
     "Blue_SetAuthorization",
@@ -20,15 +20,10 @@ exports.METAMORPHO_BUNDLER_OPERATIONS = [
 ];
 exports.PARASWAP_BUNDLER_OPERATIONS = simulation_sdk_1.PARASWAP_OPERATIONS;
 exports.ERC20_BUNDLER_OPERATIONS = simulation_sdk_1.ERC20_OPERATIONS;
-exports.VAULT_V2_BUNDLER_OPERATIONS = [
-    "VaultV2_Deposit",
-    "VaultV2_Withdraw",
-];
 exports.BUNDLER_OPERATIONS = [
     ...exports.BLUE_BUNDLER_OPERATIONS,
     ...exports.METAMORPHO_BUNDLER_OPERATIONS,
     ...exports.ERC20_BUNDLER_OPERATIONS,
-    ...exports.VAULT_V2_BUNDLER_OPERATIONS,
 ];
 const isBlueBundlerOperation = (operation) => {
     return exports.BLUE_BUNDLER_OPERATIONS.includes(operation.type);
@@ -46,10 +41,6 @@ const isCallbackBundlerOperation = (operation) => {
     return simulation_sdk_1.CALLBACK_OPERATIONS.includes(operation.type);
 };
 exports.isCallbackBundlerOperation = isCallbackBundlerOperation;
-const isVaultV2BundlerOperation = (operation) => {
-    return exports.VAULT_V2_BUNDLER_OPERATIONS.includes(operation.type);
-};
-exports.isVaultV2BundlerOperation = isVaultV2BundlerOperation;
 exports.BLUE_INPUT_OPERATIONS = exports.BLUE_BUNDLER_OPERATIONS;
 exports.METAMORPHO_INPUT_OPERATIONS = [
     "MetaMorpho_Deposit",
@@ -57,10 +48,6 @@ exports.METAMORPHO_INPUT_OPERATIONS = [
 ];
 exports.PARASWAP_INPUT_OPERATIONS = exports.PARASWAP_BUNDLER_OPERATIONS;
 exports.ERC20_INPUT_OPERATIONS = exports.ERC20_BUNDLER_OPERATIONS;
-exports.VAULT_V2_INPUT_OPERATIONS = [
-    "VaultV2_Deposit",
-    "VaultV2_Withdraw",
-];
 const isBlueInputBundlerOperation = (operation) => {
     return exports.BLUE_INPUT_OPERATIONS.includes(operation.type);
 };
@@ -77,7 +64,3 @@ const isParaswapInputBundlerOperation = (operation) => {
     return exports.PARASWAP_INPUT_OPERATIONS.includes(operation.type);
 };
 exports.isParaswapInputBundlerOperation = isParaswapInputBundlerOperation;
-const isVaultV2InputBundlerOperation = (operation) => {
-    return exports.VAULT_V2_INPUT_OPERATIONS.includes(operation.type);
-};
-exports.isVaultV2InputBundlerOperation = isVaultV2InputBundlerOperation;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morpho-org/bundler-sdk-viem",
   "description": "Viem-based extension of `@morpho-org/simulation-sdk` that exports utilities to transform simple interactions on Morpho (such as `Blue_Borrow`) and Morpho Vaults (such as `MetaMorpho_Deposit`) into the required bundles (with ERC20 approvals, transfers, etc) to submit to the bundler onchain.",
-  "version": "3.3.0-next.0",
+  "version": "3.3.1",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -19,10 +19,10 @@
   ],
   "peerDependencies": {
     "viem": "^2.0.0",
+    "@morpho-org/blue-sdk": "^4.10.0",
+    "@morpho-org/blue-sdk-viem": "^3.1.2",
     "@morpho-org/morpho-ts": "^2.4.1",
-    "@morpho-org/blue-sdk-viem": "^3.2.0-next.0",
-    "@morpho-org/blue-sdk": "^4.10.0-next.0",
-    "@morpho-org/simulation-sdk": "^3.2.0-next.0"
+    "@morpho-org/simulation-sdk": "^3.1.3"
   },
   "devDependencies": {
     "@tanstack/query-core": "^5.62.16",
@@ -32,16 +32,16 @@
     "@types/lodash": "^4.17.12",
     "lodash": "^4.17.21",
     "typescript": "^5.7.2",
-    "viem": "^2.33.3",
+    "viem": "^2.23.0",
     "vitest": "^3.0.5",
-    "@morpho-org/blue-sdk": "^4.10.0-next.0",
-    "@morpho-org/blue-sdk-viem": "^3.2.0-next.0",
+    "@morpho-org/blue-sdk": "^4.10.0",
+    "@morpho-org/blue-sdk-viem": "^3.1.2",
+    "@morpho-org/morpho-test": "^2.4.0",
     "@morpho-org/morpho-ts": "^2.4.1",
-    "@morpho-org/morpho-test": "^2.4.1-next.0",
-    "@morpho-org/simulation-sdk": "^3.2.0-next.0",
-    "@morpho-org/simulation-sdk-wagmi": "^3.1.0-next.0",
-    "@morpho-org/test-wagmi": "^2.0.5-next.0",
-    "@morpho-org/test": "^2.1.6-next.0"
+    "@morpho-org/simulation-sdk": "^3.1.3",
+    "@morpho-org/simulation-sdk-wagmi": "^3.0.3",
+    "@morpho-org/test-wagmi": "^2.0.4",
+    "@morpho-org/test": "^2.4.0"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",