Multisig tests + slight adjustments

distributed-lab · Aug 20, 2024 · 5142f62 · 5142f62
1 parent 726bf7e
commit 5142f62
Show file tree

Hide file tree

Showing 4 changed files with 411 additions and 5 deletions.
diff --git a/contracts/ZKMultisig.sol b/contracts/ZKMultisig.sol
@@ -190,7 +190,17 @@ contract ZKMultisig is UUPSUpgradeable, IZKMultisig {
         return
             uint256(
                 PoseidonUnit1L.poseidon(
-                    [uint256(keccak256(abi.encode(block.chainid, address(this), proposalId_)))]
+                    [
+                        uint256(
+                            uint248(
+                                uint256(
+                                    keccak256(
+                                        abi.encode(block.chainid, address(this), proposalId_)
+                                    )
+                                )
+                            )
+                        )
+                    ]
                 )
             );
     }
@@ -265,6 +275,11 @@ contract ZKMultisig is UUPSUpgradeable, IZKMultisig {
 
     function _updateParticipantVerifier(address participantVerifier_) internal {
         require(participantVerifier_ != address(0), "ZKMultisig: Invalid verifier address");
+        require(
+            participantVerifier_ != participantVerifier,
+            "ZKMultisig: The same verifier address"
+        );
+        require(participantVerifier_.code.length > 0, "ZKMultisig: Not a contract");
 
         participantVerifier = participantVerifier_;
     }

diff --git a/contracts/ZKMultisigFactory.sol b/contracts/ZKMultisigFactory.sol
@@ -27,7 +27,10 @@ contract ZKMultisigFactory is EIP712, IZKMultisigFactory {
         address participantVerifier_
     ) EIP712("ZKMultisigFactory", "1") {
         require(
-            zkMultisigImplementation_ != address(0) && participantVerifier_ != address(0),
+            zkMultisigImplementation_ != address(0) &&
+                zkMultisigImplementation_.code.length > 0 &&
+                participantVerifier_ != address(0) &&
+                participantVerifier_.code.length > 0,
             "ZKMultisigFactory: Invalid implementation or verifier address"
         );
 
@@ -43,7 +46,6 @@ contract ZKMultisigFactory is EIP712, IZKMultisigFactory {
         address zkMultisigAddress_ = address(
             new ERC1967Proxy{salt: keccak256(abi.encode(msg.sender, salt_))}(ZK_MULTISIG_IMPL, "")
         );
-
         IZKMultisig(zkMultisigAddress_).initialize(
             participants_,
             quorumPercentage_,

diff --git a/contracts/mock/VerifierMock.sol b/contracts/mock/VerifierMock.sol
@@ -6,7 +6,7 @@ contract PositiveVerifierMock {
         uint256[2] calldata,
         uint256[2][2] calldata,
         uint256[2] calldata,
-        uint256[24] calldata
+        uint256[3] calldata
     ) public pure returns (bool) {
         return true;
     }
@@ -17,7 +17,7 @@ contract NegativeVerifierMock {
         uint256[2] calldata,
         uint256[2][2] calldata,
         uint256[2] calldata,
-        uint256[24] calldata
+        uint256[3] calldata
     ) public pure returns (bool) {
         return false;
     }