add erc20 tests for good measure

Author: amiecorso

test/EIP7702Proxy/TokenReceive.t.sol

@@ -4,54 +4,53 @@ pragma solidity ^0.8.23;
 import {CoinbaseImplementationTest} from "./coinbaseImplementation.t.sol";
 import {MockERC721} from "../mocks/MockERC721.sol";
 import {MockERC1155} from "../mocks/MockERC1155.sol";
+import {MockERC20} from "../mocks/MockERC20.sol";
 import {EIP7702Proxy} from "../../src/EIP7702Proxy.sol";
 
 contract TokenReceiveTest is CoinbaseImplementationTest {
     MockERC721 public nft;
     MockERC1155 public multiToken;
+    MockERC20 public token;
     uint256 constant TOKEN_ID = 1;
     uint256 constant AMOUNT = 1;
+    uint256 constant TOKEN_AMOUNT = 1 ether;
 
     function setUp() public override {
         super.setUp();
         nft = new MockERC721();
         multiToken = new MockERC1155();
+        token = new MockERC20();
     }
 
-    function test_canReceive_ERC721_afterInitialization() public {
-        // Mint and transfer NFT
+    function test_succeeds_ERC721Transfer_afterInitialization() public {
         nft.mint(address(this), TOKEN_ID);
         nft.safeTransferFrom(address(this), _eoa, TOKEN_ID);
-
-        // Verify transfer succeeded
         assertEq(nft.ownerOf(TOKEN_ID), _eoa);
     }
 
-    function test_canReceive_ERC1155_afterInitialization() public {
-        // Mint tokens directly to a regular address first
+    function test_succeeds_ERC1155Transfer_afterInitialization() public {
         address regularAddress = makeAddr("regularHolder");
         multiToken.mint(regularAddress, TOKEN_ID, AMOUNT, "");
 
-        // Then transfer to our smart wallet
         vm.prank(regularAddress);
         multiToken.safeTransferFrom(regularAddress, _eoa, TOKEN_ID, AMOUNT, "");
-
-        // Verify transfer succeeded
         assertEq(multiToken.balanceOf(_eoa, TOKEN_ID), AMOUNT);
     }
 
+    function test_succeeds_ERC20Transfer_afterInitialization() public {
+        token.mint(address(this), TOKEN_AMOUNT);
+
+        token.transfer(_eoa, TOKEN_AMOUNT);
+        assertEq(token.balanceOf(_eoa), TOKEN_AMOUNT);
+    }
+
     function test_succeeds_ERC721Transfer_beforeInitialization() public {
         // Deploy proxy without initializing
         address payable uninitProxy = payable(makeAddr("uninitProxy"));
         _deployProxy(uninitProxy);
 
-        // Mint NFT
         nft.mint(address(this), TOKEN_ID);
-
-        // Transfer should succeed
         nft.safeTransferFrom(address(this), uninitProxy, TOKEN_ID);
-
-        // Verify transfer succeeded
         assertEq(nft.ownerOf(TOKEN_ID), uninitProxy);
     }
 
@@ -60,11 +59,9 @@ contract TokenReceiveTest is CoinbaseImplementationTest {
         address payable uninitProxy = payable(makeAddr("uninitProxy"));
         _deployProxy(uninitProxy);
 
-        // Mint tokens to a regular address first
         address regularAddress = makeAddr("regularHolder");
         multiToken.mint(regularAddress, TOKEN_ID, AMOUNT, "");
 
-        // Transfer should succeed
         vm.prank(regularAddress);
         multiToken.safeTransferFrom(
             regularAddress,
@@ -73,8 +70,16 @@ contract TokenReceiveTest is CoinbaseImplementationTest {
             AMOUNT,
             ""
         );
-
-        // Verify transfer succeeded
         assertEq(multiToken.balanceOf(uninitProxy, TOKEN_ID), AMOUNT);
     }
+
+    function test_succeeds_ERC20Transfer_beforeInitialization() public {
+        // Deploy proxy without initializing
+        address payable uninitProxy = payable(makeAddr("uninitProxy"));
+        _deployProxy(uninitProxy);
+
+        token.mint(address(this), TOKEN_AMOUNT);
+        token.transfer(uninitProxy, TOKEN_AMOUNT);
+        assertEq(token.balanceOf(uninitProxy), TOKEN_AMOUNT);
+    }
 }

test/mocks/MockERC20.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.23;
+
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+contract MockERC20 is ERC20 {
+    constructor() ERC20("Mock Token", "MOCK") {}
+
+    function mint(address to, uint256 amount) external {
+        _mint(to, amount);
+    }
+}