Merge pull request #180 from semaphore-protocol/refactor/group-id

No SNARK restrictions for Group IDs

Former-commit-id: 27320f1

Author: cedoor

packages/contracts/contracts/base/SemaphoreConstants.sol

@@ -1,7 +1,6 @@
 //SPDX-License-Identifier: MIT
 pragma solidity 0.8.4;
 
-import {SNARK_SCALAR_FIELD} from "./SemaphoreConstants.sol";
 import "../interfaces/ISemaphoreGroups.sol";
 import "@zk-kit/incremental-merkle-tree.sol/IncrementalBinaryTree.sol";
 import "@openzeppelin/contracts/utils/Context.sol";
@@ -24,10 +23,6 @@ abstract contract SemaphoreGroups is Context, ISemaphoreGroups {
         uint256 merkleTreeDepth,
         uint256 zeroValue
     ) internal virtual {
-        if (groupId >= SNARK_SCALAR_FIELD) {
-            revert Semaphore__GroupIdIsNotLessThanSnarkScalarField();
-        }
-
         if (getMerkleTreeDepth(groupId) != 0) {
             revert Semaphore__GroupAlreadyExists();
         }

packages/contracts/contracts/base/SemaphoreGroups.sol

@@ -2,7 +2,6 @@
 pragma solidity 0.8.4;
 
 import "../interfaces/ISemaphoreVerifier.sol";
-import "./SemaphoreConstants.sol";
 
 /// @title Semaphore verifier contract.
 /// @notice Minimal code to allow users to verify their Semaphore proofs.

packages/contracts/contracts/base/SemaphoreVerifier.sol

@@ -36,16 +36,6 @@ describe("SemaphoreVoting", () => {
             await expect(transaction).to.be.revertedWith("Semaphore__MerkleTreeDepthIsNotSupported()")
         })
 
-        it("Should not create a poll greater than the snark scalar field", async () => {
-            const transaction = contract.createPoll(
-                BigInt("21888242871839275222246405745257275088548364400416034343698204186575808495618"),
-                coordinator,
-                treeDepth
-            )
-
-            await expect(transaction).to.be.revertedWith("Semaphore__GroupIdIsNotLessThanSnarkScalarField()")
-        })
-
         it("Should create a poll", async () => {
             const transaction = contract.createPoll(pollIds[0], coordinator, treeDepth)
 

packages/contracts/test/SemaphoreVoting.ts

@@ -34,16 +34,6 @@ describe("SemaphoreWhistleblowing", () => {
             await expect(transaction).to.be.revertedWith("Semaphore__MerkleTreeDepthIsNotSupported()")
         })
 
-        it("Should not create an entity greater than the snark scalar field", async () => {
-            const transaction = contract.createEntity(
-                BigInt("21888242871839275222246405745257275088548364400416034343698204186575808495618"),
-                editor,
-                treeDepth
-            )
-
-            await expect(transaction).to.be.revertedWith("Semaphore__GroupIdIsNotLessThanSnarkScalarField()")
-        })
-
         it("Should create an entity", async () => {
             const transaction = contract.createEntity(entityIds[0], editor, treeDepth)
 

packages/contracts/test/SemaphoreWhistleblowing.ts

@@ -1 +1 @@
-ade939691dcd569b1afd17037512c05544cb453a
+d5e764e1df1ee8a4de266237c73e44074450106d