feat: group data

.github/workflows/test.yaml

@@ -0,0 +1,39 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - "main"
+  pull_request:
+    branches:
+      - "**"
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Use Node.js 18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 7
+
+      - name: Install dependenciess
+        run: pnpm install --frozen-lockfile
+
+      - name: Download snark-artifacts
+        run: pnpm run download:snark-artifacts
+
+      - name: Start Hardhat node, Run Tests, and Shutdown Hardhat node
+        run: |
+          npx hardhat node &
+          HARDHAT_PID=$!
+          sleep 5 # Wait for Hardhat node to be fully up and running
+          pnpm test
+          kill $HARDHAT_PID

.npmrc

@@ -0,0 +1,2 @@
+engine-strict=true
+auto-install-peers=false

contracts/CypherCity.sol

@@ -2,21 +2,22 @@
 pragma abicoder v2;
 pragma solidity ^0.8.4;
 
-import "@semaphore-protocol/contracts/interfaces/ISemaphore.sol";
+import "./CypherCitySemaphore.sol";
 
 contract CypherCity {
     error IdentityAlreadyExists();
 
-    event NewMessage(string message);
     event NewIdentity(uint256 identityCommitment);
 
-    ISemaphore public semaphore;
+    uint256 public constant ADD_TO_GROUP = uint256(keccak256(abi.encodePacked("add_to_group")));
+
+    CypherCitySemaphore public semaphore;
 
     uint256 public groupId;
     mapping(uint256 => bool) public registeredIdentities;
 
     constructor(address semaphoreAddress, uint256 _groupId) {
-        semaphore = ISemaphore(semaphoreAddress);
+        semaphore = CypherCitySemaphore(semaphoreAddress);
         groupId = _groupId;
 
         semaphore.createGroup(groupId, 20, address(this));
@@ -33,8 +34,8 @@ contract CypherCity {
         emit NewIdentity(identityCommitment);
     }
 
-    function sendMessage(
-        string calldata message,
+    function addToGroup(
+        uint256 identityCommitment,
         uint256 merkleTreeRoot,
         uint256 nullifierHash,
         uint256 externalNullifier,
@@ -43,12 +44,20 @@ contract CypherCity {
         semaphore.verifyProof(
             groupId,
             merkleTreeRoot,
-            uint256(keccak256(abi.encodePacked(message))),
+            ADD_TO_GROUP,
             nullifierHash,
             externalNullifier,
             proof
         );
 
-        emit NewMessage(message);
+        this.joinGroup(identityCommitment);
+    }
+
+    function getMerkleRootCreationDate(uint256 merkleRoot) external view returns (uint256) {
+        return semaphore.getMerkleRootCreationDate(groupId, merkleRoot);
+    }
+
+    function getMerkleTreeRoot() external view returns (uint256) {
+        return semaphore.getMerkleTreeRoot(groupId);
     }
 }

contracts/CypherCitySemaphore.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.4;
+
+import "@semaphore-protocol/contracts/Semaphore.sol";
+import "@semaphore-protocol/contracts/interfaces/ISemaphore.sol";
+
+contract CypherCitySemaphore is Semaphore {
+    constructor(ISemaphoreVerifier _verifier) Semaphore(_verifier) {}
+
+    function getMerkleRootCreationDate(uint256 groupId, uint256 merkleRoot) external view returns (uint256) {
+        return groups[groupId].merkleRootCreationDates[merkleRoot];
+    }
+}

package.json

@@ -47,6 +47,7 @@
     },
     "dependencies": {
         "@semaphore-protocol/contracts": "3.15.1",
+        "@semaphore-protocol/data": "^3.15.1",
         "@zk-kit/incremental-merkle-tree.sol": "1.3.3"
     },
     "config": {