@semaphore-protocol/proof 4.0.0-alpha → 4.0.0-alpha.2

package/README.md

@@ -10,7 +10,7 @@
         <img src="https://img.shields.io/badge/project-Semaphore-blue.svg?style=flat-square">
     </a>
     <a href="https://github.com/semaphore-protocol/semaphore/blob/main/LICENSE">
-        <img alt="Github license" src="https://img.shields.io/github/license/semaphore-protocol/semaphore.svg?style=flat-square">
+        <img alt="NPM license" src="https://img.shields.io/npm/l/%40semaphore-protocol%2Fproof?style=flat-square">
     </a>
     <a href="https://www.npmjs.com/package/@semaphore-protocol/proof">
         <img alt="NPM version" src="https://img.shields.io/npm/v/@semaphore-protocol/proof?style=flat-square" />

package/dist/index.browser.mjs

@@ -1,13 +1,13 @@
 /**
  * @module @semaphore-protocol/proof
- * @version 4.0.0-alpha
+ * @version 4.0.0-alpha.2
  * @file A library to generate and verify Semaphore proofs.
  * @copyright Ethereum Foundation 2024
  * @license MIT
  * @see [Github]{@link https://github.com/semaphore-protocol/semaphore/tree/main/packages/proof}
 */
 import { BigNumber } from '@ethersproject/bignumber';
-import { prove, verify } from '@zk-kit/groth16';
+import { groth16 } from 'snarkjs';
 import { zeroPad } from '@ethersproject/bytes';
 import { keccak256 } from '@ethersproject/keccak256';
 
@@ -100,11 +100,11 @@ function hash(message) {
 }
 
 /**
- * Packs a proof into a format compatible with Semaphore.
- * @param proof The Groth16 proof generated with SnarkJS.
- * @returns The proof compatible with Semaphore.
+ * Packs the Groth16 proof points into a format compatible with Semaphore.
+ * @param proof The proof points generated with SnarkJS.
+ * @returns The proof points compatible with Semaphore.
  */
