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

package/lib/BundlerAction.js

@@ -12,7 +12,6 @@ export var BundlerAction;
     function encodeBundle(chainId, actions) {
         const { bundler3: { bundler3, generalAdapter1 }, } = getChainAddresses(chainId);
         let value = 0n;
-        let generalAdapter1Value = 0n;
         for (const { type, args } of actions) {
             if (type !== "nativeTransfer")
                 continue;
@@ -21,18 +20,8 @@ export var BundlerAction;
                 owner !== generalAdapter1 &&
                 (recipient === bundler3 || recipient === generalAdapter1))
                 value += amount;
-            if (owner !== generalAdapter1 && recipient === generalAdapter1)
-                generalAdapter1Value += amount;
         }
         const encodedActions = actions.flatMap(BundlerAction.encode.bind(null, chainId));
-        if (generalAdapter1Value > 0n)
-            encodedActions.unshift({
-                to: generalAdapter1,
-                value: generalAdapter1Value,
-                data: "0x",
-                skipRevert: false,
-                callbackHash: zeroHash,
-            });
         return {
             to: bundler3,
             value,
@@ -51,7 +40,7 @@ export var BundlerAction;
                 return BundlerAction.nativeTransfer(chainId, ...args);
             }
             case "erc20Transfer": {
-                return BundlerAction.erc20Transfer(chainId, ...args);
+                return BundlerAction.erc20Transfer(...args);
             }
             case "erc20TransferFrom": {
                 return BundlerAction.erc20TransferFrom(chainId, ...args);
@@ -65,16 +54,16 @@ export var BundlerAction;
             }
             /* Permit */
             case "permit": {
-                const [sender, asset, amount, deadline, signature, spender, skipRevert,] = args;
+                const [sender, asset, amount, deadline, signature, skipRevert] = args;
                 if (signature == null)
                     throw new BundlerErrors.MissingSignature();
-                return BundlerAction.permit(chainId, sender, asset, amount, deadline, signature, spender, skipRevert);
+                return BundlerAction.permit(chainId, sender, asset, amount, deadline, signature, skipRevert);
             }
             case "permitDai": {
-                const [sender, nonce, expiry, allowed, signature, spender, skipRevert] = args;
+                const [sender, nonce, expiry, allowed, signature, skipRevert] = args;
                 if (signature == null)
                     throw new BundlerErrors.MissingSignature();
-                return BundlerAction.permitDai(chainId, sender, nonce, expiry, allowed, signature, spender, skipRevert);
+                return BundlerAction.permitDai(chainId, sender, nonce, expiry, allowed, signature, skipRevert);
             }
             /* Permit2 */
             case "approve2": {
@@ -107,19 +96,19 @@ export var BundlerAction;
                 return BundlerAction.morphoSetAuthorizationWithSig(chainId, authorization, signature, skipRevert);
             }
             case "morphoSupply": {
-                const [market, assets, shares, slippageAmount, onBehalf, onMorphoSupply,] = args;
-                return BundlerAction.morphoSupply(chainId, market, assets, shares, slippageAmount, onBehalf, onMorphoSupply.flatMap(BundlerAction.encode.bind(null, chainId)));
+                const [market, assets, shares, slippageAmount, onBehalf, onMorphoSupply, skipRevert,] = args;
+                return BundlerAction.morphoSupply(chainId, market, assets, shares, slippageAmount, onBehalf, onMorphoSupply.flatMap(BundlerAction.encode.bind(null, chainId)), skipRevert);
             }
             case "morphoSupplyCollateral": {
-                const [market, amount, onBehalf, onMorphoSupplyCollateral] = args;
-                return BundlerAction.morphoSupplyCollateral(chainId, market, amount, onBehalf, onMorphoSupplyCollateral.flatMap(BundlerAction.encode.bind(null, chainId)));
+                const [market, amount, onBehalf, onMorphoSupplyCollateral, skipRevert] = args;
+                return BundlerAction.morphoSupplyCollateral(chainId, market, amount, onBehalf, onMorphoSupplyCollateral.flatMap(BundlerAction.encode.bind(null, chainId)), skipRevert);
             }
             case "morphoBorrow": {
                 return BundlerAction.morphoBorrow(chainId, ...args);
             }
             case "morphoRepay": {
-                const [market, assets, shares, slippageAmount, onBehalf, onMorphoRepay,] = args;
-                return BundlerAction.morphoRepay(chainId, market, assets, shares, slippageAmount, onBehalf, onMorphoRepay.flatMap(BundlerAction.encode.bind(null, chainId)));
+                const [market, assets, shares, slippageAmount, onBehalf, onMorphoRepay, skipRevert,] = args;
+                return BundlerAction.morphoRepay(chainId, market, assets, shares, slippageAmount, onBehalf, onMorphoRepay.flatMap(BundlerAction.encode.bind(null, chainId)), skipRevert);
             }
             case "morphoWithdraw": {
                 return BundlerAction.morphoWithdraw(chainId, ...args);
@@ -178,10 +167,10 @@ export var BundlerAction;
                 return BundlerAction.aaveV3OptimizerWithdrawCollateral(chainId, ...args);
             }
             case "aaveV3OptimizerApproveManagerWithSig": {
-                const [aaveV3Optimizer, owner, isApproved, nonce, deadline, signature, manager, skipRevert,] = args;
+                const [aaveV3Optimizer, owner, isApproved, nonce, deadline, signature, skipRevert,] = args;
                 if (signature == null)
                     throw new BundlerErrors.MissingSignature();
-                return BundlerAction.aaveV3OptimizerApproveManagerWithSig(chainId, aaveV3Optimizer, owner, isApproved, nonce, deadline, signature, manager, skipRevert);
+                return BundlerAction.aaveV3OptimizerApproveManagerWithSig(chainId, aaveV3Optimizer, owner, isApproved, nonce, deadline, signature, skipRevert);
             }
             /* CompoundV2 */
             case "compoundV2Repay": {
@@ -198,10 +187,10 @@ export var BundlerAction;
                 return BundlerAction.compoundV3WithdrawFrom(chainId, ...args);
             }
             case "compoundV3AllowBySig": {
-                const [instance, owner, isAllowed, nonce, expiry, signature, manager, skipRevert,] = args;
+                const [instance, owner, isAllowed, nonce, expiry, signature, skipRevert,] = args;
                 if (signature == null)
                     throw new BundlerErrors.MissingSignature();
-                return BundlerAction.compoundV3AllowBySig(chainId, instance, owner, isAllowed, nonce, expiry, signature, manager, skipRevert);
+                return BundlerAction.compoundV3AllowBySig(chainId, instance, owner, isAllowed, nonce, expiry, signature, skipRevert);
             }
         }
         throw Error(`unhandled action encoding: ${type}`);
