fix: issue 23

src/ERC4626Bundler.sol

@@ -60,10 +60,10 @@ abstract contract ERC4626Bundler is BaseBundler {
 
     /// @notice Withdraws the given amount of `assets` from the given ERC4626 `vault`, transferring assets to
     /// `receiver`.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Pass `type(uint256).max` as `assets` to withdraw max.
     /// @dev Assumes the given `vault` implements EIP-4626.
     function erc4626Withdraw(address vault, uint256 assets, address receiver) external payable {
+        _checkInitiated();
         require(receiver != address(0), ErrorsLib.ZERO_ADDRESS);
         /// Do not check `receiver != address(this)` to allow the bundler to receive the underlying asset.
 
@@ -77,10 +77,10 @@ abstract contract ERC4626Bundler is BaseBundler {
     }
 
     /// @notice Redeems the given amount of `shares` from the given ERC4626 `vault`, transferring assets to `receiver`.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Pass `type(uint256).max` as `shares` to redeem max.
     /// @dev Assumes the given `vault` implements EIP-4626.
     function erc4626Redeem(address vault, uint256 shares, address receiver) external payable {
+        _checkInitiated();
         require(receiver != address(0), ErrorsLib.ZERO_ADDRESS);
         /// Do not check `receiver != address(this)` to allow the bundler to receive the underlying asset.
 

src/MorphoBundler.sol

@@ -111,12 +111,13 @@ abstract contract MorphoBundler is BaseBundler, IMorphoBundler {
     }
 
     /// @notice Borrows `amount` of `asset` on behalf of the sender.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Initiator must have previously authorized the bundler to act on their behalf on Morpho.
     function morphoBorrow(MarketParams calldata marketParams, uint256 amount, uint256 shares, address receiver)
         external
         payable
     {
+        _checkInitiated();
+
         MORPHO.borrow(marketParams, amount, shares, initiator(), receiver);
     }
 
@@ -142,22 +143,24 @@ abstract contract MorphoBundler is BaseBundler, IMorphoBundler {
     }
 
     /// @notice Withdraws `amount` of the loan asset on behalf of `onBehalf`.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Initiator must have previously authorized the bundler to act on their behalf on Morpho.
     function morphoWithdraw(MarketParams calldata marketParams, uint256 amount, uint256 shares, address receiver)
         external
         payable
     {
+        _checkInitiated();
+
         MORPHO.withdraw(marketParams, amount, shares, initiator(), receiver);
     }
 
     /// @notice Withdraws `amount` of the collateral asset on behalf of sender.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Initiator must have previously authorized the bundler to act on their behalf on Morpho.
     function morphoWithdrawCollateral(MarketParams calldata marketParams, uint256 amount, address receiver)
         external
         payable
     {
+        _checkInitiated();
+
         MORPHO.withdrawCollateral(marketParams, amount, initiator(), receiver);
     }
 

src/Permit2Bundler.sol

@@ -18,12 +18,13 @@ abstract contract Permit2Bundler is BaseBundler {
     /* ACTIONS */
 
     /// @notice Permits and performs a transfer from the initiator to the recipient via Permit2.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Pass `permit.permitted.amount = type(uint256).max` to transfer all.
     function permit2TransferFrom(ISignatureTransfer.PermitTransferFrom memory permit, bytes memory signature)
         external
         payable
     {
+        _checkInitiated();
+
         address initiator = initiator();
         uint256 amount = Math.min(permit.permitted.amount, ERC20(permit.permitted.token).balanceOf(initiator));
 

src/PermitBundler.sol

@@ -12,12 +12,13 @@ import {BaseBundler} from "./BaseBundler.sol";
 abstract contract PermitBundler is BaseBundler {
     /// @notice Permits the given `amount` of `asset` from sender to be spent by the bundler via EIP-2612 Permit with
     /// the given `deadline` & EIP-712 signature's `v`, `r` & `s`.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Pass `skipRevert == true` to avoid reverting the whole bundle in case the signature expired.
     function permit(address asset, uint256 amount, uint256 deadline, uint8 v, bytes32 r, bytes32 s, bool skipRevert)
         external
         payable
     {
+        _checkInitiated();
+
         try IERC20Permit(asset).permit(initiator(), address(this), amount, deadline, v, r, s) {}
         catch (bytes memory returnData) {
             if (!skipRevert) _revert(returnData);

src/TransferBundler.sol

@@ -46,9 +46,10 @@ abstract contract TransferBundler is BaseBundler {
     }
 
     /// @notice Transfers the given `amount` of `asset` from sender to this contract via ERC20 transferFrom.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Pass `amount = type(uint256).max` to transfer all.
     function erc20TransferFrom(address asset, uint256 amount) external payable {
+        _checkInitiated();
+
         address initiator = initiator();
         amount = Math.min(amount, ERC20(asset).balanceOf(initiator));
 

src/WNativeBundler.sol

@@ -38,9 +38,10 @@ abstract contract WNativeBundler is BaseBundler {
     /* ACTIONS */
 
     /// @notice Wraps the given `amount` of the native token to wNative.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Pass `amount = type(uint256).max` to wrap all.
     function wrapNative(uint256 amount) external payable {
+        _checkInitiated();
+
         amount = Math.min(amount, address(this).balance);
 
         require(amount != 0, ErrorsLib.ZERO_AMOUNT);
@@ -49,9 +50,10 @@ abstract contract WNativeBundler is BaseBundler {
     }
 
     /// @notice Unwraps the given `amount` of wNative to the native token.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Pass `amount = type(uint256).max` to unwrap all.
     function unwrapNative(uint256 amount) external payable {
+        _checkInitiated();
+
         amount = Math.min(amount, ERC20(WRAPPED_NATIVE).balanceOf(address(this)));
 
         require(amount != 0, ErrorsLib.ZERO_AMOUNT);

src/ethereum/EthereumPermitBundler.sol

@@ -14,12 +14,13 @@ import {PermitBundler} from "../PermitBundler.sol";
 abstract contract EthereumPermitBundler is PermitBundler {
     /// @notice Permits DAI from sender to be spent by the bundler with the given `nonce`, `expiry` & EIP-712
     /// signature's `v`, `r` & `s`.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Pass `skipRevert = true` to avoid reverting the whole bundle in case the signature expired.
     function permitDai(uint256 nonce, uint256 expiry, bool allowed, uint8 v, bytes32 r, bytes32 s, bool skipRevert)
         external
         payable
     {
+        _checkInitiated();
+
         try IDaiPermit(MainnetLib.DAI).permit(initiator(), address(this), nonce, expiry, allowed, v, r, s) {}
         catch (bytes memory returnData) {
             if (!skipRevert) _revert(returnData);

src/interfaces/ICompoundV2MigrationBundler.sol

@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+pragma solidity >=0.5.0;
+
+interface ICompoundV2MigrationBundler {
+    function compoundV2Repay(address cToken, uint256 amount) external payable;
+    function compoundV2Redeem(address cToken, uint256 amount) external payable;
+}

src/interfaces/IWNativeBundler.sol

@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+pragma solidity >=0.5.0;
+
+interface IWNativeBundler {
+    function wrapNative(uint256 amount) external;
+    function unwrapNative(uint256 amount) external;
+}

src/migration/AaveV2MigrationBundler.sol

@@ -27,9 +27,10 @@ contract AaveV2MigrationBundler is MigrationBundler {
     /* ACTIONS */
 
     /// @notice Repays `amount` of `asset` on AaveV2, on behalf of the initiator.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Pass `amount = type(uint256).max` to repay all.
     function aaveV2Repay(address asset, uint256 amount, uint256 interestRateMode) external payable {
+        _checkInitiated();
+
         amount = Math.min(amount, ERC20(asset).balanceOf(address(this)));
 
         require(amount != 0, ErrorsLib.ZERO_AMOUNT);

src/migration/AaveV3MigrationBundler.sol

@@ -26,9 +26,10 @@ contract AaveV3MigrationBundler is MigrationBundler {
     /* ACTIONS */
 
     /// @notice Repays `amount` of `asset` on AaveV3, on behalf of the initiator.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Pass `amount = type(uint256).max` to repay all.
     function aaveV3Repay(address asset, uint256 amount, uint256 interestRateMode) external payable {
+        _checkInitiated();
+
         amount = Math.min(amount, ERC20(asset).balanceOf(address(this)));
 
         require(amount != 0, ErrorsLib.ZERO_AMOUNT);

src/migration/AaveV3OptimizerMigrationBundler.sol

@@ -27,9 +27,10 @@ contract AaveV3OptimizerMigrationBundler is MigrationBundler {
     /* ACTIONS */
 
     /// @notice Repays `amount` of `underlying` on the AaveV3 Optimizer, on behalf of the initiator.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Pass `amount = type(uint256).max` to repay all.
     function aaveV3OptimizerRepay(address underlying, uint256 amount) external payable {
+        _checkInitiated();
+
         amount = Math.min(amount, ERC20(underlying).balanceOf(address(this)));
 
         require(amount != 0, ErrorsLib.ZERO_AMOUNT);
@@ -41,34 +42,37 @@ contract AaveV3OptimizerMigrationBundler is MigrationBundler {
 
     /// @notice Repays `amount` of `underlying` on the AaveV3 Optimizer, on behalf of the initiator, transferring funds
     /// to `receiver`.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Initiator must have previously approved the bundler to manage their AaveV3 Optimizer position.
     /// @dev Pass `amount = type(uint256).max` to withdraw all.
     function aaveV3OptimizerWithdraw(address underlying, uint256 amount, address receiver, uint256 maxIterations)
         external
         payable
     {
+        _checkInitiated();
+
         AAVE_V3_OPTIMIZER.withdraw(underlying, amount, initiator(), receiver, maxIterations);
     }
 
     /// @notice Repays `amount` of `underlying` on the AaveV3 Optimizer, on behalf of the initiator, transferring funds
     /// to `receiver`.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Initiator must have previously approved the bundler to manage their AaveV3 Optimizer position.
     /// @dev Pass `amount = type(uint256).max` to withdraw all.
     function aaveV3OptimizerWithdrawCollateral(address underlying, uint256 amount, address receiver) external payable {
+        _checkInitiated();
+
         AAVE_V3_OPTIMIZER.withdrawCollateral(underlying, amount, initiator(), receiver);
     }
 
     /// @notice Approves the bundler to act on behalf of the initiator on the AaveV3 Optimizer, given a signed EIP-712
     /// approval message.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     function aaveV3OptimizerApproveManagerWithSig(
         bool isApproved,
         uint256 nonce,
         uint256 deadline,
         Types.Signature calldata signature
     ) external payable {
+        _checkInitiated();
+
         AAVE_V3_OPTIMIZER.approveManagerWithSig(initiator(), address(this), isApproved, nonce, deadline, signature);
     }
 }

src/migration/CompoundV2MigrationBundler.sol

@@ -36,9 +36,10 @@ contract CompoundV2MigrationBundler is WNativeBundler, MigrationBundler {
     /* ACTIONS */
 
     /// @notice Repays `amount` of `cToken`'s underlying asset, on behalf of the initiator.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Pass `amount = type(uint256).max` to repay all.
     function compoundV2Repay(address cToken, uint256 amount) external payable {
+        _checkInitiated();
+
         if (cToken == C_ETH) {
             amount = Math.min(amount, address(this).balance);
 

src/migration/CompoundV3MigrationBundler.sol

@@ -20,10 +20,11 @@ contract CompoundV3MigrationBundler is MigrationBundler {
     /* ACTIONS */
 
     /// @notice Repays `amount` of `asset` on the CompoundV3 `instance`, on behalf of the initiator.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Assumes the given instance is a CompoundV3 instance.
     /// @dev Pass `amount = type(uint256).max` to repay all.
     function compoundV3Repay(address instance, address asset, uint256 amount) external payable {
+        _checkInitiated();
+
         amount = Math.min(amount, ERC20(asset).balanceOf(address(this)));
 
         require(amount != 0, ErrorsLib.ZERO_AMOUNT);
@@ -43,17 +44,17 @@ contract CompoundV3MigrationBundler is MigrationBundler {
     }
 
     /// @notice Withdraws `amount` of `asset` from the CompoundV3 `instance`, on behalf of the initiator.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Initiator must have previously approved the bundler to manage their CompoundV3 position.
     /// @dev Assumes the given `instance` is a CompoundV3 instance.
     /// @dev Pass `amount = type(uint256).max` to withdraw all.
     function compoundV3WithdrawFrom(address instance, address asset, uint256 amount) external payable {
+        _checkInitiated();
+
         ICompoundV3(instance).withdrawFrom(initiator(), address(this), asset, amount);
     }
 
     /// @notice Approves the bundler to act on behalf of the initiator on the CompoundV3 `instance`, given a signed
     /// EIP-712 approval message.
-    /// @notice Warning: should only be called via the bundler's `multicall` function.
     /// @dev Assumes the given `instance` is a CompoundV3 instance.
     function compoundV3AllowBySig(
         address instance,
@@ -64,6 +65,8 @@ contract CompoundV3MigrationBundler is MigrationBundler {
         bytes32 r,
         bytes32 s
     ) external payable {
+        _checkInitiated();
+
         ICompoundV3(instance).allowBySig(initiator(), address(this), isAllowed, nonce, expiry, v, r, s);
     }
 }

test/forge/ERC4626BundlerLocalTest.sol

@@ -47,6 +47,11 @@ contract ERC4626BundlerLocalTest is LocalTest {
         bundler.multicall(bundle);
     }
 
+    function test4626DepositUninitiated(uint256 assets) public {
+        vm.expectRevert(bytes(ErrorsLib.UNINITIATED));
+        ERC4626BundlerMock(address(bundler)).erc4626Withdraw(address(vault), assets, RECEIVER);
+    }
+
     function testErc4626WithdrawZeroAdressVault(uint256 assets) public {
         bundle.push(_erc4626Withdraw(address(0), assets, RECEIVER));
 
@@ -61,6 +66,11 @@ contract ERC4626BundlerLocalTest is LocalTest {
         bundler.multicall(bundle);
     }
 
+    function test4626RedeemUninitiated(uint256 assets) public {
+        vm.expectRevert(bytes(ErrorsLib.UNINITIATED));
+        ERC4626BundlerMock(address(bundler)).erc4626Redeem(address(vault), assets, RECEIVER);
+    }
+
     function testErc4626RedeemZeroAdressVault(uint256 assets) public {
         bundle.push(_erc4626Redeem(address(0), assets, RECEIVER));
 

test/forge/MorphoBundlerLocalTest.sol

@@ -215,6 +215,11 @@ contract MorphoBundlerLocalTest is LocalTest {
         _testSupplyCollateral(amount, onBehalf);
     }
 
+    function testWithdrawUninitiated(uint256 withdrawnShares) public {
+        vm.expectRevert(bytes(ErrorsLib.UNINITIATED));
+        MorphoBundlerMock(address(bundler)).morphoWithdraw(marketParams, 0, withdrawnShares, RECEIVER);
+    }
+
     function testWithdraw(uint256 privateKey, uint256 amount, uint256 withdrawnShares) public {
         address user;
         (privateKey, user) = _boundPrivateKey(privateKey);
@@ -247,6 +252,11 @@ contract MorphoBundlerLocalTest is LocalTest {
         assertEq(morpho.borrowShares(id, user), 0, "borrowShares(user)");
     }
 
+    function testBorrowUnititiated(uint256 borrowedAssets) public {
+        vm.expectRevert(bytes(ErrorsLib.UNINITIATED));
+        MorphoBundlerMock(address(bundler)).morphoBorrow(marketParams, borrowedAssets, 0, RECEIVER);
+    }
+
     function _testSupplyCollateralBorrow(address user, uint256 amount, uint256 collateralAmount) internal {
         assertEq(collateralToken.balanceOf(RECEIVER), 0, "collateral.balanceOf(RECEIVER)");
         assertEq(loanToken.balanceOf(RECEIVER), amount, "loan.balanceOf(RECEIVER)");
@@ -316,6 +326,11 @@ contract MorphoBundlerLocalTest is LocalTest {
         _testSupplyCollateralBorrow(user, amount, collateralAmount);
     }
 
+    function testWithdrawCollateralUninitiated(uint256 collateralAmount) public {
+        vm.expectRevert(bytes(ErrorsLib.UNINITIATED));
+        MorphoBundlerMock(address(bundler)).morphoWithdrawCollateral(marketParams, collateralAmount, RECEIVER);
+    }
+
     function _testRepayWithdrawCollateral(address user, uint256 collateralAmount) internal {
         assertEq(collateralToken.balanceOf(RECEIVER), collateralAmount, "collateral.balanceOf(RECEIVER)");
         assertEq(loanToken.balanceOf(RECEIVER), 0, "loan.balanceOf(RECEIVER)");

test/forge/PermitBundlerLocalTest.sol

@@ -35,6 +35,17 @@ contract PermitBundlerLocalTest is LocalTest {
         assertEq(permitToken.allowance(user, address(bundler)), amount, "allowance(user, bundler)");
     }
 
+    function testPermitUninitiated(uint256 amount) public {
+        amount = bound(amount, MIN_AMOUNT, MAX_AMOUNT);
+
+        uint8 v;
+        bytes32 r;
+        bytes32 s;
+
+        vm.expectRevert(bytes(ErrorsLib.UNINITIATED));
+        PermitBundlerMock(address(bundler)).permit(address(loanToken), amount, SIGNATURE_DEADLINE, v, r, s, true);
+    }
+
     function testPermitRevert(uint256 amount, uint256 privateKey, uint256 deadline) public {
         amount = bound(amount, MIN_AMOUNT, MAX_AMOUNT);
         deadline = bound(deadline, block.timestamp, type(uint48).max);

test/forge/TransferBundlerLocalTest.sol

@@ -93,6 +93,13 @@ contract TransferBundlerLocalTest is LocalTest {
         assertEq(loanToken.balanceOf(USER), 0, "loan.balanceOf(USER)");
     }
 
+    function testTransferFromUninitiated(uint256 amount) public {
+        amount = bound(amount, MIN_AMOUNT, MAX_AMOUNT);
+
+        vm.expectRevert(bytes(ErrorsLib.UNINITIATED));
+        TransferBundlerMock(address(bundler)).erc20TransferFrom(address(loanToken), amount);
+    }
+
     function testTranferFromZeroAddress(uint256 amount) public {
         amount = bound(amount, MIN_AMOUNT, MAX_AMOUNT);