feat: change contract name and add dummy signature verification (#109)

* feat: change contract name and add dummy signature verification * feat: add dummy signature verification to multi chain signer * fmt --------- Co-authored-by: leekt <leekt216@gmail.com>
zerodevapp · May 7, 2024 · 10c0997 · 10c0997
1 parent 6681a2b
commit 10c0997
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/src/signer/MultiSignatureSigner.sol → src/signer/MultiChainSigner.sol b/src/signer/MultiSignatureSigner.sol → src/signer/MultiChainSigner.sol
@@ -20,7 +20,10 @@ struct ECDSAValidatorStorage {
     address owner;
 }
 
-contract MultiSignatureECDSASigner is SignerBase {
+bytes constant DUMMY_ECDSA_SIG =
+    hex"fffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
+
+contract MultiChainSigner is SignerBase {
     mapping(address => uint256) public usedIds;
     mapping(bytes32 id => mapping(address wallet => address)) public signer;
 
@@ -70,8 +73,15 @@ contract MultiSignatureECDSASigner is SignerBase {
         }
         bytes memory ecdsaSig = sig[0:65];
         bytes32 merkleRoot = bytes32(sig[65:97]);
-        bytes32[] memory proof = abi.decode(sig[97:], (bytes32[]));
-        require(MerkleProofLib.verify(proof, merkleRoot, userOpHash), "hash is not in proof");
+        // if the signature is a dummy signature, then use dummyUserOpHash instead of real userOpHash
+        if (keccak256(ecdsaSig) == keccak256(DUMMY_ECDSA_SIG)) {
+            (bytes32 dummyUserOpHash, bytes32[] memory proof) = abi.decode(sig[97:], (bytes32, bytes32[]));
+            require(MerkleProofLib.verify(proof, merkleRoot, dummyUserOpHash), "hash is not in proof");
+            // otherwise, use real userOpHash
+        } else {
+            bytes32[] memory proof = abi.decode(sig[97:], (bytes32[]));
+            require(MerkleProofLib.verify(proof, merkleRoot, userOpHash), "hash is not in proof");
+        }
         // simple ecdsa verification
         if (owner == ECDSA.recover(merkleRoot, ecdsaSig)) {
             return SIG_VALIDATION_SUCCESS_UINT;

diff --git a/...alidator/MultiSignatureECDSAValidator.sol → src/validator/MultiChainValidator.sol b/...alidator/MultiSignatureECDSAValidator.sol → src/validator/MultiChainValidator.sol
@@ -19,7 +19,10 @@ struct ECDSAValidatorStorage {
     address owner;
 }
 
-contract MultiSignatureECDSAValidator is IValidator, IHook {
+bytes constant DUMMY_ECDSA_SIG =
+    hex"fffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
+
+contract MultiChainValidator is IValidator, IHook {
     event OwnerRegistered(address indexed kernel, address indexed owner);
 
     mapping(address => ECDSAValidatorStorage) public ecdsaValidatorStorage;
@@ -69,8 +72,15 @@ contract MultiSignatureECDSAValidator is IValidator, IHook {
         }
         bytes memory ecdsaSig = sig[0:65];
         bytes32 merkleRoot = bytes32(sig[65:97]);
-        bytes32[] memory proof = abi.decode(sig[97:], (bytes32[]));
-        require(MerkleProofLib.verify(proof, merkleRoot, userOpHash), "hash is not in proof");
+        // if the signature is a dummy signature, then use dummyUserOpHash instead of real userOpHash
+        if (keccak256(ecdsaSig) == keccak256(DUMMY_ECDSA_SIG)) {
+            (bytes32 dummyUserOpHash, bytes32[] memory proof) = abi.decode(sig[97:], (bytes32, bytes32[]));
+            require(MerkleProofLib.verify(proof, merkleRoot, dummyUserOpHash), "hash is not in proof");
+            // otherwise, use real userOpHash
+        } else {
+            bytes32[] memory proof = abi.decode(sig[97:], (bytes32[]));
+            require(MerkleProofLib.verify(proof, merkleRoot, userOpHash), "hash is not in proof");
+        }
         // simple ecdsa verification
         if (owner == ECDSA.recover(merkleRoot, ecdsaSig)) {
             return SIG_VALIDATION_SUCCESS_UINT;