Revert on non-contract entrypoint (#14)

base-org · Nov 1, 2023 · 1c7eb30 · 1c7eb30
1 parent 25fdbc7
commit 1c7eb30
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/Paymaster.sol b/src/Paymaster.sol
@@ -26,6 +26,7 @@ contract Paymaster is BasePaymaster {
     constructor(IEntryPoint _entryPoint, address _verifyingSigner) BasePaymaster(_entryPoint) {
         require(_verifyingSigner != address(0), "Paymaster: verifyingSigner cannot be address(0)");
         require(_verifyingSigner != msg.sender, "Paymaster: verifyingSigner cannot be the owner");
+        require(address(_entryPoint).code.length > 0, "Paymaster: passed _entryPoint is not currently a contract");
         verifyingSigner = _verifyingSigner;
     }
 

diff --git a/test/Paymaster.t.sol b/test/Paymaster.t.sol
@@ -41,6 +41,11 @@ contract PaymasterTest is Test {
         new Paymaster(entrypoint, address(this));
     }
 
+    function test_entryPointNotAContract() public {
+        vm.expectRevert("Paymaster: passed _entryPoint is not currently a contract");
+        new Paymaster(IEntryPoint(address(0x1234)), PAYMASTER_SIGNER);
+    }
+
     function test_noRenounceOwnership() public {
         vm.expectRevert("Paymaster: renouncing ownership is not allowed");
         paymaster.renounceOwnership();