Merge pull request #14 from base-org/amie/blocksec-review-changes

Validate constructor arguments to proxy are nonzero

Author: amiecorso

src/EIP7702Proxy.sol

@@ -36,10 +36,17 @@ contract EIP7702Proxy is Proxy {
     /// @notice Emitted when initialization is attempted on a non-initial implementation
     error InvalidImplementation();
 
+    /// @notice Emitted when constructor arguments are zero
+    error ZeroValueConstructorArguments();
+
     /// @notice Initializes the proxy with an initial implementation and guarded initializer
     /// @param implementation The initial implementation address
     /// @param initializer The selector of the `guardedInitializer` function
     constructor(address implementation, bytes4 initializer) {
+        if (implementation == address(0))
+            revert ZeroValueConstructorArguments();
+        if (initializer == bytes4(0)) revert ZeroValueConstructorArguments();
+
         proxy = address(this);
         initialImplementation = implementation;
         guardedInitializer = initializer;

test/EIP7702Proxy/initialize.t.sol

@@ -147,4 +147,14 @@ contract InitializeTest is EIP7702ProxyBase {
         vm.expectRevert(EIP7702Proxy.InvalidSignature.selector);
         EIP7702Proxy(_eoa).initialize(differentArgs, signature);
     }
+
+    function test_constructor_reverts_whenImplementationZero() public {
+        vm.expectRevert(EIP7702Proxy.ZeroValueConstructorArguments.selector);
+        new EIP7702Proxy(address(0), MockImplementation.initialize.selector);
+    }
+
+    function test_constructor_reverts_whenInitializerZero() public {
+        vm.expectRevert(EIP7702Proxy.ZeroValueConstructorArguments.selector);
+        new EIP7702Proxy(address(_implementation), bytes4(0));
+    }
 }