c

Author: hazim-j

README.md

@@ -13,7 +13,7 @@ All contracts are deployed deterministically with the following addresses.
 | Keystore                     | `0x69C9F626b5Bd934C0F9806346682eD407FB978d3` |
 | KeystoreAccountFactory       | `0x625cF8EDec3f68d48D3aA385F356524B04760BE8` |
 | UserOpECDSAVerifier          | `0x52949503fF5c34caEa4FC98F0723ebD0c300f232` |
-| UserOpMultiSigVerifier       | `0x0ad936Ee17E2d1c5038A038151Da7c5F963384b8` |
+| UserOpMultiSigVerifier       | `0xE0d2C6d58d1A4703C703ced10FD2bA682f1006f0` |
 | UserOpWebAuthnVerifier       | `0xE19620169A26aEbC4Fe229A073639da6b009bF1a` |
 | UserOpWebAuthnCosignVerifier | `0x939C10DCdA11A73eCCc563340aBE3d257859dC6d` |
 

src/verifier/UserOpMultiSigVerifier.sol

@@ -21,6 +21,12 @@ contract UserOpMultiSigVerifier is IVerifier, OnlyKeystore {
         bytes signature;
     }
 
+    struct SignatureCheck {
+        uint8 valid;
+        uint8 invalid;
+        bytes32 message;
+    }
+
     constructor(address aKeystore) OnlyKeystore(aKeystore) {}
 
     /**
@@ -65,18 +71,18 @@ contract UserOpMultiSigVerifier is IVerifier, OnlyKeystore {
         uint256 length = signatures.length;
         require(length <= type(uint8).max, MaxSignaturesExceeded());
 
-        uint8 valid = 0;
-        uint8 invalid = 0;
+        SignatureCheck memory sc;
+        sc.message = ECDSA.toEthSignedMessageHash(message);
         bool[] memory seen = new bool[](owners.length);
         for (uint256 i = 0; i < length; i++) {
             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] == _ecdsaRecover(message, sd.signature) ? valid++ : invalid++;
+            !seen[sd.index] && owners[sd.index] == ECDSA.recover(sc.message, sd.signature) ? sc.valid++ : sc.invalid++;
             seen[sd.index] = true;
         }
 
-        return valid >= threshold ? SIG_VALIDATION_SUCCESS : SIG_VALIDATION_FAILED;
+        return sc.valid >= threshold ? SIG_VALIDATION_SUCCESS : SIG_VALIDATION_FAILED;
     }
 
     // ================================================================
@@ -94,8 +100,4 @@ 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);
-    }
 }