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

package/lib/BundlerAction.js

@@ -40,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);
@@ -54,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": {
@@ -167,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": {
@@ -187,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}`);
@@ -198,7 +198,7 @@ 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.
@@ -235,17 +235,15 @@ export var BundlerAction;
     }
     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. Defaults to the chain's bundler3 general adapter.
+     * @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, skipRevert = false) {
-        const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        adapter ??= generalAdapter1;
+    function erc20Transfer(asset, recipient, amount, adapter, skipRevert = false) {
         return [
             {
                 to: adapter,
@@ -262,16 +260,15 @@ export var BundlerAction;
     }
     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, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        recipient ??= generalAdapter1;
         return [
             {
                 to: generalAdapter1,
@@ -289,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 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,
@@ -319,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 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 [
             {
@@ -360,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,
@@ -371,7 +385,7 @@ 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.
@@ -393,7 +407,7 @@ export var BundlerAction;
                         {
                             ...permitSingle,
                             // Never permit any other address than the GeneralAdapter1 otherwise
-                            // the signature can be extracted and used independently.
+                            // there are no guarantees that the signature can't be used independently.
                             spender: generalAdapter1,
                         },
                         signature,
@@ -407,17 +421,16 @@ 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, amount, recipient, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        recipient ??= generalAdapter1;
         return [
             {
                 to: generalAdapter1,
@@ -435,7 +448,7 @@ 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.
@@ -484,7 +497,7 @@ export var BundlerAction;
     }
     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.
@@ -534,7 +547,7 @@ 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.
@@ -560,7 +573,7 @@ export var BundlerAction;
     }
     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.
@@ -586,7 +599,7 @@ export var BundlerAction;
     }
     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.
@@ -613,7 +626,7 @@ export var BundlerAction;
     }
     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.
@@ -641,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 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,
@@ -666,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.
@@ -698,7 +713,7 @@ export var BundlerAction;
     }
     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.
@@ -728,7 +743,7 @@ export var BundlerAction;
     }
     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.
@@ -755,7 +770,7 @@ export var BundlerAction;
     }
     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.
@@ -787,7 +802,7 @@ export var BundlerAction;
     }
     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.
@@ -814,7 +829,7 @@ export var BundlerAction;
     }
     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.
@@ -839,7 +854,7 @@ export var BundlerAction;
     }
     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.
@@ -876,7 +891,7 @@ export var BundlerAction;
     }
     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.
@@ -905,7 +920,7 @@ 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.
@@ -932,15 +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, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        recipient ??= generalAdapter1;
         return [
             {
                 to: generalAdapter1,
@@ -957,15 +971,14 @@ export var BundlerAction;
     }
     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, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        recipient ??= generalAdapter1;
         return [
             {
                 to: generalAdapter1,
@@ -983,17 +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, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        recipient ??= generalAdapter1;
         return [
             {
                 to: generalAdapter1,
@@ -1011,15 +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, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        recipient ??= generalAdapter1;
         return [
             {
                 to: generalAdapter1,
@@ -1036,15 +1047,14 @@ export var BundlerAction;
     }
     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, skipRevert = false) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        recipient ??= generalAdapter1;
         return [
             {
                 to: generalAdapter1,
@@ -1062,7 +1072,7 @@ 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.
@@ -1090,18 +1100,17 @@ export var BundlerAction;
     }
     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, skipRevert = false) {
         const { bundler3: { aaveV2MigrationAdapter }, } = getChainAddresses(chainId);
         if (aaveV2MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("aaveV2Withdraw", chainId);
-        recipient ??= aaveV2MigrationAdapter;
         return [
             {
                 to: aaveV2MigrationAdapter,
@@ -1119,7 +1128,7 @@ 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.
@@ -1148,11 +1157,11 @@ export var BundlerAction;
     }
     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, skipRevert = false) {
@@ -1160,7 +1169,6 @@ export var BundlerAction;
          } = getChainAddresses(chainId);
         if (aaveV3CoreMigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("aaveV3Withdraw", chainId);
-        recipient ??= aaveV3CoreMigrationAdapter;
         return [
             {
                 to: aaveV3CoreMigrationAdapter,
@@ -1178,7 +1186,7 @@ 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.
@@ -1205,19 +1213,18 @@ export var BundlerAction;
     }
     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, skipRevert = false) {
         const { bundler3: { aaveV3OptimizerMigrationAdapter }, } = getChainAddresses(chainId);
         if (aaveV3OptimizerMigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("aaveV3OptimizerWithdraw", chainId);
-        recipient ??= aaveV3OptimizerMigrationAdapter;
         return [
             {
                 to: aaveV3OptimizerMigrationAdapter,
@@ -1234,18 +1241,17 @@ export var BundlerAction;
     }
     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, skipRevert = false) {
         const { bundler3: { aaveV3OptimizerMigrationAdapter }, } = getChainAddresses(chainId);
         if (aaveV3OptimizerMigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("aaveV3OptimizerWithdrawCollateral", chainId);
-        recipient ??= aaveV3OptimizerMigrationAdapter;
         return [
             {
                 to: aaveV3OptimizerMigrationAdapter,
@@ -1262,21 +1268,20 @@ export var BundlerAction;
     }
     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 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 [
             {
@@ -1310,7 +1315,7 @@ export var BundlerAction;
                     functionName: "approveManagerWithSig",
                     args: [
                         owner,
-                        manager,
+                        aaveV3OptimizerMigrationAdapter,
                         isApproved,
                         nonce,
                         deadline,
@@ -1326,11 +1331,11 @@ 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, skipRevert = false) {
@@ -1359,18 +1364,17 @@ export var BundlerAction;
     }
     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, skipRevert = false) {
         const { bundler3: { compoundV2MigrationAdapter }, } = getChainAddresses(chainId);
         if (compoundV2MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("compoundV2Repay", chainId);
-        recipient ??= compoundV2MigrationAdapter;
         return [
             {
                 to: compoundV2MigrationAdapter,
@@ -1394,7 +1398,7 @@ 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.
@@ -1421,19 +1425,18 @@ export var BundlerAction;
     }
     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, skipRevert = false) {
         const { bundler3: { compoundV3MigrationAdapter }, } = getChainAddresses(chainId);
         if (compoundV3MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("compoundV3WithdrawFrom", chainId);
-        recipient ??= compoundV3MigrationAdapter;
         return [
             {
                 to: compoundV3MigrationAdapter,
@@ -1450,7 +1453,8 @@ export var BundlerAction;
     }
     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.
@@ -1458,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 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,
@@ -1490,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,