@@ -209,13 +198,14 @@ export var BundlerAction;
     BundlerAction.encode = encode;
     /* ERC20 */
     /**
-     * Encodes a call to the Adapter to transfer native tokens (ETH on ethereum, MATIC on polygon, etc).
+     * Encodes a call to the GeneralAdapter1 to transfer native tokens (ETH on ethereum, MATIC on polygon, etc).
      * @param chainId The chain id for which to encode the call.
      * @param owner The owner of native tokens.
      * @param recipient The address to send native tokens to.
      * @param amount The amount of native tokens to send (in wei).
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function nativeTransfer(chainId, owner, recipient, amount) {
+    function nativeTransfer(chainId, owner, recipient, amount, skipRevert = false) {
         const { bundler3: { bundler3, generalAdapter1 }, } = getChainAddresses(chainId);
         if (recipient === bundler3)
             return [];
@@ -238,22 +228,22 @@ export var BundlerAction;
                 to: recipient,
                 data: "0x",
                 value: amount,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.nativeTransfer = nativeTransfer;
     /**
-     * Encodes a call to the Adapter to transfer ERC20 tokens.
+     * Encodes a call to the requested adapter to transfer ERC20 tokens.
      * @param chainId The chain id for which to encode the call.
      * @param asset The address of the ERC20 token to transfer.
      * @param recipient The address to send tokens to.
      * @param amount The amount of tokens to send.
+     * @param adapter The address of the adapter to use.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function erc20Transfer(chainId, asset, recipient, amount, adapter) {
-        const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        adapter ??= generalAdapter1;
+    function erc20Transfer(asset, recipient, amount, adapter, skipRevert = false) {
         return [
             {
                 to: adapter,
@@ -263,22 +253,22 @@ export var BundlerAction;
                     args: [asset, recipient, amount],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.erc20Transfer = erc20Transfer;
     /**
-     * Encodes a call to the Adapter to transfer ERC20 tokens from the sender to the Bundler.
+     * Encodes a call to the GeneralAdapter1 to transfer ERC20 tokens with `transferFrom`.
      * @param chainId The chain id for which to encode the call.
      * @param asset The address of the ERC20 token to transfer.
      * @param amount The amount of tokens to send.
-     * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
+     * @param recipient The recipient of ERC20 tokens.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function erc20TransferFrom(chainId, asset, amount, recipient) {
+    function erc20TransferFrom(chainId, asset, amount, recipient, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        recipient ??= generalAdapter1;
         return [
             {
                 to: generalAdapter1,
@@ -288,7 +278,7 @@ export var BundlerAction;
                     args: [asset, recipient, amount],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -296,27 +286,35 @@ export var BundlerAction;
     BundlerAction.erc20TransferFrom = erc20TransferFrom;
     /* Permit */
     /**
-     * Encodes a call to the Adapter to permit an ERC20 token.
+     * Encodes a call to the GeneralAdapter1 to permit an ERC20 token.
      * @param chainId The chain id for which to encode the call.
      * @param owner The address which owns the tokens.
      * @param asset The address of the ERC20 token to permit.
      * @param amount The amount of tokens to permit.
      * @param deadline The timestamp until which the signature is valid.
      * @param signature The Ethers signature to permit the tokens.
-     * @param spender The address allowed to spend the tokens.
-     * @param skipRevert Whether to allow the permit to revert without making the whole multicall revert.
+     * @param skipRevert Whether to allow the permit to revert without making the whole bundle revert. Defaults to true.
      */
