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

package/lib/BundlerAction.js

@@ -1,18 +1,17 @@
 import { aaveV2MigrationAdapterAbi, aaveV3MigrationAdapterAbi, aaveV3OptimizerMigrationAdapterAbi, bundler3Abi, compoundV2MigrationAdapterAbi, compoundV3MigrationAdapterAbi, coreAdapterAbi, erc20WrapperAdapterAbi, ethereumGeneralAdapter1Abi, generalAdapter1Abi, universalRewardsDistributorAbi, } from "./abis.js";
 import { getChainAddresses, } from "@morpho-org/blue-sdk";
 import { blueAbi, erc2612Abi, permit2Abi, publicAllocatorAbi, } from "@morpho-org/blue-sdk-viem";
-import { encodeAbiParameters, encodeFunctionData, keccak256, maxUint256, parseSignature, toFunctionSelector, zeroHash, } from "viem";
+import { encodeAbiParameters, encodeFunctionData, keccak256, maxUint256, parseSignature, zeroHash, } from "viem";
 import { BundlerErrors } from "./errors.js";
-const reenterSelectorHash = keccak256(toFunctionSelector(bundler3Abi.find((item) => item.type === "function" && item.name === "reenter")));
+const reenterAbiInputs = bundler3Abi.find((item) => item.name === "reenter").inputs;
 /**
- * Namespace to easily encode calls to the Bundler contract, using ethers.
+ * Namespace to easily encode calls to the Bundler contract, using viem.
  */
 export var BundlerAction;
 (function (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,
@@ -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 [owner, isApproved, nonce, deadline, signature, manager, skipRevert,] = args;
+                const [aaveV3Optimizer, owner, isApproved, nonce, deadline, signature, manager, skipRevert,] = args;
                 if (signature == null)
                     throw new BundlerErrors.MissingSignature();
-                return BundlerAction.aaveV3OptimizerApproveManagerWithSig(chainId, owner, isApproved, nonce, deadline, signature, manager, skipRevert);
+                return BundlerAction.aaveV3OptimizerApproveManagerWithSig(chainId, aaveV3Optimizer, owner, isApproved, nonce, deadline, signature, manager, skipRevert);
             }
             /* CompoundV2 */
             case "compoundV2Repay": {
@@ -214,8 +203,9 @@ export var BundlerAction;
      * @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,7 +228,7 @@ export var BundlerAction;
                 to: recipient,
                 data: "0x",
                 value: amount,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -250,19 +240,22 @@ export var BundlerAction;
      * @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. Defaults to the chain's bundler3 general adapter.
+     * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function erc20Transfer(chainId, asset, recipient, amount) {
+    function erc20Transfer(chainId, asset, recipient, amount, adapter, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
+        adapter ??= generalAdapter1;
         return [
             {
-                to: generalAdapter1,
+                to: adapter,
                 data: encodeFunctionData({
                     abi: coreAdapterAbi,
                     functionName: "erc20Transfer",
                     args: [asset, recipient, amount],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -274,8 +267,9 @@ export var BundlerAction;
      * @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 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 [
@@ -287,7 +281,7 @@ export var BundlerAction;
                     args: [asset, recipient, amount],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -303,7 +297,7 @@ export var BundlerAction;
      * @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) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
@@ -333,7 +327,7 @@ export var BundlerAction;
      * @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) {
         const { dai, bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
@@ -382,7 +376,7 @@ export var BundlerAction;
      * @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);
@@ -410,8 +404,9 @@ export var BundlerAction;
      * @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 skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function transferFrom2(chainId, asset, owner, amount, recipient) {
+    function transferFrom2(chainId, asset, owner, amount, recipient, skipRevert = false) {
         const { permit2, bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         if (permit2 == null)
             throw new BundlerErrors.UnexpectedAction("transferFrom2", chainId);
@@ -426,7 +421,7 @@ export var BundlerAction;
                     args: [owner, recipient, amount, asset],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -439,8 +434,9 @@ export var BundlerAction;
      * @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);
@@ -453,7 +449,7 @@ export var BundlerAction;
                     args: [underlying, erc20WrapperAdapter, maxUint256],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
             {
@@ -464,7 +460,7 @@ export var BundlerAction;
                     args: [wrapper, amount],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
             {
@@ -475,7 +471,7 @@ export var BundlerAction;
                     args: [underlying, generalAdapter1, maxUint256],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -487,8 +483,9 @@ export var BundlerAction;
      * @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);
@@ -501,7 +498,7 @@ export var BundlerAction;
                     args: [wrapper, erc20WrapperAdapter, maxUint256],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
             {
@@ -512,7 +509,7 @@ export var BundlerAction;
                     args: [wrapper, receiver, amount],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
             {
@@ -523,7 +520,7 @@ export var BundlerAction;
                     args: [wrapper, generalAdapter1, maxUint256],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -537,8 +534,9 @@ export var BundlerAction;
      * @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 [
             {
@@ -549,7 +547,7 @@ export var BundlerAction;
                     args: [erc4626, shares, maxSharePrice, receiver],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -562,8 +560,9 @@ export var BundlerAction;
      * @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 [
             {
@@ -574,7 +573,7 @@ export var BundlerAction;
                     args: [erc4626, assets, maxSharePrice, receiver],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -588,8 +587,9 @@ export var BundlerAction;
      * @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 [
             {
@@ -600,7 +600,7 @@ export var BundlerAction;
                     args: [erc4626, assets, minSharePrice, receiver, owner],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -614,8 +614,9 @@ export var BundlerAction;
      * @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 [
             {
@@ -626,7 +627,7 @@ export var BundlerAction;
                     args: [erc4626, shares, minSharePrice, receiver, owner],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -638,7 +639,7 @@ export var BundlerAction;
      * @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);
@@ -667,12 +668,13 @@ 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
-            ? encodeAbiParameters(bundler3Abi.find((item) => item.name === "reenter").inputs, [callbackCalls])
+            ? encodeAbiParameters(reenterAbiInputs, [callbackCalls])
             : "0x";
         return [
             {
@@ -683,7 +685,7 @@ export var BundlerAction;
                     args: [market, assets, shares, slippageAmount, onBehalf, reenterData],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: reenter ? keccak256(reenterData) : zeroHash,
             },
         ];
@@ -696,12 +698,13 @@ export var BundlerAction;
      * @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
-            ? encodeAbiParameters(bundler3Abi.find((item) => item.name === "reenter").inputs, [callbackCalls])
+            ? encodeAbiParameters(reenterAbiInputs, [callbackCalls])
             : "0x";
         return [
             {
@@ -712,7 +715,7 @@ export var BundlerAction;
                     args: [market, assets, onBehalf, reenterData],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: reenter ? keccak256(reenterData) : zeroHash,
             },
         ];
@@ -726,8 +729,9 @@ export var BundlerAction;
      * @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 [
             {
@@ -738,7 +742,7 @@ export var BundlerAction;
                     args: [market, assets, shares, slippageAmount, receiver],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -753,12 +757,13 @@ 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
-            ? encodeAbiParameters(bundler3Abi.find((item) => item.name === "reenter").inputs, [callbackCalls])
+            ? encodeAbiParameters(reenterAbiInputs, [callbackCalls])
             : "0x";
         return [
             {
@@ -769,7 +774,7 @@ export var BundlerAction;
                     args: [market, assets, shares, slippageAmount, onBehalf, reenterData],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: reenter ? keccak256(reenterData) : zeroHash,
             },
         ];
@@ -783,8 +788,9 @@ export var BundlerAction;
      * @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 [
             {
@@ -795,7 +801,7 @@ export var BundlerAction;
                     args: [market, assets, shares, slippageAmount, receiver],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -807,8 +813,9 @@ export var BundlerAction;
      * @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 [
             {
@@ -819,7 +826,7 @@ export var BundlerAction;
                     args: [market, assets, receiver],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -831,9 +838,14 @@ export var BundlerAction;
      * @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
+            ? encodeAbiParameters(reenterAbiInputs, [callbackCalls])
+            : "0x";
         return [
             {
                 to: generalAdapter1,
@@ -851,8 +863,8 @@ export var BundlerAction;
                     ],
                 }),
                 value: 0n,
-                skipRevert: false,
-                callbackHash: keccak256(`${generalAdapter1}${reenterSelectorHash}`),
+                skipRevert,
+                callbackHash: reenter ? keccak256(reenterData) : zeroHash,
             },
         ];
     }
@@ -864,9 +876,12 @@ export var BundlerAction;
      * @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);
         return [
             {
                 to: publicAllocator,
@@ -876,7 +891,7 @@ export var BundlerAction;
                     args: [vault, withdrawals, supplyMarketParams],
                 }),
                 value: fee,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -891,7 +906,7 @@ export var BundlerAction;
      * @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 [
@@ -915,8 +930,9 @@ export var BundlerAction;
      * @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 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 [
@@ -928,7 +944,7 @@ export var BundlerAction;
                     args: [amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -939,8 +955,9 @@ export var BundlerAction;
      * @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 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 [
@@ -952,7 +969,7 @@ export var BundlerAction;
                     args: [amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -966,8 +983,9 @@ export var BundlerAction;
      * @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 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 [
@@ -979,7 +997,7 @@ export var BundlerAction;
                     args: [amount, maxSharePrice, referral, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -991,8 +1009,9 @@ export var BundlerAction;
      * @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 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 [
@@ -1004,7 +1023,7 @@ export var BundlerAction;
                     args: [amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1015,8 +1034,9 @@ export var BundlerAction;
      * @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 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 [
@@ -1028,7 +1048,7 @@ export var BundlerAction;
                     args: [amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1042,8 +1062,9 @@ export var BundlerAction;
      * @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);
@@ -1056,7 +1077,7 @@ export var BundlerAction;
                     args: [asset, amount, rateMode, onBehalf],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1068,8 +1089,9 @@ export var BundlerAction;
      * @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 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);
@@ -1083,7 +1105,7 @@ export var BundlerAction;
                     args: [asset, amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1097,8 +1119,9 @@ export var BundlerAction;
      * @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)
@@ -1112,7 +1135,7 @@ export var BundlerAction;
                     args: [asset, amount, rateMode, onBehalf],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1124,8 +1147,9 @@ export var BundlerAction;
      * @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 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)
@@ -1140,7 +1164,7 @@ export var BundlerAction;
                     args: [asset, amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1153,8 +1177,9 @@ export var BundlerAction;
      * @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);
@@ -1167,7 +1192,7 @@ export var BundlerAction;
                     args: [underlying, amount, onBehalf],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1180,8 +1205,9 @@ export var BundlerAction;
      * @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 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);
@@ -1195,7 +1221,7 @@ export var BundlerAction;
                     args: [underlying, amount, maxIterations, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1207,8 +1233,9 @@ export var BundlerAction;
      * @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 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);
@@ -1222,7 +1249,7 @@ export var BundlerAction;
                     args: [underlying, amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1237,11 +1264,11 @@ export var BundlerAction;
      * @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, owner, isApproved, nonce, deadline, signature, manager, skipRevert = true) {
-        const { aaveV3Optimizer, bundler3: { aaveV3OptimizerMigrationAdapter }, } = getChainAddresses(chainId);
-        if (aaveV3Optimizer == null || aaveV3OptimizerMigrationAdapter == null)
+    function aaveV3OptimizerApproveManagerWithSig(chainId, aaveV3Optimizer, owner, isApproved, nonce, deadline, signature, manager, skipRevert = true) {
+        const { bundler3: { aaveV3OptimizerMigrationAdapter }, } = getChainAddresses(chainId);
+        if (aaveV3OptimizerMigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("aaveV3OptimizerApproveManagerWithSig", chainId);
         manager ??= aaveV3OptimizerMigrationAdapter;
         const { r, s, yParity } = parseSignature(signature);
@@ -1298,13 +1325,12 @@ export var BundlerAction;
      * @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 skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function compoundV2Repay(chainId, cToken, amount, recipient) {
-        const { cEth, bundler3: { compoundV2MigrationAdapter }, } = getChainAddresses(chainId);
-        if (cEth == null || compoundV2MigrationAdapter == null)
+    function compoundV2Repay(chainId, cToken, amount, isEth, onBehalf, skipRevert = false) {
+        const { bundler3: { compoundV2MigrationAdapter }, } = getChainAddresses(chainId);
+        if (compoundV2MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("compoundV2Repay", chainId);
-        const isEth = cToken === cEth;
-        recipient ??= compoundV2MigrationAdapter;
         return [
             {
                 to: compoundV2MigrationAdapter,
@@ -1312,15 +1338,15 @@ export var BundlerAction;
                     ? encodeFunctionData({
                         abi: compoundV2MigrationAdapterAbi,
                         functionName: "compoundV2RepayEth",
-                        args: [amount, recipient],
+                        args: [amount, onBehalf],
                     })
                     : encodeFunctionData({
                         abi: compoundV2MigrationAdapterAbi,
                         functionName: "compoundV2RepayErc20",
-                        args: [cToken, amount, recipient],
+                        args: [cToken, amount, onBehalf],
                     }),
                 value: isEth ? amount : 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1332,12 +1358,12 @@ export var BundlerAction;
      * @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 skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function compoundV2Redeem(chainId, cToken, amount, recipient) {
-        const { cEth, bundler3: { compoundV2MigrationAdapter }, } = getChainAddresses(chainId);
-        if (cEth == null || compoundV2MigrationAdapter == null)
+    function compoundV2Redeem(chainId, cToken, amount, isEth, recipient, skipRevert = false) {
+        const { bundler3: { compoundV2MigrationAdapter }, } = getChainAddresses(chainId);
+        if (compoundV2MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("compoundV2Repay", chainId);
-        const isEth = cToken === cEth;
         recipient ??= compoundV2MigrationAdapter;
         return [
             {
@@ -1354,7 +1380,7 @@ export var BundlerAction;
                         args: [cToken, amount, recipient],
                     }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1367,8 +1393,9 @@ export var BundlerAction;
      * @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);
@@ -1381,7 +1408,7 @@ export var BundlerAction;
                     args: [instance, amount, onBehalf],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1394,8 +1421,9 @@ export var BundlerAction;
      * @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 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);
@@ -1409,7 +1437,7 @@ export var BundlerAction;
                     args: [instance, asset, amount, recipient],
                 }),
                 value: 0n,
-                skipRevert: false,
+                skipRevert,
                 callbackHash: zeroHash,
             },
         ];
@@ -1425,7 +1453,7 @@ export var BundlerAction;
      * @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) {
         const { bundler3: { compoundV3MigrationAdapter }, } = getChainAddresses(chainId);
@@ -1466,4 +1494,3 @@ export var BundlerAction;
     }
     BundlerAction.compoundV3AllowBySig = compoundV3AllowBySig;
 })(BundlerAction || (BundlerAction = {}));
-export default BundlerAction;