refactor: update verifiers

Author: cedoor

package.json

@@ -59,7 +59,6 @@
         "@types/jest": "^27.4.0",
         "@types/node": "^17.0.9",
         "@types/rimraf": "^3.0.2",
-        "@types/snarkjs": "^0.7.5",
         "@typescript-eslint/eslint-plugin": "^5.9.1",
         "@typescript-eslint/parser": "^5.9.1",
         "babel-jest": "^27.4.6",
@@ -83,6 +82,7 @@
         "prettier": "^2.5.1",
         "rimraf": "^3.0.2",
         "rollup": "^2.64.0",
+        "snarkjs": "^0.7.2",
         "ts-node": "^10.4.0",
         "tslib": "^2.3.1",
         "typedoc": "^0.25.1",

packages/contracts/contracts/Semaphore.sol

@@ -152,8 +152,8 @@ contract Semaphore is ISemaphore, SemaphoreGroups {
     function verifyProof(
         uint256 groupId,
         uint256 merkleTreeRoot,
-        uint256 message,
         uint256 nullifier,
+        uint256 message,
         uint256 scope,
         uint256[8] calldata proof
     ) external override onlyExistingGroup(groupId) {
@@ -184,10 +184,19 @@ contract Semaphore is ISemaphore, SemaphoreGroups {
             revert Semaphore__YouAreUsingTheSameNillifierTwice();
         }
 
-        verifier.verifyProof(merkleTreeRoot, nullifier, message, scope, proof);
+        if (
+            !verifier.verifyProof(
+                [proof[0], proof[1]],
+                [[proof[3], proof[2]], [proof[5], proof[4]]],
+                [proof[6], proof[7]],
+                [merkleTreeRoot, nullifier, message, scope]
+            )
+        ) {
+            revert Semaphore__InvalidProof();
+        }
 
         groups[groupId].nullifiers[nullifier] = true;
 
-        emit ProofVerified(groupId, merkleTreeRoot, nullifier, scope, message, proof);
+        emit ProofVerified(groupId, merkleTreeRoot, nullifier, message, scope, proof);
     }
 }