@semaphore-protocol/proof 2.2.0 → 2.3.0

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /**
  * @module @semaphore-protocol/proof
- * @version 2.2.0
+ * @version 2.3.0
  * @file A library to generate and verify Semaphore proofs.
  * @copyright Ethereum Foundation 2022
  * @license MIT
@@ -8,6 +8,7 @@
 */
 import { poseidon } from 'circomlibjs';
 import { groth16 } from 'snarkjs';
+import { isHexString } from '@ethersproject/bytes';
 import { keccak256 } from '@ethersproject/solidity';
 import { formatBytes32String } from '@ethersproject/strings';
 
@@ -80,7 +81,10 @@ function __generator(thisArg, body) {
  * @returns The signal hash.
  */
 function genSignalHash(signal) {
-    return BigInt(keccak256(["bytes32"], [formatBytes32String(signal)])) >> BigInt(8);
+    if (!isHexString(signal, 32)) {
+        signal = formatBytes32String(signal);
+    }
+    return BigInt(keccak256(["bytes32"], [signal])) >> BigInt(8);
 }
 
 function generateProof(identity, groupOrMerkleProof, externalNullifier, signal, snarkArtifacts) {

package/dist/index.node.js

@@ -1,6 +1,6 @@
 /**
  * @module @semaphore-protocol/proof
- * @version 2.2.0
+ * @version 2.3.0
  * @file A library to generate and verify Semaphore proofs.
  * @copyright Ethereum Foundation 2022
  * @license MIT
@@ -12,6 +12,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var circomlibjs = require('circomlibjs');
 var snarkjs = require('snarkjs');
+var bytes = require('@ethersproject/bytes');
 var solidity = require('@ethersproject/solidity');
 var strings = require('@ethersproject/strings');
 
@@ -84,7 +85,10 @@ function __generator(thisArg, body) {
  * @returns The signal hash.
  */
 function genSignalHash(signal) {
-    return BigInt(solidity.keccak256(["bytes32"], [strings.formatBytes32String(signal)])) >> BigInt(8);
+    if (!bytes.isHexString(signal, 32)) {
+        signal = strings.formatBytes32String(signal);
+    }
+    return BigInt(solidity.keccak256(["bytes32"], [signal])) >> BigInt(8);
 }
 
 function generateProof(identity, groupOrMerkleProof, externalNullifier, signal, snarkArtifacts) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@semaphore-protocol/proof",
-    "version": "2.2.0",
+    "version": "2.3.0",
     "description": "A library to generate and verify Semaphore proofs.",
     "license": "MIT",
     "main": "dist/index.node.js",
@@ -34,7 +34,7 @@
         "typedoc": "^0.22.11"
     },
     "dependencies": {
-        "@ethersproject/bytes": "^5.5.0",
+        "@ethersproject/bytes": "^5.7.0",
         "@ethersproject/solidity": "^5.5.0",
         "@ethersproject/strings": "^5.5.0",
         "@semaphore-protocol/group": "2.0.0",

package/src/generateSignalHash.ts

@@ -1,3 +1,4 @@
+import { isHexString } from "@ethersproject/bytes"
 import { keccak256 } from "@ethersproject/solidity"
 import { formatBytes32String } from "@ethersproject/strings"
 
@@ -7,5 +8,9 @@ import { formatBytes32String } from "@ethersproject/strings"
  * @returns The signal hash.
  */
 export default function genSignalHash(signal: string): bigint {
-    return BigInt(keccak256(["bytes32"], [formatBytes32String(signal)])) >> BigInt(8)
+    if (!isHexString(signal, 32)) {
+        signal = formatBytes32String(signal)
+    }
+
+    return BigInt(keccak256(["bytes32"], [signal])) >> BigInt(8)
 }

package/src/index.test.ts

@@ -1,3 +1,4 @@
+import { formatBytes32String } from "@ethersproject/strings"
 import { Group } from "@semaphore-protocol/group"
 import { Identity } from "@semaphore-protocol/identity"
 import download from "download"
@@ -105,6 +106,12 @@ describe("Proof", () => {
 
             expect(signalHash.toString()).toBe(fullProof.publicSignals.signalHash)
         })
+
+        it("Should generate a valid signal hash by passing a valid hex string", async () => {
+            const signalHash = generateSignalHash(formatBytes32String(signal))
+
+            expect(signalHash.toString()).toBe(fullProof.publicSignals.signalHash)
+        })
     })
 
     describe("# generateNullifierHash", () => {