successful tests for 1967 upgrades

Author: amiecorso

remappings.txt

@@ -1,3 +1,4 @@
 smart-wallet/=lib/smart-wallet/src/
 forge-std/=lib/forge-std/src/
-openzeppelin-contracts/=lib/openzeppelin-contracts/ 
+openzeppelin-contracts/=lib/openzeppelin-contracts/
+solady/=lib/solady/src/

test/EIP7702Proxy/upgradeToAndCall.t.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.23;
 import {EIP7702ProxyBase} from "../base/EIP7702ProxyBase.sol";
 import {EIP7702Proxy} from "../../src/EIP7702Proxy.sol";
 import {CoinbaseSmartWallet} from "../../lib/smart-wallet/src/CoinbaseSmartWallet.sol";
-import {UUPSUpgradeable} from "solady/src/utils/UUPSUpgradeable.sol";
+import {UUPSUpgradeable} from "solady/utils/UUPSUpgradeable.sol";
 
 contract UpgradeToAndCallTest is EIP7702ProxyBase {
     DummyImplementation newImplementation;
@@ -22,8 +22,8 @@ contract UpgradeToAndCallTest is EIP7702ProxyBase {
         newImplementation = new DummyImplementation();
     }
 
-    function testUpgradeToAndCall() public {
-        // Only owner should be able to upgrade
+    function testUpgradeToAndCall_succeedsForOwner() public {
+        // Wallet owner should be able to upgrade
         vm.prank(_newOwner);
 
         CoinbaseSmartWallet(payable(_eoa)).upgradeToAndCall(
@@ -37,6 +37,21 @@ contract UpgradeToAndCallTest is EIP7702ProxyBase {
         DummyImplementation(payable(_eoa)).dummy();
     }
 
+    function testUpgradeToAndCall_succeedsForEOA() public {
+        // EOA should be able to upgrade
+        vm.prank(_eoa);
+
+        CoinbaseSmartWallet(payable(_eoa)).upgradeToAndCall(
+            address(newImplementation),
+            abi.encodeWithSignature("dummy()")
+        );
+
+        // Verify upgrade worked by calling new function
+        vm.expectEmit(true, true, true, true, _eoa);
+        emit DummyImplementation.DummyCalled();
+        DummyImplementation(payable(_eoa)).dummy();
+    }
+
     function testUpgradeToAndCallRevertsForNonOwner() public {
         vm.prank(address(0xBAD));
         vm.expectRevert(); // CoinbaseSmartWallet will revert for non-owner