-function packProof(proof) {
+function packPoints(proof) {
     return [
         proof.pi_a[0],
         proof.pi_a[1],
@@ -120,21 +120,26 @@ function packProof(proof) {
 /**
  * Generates a Semaphore proof.
  * @param identity The Semaphore identity.
- * @param group The Semaphore group or its Merkle proof.
+ * @param groupOrMerkleProof The Semaphore group or its Merkle proof.
  * @param scope The external nullifier.
  * @param message The Semaphore signal.
  * @param merkleTreeDepth The depth of the tree with which the circuit was compiled.
  * @param snarkArtifacts The SNARK artifacts.
  * @returns The Semaphore proof ready to be verified.
  */
-function generateProof(identity, group, message, scope, merkleTreeDepth, snarkArtifacts) {
+function generateProof(identity, groupOrMerkleProof, message, scope, merkleTreeDepth, snarkArtifacts) {
     return __awaiter(this, void 0, void 0, function () {
-        var leafIndex, merkleProof, merkleProofLength, merkleProofIndices, merkleProofSiblings, i, _a, proof, publicSignals;
+        var merkleProof, leafIndex, merkleProofLength, merkleProofIndices, merkleProofSiblings, i, _a, proof, publicSignals;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    leafIndex = group.indexOf(identity.commitment);
-                    merkleProof = group.generateMerkleProof(leafIndex);
+                    if ("siblings" in groupOrMerkleProof) {
+                        merkleProof = groupOrMerkleProof;
+                    }
+                    else {
+                        leafIndex = groupOrMerkleProof.indexOf(identity.commitment);
+                        merkleProof = groupOrMerkleProof.generateMerkleProof(leafIndex);
+                    }
                     merkleProofLength = merkleProof.siblings.length;
                     if (merkleTreeDepth !== undefined) {
                         if (merkleTreeDepth < 1 || merkleTreeDepth > 12) {
@@ -158,7 +163,7 @@ function generateProof(identity, group, message, scope, merkleTreeDepth, snarkAr
                             merkleProofSiblings[i] = "0";
                         }
                     }
-                    return [4 /*yield*/, prove({
+                    return [4 /*yield*/, groth16.fullProve({
                             secret: identity.secretScalar,
                             merkleProofLength: merkleProofLength,
                             merkleProofIndices: merkleProofIndices,
@@ -174,7 +179,7 @@ function generateProof(identity, group, message, scope, merkleTreeDepth, snarkAr
                             nullifier: publicSignals[1],
                             message: BigNumber.from(message).toString(),
                             scope: BigNumber.from(scope).toString(),
-                            proof: packProof(proof)
+                            points: packPoints(proof)
                         }];
             }
         });
@@ -182,11 +187,11 @@ function generateProof(identity, group, message, scope, merkleTreeDepth, snarkAr
 }
 
 /**
- * Unpacks a proof into its original form.
- * @param proof The proof compatible with Semaphore.
- * @returns The proof compatible with SnarkJS.
+ * Unpacks the Groth16 proof points into their original form.
+ * @param proof The proof points compatible with Semaphore.
+ * @returns The proof points compatible with SnarkJS.
  */
-function unpackProof(proof) {
+function unpackPoints(proof) {
     return {
         pi_a: [proof[0], proof[1]],
         pi_b: [
@@ -780,7 +785,7 @@ var verificationKeys = {
  * @returns True if the proof is valid, false otherwise.
  */
 function verifyProof(_a) {
-    var merkleTreeDepth = _a.merkleTreeDepth, merkleTreeRoot = _a.merkleTreeRoot, nullifier = _a.nullifier, message = _a.message, scope = _a.scope, proof = _a.proof;
+    var merkleTreeDepth = _a.merkleTreeDepth, merkleTreeRoot = _a.merkleTreeRoot, nullifier = _a.nullifier, message = _a.message, scope = _a.scope, points = _a.points;
     return __awaiter(this, void 0, void 0, function () {
         var verificationKey;
         return __generator(this, function (_b) {
@@ -789,12 +794,9 @@ function verifyProof(_a) {
                 throw new TypeError("The tree depth must be a number between 1 and 12");
             }
             verificationKey = __assign(__assign({}, verificationKeys), { vk_delta_2: verificationKeys.vk_delta_2[merkleTreeDepth - 1], IC: verificationKeys.IC[merkleTreeDepth - 1] });
-            return [2 /*return*/, verify(verificationKey, {
-                    publicSignals: [merkleTreeRoot, nullifier, hash(message), hash(scope)],
-                    proof: unpackProof(proof)
-                })];
+            return [2 /*return*/, groth16.verify(verificationKey, [merkleTreeRoot, nullifier, hash(message), hash(scope)], unpackPoints(points))];
         });
     });
 }
 
-export { generateProof, getSnarkArtifacts, packProof, unpackProof, verifyProof };
+export { generateProof, getSnarkArtifacts, packPoints, unpackPoints, verifyProof };

package/dist/index.node.js

@@ -1,6 +1,6 @@
 /**
  * @module @semaphore-protocol/proof
- * @version 4.0.0-alpha
+ * @version 4.0.0-alpha.2
  * @file A library to generate and verify Semaphore proofs.
  * @copyright Ethereum Foundation 2024
  * @license MIT
@@ -9,7 +9,7 @@
 'use strict';
 
 var bignumber = require('@ethersproject/bignumber');
-var groth16 = require('@zk-kit/groth16');
+var snarkjs = require('snarkjs');
 var download = require('download');
 var fs = require('fs');
 var tmp = require('tmp');
@@ -90,10 +90,7 @@ function getSnarkArtifacts(treeDepth) {
                 case 0:
                     tmpDir = "semaphore-proof";
                     tmpPath = "".concat(tmp.tmpdir, "/").concat(tmpDir, "-").concat(treeDepth);
-                    if (!fs.existsSync(tmpPath)) {
-                        tmp.dirSync({ name: "".concat(tmpDir, "-").concat(treeDepth) });
-                    }
-                    if (!(fs.readdirSync(tmpPath).length !== 2)) return [3 /*break*/, 3];
+                    if (!(!fs.existsSync(tmpPath) || fs.readdirSync(tmpPath).length !== 2)) return [3 /*break*/, 3];
                     return [4 /*yield*/, download("https://semaphore.cedoor.dev/artifacts/".concat(treeDepth, "/semaphore.wasm"), tmpPath)];
                 case 1:
                     _a.sent();
@@ -122,11 +119,11 @@ function hash(message) {
 }
 
 /**
- * Packs a proof into a format compatible with Semaphore.
- * @param proof The Groth16 proof generated with SnarkJS.
- * @returns The proof compatible with Semaphore.
+ * Packs the Groth16 proof points into a format compatible with Semaphore.
+ * @param proof The proof points generated with SnarkJS.
+ * @returns The proof points compatible with Semaphore.
  */
-function packProof(proof) {
+function packPoints(proof) {
     return [
         proof.pi_a[0],
         proof.pi_a[1],
@@ -142,21 +139,26 @@ function packProof(proof) {
 /**
  * Generates a Semaphore proof.
  * @param identity The Semaphore identity.
- * @param group The Semaphore group or its Merkle proof.
+ * @param groupOrMerkleProof The Semaphore group or its Merkle proof.
  * @param scope The external nullifier.
  * @param message The Semaphore signal.
  * @param merkleTreeDepth The depth of the tree with which the circuit was compiled.
  * @param snarkArtifacts The SNARK artifacts.
  * @returns The Semaphore proof ready to be verified.
  */
-function generateProof(identity, group, message, scope, merkleTreeDepth, snarkArtifacts) {
+function generateProof(identity, groupOrMerkleProof, message, scope, merkleTreeDepth, snarkArtifacts) {
     return __awaiter(this, void 0, void 0, function () {
-        var leafIndex, merkleProof, merkleProofLength, merkleProofIndices, merkleProofSiblings, i, _a, proof, publicSignals;
+        var merkleProof, leafIndex, merkleProofLength, merkleProofIndices, merkleProofSiblings, i, _a, proof, publicSignals;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    leafIndex = group.indexOf(identity.commitment);
-                    merkleProof = group.generateMerkleProof(leafIndex);
+                    if ("siblings" in groupOrMerkleProof) {
+                        merkleProof = groupOrMerkleProof;
+                    }
+                    else {
+                        leafIndex = groupOrMerkleProof.indexOf(identity.commitment);
+                        merkleProof = groupOrMerkleProof.generateMerkleProof(leafIndex);
+                    }
                     merkleProofLength = merkleProof.siblings.length;
                     if (merkleTreeDepth !== undefined) {
                         if (merkleTreeDepth < 1 || merkleTreeDepth > 12) {
@@ -180,7 +182,7 @@ function generateProof(identity, group, message, scope, merkleTreeDepth, snarkAr
                             merkleProofSiblings[i] = "0";
                         }
                     }
-                    return [4 /*yield*/, groth16.prove({
+                    return [4 /*yield*/, snarkjs.groth16.fullProve({
                             secret: identity.secretScalar,
                             merkleProofLength: merkleProofLength,
                             merkleProofIndices: merkleProofIndices,
@@ -196,7 +198,7 @@ function generateProof(identity, group, message, scope, merkleTreeDepth, snarkAr
                             nullifier: publicSignals[1],
                             message: bignumber.BigNumber.from(message).toString(),
                             scope: bignumber.BigNumber.from(scope).toString(),
-                            proof: packProof(proof)
+                            points: packPoints(proof)
                         }];
             }
         });
@@ -204,11 +206,11 @@ function generateProof(identity, group, message, scope, merkleTreeDepth, snarkAr
 }
 
 /**
- * Unpacks a proof into its original form.
- * @param proof The proof compatible with Semaphore.
- * @returns The proof compatible with SnarkJS.
+ * Unpacks the Groth16 proof points into their original form.
+ * @param proof The proof points compatible with Semaphore.
+ * @returns The proof points compatible with SnarkJS.
  */
-function unpackProof(proof) {
+function unpackPoints(proof) {
     return {
         pi_a: [proof[0], proof[1]],
         pi_b: [
@@ -802,7 +804,7 @@ var verificationKeys = {
  * @returns True if the proof is valid, false otherwise.
  */
 function verifyProof(_a) {
-    var merkleTreeDepth = _a.merkleTreeDepth, merkleTreeRoot = _a.merkleTreeRoot, nullifier = _a.nullifier, message = _a.message, scope = _a.scope, proof = _a.proof;
+    var merkleTreeDepth = _a.merkleTreeDepth, merkleTreeRoot = _a.merkleTreeRoot, nullifier = _a.nullifier, message = _a.message, scope = _a.scope, points = _a.points;
     return __awaiter(this, void 0, void 0, function () {
         var verificationKey;
         return __generator(this, function (_b) {
@@ -811,16 +813,13 @@ function verifyProof(_a) {
                 throw new TypeError("The tree depth must be a number between 1 and 12");
             }
             verificationKey = __assign(__assign({}, verificationKeys), { vk_delta_2: verificationKeys.vk_delta_2[merkleTreeDepth - 1], IC: verificationKeys.IC[merkleTreeDepth - 1] });
-            return [2 /*return*/, groth16.verify(verificationKey, {
-                    publicSignals: [merkleTreeRoot, nullifier, hash(message), hash(scope)],
-                    proof: unpackProof(proof)
-                })];
+            return [2 /*return*/, snarkjs.groth16.verify(verificationKey, [merkleTreeRoot, nullifier, hash(message), hash(scope)], unpackPoints(points))];
         });
     });
 }
 
 exports.generateProof = generateProof;
 exports.getSnarkArtifacts = getSnarkArtifacts;
-exports.packProof = packProof;
-exports.unpackProof = unpackProof;
+exports.packPoints = packPoints;
+exports.unpackPoints = unpackPoints;
 exports.verifyProof = verifyProof;

package/dist/index.node.mjs

@@ -1,13 +1,13 @@
 /**
  * @module @semaphore-protocol/proof
- * @version 4.0.0-alpha
+ * @version 4.0.0-alpha.2
  * @file A library to generate and verify Semaphore proofs.
  * @copyright Ethereum Foundation 2024
  * @license MIT
  * @see [Github]{@link https://github.com/semaphore-protocol/semaphore/tree/main/packages/proof}
 */
 import { BigNumber } from '@ethersproject/bignumber';
-import { prove, verify } from '@zk-kit/groth16';
+import { groth16 } from 'snarkjs';
 import download from 'download';
 import fs from 'fs';
 import tmp from 'tmp';
@@ -88,10 +88,7 @@ function getSnarkArtifacts(treeDepth) {
                 case 0:
                     tmpDir = "semaphore-proof";
                     tmpPath = "".concat(tmp.tmpdir, "/").concat(tmpDir, "-").concat(treeDepth);
-                    if (!fs.existsSync(tmpPath)) {
-                        tmp.dirSync({ name: "".concat(tmpDir, "-").concat(treeDepth) });
-                    }
-                    if (!(fs.readdirSync(tmpPath).length !== 2)) return [3 /*break*/, 3];
+                    if (!(!fs.existsSync(tmpPath) || fs.readdirSync(tmpPath).length !== 2)) return [3 /*break*/, 3];
                     return [4 /*yield*/, download("https://semaphore.cedoor.dev/artifacts/".concat(treeDepth, "/semaphore.wasm"), tmpPath)];
                 case 1:
                     _a.sent();
@@ -120,11 +117,11 @@ function hash(message) {
 }
 
 /**
- * Packs a proof into a format compatible with Semaphore.
- * @param proof The Groth16 proof generated with SnarkJS.
- * @returns The proof compatible with Semaphore.
+ * Packs the Groth16 proof points into a format compatible with Semaphore.
+ * @param proof The proof points generated with SnarkJS.
+ * @returns The proof points compatible with Semaphore.
  */
-function packProof(proof) {
+function packPoints(proof) {
     return [
         proof.pi_a[0],
         proof.pi_a[1],
@@ -140,21 +137,26 @@ function packProof(proof) {
 /**
  * Generates a Semaphore proof.
  * @param identity The Semaphore identity.
- * @param group The Semaphore group or its Merkle proof.
+ * @param groupOrMerkleProof The Semaphore group or its Merkle proof.
  * @param scope The external nullifier.
  * @param message The Semaphore signal.
  * @param merkleTreeDepth The depth of the tree with which the circuit was compiled.
  * @param snarkArtifacts The SNARK artifacts.
  * @returns The Semaphore proof ready to be verified.
  */
-function generateProof(identity, group, message, scope, merkleTreeDepth, snarkArtifacts) {
+function generateProof(identity, groupOrMerkleProof, message, scope, merkleTreeDepth, snarkArtifacts) {
     return __awaiter(this, void 0, void 0, function () {
-        var leafIndex, merkleProof, merkleProofLength, merkleProofIndices, merkleProofSiblings, i, _a, proof, publicSignals;
+        var merkleProof, leafIndex, merkleProofLength, merkleProofIndices, merkleProofSiblings, i, _a, proof, publicSignals;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    leafIndex = group.indexOf(identity.commitment);
-                    merkleProof = group.generateMerkleProof(leafIndex);
+                    if ("siblings" in groupOrMerkleProof) {
+                        merkleProof = groupOrMerkleProof;
+                    }
+                    else {
+                        leafIndex = groupOrMerkleProof.indexOf(identity.commitment);
+                        merkleProof = groupOrMerkleProof.generateMerkleProof(leafIndex);
+                    }
                     merkleProofLength = merkleProof.siblings.length;
                     if (merkleTreeDepth !== undefined) {
                         if (merkleTreeDepth < 1 || merkleTreeDepth > 12) {
@@ -178,7 +180,7 @@ function generateProof(identity, group, message, scope, merkleTreeDepth, snarkAr
                             merkleProofSiblings[i] = "0";
                         }
                     }
-                    return [4 /*yield*/, prove({
+                    return [4 /*yield*/, groth16.fullProve({
                             secret: identity.secretScalar,
                             merkleProofLength: merkleProofLength,
                             merkleProofIndices: merkleProofIndices,
@@ -194,7 +196,7 @@ function generateProof(identity, group, message, scope, merkleTreeDepth, snarkAr
                             nullifier: publicSignals[1],
                             message: BigNumber.from(message).toString(),
                             scope: BigNumber.from(scope).toString(),
-                            proof: packProof(proof)
+                            points: packPoints(proof)
                         }];
             }
         });
@@ -202,11 +204,11 @@ function generateProof(identity, group, message, scope, merkleTreeDepth, snarkAr
 }
 
 /**
- * Unpacks a proof into its original form.
- * @param proof The proof compatible with Semaphore.
- * @returns The proof compatible with SnarkJS.
+ * Unpacks the Groth16 proof points into their original form.
+ * @param proof The proof points compatible with Semaphore.
+ * @returns The proof points compatible with SnarkJS.
  */
-function unpackProof(proof) {
+function unpackPoints(proof) {
     return {
         pi_a: [proof[0], proof[1]],
         pi_b: [
@@ -800,7 +802,7 @@ var verificationKeys = {
  * @returns True if the proof is valid, false otherwise.
  */
 function verifyProof(_a) {
-    var merkleTreeDepth = _a.merkleTreeDepth, merkleTreeRoot = _a.merkleTreeRoot, nullifier = _a.nullifier, message = _a.message, scope = _a.scope, proof = _a.proof;
+    var merkleTreeDepth = _a.merkleTreeDepth, merkleTreeRoot = _a.merkleTreeRoot, nullifier = _a.nullifier, message = _a.message, scope = _a.scope, points = _a.points;
     return __awaiter(this, void 0, void 0, function () {
         var verificationKey;
         return __generator(this, function (_b) {
@@ -809,12 +811,9 @@ function verifyProof(_a) {
                 throw new TypeError("The tree depth must be a number between 1 and 12");
             }
             verificationKey = __assign(__assign({}, verificationKeys), { vk_delta_2: verificationKeys.vk_delta_2[merkleTreeDepth - 1], IC: verificationKeys.IC[merkleTreeDepth - 1] });
-            return [2 /*return*/, verify(verificationKey, {
-                    publicSignals: [merkleTreeRoot, nullifier, hash(message), hash(scope)],
-                    proof: unpackProof(proof)
-                })];
+            return [2 /*return*/, groth16.verify(verificationKey, [merkleTreeRoot, nullifier, hash(message), hash(scope)], unpackPoints(points))];
         });
     });
 }
 
-export { generateProof, getSnarkArtifacts, packProof, unpackProof, verifyProof };
+export { generateProof, getSnarkArtifacts, packPoints, unpackPoints, verifyProof };

package/dist/types/generate-proof.d.ts

@@ -1,15 +1,15 @@
 import { BytesLike, Hexable } from "@ethersproject/bytes";
-import { Group } from "@semaphore-protocol/group";
+import type { Group, MerkleProof } from "@semaphore-protocol/group";
 import type { Identity } from "@semaphore-protocol/identity";
 import { SemaphoreProof, SnarkArtifacts } from "./types";
 /**
  * Generates a Semaphore proof.
  * @param identity The Semaphore identity.
- * @param group The Semaphore group or its Merkle proof.
+ * @param groupOrMerkleProof The Semaphore group or its Merkle proof.
  * @param scope The external nullifier.
  * @param message The Semaphore signal.
  * @param merkleTreeDepth The depth of the tree with which the circuit was compiled.
  * @param snarkArtifacts The SNARK artifacts.
  * @returns The Semaphore proof ready to be verified.
  */
-export default function generateProof(identity: Identity, group: Group, message: BytesLike | Hexable | number | bigint, scope: BytesLike | Hexable | number | bigint, merkleTreeDepth?: number, snarkArtifacts?: SnarkArtifacts): Promise<SemaphoreProof>;
+export default function generateProof(identity: Identity, groupOrMerkleProof: Group | MerkleProof, message: BytesLike | Hexable | number | bigint, scope: BytesLike | Hexable | number | bigint, merkleTreeDepth?: number, snarkArtifacts?: SnarkArtifacts): Promise<SemaphoreProof>;

package/dist/types/hash.d.ts

@@ -1,5 +1,5 @@
 import { BytesLike, Hexable } from "@ethersproject/bytes";
-import { NumericString } from "@zk-kit/groth16";
+import { NumericString } from "snarkjs";
 /**
  * Creates a keccak256 hash of a message compatible with the SNARK scalar modulus.
  * @param message The message to be hashed.

package/dist/types/index.d.ts

@@ -1,7 +1,7 @@
 import generateProof from "./generate-proof";
 import getSnarkArtifacts from "./get-snark-artifacts.node";
-import packProof from "./pack-proof";
-import unpackProof from "./unpack-proof";
+import packPoints from "./pack-points";
+import unpackPoints from "./unpack-points";
 import verifyProof from "./verify-proof";
 export * from "./types";
-export { generateProof, getSnarkArtifacts, packProof, unpackProof, verifyProof };
+export { generateProof, getSnarkArtifacts, packPoints, unpackPoints, verifyProof };

package/dist/types/pack-points.d.ts

@@ -0,0 +1,8 @@
+import { Groth16Proof } from "snarkjs";
+import { PackedPoints } from "./types";
+/**
+ * Packs the Groth16 proof points into a format compatible with Semaphore.
+ * @param proof The proof points generated with SnarkJS.
+ * @returns The proof points compatible with Semaphore.
+ */
+export default function packPoints(proof: Groth16Proof): PackedPoints;

package/dist/types/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { NumericString } from "@zk-kit/groth16";
+import type { NumericString } from "snarkjs";
 export type BigNumberish = string | number | bigint;
 export type SnarkArtifacts = {
     wasmFilePath: string;
@@ -10,9 +10,9 @@ export type SemaphoreProof = {
     message: NumericString;
     nullifier: NumericString;
     scope: NumericString;
-    proof: PackedProof;
+    points: PackedPoints;
 };
-export type PackedProof = [
+export type PackedPoints = [
     NumericString,
     NumericString,
     NumericString,

package/dist/types/unpack-points.d.ts

@@ -0,0 +1,8 @@
+import { Groth16Proof } from "snarkjs";
+import { PackedPoints } from "./types";
+/**
+ * Unpacks the Groth16 proof points into their original form.
+ * @param proof The proof points compatible with Semaphore.
+ * @returns The proof points compatible with SnarkJS.
+ */
+export default function unpackPoints(proof: PackedPoints): Groth16Proof;

package/dist/types/verify-proof.d.ts

@@ -5,4 +5,4 @@ import { SemaphoreProof } from "./types";
  * @param treeDepth The depth of the tree.
  * @returns True if the proof is valid, false otherwise.
  */
-export default function verifyProof({ merkleTreeDepth, merkleTreeRoot, nullifier, message, scope, proof }: SemaphoreProof): Promise<boolean>;
+export default function verifyProof({ merkleTreeDepth, merkleTreeRoot, nullifier, message, scope, points }: SemaphoreProof): Promise<boolean>;

package/package.json

@@ -1,17 +1,20 @@
 {
   "name": "@semaphore-protocol/proof",
-  "version": "4.0.0-alpha",
+  "version": "4.0.0-alpha.2",
   "description": "A library to generate and verify Semaphore proofs.",
   "license": "MIT",
   "main": "dist/index.node.js",
+  "browser": "dist/index.browser.mjs",
   "exports": {
-    "node": {
-      "import": "./dist/index.node.mjs",
-      "require": "./dist/index.node.js"
-    },
-    "browser": "./dist/index.browser.mjs",
-    "default": "./dist/index.browser.mjs",
-    "types": "./dist/types/index.d.ts"
+    ".": {
+      "node": {
+        "import": "./dist/index.node.mjs",
+        "require": "./dist/index.node.js"
+      },
+      "browser": "./dist/index.browser.mjs",
+      "default": "./dist/index.browser.mjs",
+      "types": "./dist/types/index.d.ts"
+    }
   },
   "types": "dist/types/index.d.ts",
   "files": [
@@ -47,15 +50,16 @@
     "rollup-plugin-typescript2": "^0.31.2"
   },
   "peerDependencies": {
-    "@semaphore-protocol/group": "4.0.0-alpha",
-    "@semaphore-protocol/identity": "4.0.0-alpha"
+    "@semaphore-protocol/group": "4.0.0-alpha.2",
+    "@semaphore-protocol/identity": "4.0.0-alpha.2"
   },
   "dependencies": {
-    "@ethersproject/bignumber": "^5.7.0",
-    "@ethersproject/bytes": "^5.7.0",
-    "@ethersproject/keccak256": "^5.7.0",
-    "@zk-kit/groth16": "0.5.0",
-    "download": "^8.0.0",
-    "tmp": "^0.2.1"
+    "@ethersproject/bignumber": "5.7.0",
+    "@ethersproject/bytes": "5.7.0",
+    "@ethersproject/keccak256": "5.7.0",
+    "@types/snarkjs": "0.7.8",
+    "download": "8.0.0",
+    "snarkjs": "0.7.3",
+    "tmp": "0.2.1"
   }
 }

package/src/generate-proof.ts

@@ -1,17 +1,17 @@
 import { BigNumber } from "@ethersproject/bignumber"
 import { BytesLike, Hexable } from "@ethersproject/bytes"
-import { Group } from "@semaphore-protocol/group"
+import type { Group, MerkleProof } from "@semaphore-protocol/group"
 import type { Identity } from "@semaphore-protocol/identity"
-import { NumericString, prove } from "@zk-kit/groth16"
+import { NumericString, groth16 } from "snarkjs"
 import getSnarkArtifacts from "./get-snark-artifacts.node"
 import hash from "./hash"
-import packProof from "./pack-proof"
+import packPoints from "./pack-points"
 import { SemaphoreProof, SnarkArtifacts } from "./types"
 
 /**
  * Generates a Semaphore proof.
  * @param identity The Semaphore identity.
- * @param group The Semaphore group or its Merkle proof.
+ * @param groupOrMerkleProof The Semaphore group or its Merkle proof.
  * @param scope The external nullifier.
  * @param message The Semaphore signal.
  * @param merkleTreeDepth The depth of the tree with which the circuit was compiled.
@@ -20,14 +20,21 @@ import { SemaphoreProof, SnarkArtifacts } from "./types"
  */
 export default async function generateProof(
     identity: Identity,
-    group: Group,
+    groupOrMerkleProof: Group | MerkleProof,
     message: BytesLike | Hexable | number | bigint,
     scope: BytesLike | Hexable | number | bigint,
     merkleTreeDepth?: number,
     snarkArtifacts?: SnarkArtifacts
 ): Promise<SemaphoreProof> {
-    const leafIndex = group.indexOf(identity.commitment)
-    const merkleProof = group.generateMerkleProof(leafIndex)
+    let merkleProof
+
+    if ("siblings" in groupOrMerkleProof) {
+        merkleProof = groupOrMerkleProof
+    } else {
+        const leafIndex = groupOrMerkleProof.indexOf(identity.commitment)
+        merkleProof = groupOrMerkleProof.generateMerkleProof(leafIndex)
+    }
+
     const merkleProofLength = merkleProof.siblings.length
 
     if (merkleTreeDepth !== undefined) {
@@ -57,7 +64,7 @@ export default async function generateProof(
         }
     }
 
-    const { proof, publicSignals } = await prove(
+    const { proof, publicSignals } = await groth16.fullProve(
         {
             secret: identity.secretScalar,
             merkleProofLength,
@@ -76,6 +83,6 @@ export default async function generateProof(
         nullifier: publicSignals[1],
         message: BigNumber.from(message).toString() as NumericString,
         scope: BigNumber.from(scope).toString() as NumericString,
-        proof: packProof(proof)
+        points: packPoints(proof)
     }
 }

package/src/get-snark-artifacts.node.ts

@@ -8,11 +8,7 @@ export default async function getSnarkArtifacts(treeDepth: number): Promise<Snar
     const tmpDir = "semaphore-proof"
     const tmpPath = `${tmp.tmpdir}/${tmpDir}-${treeDepth}`
 
-    if (!fs.existsSync(tmpPath)) {
-        tmp.dirSync({ name: `${tmpDir}-${treeDepth}` })
-    }
-
-    if (fs.readdirSync(tmpPath).length !== 2) {
+    if (!fs.existsSync(tmpPath) || fs.readdirSync(tmpPath).length !== 2) {
         await download(`https://semaphore.cedoor.dev/artifacts/${treeDepth}/semaphore.wasm`, tmpPath)
         await download(`https://semaphore.cedoor.dev/artifacts/${treeDepth}/semaphore.zkey`, tmpPath)
     }

package/src/hash.ts

@@ -1,7 +1,7 @@
 import { BigNumber } from "@ethersproject/bignumber"
 import { BytesLike, Hexable, zeroPad } from "@ethersproject/bytes"
 import { keccak256 } from "@ethersproject/keccak256"
-import { NumericString } from "@zk-kit/groth16"
+import { NumericString } from "snarkjs"
 
 /**
  * Creates a keccak256 hash of a message compatible with the SNARK scalar modulus.

package/src/index.ts

@@ -1,8 +1,8 @@
 import generateProof from "./generate-proof"
 import getSnarkArtifacts from "./get-snark-artifacts.node"
-import packProof from "./pack-proof"
-import unpackProof from "./unpack-proof"
+import packPoints from "./pack-points"
+import unpackPoints from "./unpack-points"
 import verifyProof from "./verify-proof"
 
 export * from "./types"
-export { generateProof, getSnarkArtifacts, packProof, unpackProof, verifyProof }
+export { generateProof, getSnarkArtifacts, packPoints, unpackPoints, verifyProof }

package/src/pack-points.ts

@@ -0,0 +1,20 @@
+import { Groth16Proof } from "snarkjs"
+import { PackedPoints } from "./types"
+
+/**
+ * Packs the Groth16 proof points into a format compatible with Semaphore.
+ * @param proof The proof points generated with SnarkJS.
+ * @returns The proof points compatible with Semaphore.
+ */
+export default function packPoints(proof: Groth16Proof): PackedPoints {
+    return [
+        proof.pi_a[0],
+        proof.pi_a[1],
+        proof.pi_b[0][1],
+        proof.pi_b[0][0],
+        proof.pi_b[1][1],
+        proof.pi_b[1][0],
+        proof.pi_c[0],
+        proof.pi_c[1]
+    ]
+}

package/src/types/index.ts

@@ -1,4 +1,4 @@
-import type { NumericString } from "@zk-kit/groth16"
+import type { NumericString } from "snarkjs"
 
 export type BigNumberish = string | number | bigint
 
@@ -13,10 +13,10 @@ export type SemaphoreProof = {
     message: NumericString
     nullifier: NumericString
     scope: NumericString
-    proof: PackedProof
+    points: PackedPoints
 }
 
-export type PackedProof = [
+export type PackedPoints = [
     NumericString,
     NumericString,
     NumericString,

package/src/unpack-points.ts

@@ -0,0 +1,20 @@
+import { Groth16Proof } from "snarkjs"
+import { PackedPoints } from "./types"
+
+/**
+ * Unpacks the Groth16 proof points into their original form.
+ * @param proof The proof points compatible with Semaphore.
+ * @returns The proof points compatible with SnarkJS.
+ */
+export default function unpackPoints(proof: PackedPoints): Groth16Proof {
+    return {
+        pi_a: [proof[0], proof[1]],
+        pi_b: [
+            [proof[3], proof[2]],
+            [proof[5], proof[4]]
+        ],
+        pi_c: [proof[6], proof[7]],
+        protocol: "groth16",
+        curve: "bn128"
+    }
+}

package/src/verify-proof.ts

@@ -1,8 +1,8 @@
-import { verify } from "@zk-kit/groth16"
+import { groth16 } from "snarkjs"
+import hash from "./hash"
 import { SemaphoreProof } from "./types"
-import unpackProof from "./unpack-proof"
+import unpackPoints from "./unpack-points"
 import verificationKeys from "./verification-keys.json"
-import hash from "./hash"
 
 /**
  * Verifies a Semaphore proof.
@@ -16,7 +16,7 @@ export default async function verifyProof({
     nullifier,
     message,
     scope,
-    proof
+    points
 }: SemaphoreProof): Promise<boolean> {
     // TODO: support all tree depths after trusted-setup.
     if (merkleTreeDepth < 1 || merkleTreeDepth > 12) {
@@ -29,8 +29,9 @@ export default async function verifyProof({
         IC: verificationKeys.IC[merkleTreeDepth - 1]
     }
 
-    return verify(verificationKey, {
-        publicSignals: [merkleTreeRoot, nullifier, hash(message), hash(scope)],
-        proof: unpackProof(proof)
-    })
+    return groth16.verify(
+        verificationKey,
+        [merkleTreeRoot, nullifier, hash(message), hash(scope)],
+        unpackPoints(points)
+    )
 }

package/dist/types/pack-proof.d.ts

@@ -1,8 +0,0 @@
-import { Groth16Proof } from "@zk-kit/groth16";
-import { PackedProof } from "./types";
-/**
- * Packs a proof into a format compatible with Semaphore.
- * @param proof The Groth16 proof generated with SnarkJS.
- * @returns The proof compatible with Semaphore.
- */
-export default function packProof(proof: Groth16Proof): PackedProof;

package/dist/types/unpack-proof.d.ts

@@ -1,8 +0,0 @@
-import { Groth16Proof } from "@zk-kit/groth16";
-import { PackedProof } from "./types";
-/**
- * Unpacks a proof into its original form.
- * @param proof The proof compatible with Semaphore.
- * @returns The proof compatible with SnarkJS.
- */
-export default function unpackProof(proof: PackedProof): Groth16Proof;

package/src/pack-proof.ts

@@ -1,20 +0,0 @@
-import { Groth16Proof } from "@zk-kit/groth16"
-import { PackedProof } from "./types"
-
-/**
- * Packs a proof into a format compatible with Semaphore.
- * @param proof The Groth16 proof generated with SnarkJS.
- * @returns The proof compatible with Semaphore.
- */
-export default function packProof(proof: Groth16Proof): PackedProof {
-    return [
-        proof.pi_a[0],
-        proof.pi_a[1],
-        proof.pi_b[0][1],
-        proof.pi_b[0][0],
-        proof.pi_b[1][1],
-        proof.pi_b[1][0],
-        proof.pi_c[0],
-        proof.pi_c[1]
-    ]
-}

package/src/unpack-proof.ts

@@ -1,20 +0,0 @@
-import { Groth16Proof } from "@zk-kit/groth16"
-import { PackedProof } from "./types"
-
-/**
- * Unpacks a proof into its original form.
- * @param proof The proof compatible with Semaphore.
- * @returns The proof compatible with SnarkJS.
- */
-export default function unpackProof(proof: PackedProof): Groth16Proof {
-    return {
-        pi_a: [proof[0], proof[1]],
-        pi_b: [
-            [proof[3], proof[2]],
-            [proof[5], proof[4]]
-        ],
-        pi_c: [proof[6], proof[7]],
-        protocol: "groth16",
-        curve: "bn128"
-    }
-}