remove space

Author: amiecorso

src/EIP7702Proxy.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.0;
 
-import {Proxy} from "@openzeppelin/contracts/proxy/Proxy.sol";
-import {ERC1967Utils} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Utils.sol";
-import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-import {Address} from "@openzeppelin/contracts/utils/Address.sol";
+import {Proxy} from "openzeppelin-contracts/contracts/proxy/Proxy.sol";
+import {ERC1967Utils} from "openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Utils.sol";
+import {ECDSA} from "openzeppelin-contracts/contracts/utils/cryptography/ECDSA.sol";
+import {Address} from "openzeppelin-contracts/contracts/utils/Address.sol";
 
 /// @notice Proxy contract designed for EIP-7702 smart accounts.
 ///
@@ -15,6 +15,8 @@ contract EIP7702Proxy is Proxy {
     address immutable initialImplementation;
     bytes4 immutable guardedInitializer;
 
+    event Upgraded(address indexed implementation);
+
     error InvalidSignature();
     error InvalidInitializer();
     error InvalidImplementation();
@@ -39,6 +41,9 @@ contract EIP7702Proxy is Proxy {
         if (implementation != initialImplementation)
             revert InvalidImplementation();
 
+        // Set the ERC-1967 implementation slot and emit Upgraded event
+        ERC1967Utils.upgradeToAndCall(initialImplementation, "");
+
         Address.functionDelegateCall(
             initialImplementation,
             abi.encodePacked(guardedInitializer, args)

test/EIP7702Proxy/initialize.t.sol

@@ -5,13 +5,13 @@ import {EIP7702ProxyBase} from "../base/EIP7702ProxyBase.sol";
 import {EIP7702Proxy} from "../../src/EIP7702Proxy.sol";
 import {CoinbaseSmartWallet} from "../../lib/smart-wallet/src/CoinbaseSmartWallet.sol";
 import {ECDSA} from "openzeppelin-contracts/contracts/utils/cryptography/ECDSA.sol";
+import {ERC1967Utils} from "openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Utils.sol";
 
 contract InitializeTest is EIP7702ProxyBase {
     function testSucceedsWithValidSignature() public {
         bytes memory initArgs = _createInitArgs(_newOwner);
         bytes memory signature = _signInitData(_EOA_PRIVATE_KEY, initArgs);
 
-        vm.prank(_eoa);
         EIP7702Proxy(_eoa).initialize(initArgs, signature);
 
         // Verify initialization through implementation at the EOA's address
@@ -26,7 +26,6 @@ contract InitializeTest is EIP7702ProxyBase {
         bytes memory initArgs = _createInitArgs(_newOwner);
         bytes memory signature = hex"deadbeef"; // Invalid signature
 
-        vm.prank(_eoa);
         vm.expectRevert(); // Should revert with signature verification error
         EIP7702Proxy(_eoa).initialize(initArgs, signature);
     }
@@ -40,7 +39,6 @@ contract InitializeTest is EIP7702ProxyBase {
         (uint8 v, bytes32 r, bytes32 s) = vm.sign(wrongPk, initHash);
         bytes memory signature = abi.encodePacked(r, s, v);
 
-        vm.prank(_eoa);
         vm.expectRevert(); // Should revert with signature verification error
         EIP7702Proxy(_eoa).initialize(initArgs, signature);
     }
@@ -49,12 +47,33 @@ contract InitializeTest is EIP7702ProxyBase {
         bytes memory initArgs = _createInitArgs(_newOwner);
         bytes memory signature = _signInitData(_EOA_PRIVATE_KEY, initArgs);
 
-        vm.prank(_eoa);
         EIP7702Proxy(_eoa).initialize(initArgs, signature);
 
         // Try to initialize again
-        vm.prank(_eoa);
         vm.expectRevert(CoinbaseSmartWallet.Initialized.selector);
         EIP7702Proxy(_eoa).initialize(initArgs, signature);
     }
+
+    function testSetsERC1967ImplementationSlot() public {
+        bytes memory initArgs = _createInitArgs(_newOwner);
+        bytes memory signature = _signInitData(_EOA_PRIVATE_KEY, initArgs);
+
+        EIP7702Proxy(_eoa).initialize(initArgs, signature);
+
+        address storedImpl = _getERC1967Implementation(address(_eoa));
+        assertEq(
+            storedImpl,
+            address(_implementation),
+            "ERC1967 implementation slot should store implementation address"
+        );
+    }
+
+    function testEmitsUpgradedEvent() public {
+        bytes memory initArgs = _createInitArgs(_newOwner);
+        bytes memory signature = _signInitData(_EOA_PRIVATE_KEY, initArgs);
+
+        vm.expectEmit(true, false, false, false, address(_eoa));
+        emit EIP7702Proxy.Upgraded(address(_implementation));
+        EIP7702Proxy(_eoa).initialize(initArgs, signature);
+    }
 }

test/base/EIP7702ProxyBase.sol

@@ -12,6 +12,10 @@ import {ECDSA} from "openzeppelin-contracts/contracts/utils/cryptography/ECDSA.s
  *      This contract should not contain any actual tests.
  */
 abstract contract EIP7702ProxyBase is Test {
+    // Add ERC1967 implementation slot constant
+    bytes32 internal constant IMPLEMENTATION_SLOT = 
+        0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;
+
     // Test accounts
     uint256 internal constant _EOA_PRIVATE_KEY = 0xA11CE;
     address payable internal _eoa;
@@ -77,4 +81,13 @@ abstract contract EIP7702ProxyBase is Test {
         owners[0] = abi.encode(owner);
         return abi.encode(owners);
     }
+
+    /**
+     * @dev Helper to read the implementation address from ERC1967 storage slot
+     * @param proxy Address of the proxy contract to read from
+     * @return The implementation address stored in the ERC1967 slot
+     */
+    function _getERC1967Implementation(address proxy) internal view returns (address) {
+        return address(uint160(uint256(vm.load(proxy, IMPLEMENTATION_SLOT))));
+    }
 }