Support contract owner setting verifyingSigner (#4)

base · Nov 1, 2023 · f0cade3 · f0cade3
1 parent 112f7e8
commit f0cade3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/src/Paymaster.sol b/src/Paymaster.sol
@@ -19,7 +19,7 @@ contract Paymaster is BasePaymaster {
     using ECDSA for bytes32;
     using UserOperationLib for UserOperation;
 
-    address public immutable verifyingSigner;
+    address public verifyingSigner;
 
     uint256 private constant VALID_TIMESTAMP_OFFSET = 20;
     uint256 private constant SIGNATURE_OFFSET = VALID_TIMESTAMP_OFFSET + 64;
@@ -90,6 +90,10 @@ contract Paymaster is BasePaymaster {
         signature = paymasterAndData[SIGNATURE_OFFSET:];
     }
 
+    function setVerifyingSigner(address _verifyingSigner) public onlyOwner {
+        verifyingSigner = _verifyingSigner;
+    }
+
     receive() external payable {
         deposit();
     }

diff --git a/test/Paymaster.t.sol b/test/Paymaster.t.sol
@@ -39,11 +39,29 @@ contract PaymasterTest is Test {
         assertEq(signature, MOCK_SIG);
     }
 
+    function test_setVerifyingSignerOnlyOwner() public {
+        vm.broadcast(ACCOUNT_OWNER);
+        vm.expectRevert("Ownable: caller is not the owner");
+        paymaster.setVerifyingSigner(ACCOUNT_OWNER);
+    }
+
     function test_validatePaymasterUserOpValidSignature() public {
         UserOperation memory userOp = createUserOp();
         signUserOp(userOp);
 
-        vm.expectRevert(createEncodedValidationResult(false));
+        vm.expectRevert(createEncodedValidationResult(false, 57198));
+        entrypoint.simulateValidation(userOp);
+    }
+
+    function test_validatePaymasterUserOpUpdatedSigner() public {
+        paymaster.setVerifyingSigner(ACCOUNT_OWNER);
+
+        UserOperation memory userOp = createUserOp();
+        (uint8 v, bytes32 r, bytes32 s) = vm.sign(ACCOUNT_OWNER_KEY, ECDSA.toEthSignedMessageHash(paymaster.getHash(userOp, MOCK_VALID_UNTIL, MOCK_VALID_AFTER)));
+        userOp.paymasterAndData = abi.encodePacked(address(paymaster), abi.encode(MOCK_VALID_UNTIL, MOCK_VALID_AFTER), r, s, v);
+        signUserOp(userOp);
+
+        vm.expectRevert(createEncodedValidationResult(false, 55198));
         entrypoint.simulateValidation(userOp);
     }
 
@@ -53,7 +71,7 @@ contract PaymasterTest is Test {
         userOp.paymasterAndData = abi.encodePacked(address(paymaster), abi.encode(MOCK_VALID_UNTIL, MOCK_VALID_AFTER), r, s, v);
         signUserOp(userOp);
 
-        vm.expectRevert(createEncodedValidationResult(true));
+        vm.expectRevert(createEncodedValidationResult(true, 57204));
         entrypoint.simulateValidation(userOp);
     }
 
@@ -99,11 +117,7 @@ contract PaymasterTest is Test {
         userOp.signature = abi.encodePacked(r, s, v);
     }
 
-    function createEncodedValidationResult(bool sigFailed) public pure returns (bytes memory) {
-        uint256 preOpGas = 55114;
-        if (sigFailed) {
-            preOpGas = 55120;
-        }
+    function createEncodedValidationResult(bool sigFailed, uint256 preOpGas) public pure returns (bytes memory) {
         uint256 prefund = 0;
         bytes memory paymasterContext = "";
         return abi.encodeWithSelector(