Merge pull request #322 from semaphore-protocol/feat/init-members

New class parameter to add members

Former-commit-id: 5915ea0

Author: cedoor

packages/group/README.md

@@ -74,6 +74,7 @@ yarn add @semaphore-protocol/group
 
 ```typescript
 import { Group } from "@semaphore-protocol/group"
+import { Identity } from "@semaphore-protocol/identity"
 
 // Group with max 1048576 members (20^²).
 const group1 = new Group(1)
@@ -83,6 +84,13 @@ const group2 = new Group(1, 16)
 
 // Group with max 16777216 members (24^²).
 const group3 = new Group(1, 24)
+
+// Group with a list of predefined members.
+const identity1 = new Identity()
+const identity2 = new Identity()
+const identity3 = new Identity()
+
+const group3 = new Group(1, 16, [identity1.commitment, identity2.commitment, identity3.commitment])
 ```
 
 \# **addMember**(identityCommitment: _Member_)
@@ -96,21 +104,6 @@ const commitment = identity.generateCommitment()
 group.addMember(commitment)
 ```
 
-\# **addMembers**(identityCommitments: _Member\[]_)
-
-```typescript
-let identityCommitments: bigint[]
-
-for (let i = 0; i < 10; i++) {
-    const identity = new Identity()
-    const commitment = identity.generateCommitment()
-
-    identityCommitments.push(commitment)
-}
-
-group.addMember(identityCommitments)
-```
-
 \# **removeMember**(index: _number_)
 
 ```typescript

packages/group/package.json

@@ -41,6 +41,6 @@
         "@ethersproject/bignumber": "^5.7.0",
         "@ethersproject/bytes": "^5.7.0",
         "@ethersproject/keccak256": "^5.7.0",
-        "@zk-kit/incremental-merkle-tree": "1.0.0"
+        "@zk-kit/incremental-merkle-tree": "1.1.0"
     }
 }

packages/group/src/group.test.ts

@@ -19,14 +19,29 @@ describe("Group", () => {
             expect(fun).toThrow("The tree depth must be between 16 and 32")
         })
 
-        it("Should create a group with different parameters", () => {
+        it("Should create a group with a different tree depth", () => {
             const group = new Group(1, 32)
 
             expect(group.root.toString()).toContain("460373")
             expect(group.depth).toBe(32)
             expect(group.zeroValue).toBe(hash(1))
             expect(group.members).toHaveLength(0)
         })
+
+        it("Should create a group with a list of members", () => {
+            const group = new Group(2, 20, [1, 2, 3])
+
+            const group2 = new Group(2, 20)
+
+            group2.addMember(1)
+            group2.addMember(2)
+            group2.addMember(3)
+
+            expect(group.root.toString()).toContain(group2.root.toString())
+            expect(group.depth).toBe(20)
+            expect(group.zeroValue).toBe(hash(2))
+            expect(group.members).toHaveLength(3)
+        })
     })
 
     describe("# addMember", () => {

packages/group/src/group.ts

@@ -12,14 +12,15 @@ export default class Group {
      * Initializes the group with the group id and the tree depth.
      * @param id Group identifier.
      * @param treeDepth Tree depth.
+     * @param members List of group members.
      */
-    constructor(id: BigNumberish, treeDepth = 20) {
+    constructor(id: BigNumberish, treeDepth = 20, members: BigNumberish[] = []) {
         if (treeDepth < 16 || treeDepth > 32) {
             throw new Error("The tree depth must be between 16 and 32")
         }
 
         this._id = id
-        this.merkleTree = new IncrementalMerkleTree(poseidon2, treeDepth, hash(id), 2)
+        this.merkleTree = new IncrementalMerkleTree(poseidon2, treeDepth, hash(id), 2, members)
     }
 
     /**
@@ -82,6 +83,7 @@ export default class Group {
     /**
      * Adds new members to the group.
      * @param members New members.
+     * @deprecated Use the new class parameter to add a list of members.
      */
     addMembers(members: BigNumberish[]) {
         for (const member of members) {

yarn.lock.REMOVED.git-id

@@ -1 +1 @@
-41a594b655244878cf24a7d982a9f8c3bc0988c2
+4cd9ed331cad58cdd4d33c9535028b24d411bd56