ECDSA verifiers: use eip-191

Author: hazim-j

README.md

@@ -12,10 +12,10 @@ All contracts are deployed deterministically with the following addresses.
 | ---------------------------- | -------------------------------------------- |
 | Keystore                     | `0x69C9F626b5Bd934C0F9806346682eD407FB978d3` |
 | KeystoreAccountFactory       | `0x625cF8EDec3f68d48D3aA385F356524B04760BE8` |
-| UserOpECDSAVerifier          | `0x294CD71960eed5AEa11DbbFa5D3c8eA4A1c1CE0F` |
-| UserOpMultiSigVerifier       | `0x1dBadE1E34706f83598ae9acFC63B7F4f928146E` |
+| UserOpECDSAVerifier          | `0x52949503fF5c34caEa4FC98F0723ebD0c300f232` |
+| UserOpMultiSigVerifier       | `0x0ad936Ee17E2d1c5038A038151Da7c5F963384b8` |
 | UserOpWebAuthnVerifier       | `0xE19620169A26aEbC4Fe229A073639da6b009bF1a` |
-| UserOpWebAuthnCosignVerifier | `0x7CD0D83C0c33AAC9cef88c75F3EDec80F4175252` |
+| UserOpWebAuthnCosignVerifier | `0x939C10DCdA11A73eCCc563340aBE3d257859dC6d` |
 
 ## Usage
 

src/verifier/UserOpECDSAVerifier.sol

@@ -38,7 +38,7 @@ contract UserOpECDSAVerifier is IVerifier, OnlyKeystore {
             signature = userOp.signature;
         }
 
-        return address(bytes20(config)) == ECDSA.recover(message, signature)
+        return address(bytes20(config)) == ECDSA.recover(ECDSA.toEthSignedMessageHash(message), signature)
             ? SIG_VALIDATION_SUCCESS
             : SIG_VALIDATION_FAILED;
     }

src/verifier/UserOpMultiSigVerifier.sol

@@ -72,7 +72,7 @@ contract UserOpMultiSigVerifier is IVerifier, OnlyKeystore {
             SignerData memory sd = signatures[i];
 
             // Note: we need to ensure gas usage is consistent during simulation with dummy signers.
-            !seen[sd.index] && owners[sd.index] == ECDSA.recover(message, sd.signature) ? valid++ : invalid++;
+            !seen[sd.index] && owners[sd.index] == _ecdsaRecover(message, sd.signature) ? valid++ : invalid++;
             seen[sd.index] = true;
         }
 
@@ -94,4 +94,8 @@ contract UserOpMultiSigVerifier is IVerifier, OnlyKeystore {
             require(owners[i] > owners[i - 1], OwnersUnsortedOrHasDuplicates());
         }
     }
+
+    function _ecdsaRecover(bytes32 message, bytes memory signature) internal view returns (address) {
+        return ECDSA.recover(ECDSA.toEthSignedMessageHash(message), signature);
+    }
 }

src/verifier/UserOpWebAuthnCosignVerifier.sol

@@ -63,7 +63,7 @@ contract UserOpWebAuthnCosignVerifier is IVerifier, OnlyKeystore {
 
         // Note: always run verification for both signatures in order to calculate accurate gas
         // estimates during simulation with dummy signers.
-        bool cosignValid = cosigner == ECDSA.recover(message, ecdsaSignature);
+        bool cosignValid = cosigner == ECDSA.recover(ECDSA.toEthSignedMessageHash(message), ecdsaSignature);
         bool webauthnValid = WebAuthn.verify(abi.encode(message), true, auth, x, y);
         return (cosignValid && webauthnValid) ? SIG_VALIDATION_SUCCESS : SIG_VALIDATION_FAILED;
     }

test/verifier/UserOpECDSAVerifier.t.sol

@@ -19,7 +19,7 @@ contract UserOpECDSAVerifierTest is Test {
     function testFuzz_validateData(bool withUserOp) public {
         (address signer, uint256 signerPK) = makeAddrAndKey("signer");
         bytes32 message = keccak256("Signed by signer");
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(signerPK, message);
+        (uint8 v, bytes32 r, bytes32 s) = vm.sign(signerPK, ECDSA.toEthSignedMessageHash(message));
 
         bytes memory data = abi.encodePacked(r, s, v);
         if (withUserOp) {
@@ -35,7 +35,7 @@ contract UserOpECDSAVerifierTest is Test {
     function testFuzz_validateDataValidationFailed(bool withUserOp, address config) public {
         (, uint256 signerPK) = makeAddrAndKey("signer");
         bytes32 message = keccak256("Signed by signer");
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(signerPK, message);
+        (uint8 v, bytes32 r, bytes32 s) = vm.sign(signerPK, ECDSA.toEthSignedMessageHash(message));
 
         bytes memory data = abi.encodePacked(r, s, v);
         if (withUserOp) {

test/verifier/UserOpMultiSigVerifier.t.sol

@@ -210,7 +210,7 @@ contract UserOpMultiSigVerifierTest is Test {
 
         Signer[] memory signers = _createSigners(1);
         bytes32 message = keccak256("Signed by signer");
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(signers[0].pk, message);
+        (uint8 v, bytes32 r, bytes32 s) = vm.sign(signers[0].pk, ECDSA.toEthSignedMessageHash(message));
         bytes memory signature = abi.encodePacked(r, s, v);
 
         uint16 count = uint16(type(uint8).max) + excess;
@@ -307,7 +307,7 @@ contract UserOpMultiSigVerifierTest is Test {
         UserOpMultiSigVerifier.SignerData[] memory sd = new UserOpMultiSigVerifier.SignerData[](threshold);
         for (uint8 i = 0; i < threshold; i++) {
             uint16 index = uint16(i) + offset;
-            (uint8 v, bytes32 r, bytes32 s) = vm.sign(signers[index].pk, message);
+            (uint8 v, bytes32 r, bytes32 s) = vm.sign(signers[index].pk, ECDSA.toEthSignedMessageHash(message));
             sd[i] = UserOpMultiSigVerifier.SignerData({
                 // Note: index will overflow back to 0 after max uint8.
                 // This is ok since an InvalidNumberOfOwners() error is expected.

test/verifier/UserOpWebAuthnCosignVerifier.t.sol

@@ -7,6 +7,7 @@ import {SIG_VALIDATION_FAILED, SIG_VALIDATION_SUCCESS} from "account-abstraction
 import {PackedUserOperation} from "account-abstraction/interfaces/PackedUserOperation.sol";
 import {Test} from "forge-std/Test.sol";
 import {Base64} from "solady/utils/Base64.sol";
+import {ECDSA} from "solady/utils/ECDSA.sol";
 import {LibString} from "solady/utils/LibString.sol";
 import {P256} from "solady/utils/P256.sol";
 import {WebAuthn} from "solady/utils/WebAuthn.sol";
@@ -116,7 +117,8 @@ contract UserOpWebAuthnCosignVerifierTest is Test {
         pure
         returns (bytes memory signature)
     {
-        (uint8 cosignerV, bytes32 cosignerR, bytes32 cosignerS) = vm.sign(cosignerPrivateKey, message);
+        (uint8 cosignerV, bytes32 cosignerR, bytes32 cosignerS) =
+            vm.sign(cosignerPrivateKey, ECDSA.toEthSignedMessageHash(message));
 
         string memory clientDataJSON =
             clientDataJSONPre.concat(Base64.encode(abi.encode(message), true, true)).concat(clientDataJSONPost);