refactor: rename proof with points

semaphore-protocol · Jan 24, 2024 · fbc8efd · fbc8efd
1 parent 8845d89
commit fbc8efd
Show file tree

Hide file tree

Showing 35 changed files with 1,070 additions and 1,027 deletions.
diff --git a/apps/subgraph/abis/Semaphore.json b/apps/subgraph/abis/Semaphore.json
diff --git a/apps/subgraph/networks.json b/apps/subgraph/networks.json
@@ -1,8 +1,8 @@
 {
     "sepolia": {
         "Semaphore": {
-            "address": "0x021dC8BF0eADd9C128490A976756C1b052edF99d",
-            "startBlock": 5108003
+            "address": "0xb25E63B115Ffba085FeCbf196a8e720F85DC351c",
+            "startBlock": 5145333
         }
     },
     "mumbai": {

diff --git a/apps/subgraph/schema.graphql b/apps/subgraph/schema.graphql
@@ -31,6 +31,6 @@ type ValidatedProof @entity {
     merkleTreeRoot: BigInt!
     merkleTreeDepth: Int!
     nullifier: BigInt!
-    proof: [BigInt!]!
+    points: [BigInt!]!
     group: Group!
 }
diff --git a/apps/subgraph/src/semaphore.ts b/apps/subgraph/src/semaphore.ts
@@ -220,7 +220,7 @@ export function addValidatedProof(event: ProofValidated): void {
         validatedProof.merkleTreeDepth = event.params.merkleTreeDepth.toI32()
         validatedProof.scope = event.params.scope
         validatedProof.nullifier = event.params.nullifier
-        validatedProof.proof = event.params.proof
+        validatedProof.points = event.params.points
         validatedProof.timestamp = event.block.timestamp
 
         validatedProof.save()

diff --git a/apps/subgraph/tests/semaphore-utils.ts b/apps/subgraph/tests/semaphore-utils.ts
@@ -158,7 +158,7 @@ export function createProofVerifiedEvent(
     nullifier: BigInt,
     message: BigInt,
     scope: BigInt,
-    proof: BigInt[]
+    points: BigInt[]
 ): ProofValidated {
     const proofValidatedEvent = changetype<ProofValidated>(newMockEvent())
 
@@ -176,7 +176,9 @@ export function createProofVerifiedEvent(
     )
     proofValidatedEvent.parameters.push(new ethereum.EventParam("message", ethereum.Value.fromUnsignedBigInt(message)))
     proofValidatedEvent.parameters.push(new ethereum.EventParam("scope", ethereum.Value.fromUnsignedBigInt(scope)))
-    proofValidatedEvent.parameters.push(new ethereum.EventParam("proof", ethereum.Value.fromUnsignedBigIntArray(proof)))
+    proofValidatedEvent.parameters.push(
+        new ethereum.EventParam("points", ethereum.Value.fromUnsignedBigIntArray(points))
+    )
 
     return proofValidatedEvent
 }
diff --git a/apps/subgraph/tests/semaphore.test.ts b/apps/subgraph/tests/semaphore.test.ts
@@ -162,7 +162,7 @@ describe("Semaphore subgraph", () => {
             const nullifier = BigInt.fromI32(666)
             const message = BigInt.fromI32(2)
             const scope = BigInt.fromI32(1)
-            const proof = [BigInt.fromI32(1), BigInt.fromI32(2)]
+            const points = [BigInt.fromI32(1), BigInt.fromI32(2)]
             const id = hash(concat(ByteArray.fromBigInt(nullifier), ByteArray.fromBigInt(groupId)))
 
             const event = createProofVerifiedEvent(
@@ -172,7 +172,7 @@ describe("Semaphore subgraph", () => {
                 nullifier,
                 message,
                 scope,
-                proof
+                points
             )
 
             addValidatedProof(event)
@@ -185,7 +185,7 @@ describe("Semaphore subgraph", () => {
             assert.fieldEquals("ValidatedProof", id, "scope", "1")
             assert.fieldEquals("ValidatedProof", id, "nullifier", "666")
             assert.fieldEquals("ValidatedProof", id, "message", "2")
-            assert.fieldEquals("ValidatedProof", id, "proof", `[${proof.join(", ")}]`)
+            assert.fieldEquals("ValidatedProof", id, "points", `[${points.join(", ")}]`)
         })
     })
 })
diff --git a/packages/cli-template-contracts-hardhat/contracts/Feedback.sol b/packages/cli-template-contracts-hardhat/contracts/Feedback.sol
@@ -24,8 +24,17 @@ contract Feedback {
         uint256 merkleTreeRoot,
         uint256 nullifier,
         uint256 feedback,
-        uint256[8] calldata proof
+        uint256[8] calldata points
     ) external {
-        semaphore.validateProof(groupId, merkleTreeDepth, merkleTreeRoot, nullifier, feedback, groupId, proof);
+        ISemaphore.SemaphoreProof memory proof = ISemaphore.SemaphoreProof(
+            merkleTreeDepth,
+            merkleTreeRoot,
+            nullifier,
+            feedback,
+            groupId,
+            points
+        );
+
+        semaphore.validateProof(groupId, proof);
     }
 }
diff --git a/packages/cli-template-contracts-hardhat/test/Feedback.ts b/packages/cli-template-contracts-hardhat/test/Feedback.ts
@@ -52,7 +52,7 @@ describe("Feedback", () => {
                 fullProof.merkleTreeRoot,
                 fullProof.nullifier,
                 feedback,
-                fullProof.proof
+                fullProof.points
             )
 
             await expect(transaction)
@@ -64,7 +64,7 @@ describe("Feedback", () => {
                     fullProof.nullifier,
                     fullProof.message,
                     groupId,
-                    fullProof.proof
+                    fullProof.points
                 )
         })
     })

diff --git a/packages/cli-template-monorepo-ethers/apps/contracts/contracts/Feedback.sol b/packages/cli-template-monorepo-ethers/apps/contracts/contracts/Feedback.sol
@@ -24,8 +24,17 @@ contract Feedback {
         uint256 merkleTreeRoot,
         uint256 nullifier,
         uint256 feedback,
-        uint256[8] calldata proof
+        uint256[8] calldata points
     ) external {
-        semaphore.validateProof(groupId, merkleTreeDepth, merkleTreeRoot, nullifier, feedback, groupId, proof);
+        ISemaphore.SemaphoreProof memory proof = ISemaphore.SemaphoreProof(
+            merkleTreeDepth,
+            merkleTreeRoot,
+            nullifier,
+            feedback,
+            groupId,
+            points
+        );
+
+        semaphore.validateProof(groupId, proof);
     }
 }
diff --git a/packages/cli-template-monorepo-ethers/apps/contracts/test/Feedback.ts b/packages/cli-template-monorepo-ethers/apps/contracts/test/Feedback.ts
@@ -52,7 +52,7 @@ describe("Feedback", () => {
                 fullProof.merkleTreeRoot,
                 fullProof.nullifier,
                 feedback,
-                fullProof.proof
+                fullProof.points
             )
 
             await expect(transaction)
@@ -64,7 +64,7 @@ describe("Feedback", () => {
                     fullProof.nullifier,
                     fullProof.message,
                     groupId,
-                    fullProof.proof
+                    fullProof.points
                 )
         })
     })