-    function permit(chainId, owner, asset, amount, deadline, signature, spender, skipRevert = true) {
+    function permit(chainId, owner, asset, amount, deadline, signature, skipRevert = true) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         const { r, s, yParity } = parseSignature(signature);
-        spender ??= generalAdapter1;
         return [
             {
                 to: asset,
                 data: encodeFunctionData({
                     abi: erc2612Abi,
                     functionName: "permit",
-                    args: [owner, spender, amount, deadline, yParity + 27, r, s],
+                    args: [
+                        owner,
+                        // Never permit any other address than the GeneralAdapter1 otherwise
+                        // there are no guarantees that the signature can't be used independently.
+                        generalAdapter1,
+                        amount,
+                        deadline,
+                        yParity + 27,
+                        r,
+                        s,
+                    ],
                 }),
                 value: 0n,
                 skipRevert,
@@ -326,21 +324,19 @@ export var BundlerAction;
     }
     BundlerAction.permit = permit;
     /**
-     * Encodes a call to the Adapter to permit DAI.
+     * Encodes a call to the GeneralAdapter1 to permit DAI.
      * @param chainId The chain id for which to encode the call.
      * @param owner The address which owns the tokens.
      * @param nonce The permit nonce used.
      * @param expiry The timestamp until which the signature is valid.
      * @param allowed The amount of DAI to permit.
      * @param signature The Ethers signature to permit the tokens.
-     * @param spender The address allowed to spend the tokens.
-     * @param skipRevert Whether to allow the permit to revert without making the whole multicall revert.
+     * @param skipRevert Whether to allow the permit to revert without making the whole bundle revert.
      */
-    function permitDai(chainId, owner, nonce, expiry, allowed, signature, spender, skipRevert = true) {
+    function permitDai(chainId, owner, nonce, expiry, allowed, signature, skipRevert = true) {
         const { dai, bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         if (dai == null)
             throw new BundlerErrors.UnexpectedAction("permitDai", chainId);
-        spender ??= generalAdapter1;
         const { r, s, yParity } = parseSignature(signature);
         return [
             {
@@ -367,7 +363,18 @@ export var BundlerAction;
                         },
                     ],
                     functionName: "permit",
-                    args: [owner, spender, nonce, expiry, allowed, yParity + 27, r, s],
+                    args: [
+                        owner,
+                        // Never permit any other address than the GeneralAdapter1 otherwise
+                        // there are no guarantees that the signature can't be used independently.
+                        generalAdapter1,
+                        nonce,
+                        expiry,
+                        allowed,
+                        yParity + 27,
+                        r,
+                        s,
+                    ],
                 }),
                 value: 0n,
                 skipRevert,
@@ -378,15 +385,15 @@ export var BundlerAction;
     BundlerAction.permitDai = permitDai;
     /* Permit2 */
     /**
-     * Encodes a call to the Adapter to permit ERC20 tokens via Permit2.
+     * Encodes a call to permit the chain's GeneralAdapter1 ERC20 tokens via Permit2.
      * @param chainId The chain id for which to encode the call.
      * @param owner The owner of ERC20 tokens.
      * @param permitSingle The permit details to submit to Permit2.
      * @param signature The Ethers signature to permit the tokens.
-     * @param skipRevert Whether to allow the permit to revert without making the whole multicall revert.
+     * @param skipRevert Whether to allow the permit to revert without making the whole bundle revert. Defaults to true.
      */
     function approve2(chainId, owner, permitSingle, signature, skipRevert = true) {
-        const { permit2 } = getChainAddresses(chainId);
+        const { permit2, bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         if (permit2 == null)
             throw new BundlerErrors.UnexpectedAction("approve2", chainId);
         return [
@@ -395,7 +402,16 @@ export var BundlerAction;
                 data: encodeFunctionData({
                     abi: permit2Abi,
                     functionName: "permit",
-                    args: [owner, permitSingle, signature],
+                    args: [
+                        owner,
+                        {
+                            ...permitSingle,
+                            // Never permit any other address than the GeneralAdapter1 otherwise
+                            // there are no guarantees that the signature can't be used independently.
+                            spender: generalAdapter1,
+                        },
+                        signature,
+                    ],
                 }),
                 value: 0n,
                 skipRevert,
@@ -405,29 +421,26 @@ export var BundlerAction;
     }
     BundlerAction.approve2 = approve2;
     /**
-     * Encodes a call to the Adapter to transfer ERC20 tokens via Permit2 from the sender to the Bundler.
+     * Encodes a call to the GeneralAdapter1 to transfer ERC20 tokens via Permit2.
      * @param chainId The chain id for which to encode the call.
      * @param asset The address of the ERC20 token to transfer.
      * @param owner The owner of ERC20 tokens.
      * @param amount The amount of tokens to send.
-     * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
+     * @param recipient The recipient of ERC20 tokens.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function transferFrom2(chainId, asset, owner, amount, recipient) {
-        const { permit2, bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        if (permit2 == null)
-            throw new BundlerErrors.UnexpectedAction("transferFrom2", chainId);
-        recipient ??= generalAdapter1;
+    function transferFrom2(chainId, asset, amount, recipient, skipRevert = false) {
+        const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         return [
             {
-                to: permit2,
+                to: generalAdapter1,
                 data: encodeFunctionData({
-                    abi: permit2Abi,
-                    functionName: "transferFrom",
-                    // TODO: batch all permit2 transfers via transferFrom(AllowanceTransferDetails[] calldata)
-                    args: [owner, recipient, amount, asset],
+                    abi: generalAdapter1Abi,
+                    functionName: "permit2TransferFrom",
+                    args: [asset, recipient, amount],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -435,13 +448,14 @@ export var BundlerAction;
     BundlerAction.transferFrom2 = transferFrom2;
     /* ERC20 Wrapper */
     /**
-     * Encodes a call to the Adapter to wrap ERC20 tokens via the provided ERC20Wrapper.
+     * Encodes a call to the GeneralAdapter1 to wrap ERC20 tokens via the provided ERC20Wrapper.
      * @param chainId The chain id for which to encode the call.
      * @param wrapper The address of the ERC20 wrapper token.
      * @param underlying The address of the underlying ERC20 token.
      * @param amount The amount of tokens to send.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function erc20WrapperDepositFor(chainId, wrapper, underlying, amount) {
+    function erc20WrapperDepositFor(chainId, wrapper, underlying, amount, skipRevert = false) {
         const { bundler3: { generalAdapter1, erc20WrapperAdapter }, } = getChainAddresses(chainId);
         if (erc20WrapperAdapter == null)
             throw new BundlerErrors.UnexpectedAction("erc20WrapperDepositFor", chainId);
@@ -454,7 +468,7 @@ export var BundlerAction;
                     args: [underlying, erc20WrapperAdapter, maxUint256],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
             {
@@ -465,7 +479,7 @@ export var BundlerAction;
                     args: [wrapper, amount],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
             {
@@ -476,20 +490,21 @@ export var BundlerAction;
                     args: [underlying, generalAdapter1, maxUint256],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.erc20WrapperDepositFor = erc20WrapperDepositFor;
     /**
-     * Encodes a call to the Adapter to unwrap ERC20 tokens from the provided ERC20Wrapper.
+     * Encodes a call to the GeneralAdapter1 to unwrap ERC20 tokens from the provided ERC20Wrapper.
      * @param chainId The chain id for which to encode the call.
      * @param wrapper The address of the ERC20 wrapper token.
      * @param account The address to send the underlying ERC20 tokens.
      * @param amount The amount of tokens to send.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function erc20WrapperWithdrawTo(chainId, wrapper, receiver, amount) {
+    function erc20WrapperWithdrawTo(chainId, wrapper, receiver, amount, skipRevert = false) {
         const { bundler3: { generalAdapter1, erc20WrapperAdapter }, } = getChainAddresses(chainId);
         if (erc20WrapperAdapter == null)
             throw new BundlerErrors.UnexpectedAction("erc20WrapperWithdrawTo", chainId);
@@ -502,7 +517,7 @@ export var BundlerAction;
                     args: [wrapper, erc20WrapperAdapter, maxUint256],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
             {
@@ -513,7 +528,7 @@ export var BundlerAction;
                     args: [wrapper, receiver, amount],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
             {
@@ -524,7 +539,7 @@ export var BundlerAction;
                     args: [wrapper, generalAdapter1, maxUint256],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -532,14 +547,15 @@ export var BundlerAction;
     BundlerAction.erc20WrapperWithdrawTo = erc20WrapperWithdrawTo;
     /* ERC4626 */
     /**
-     * Encodes a call to the Adapter to mint shares of the provided ERC4626 vault.
+     * Encodes a call to the GeneralAdapter1 to mint shares of the provided ERC4626 vault.
      * @param chainId The chain id for which to encode the call.
      * @param erc4626 The address of the ERC4626 vault.
      * @param shares The amount of shares to mint.
      * @param maxSharePrice The maximum amount of assets to pay to get 1 share (scaled by RAY).
      * @param receiver The address to send the shares to.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function erc4626Mint(chainId, erc4626, shares, maxSharePrice, receiver) {
+    function erc4626Mint(chainId, erc4626, shares, maxSharePrice, receiver, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         return [
             {
@@ -550,21 +566,22 @@ export var BundlerAction;
                     args: [erc4626, shares, maxSharePrice, receiver],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.erc4626Mint = erc4626Mint;
     /**
-     * Encodes a call to the Adapter to deposit assets into the provided ERC4626 vault.
+     * Encodes a call to the GeneralAdapter1 to deposit assets into the provided ERC4626 vault.
      * @param chainId The chain id for which to encode the call.
      * @param erc4626 The address of the ERC4626 vault.
      * @param assets The amount of assets to deposit.
      * @param maxSharePrice The maximum amount of assets to pay to get 1 share (scaled by RAY).
      * @param receiver The address to send the shares to.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function erc4626Deposit(chainId, erc4626, assets, maxSharePrice, receiver) {
+    function erc4626Deposit(chainId, erc4626, assets, maxSharePrice, receiver, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         return [
             {
@@ -575,22 +592,23 @@ export var BundlerAction;
                     args: [erc4626, assets, maxSharePrice, receiver],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.erc4626Deposit = erc4626Deposit;
     /**
-     * Encodes a call to the Adapter to withdraw assets from the provided ERC4626 vault.
+     * Encodes a call to the GeneralAdapter1 to withdraw assets from the provided ERC4626 vault.
      * @param chainId The chain id for which to encode the call.
      * @param erc4626 The address of the ERC4626 vault.
      * @param assets The amount of assets to withdraw.
      * @param minSharePrice The minimum number of assets to receive per share (scaled by RAY).
      * @param receiver The address to send the assets to.
      * @param owner The address on behalf of which the assets are withdrawn.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function erc4626Withdraw(chainId, erc4626, assets, minSharePrice, receiver, owner) {
+    function erc4626Withdraw(chainId, erc4626, assets, minSharePrice, receiver, owner, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         return [
             {
@@ -601,22 +619,23 @@ export var BundlerAction;
                     args: [erc4626, assets, minSharePrice, receiver, owner],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.erc4626Withdraw = erc4626Withdraw;
     /**
-     * Encodes a call to the Adapter to redeem shares from the provided ERC4626 vault.
+     * Encodes a call to the GeneralAdapter1 to redeem shares from the provided ERC4626 vault.
      * @param chainId The chain id for which to encode the call.
      * @param erc4626 The address of the ERC4626 vault.
      * @param shares The amount of shares to redeem.
      * @param minSharePrice The minimum number of assets to receive per share (scaled by RAY).
      * @param receiver The address to send the assets to.
      * @param owner The address on behalf of which the assets are withdrawn.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function erc4626Redeem(chainId, erc4626, shares, minSharePrice, receiver, owner) {
+    function erc4626Redeem(chainId, erc4626, shares, minSharePrice, receiver, owner, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         return [
             {
@@ -627,7 +646,7 @@ export var BundlerAction;
                     args: [erc4626, shares, minSharePrice, receiver, owner],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -635,15 +654,17 @@ export var BundlerAction;
     BundlerAction.erc4626Redeem = erc4626Redeem;
     /* Morpho */
     /**
-     * Encodes a call to the Adapter to authorize an account on Morpho Blue.
+     * Encodes a call to authorize an account on Morpho Blue.
      * @param chainId The chain id for which to encode the call.
      * @param authorization The authorization details to submit to Morpho Blue.
      * @param signature The Ethers signature to authorize the account.
-     * @param skipRevert Whether to allow the authorization call to revert without making the whole multicall revert.
+     * @param skipRevert Whether to allow the authorization call to revert without making the whole bundle revert. Defaults to true.
      */
     function morphoSetAuthorizationWithSig(chainId, authorization, signature, skipRevert = true) {
-        const { morpho } = getChainAddresses(chainId);
+        const { morpho, bundler3: { bundler3 }, } = getChainAddresses(chainId);
         const { r, s, yParity } = parseSignature(signature);
+        if (authorization.authorized === bundler3)
+            throw new BundlerErrors.UnexpectedSignature(authorization.authorized);
         return [
             {
                 to: morpho,
@@ -660,7 +681,7 @@ export var BundlerAction;
     }
     BundlerAction.morphoSetAuthorizationWithSig = morphoSetAuthorizationWithSig;
     /**
-     * Encodes a call to the Adapter to supply to a Morpho Blue market.
+     * Encodes a call to the GeneralAdapter1 to supply to a Morpho Blue market.
      * @param chainId The chain id for which to encode the call.
      * @param market The market params to supply to.
      * @param assets The amount of assets to supply.
@@ -668,8 +689,9 @@ export var BundlerAction;
      * @param slippageAmount The maximum (resp. minimum) amount of assets (resp. supply shares) to supply (resp. mint) (protects the sender from unexpected slippage).
      * @param onBehalf The address to supply on behalf of.
      * @param callbackCalls The array of calls to execute inside Morpho Blue's `onMorphoSupply` callback.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function morphoSupply(chainId, market, assets, shares, slippageAmount, onBehalf, callbackCalls) {
+    function morphoSupply(chainId, market, assets, shares, slippageAmount, onBehalf, callbackCalls, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         const reenter = callbackCalls.length > 0;
         const reenterData = reenter
@@ -684,21 +706,22 @@ export var BundlerAction;
                     args: [market, assets, shares, slippageAmount, onBehalf, reenterData],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: reenter ? keccak256(reenterData) : zeroHash,
             },
         ];
     }
     BundlerAction.morphoSupply = morphoSupply;
     /**
-     * Encodes a call to the Adapter to supply collateral to a Morpho Blue market.
+     * Encodes a call to the GeneralAdapter1 to supply collateral to a Morpho Blue market.
      * @param chainId The chain id for which to encode the call.
      * @param market The market params to supply to.
      * @param assets The amount of assets to supply.
      * @param onBehalf The address to supply on behalf of.
      * @param callbackCalls The array of calls to execute inside Morpho Blue's `onMorphoSupplyCollateral` callback.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function morphoSupplyCollateral(chainId, market, assets, onBehalf, callbackCalls) {
+    function morphoSupplyCollateral(chainId, market, assets, onBehalf, callbackCalls, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         const reenter = callbackCalls.length > 0;
         const reenterData = reenter
@@ -713,22 +736,23 @@ export var BundlerAction;
                     args: [market, assets, onBehalf, reenterData],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: reenter ? keccak256(reenterData) : zeroHash,
             },
         ];
     }
     BundlerAction.morphoSupplyCollateral = morphoSupplyCollateral;
     /**
-     * Encodes a call to the Adapter to borrow from a Morpho Blue market.
+     * Encodes a call to the GeneralAdapter1 to borrow from a Morpho Blue market.
      * @param chainId The chain id for which to encode the call.
      * @param market The market params to borrow from.
      * @param assets The amount of assets to borrow.
      * @param shares The amount of borrow shares to mint.
      * @param slippageAmount The minimum (resp. maximum) amount of assets (resp. borrow shares) to borrow (resp. mint) (protects the sender from unexpected slippage).
      * @param receiver The address to send borrowed tokens to.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function morphoBorrow(chainId, market, assets, shares, slippageAmount, receiver) {
+    function morphoBorrow(chainId, market, assets, shares, slippageAmount, receiver, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         return [
             {
@@ -739,14 +763,14 @@ export var BundlerAction;
                     args: [market, assets, shares, slippageAmount, receiver],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.morphoBorrow = morphoBorrow;
     /**
-     * Encodes a call to the Adapter to repay to a Morpho Blue market.
+     * Encodes a call to the GeneralAdapter1 to repay to a Morpho Blue market.
      * @param chainId The chain id for which to encode the call.
      * @param market The market params to repay to.
      * @param assets The amount of assets to repay.
@@ -754,8 +778,9 @@ export var BundlerAction;
      * @param slippageAmount The maximum (resp. minimum) amount of assets (resp. borrow shares) to repay (resp. redeem) (protects the sender from unexpected slippage).
      * @param onBehalf The address to repay on behalf of.
      * @param callbackCalls The array of calls to execute inside Morpho Blue's `onMorphoSupply` callback.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function morphoRepay(chainId, market, assets, shares, slippageAmount, onBehalf, callbackCalls) {
+    function morphoRepay(chainId, market, assets, shares, slippageAmount, onBehalf, callbackCalls, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         const reenter = callbackCalls.length > 0;
         const reenterData = reenter
@@ -770,22 +795,23 @@ export var BundlerAction;
                     args: [market, assets, shares, slippageAmount, onBehalf, reenterData],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: reenter ? keccak256(reenterData) : zeroHash,
             },
         ];
     }
     BundlerAction.morphoRepay = morphoRepay;
     /**
-     * Encodes a call to the Adapter to withdraw from a Morpho Blue market.
+     * Encodes a call to the GeneralAdapter1 to withdraw from a Morpho Blue market.
      * @param chainId The chain id for which to encode the call.
      * @param market The market params to withdraw from.
      * @param assets The amount of assets to withdraw.
      * @param shares The amount of supply shares to redeem.
      * @param slippageAmount The minimum (resp. maximum) amount of assets (resp. supply shares) to withdraw (resp. redeem) (protects the sender from unexpected slippage).
      * @param receiver The address to send withdrawn tokens to.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function morphoWithdraw(chainId, market, assets, shares, slippageAmount, receiver) {
+    function morphoWithdraw(chainId, market, assets, shares, slippageAmount, receiver, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         return [
             {
@@ -796,20 +822,21 @@ export var BundlerAction;
                     args: [market, assets, shares, slippageAmount, receiver],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.morphoWithdraw = morphoWithdraw;
     /**
-     * Encodes a call to the Adapter to withdraw collateral from a Morpho Blue market.
+     * Encodes a call to the GeneralAdapter1 to withdraw collateral from a Morpho Blue market.
      * @param chainId The chain id for which to encode the call.
      * @param market The market params to withdraw from.
      * @param assets The amount of assets to withdraw.
      * @param receiver The address to send withdrawn tokens to.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function morphoWithdrawCollateral(chainId, market, assets, receiver) {
+    function morphoWithdrawCollateral(chainId, market, assets, receiver, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         return [
             {
@@ -820,20 +847,21 @@ export var BundlerAction;
                     args: [market, assets, receiver],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.morphoWithdrawCollateral = morphoWithdrawCollateral;
     /**
-     * Encodes a call to the Adapter to flash loan from Morpho Blue.
+     * Encodes a call to the GeneralAdapter1 to flash loan from Morpho Blue.
      * @param chainId The chain id for which to encode the call.
      * @param asset The address of the ERC20 token to flash loan.
      * @param amount The amount of tokens to flash loan.
      * @param callbackCalls The array of calls to execute inside Morpho Blue's `onMorphoFlashLoan` callback.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function morphoFlashLoan(chainId, asset, amount, callbackCalls) {
+    function morphoFlashLoan(chainId, asset, amount, callbackCalls, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         const reenter = callbackCalls.length > 0;
         const reenterData = reenter
@@ -856,21 +884,22 @@ export var BundlerAction;
                     ],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: reenter ? keccak256(reenterData) : zeroHash,
             },
         ];
     }
     BundlerAction.morphoFlashLoan = morphoFlashLoan;
     /**
-     * Encodes a call to the Adapter to trigger a public reallocation on the PublicAllocator.
+     * Encodes a call to trigger a public reallocation on the PublicAllocator.
      * @param chainId The chain id for which to encode the call.
      * @param vault The vault to reallocate.
      * @param fee The vault public reallocation fee.
      * @param withdrawals The array of withdrawals to perform, before supplying everything to the supply market.
      * @param supplyMarketParams The market params to reallocate to.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function publicAllocatorReallocateTo(chainId, vault, fee, withdrawals, supplyMarketParams) {
+    function publicAllocatorReallocateTo(chainId, vault, fee, withdrawals, supplyMarketParams, skipRevert = false) {
         const { publicAllocator } = getChainAddresses(chainId);
         if (publicAllocator == null)
             throw new BundlerErrors.UnexpectedAction("reallocateTo", chainId);
@@ -883,7 +912,7 @@ export var BundlerAction;
                     args: [vault, withdrawals, supplyMarketParams],
                 }),
                 value: fee,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -891,14 +920,14 @@ export var BundlerAction;
     BundlerAction.publicAllocatorReallocateTo = publicAllocatorReallocateTo;
     /* Universal Rewards Distributor */
     /**
-     * Encodes a call to the Adapter to claim rewards from the Universal Rewards Distributor.
+     * Encodes a call to the Universal Rewards Distributor to claim rewards.
      * @param chainId The chain id for which to encode the call.
      * @param distributor The address of the distributor to claim rewards from.
      * @param account The address to claim rewards for.
      * @param reward The address of the reward token to claim.
      * @param amount The amount of rewards to claim.
      * @param proof The Merkle proof to claim the rewards.
-     * @param skipRevert Whether to allow the claim to revert without making the whole multicall revert.
+     * @param skipRevert Whether to allow the claim to revert without making the whole bundle revert. Defaults to true.
      */
     function urdClaim(distributor, account, reward, amount, proof, skipRevert = true) {
         return [
@@ -918,14 +947,14 @@ export var BundlerAction;
     BundlerAction.urdClaim = urdClaim;
     /* Wrapped Native */
     /**
-     * Encodes a call to the Adapter to wrap native tokens (ETH to WETH on ethereum, MATIC to WMATIC on polygon, etc).
+     * Encodes a call to the GeneralAdapter1 to wrap native tokens (ETH to WETH on ethereum, MATIC to WMATIC on polygon, etc).
      * @param chainId The chain id for which to encode the call.
      * @param amount The amount of native tokens to wrap (in wei).
-     * @param recipient The address to send tokens to. Defaults to the chain's bundler3 general adapter.
+     * @param recipient The address to send tokens to.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function wrapNative(chainId, amount, recipient) {
+    function wrapNative(chainId, amount, recipient, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        recipient ??= generalAdapter1;
         return [
             {
                 to: generalAdapter1,
@@ -935,21 +964,21 @@ export var BundlerAction;
                     args: [amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.wrapNative = wrapNative;
     /**
-     * Encodes a call to the Adapter to unwrap native tokens (WETH to ETH on ethereum, WMATIC to MATIC on polygon, etc).
+     * Encodes a call to the GeneralAdapter1 to unwrap native tokens (WETH to ETH on ethereum, WMATIC to MATIC on polygon, etc).
      * @param chainId The chain id for which to encode the call.
      * @param amount The amount of native tokens to unwrap (in wei).
-     * @param recipient The address to send tokens to. Defaults to the chain's bundler3 general adapter.
+     * @param recipient The address to send tokens to.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function unwrapNative(chainId, amount, recipient) {
+    function unwrapNative(chainId, amount, recipient, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        recipient ??= generalAdapter1;
         return [
             {
                 to: generalAdapter1,
@@ -959,7 +988,7 @@ export var BundlerAction;
                     args: [amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -967,16 +996,16 @@ export var BundlerAction;
     BundlerAction.unwrapNative = unwrapNative;
     /* stETH */
     /**
-     * Encodes a call to the Adapter to stake native tokens using Lido (ETH to stETH on ethereum).
+     * Encodes a call to the GeneralAdapter1 to stake native tokens using Lido (ETH to stETH on ethereum).
      * @param chainId The chain id for which to encode the call.
      * @param amount The amount of native tokens to stake (in wei).
      * @param maxSharePrice The maximum amount of wei to pay for minting 1 share (scaled by RAY).
      * @param referral The referral address to use.
-     * @param recipient The address to send stETH to. Defaults to the chain's bundler3 general adapter.
+     * @param recipient The address to send stETH to.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function stakeEth(chainId, amount, maxSharePrice, referral, recipient) {
+    function stakeEth(chainId, amount, maxSharePrice, referral, recipient, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        recipient ??= generalAdapter1;
         return [
             {
                 to: generalAdapter1,
@@ -986,7 +1015,7 @@ export var BundlerAction;
                     args: [amount, maxSharePrice, referral, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -994,14 +1023,14 @@ export var BundlerAction;
     BundlerAction.stakeEth = stakeEth;
     /* Wrapped stETH */
     /**
-     * Encodes a call to the Adapter to wrap stETH (stETH to wstETH on ethereum).
+     * Encodes a call to the GeneralAdapter1 to wrap stETH (stETH to wstETH on ethereum).
      * @param chainId The chain id for which to encode the call.
      * @param amount The amount of stETH to wrap (in wei).
-     * @param recipient The address to send wstETH to. Defaults to the chain's bundler3 general adapter.
+     * @param recipient The address to send wstETH to.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function wrapStEth(chainId, amount, recipient) {
+    function wrapStEth(chainId, amount, recipient, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        recipient ??= generalAdapter1;
         return [
             {
                 to: generalAdapter1,
@@ -1011,21 +1040,21 @@ export var BundlerAction;
                     args: [amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.wrapStEth = wrapStEth;
     /**
-     * Encodes a call to the Adapter to unwrap wstETH (wstETH to stETH on ethereum).
+     * Encodes a call to the GeneralAdapter1 to unwrap wstETH (wstETH to stETH on ethereum).
      * @param chainId The chain id for which to encode the call.
      * @param amount The amount of wstETH to unwrap (in wei).
-     * @param recipient The address to send stETH to. Defaults to the chain's bundler3 general adapter.
+     * @param recipient The address to send stETH to.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function unwrapStEth(chainId, amount, recipient) {
+    function unwrapStEth(chainId, amount, recipient, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        recipient ??= generalAdapter1;
         return [
             {
                 to: generalAdapter1,
@@ -1035,7 +1064,7 @@ export var BundlerAction;
                     args: [amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1043,14 +1072,15 @@ export var BundlerAction;
     BundlerAction.unwrapStEth = unwrapStEth;
     /* AaveV2 */
     /**
-     * Encodes a call to the Adapter to repay a debt on AaveV2.
+     * Encodes a call to the AaveV2MigrationAdapter to repay a debt on AaveV2.
      * @param chainId The chain id for which to encode the call.
      * @param asset The debt asset to repay.
      * @param amount The amount of debt to repay.
      * @param onBehalf The address on behalf of which to repay.
      * @param rateMode The interest rate mode used by the debt to repay.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function aaveV2Repay(chainId, asset, amount, onBehalf, rateMode = 1n) {
+    function aaveV2Repay(chainId, asset, amount, onBehalf, rateMode = 1n, skipRevert = false) {
         const { bundler3: { aaveV2MigrationAdapter }, } = getChainAddresses(chainId);
         if (aaveV2MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("aaveV2Repay", chainId);
@@ -1063,24 +1093,24 @@ export var BundlerAction;
                     args: [asset, amount, rateMode, onBehalf],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.aaveV2Repay = aaveV2Repay;
     /**
-     * Encodes a call to the Adapter to withdrawn from AaveV2.
+     * Encodes a call to the AaveV2MigrationAdapter to withdraw from AaveV2.
      * @param chainId The chain id for which to encode the call.
      * @param asset The asset to withdraw.
      * @param amount The amount of asset to withdraw.
-     * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
+     * @param recipient The recipient of ERC20 tokens.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function aaveV2Withdraw(chainId, asset, amount, recipient) {
+    function aaveV2Withdraw(chainId, asset, amount, recipient, skipRevert = false) {
         const { bundler3: { aaveV2MigrationAdapter }, } = getChainAddresses(chainId);
         if (aaveV2MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("aaveV2Withdraw", chainId);
-        recipient ??= aaveV2MigrationAdapter;
         return [
             {
                 to: aaveV2MigrationAdapter,
@@ -1090,7 +1120,7 @@ export var BundlerAction;
                     args: [asset, amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1098,14 +1128,15 @@ export var BundlerAction;
     BundlerAction.aaveV2Withdraw = aaveV2Withdraw;
     /* AaveV3 */
     /**
-     * Encodes a call to the Adapter to repay a debt on AaveV3.
+     * Encodes a call to the AaveV3CoreMigrationAdapter to repay a debt on AaveV3.
      * @param chainId The chain id for which to encode the call.
      * @param asset The debt asset to repay.
      * @param amount The amount of debt to repay.
      * @param onBehalf The address on behalf of which to repay.
      * @param rateMode The interest rate mode used by the debt to repay.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function aaveV3Repay(chainId, asset, amount, onBehalf, rateMode = 1n) {
+    function aaveV3Repay(chainId, asset, amount, onBehalf, rateMode = 1n, skipRevert = false) {
         const { bundler3: { aaveV3CoreMigrationAdapter }, // TODO: choose between core & prime
          } = getChainAddresses(chainId);
         if (aaveV3CoreMigrationAdapter == null)
@@ -1119,25 +1150,25 @@ export var BundlerAction;
                     args: [asset, amount, rateMode, onBehalf],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.aaveV3Repay = aaveV3Repay;
     /**
-     * Encodes a call to the Adapter to withdrawn from AaveV3.
+     * Encodes a call to the AaveV3CoreMigrationAdapter to withdrawn from AaveV3.
      * @param chainId The chain id for which to encode the call.
      * @param asset The asset to withdraw.
      * @param amount The amount of asset to withdraw.
-     * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
+     * @param recipient The recipient of ERC20 tokens.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function aaveV3Withdraw(chainId, asset, amount, recipient) {
+    function aaveV3Withdraw(chainId, asset, amount, recipient, skipRevert = false) {
         const { bundler3: { aaveV3CoreMigrationAdapter }, // TODO: choose between core & prime
          } = getChainAddresses(chainId);
         if (aaveV3CoreMigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("aaveV3Withdraw", chainId);
-        recipient ??= aaveV3CoreMigrationAdapter;
         return [
             {
                 to: aaveV3CoreMigrationAdapter,
@@ -1147,7 +1178,7 @@ export var BundlerAction;
                     args: [asset, amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1155,13 +1186,14 @@ export var BundlerAction;
     BundlerAction.aaveV3Withdraw = aaveV3Withdraw;
     /* AaveV3 Optimizer */
     /**
-     * Encodes a call to the Adapter to repay a debt on Morpho's AaveV3Optimizer.
+     * Encodes a call to the AaveV3OptimizerMigrationAdapter to repay a debt on Morpho's AaveV3Optimizer.
      * @param chainId The chain id for which to encode the call.
      * @param underlying The underlying debt asset to repay.
      * @param amount The amount of debt to repay.
      * @param onBehalf The address on behalf of which to repay.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function aaveV3OptimizerRepay(chainId, underlying, amount, onBehalf) {
+    function aaveV3OptimizerRepay(chainId, underlying, amount, onBehalf, skipRevert = false) {
         const { bundler3: { aaveV3OptimizerMigrationAdapter }, } = getChainAddresses(chainId);
         if (aaveV3OptimizerMigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("aaveV3OptimizerRepay", chainId);
@@ -1174,25 +1206,25 @@ export var BundlerAction;
                     args: [underlying, amount, onBehalf],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.aaveV3OptimizerRepay = aaveV3OptimizerRepay;
     /**
-     * Encodes a call to the Adapter to withdraw from Morpho's AaveV3Optimizer.
+     * Encodes a call to the AaveV3OptimizerMigrationAdapter to withdraw from Morpho's AaveV3Optimizer.
      * @param chainId The chain id for which to encode the call.
      * @param underlying The underlying asset to withdraw.
      * @param amount The amount to withdraw.
      * @param maxIterations The maximum amount of iterations to use for the withdrawal.
-     * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
+     * @param recipient The recipient of ERC20 tokens.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function aaveV3OptimizerWithdraw(chainId, underlying, amount, maxIterations, recipient) {
+    function aaveV3OptimizerWithdraw(chainId, underlying, amount, maxIterations, recipient, skipRevert = false) {
         const { bundler3: { aaveV3OptimizerMigrationAdapter }, } = getChainAddresses(chainId);
         if (aaveV3OptimizerMigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("aaveV3OptimizerWithdraw", chainId);
-        recipient ??= aaveV3OptimizerMigrationAdapter;
         return [
             {
                 to: aaveV3OptimizerMigrationAdapter,
@@ -1202,24 +1234,24 @@ export var BundlerAction;
                     args: [underlying, amount, maxIterations, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.aaveV3OptimizerWithdraw = aaveV3OptimizerWithdraw;
     /**
-     * Encodes a call to the Adapter to withdraw collateral from Morpho's AaveV3Optimizer.
+     * Encodes a call to the AaveV3OptimizerMigrationAdapter to withdraw collateral from Morpho's AaveV3Optimizer.
      * @param chainId The chain id for which to encode the call.
      * @param underlying The underlying asset to withdraw.
      * @param amount The amount to withdraw.
-     * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
+     * @param recipient The recipient of ERC20 tokens.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function aaveV3OptimizerWithdrawCollateral(chainId, underlying, amount, recipient) {
+    function aaveV3OptimizerWithdrawCollateral(chainId, underlying, amount, recipient, skipRevert = false) {
         const { bundler3: { aaveV3OptimizerMigrationAdapter }, } = getChainAddresses(chainId);
         if (aaveV3OptimizerMigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("aaveV3OptimizerWithdrawCollateral", chainId);
-        recipient ??= aaveV3OptimizerMigrationAdapter;
         return [
             {
                 to: aaveV3OptimizerMigrationAdapter,
@@ -1229,28 +1261,27 @@ export var BundlerAction;
                     args: [underlying, amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.aaveV3OptimizerWithdrawCollateral = aaveV3OptimizerWithdrawCollateral;
     /**
-     * Encodes a call to the Adapter to approve the Bundler as the sender's manager on Morpho's AaveV3Optimizer.
+     * Encodes a call to the AaveV3 optimizer to approve the chain's AaveV3OptimizerMigrationAdapter.
+     * as the sender's manager on Morpho's AaveV3Optimizer.
      * @param chainId The chain id for which to encode the call.
      * @param owner The owner of the AaveV3Optimizer position.
      * @param isApproved Whether the manager is approved.
      * @param nonce The nonce used to sign.
      * @param deadline The timestamp until which the signature is valid.
      * @param signature The Ethers signature to submit.
-     * @param manager The address of the manager to approve. Defaults to the chain's bundler3 AaveV3OptimizerMigrationAdapter.
-     * @param skipRevert Whether to allow the signature to revert without making the whole multicall revert.
+     * @param skipRevert Whether to allow the signature to revert without making the whole bundle revert. Defaults to true.
      */
-    function aaveV3OptimizerApproveManagerWithSig(chainId, aaveV3Optimizer, owner, isApproved, nonce, deadline, signature, manager, skipRevert = true) {
+    function aaveV3OptimizerApproveManagerWithSig(chainId, aaveV3Optimizer, owner, isApproved, nonce, deadline, signature, skipRevert = true) {
         const { bundler3: { aaveV3OptimizerMigrationAdapter }, } = getChainAddresses(chainId);
         if (aaveV3OptimizerMigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("aaveV3OptimizerApproveManagerWithSig", chainId);
-        manager ??= aaveV3OptimizerMigrationAdapter;
         const { r, s, yParity } = parseSignature(signature);
         return [
             {
@@ -1284,7 +1315,7 @@ export var BundlerAction;
                     functionName: "approveManagerWithSig",
                     args: [
                         owner,
-                        manager,
+                        aaveV3OptimizerMigrationAdapter,
                         isApproved,
                         nonce,
                         deadline,
@@ -1300,13 +1331,14 @@ export var BundlerAction;
     BundlerAction.aaveV3OptimizerApproveManagerWithSig = aaveV3OptimizerApproveManagerWithSig;
     /* CompoundV2 */
     /**
-     * Encodes a call to the Adapter to repay a debt on CompoundV2.
+     * Encodes a call to the CompoundV2MigrationAdapter to repay a debt on CompoundV2.
      * @param chainId The chain id for which to encode the call.
      * @param cToken The cToken on which to repay the debt.
      * @param amount The amount of debt to repay.
-     * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
+     * @param onBehalf The account on behalf of which to repay.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function compoundV2Repay(chainId, cToken, amount, isEth, onBehalf) {
+    function compoundV2Repay(chainId, cToken, amount, isEth, onBehalf, skipRevert = false) {
         const { bundler3: { compoundV2MigrationAdapter }, } = getChainAddresses(chainId);
         if (compoundV2MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("compoundV2Repay", chainId);
@@ -1325,24 +1357,24 @@ export var BundlerAction;
                         args: [cToken, amount, onBehalf],
                     }),
                 value: isEth ? amount : 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.compoundV2Repay = compoundV2Repay;
     /**
-     * Encodes a call to the Adapter to withdraw collateral from CompoundV2.
+     * Encodes a call to the CompoundV2MigrationAdapter to withdraw collateral from CompoundV2.
      * @param chainId The chain id for which to encode the call.
      * @param cToken The cToken on which to withdraw.
      * @param amount The amount to withdraw.
-     * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
+     * @param recipient The recipient of ERC20 tokens.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function compoundV2Redeem(chainId, cToken, amount, isEth, recipient) {
+    function compoundV2Redeem(chainId, cToken, amount, isEth, recipient, skipRevert = false) {
         const { bundler3: { compoundV2MigrationAdapter }, } = getChainAddresses(chainId);
         if (compoundV2MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("compoundV2Repay", chainId);
-        recipient ??= compoundV2MigrationAdapter;
         return [
             {
                 to: compoundV2MigrationAdapter,
@@ -1358,7 +1390,7 @@ export var BundlerAction;
                         args: [cToken, amount, recipient],
                     }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1366,13 +1398,14 @@ export var BundlerAction;
     BundlerAction.compoundV2Redeem = compoundV2Redeem;
     /* CompoundV3 */
     /**
-     * Encodes a call to the Adapter to repay a debt on CompoundV3.
+     * Encodes a call to the CompoundV3MigrationAdapter to repay a debt on CompoundV3.
      * @param chainId The chain id for which to encode the call.
      * @param instance The CompoundV3 instance on which to repay the debt.
      * @param amount The amount of debt to repay.
      * @param onBehalf The address on behalf of which to repay.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function compoundV3Repay(chainId, instance, amount, onBehalf) {
+    function compoundV3Repay(chainId, instance, amount, onBehalf, skipRevert = false) {
         const { bundler3: { compoundV3MigrationAdapter }, } = getChainAddresses(chainId);
         if (compoundV3MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("compoundV3Repay", chainId);
@@ -1385,25 +1418,25 @@ export var BundlerAction;
                     args: [instance, amount, onBehalf],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.compoundV3Repay = compoundV3Repay;
     /**
-     * Encodes a call to the Adapter to withdraw collateral from CompoundV3.
+     * Encodes a call to the CompoundV3MigrationAdapter to withdraw collateral from CompoundV3.
      * @param chainId The chain id for which to encode the call.
      * @param instance The CompoundV3 instance on which to withdraw.
      * @param asset The asset to withdraw.
      * @param amount The amount to withdraw.
-     * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
+     * @param recipient The recipient of ERC20 tokens.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function compoundV3WithdrawFrom(chainId, instance, asset, amount, recipient) {
+    function compoundV3WithdrawFrom(chainId, instance, asset, amount, recipient, skipRevert = false) {
         const { bundler3: { compoundV3MigrationAdapter }, } = getChainAddresses(chainId);
         if (compoundV3MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("compoundV3WithdrawFrom", chainId);
-        recipient ??= compoundV3MigrationAdapter;
         return [
             {
                 to: compoundV3MigrationAdapter,
@@ -1413,14 +1446,15 @@ export var BundlerAction;
                     args: [instance, asset, amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
     }
     BundlerAction.compoundV3WithdrawFrom = compoundV3WithdrawFrom;
     /**
-     * Encodes a call to the Adapter to allow the Bundler to act on the sender's position on CompoundV3.
+     * Encodes a call to the CompoundV3 instance to allow the chain's CompoundV3MigrationAdapter.
+     * to act on the sender's position on CompoundV3.
      * @param chainId The chain id for which to encode the call.
      * @param instance The CompoundV3 instance on which to submit the signature.
      * @param owner The owner of the CompoundV3 position.
@@ -1428,15 +1462,13 @@ export var BundlerAction;
      * @param nonce The nonce used to sign.
      * @param expiry The timestamp until which the signature is valid.
      * @param signature The Ethers signature to submit.
-     * @param manager The address of the manager to approve. Defaults to the chain's bundler3 CompoundV3MigrationAdapter.
-     * @param skipRevert Whether to allow the signature to revert without making the whole multicall revert.
+     * @param skipRevert Whether to allow the signature to revert without making the whole bundle revert. Defaults to true.
      */
-    function compoundV3AllowBySig(chainId, instance, owner, isAllowed, nonce, expiry, signature, manager, skipRevert = true) {
+    function compoundV3AllowBySig(chainId, instance, owner, isAllowed, nonce, expiry, signature, skipRevert = true) {
         const { bundler3: { compoundV3MigrationAdapter }, } = getChainAddresses(chainId);
         if (compoundV3MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("compoundV3AllowBySig", chainId);
         const { r, s, yParity } = parseSignature(signature);
-        manager ??= compoundV3MigrationAdapter;
         return [
             {
                 to: instance,
@@ -1460,7 +1492,16 @@ export var BundlerAction;
                         },
                     ],
                     functionName: "allowBySig",
-                    args: [owner, manager, isAllowed, nonce, expiry, yParity + 27, r, s],
+                    args: [
+                        owner,
+                        compoundV3MigrationAdapter,
+                        isAllowed,
+                        nonce,
+                        expiry,
+                        yParity + 27,
+                        r,
+                        s,
+                    ],
                 }),
                 value: 0n,
                 skipRevert,