Include circuit identifier when making GPC proof (#21)

proofcarryingdata · Oct 22, 2024 · ef72370 · ef72370
1 parent 52b25c0
commit ef72370
Show file tree

Hide file tree

Showing 22 changed files with 234 additions and 47 deletions.
diff --git a/apps/client-web/CHANGELOG.md b/apps/client-web/CHANGELOG.md
@@ -1,5 +1,14 @@
 # client-web
 
+## 0.0.12
+
+### Patch Changes
+
+- Updated dependencies [c02d469]
+  - @parcnet-js/client-rpc@1.1.2
+  - @parcnet-js/podspec@1.1.1
+  - @parcnet-js/client-helpers@1.0.3
+
 ## 0.0.11
 
 ### Patch Changes

diff --git a/apps/client-web/package.json b/apps/client-web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "client-web",
   "private": true,
-  "version": "0.0.11",
+  "version": "0.0.12",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -13,11 +13,11 @@
     "@parcnet-js/client-helpers": "workspace:*",
     "@parcnet-js/client-rpc": "workspace:*",
     "@parcnet-js/podspec": "workspace:*",
-    "@pcd/gpc": "0.2.0",
-    "@pcd/pod": "0.3.0",
+    "@pcd/gpc": "^0.2.0",
+    "@pcd/pod": "^0.3.0",
     "@pcd/proto-pod-gpc-artifacts": "^0.9.0",
     "@radix-ui/react-dialog": "^1.1.1",
-    "@semaphore-protocol/core": "^4.0.3",
+    "@semaphore-protocol/core": "^4.4.1",
     "@semaphore-protocol/identity": "3.15.2",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",

diff --git a/apps/client-web/src/App.tsx b/apps/client-web/src/App.tsx
@@ -290,17 +290,26 @@ export function Prove({
               const prs = proofRequest(
                 proveOperation.proofRequest
               ).getProofRequest();
+              const inputs = {
+                pods: proveOperation.selectedPods as Record<string, POD>,
+                membershipLists: prs.membershipLists,
+                watermark: prs.watermark,
+                owner: {
+                  semaphoreV4: getIdentity(),
+                  externalNullifier: prs.externalNullifier
+                }
+              };
+              console.log(inputs);
               gpcProve(
-                prs.proofConfig,
                 {
-                  pods: proveOperation.selectedPods as Record<string, POD>,
-                  membershipLists: prs.membershipLists,
-                  watermark: prs.watermark,
-                  owner: {
-                    semaphoreV4: getIdentity(),
-                    externalNullifier: prs.externalNullifier
-                  }
+                  ...prs.proofConfig,
+                  ...(proveOperation.circuitIdentifier
+                    ? {
+                        circuitIdentifier: proveOperation.circuitIdentifier
+                      }
+                    : {})
                 },
+                inputs,
                 new URL("/artifacts", window.location.origin).toString()
               )
                 .then((proof) => {

diff --git a/apps/client-web/src/client/gpc.ts b/apps/client-web/src/client/gpc.ts
@@ -8,7 +8,12 @@ import {
 } from "@parcnet-js/client-rpc";
 import type { PodspecProofRequest } from "@parcnet-js/podspec";
 import { proofRequest } from "@parcnet-js/podspec";
-import type { GPCBoundConfig, GPCProof, GPCRevealedClaims } from "@pcd/gpc";
+import type {
+  GPCBoundConfig,
+  GPCIdentifier,
+  GPCProof,
+  GPCRevealedClaims
+} from "@pcd/gpc";
 import { gpcVerify } from "@pcd/gpc";
 import type { Dispatch } from "react";
 import type { ClientAction } from "../state";
@@ -68,10 +73,12 @@ export class ParcnetGPCProcessor implements ParcnetGPCRPC {
 
   public async prove({
     request,
-    collectionIds
+    collectionIds,
+    circuitIdentifier
   }: {
     request: PodspecProofRequest;
     collectionIds?: string[];
+    circuitIdentifier?: GPCIdentifier;
   }): Promise<ProveResult> {
     const pods = this.getPODsIfPermitted(collectionIds, "gpc.prove");
     const prs = proofRequest(request);
@@ -94,6 +101,7 @@ export class ParcnetGPCProcessor implements ParcnetGPCRPC {
         proofRequest: request,
         pods: inputPods,
         selectedPods: {},
+        circuitIdentifier,
         proving: false,
         resolve: (result) => {
           advice.hideClient();

diff --git a/apps/client-web/src/state.tsx b/apps/client-web/src/state.tsx
@@ -7,6 +7,7 @@ import {
 import type { PodspecProofRequest } from "@parcnet-js/podspec";
 import * as p from "@parcnet-js/podspec";
 import { $s } from "@parcnet-js/podspec/pod_value_utils";
+import type { GPCIdentifier } from "@pcd/gpc";
 import { POD, encodePrivateKey, encodePublicKey } from "@pcd/pod";
 import type { Identity as IdentityV4 } from "@semaphore-protocol/core";
 import isEqual from "lodash/isEqual";
@@ -81,6 +82,7 @@ export type ClientState = {
         selectedPods: Record<string, POD | undefined>;
         proofRequest: PodspecProofRequest;
         proving: boolean;
+        circuitIdentifier?: GPCIdentifier;
         resolve?: (result: ProveResult) => void;
       }
     | undefined;
@@ -112,6 +114,7 @@ export type ClientAction =
       pods: Record<string, POD[]>;
       selectedPods: Record<string, POD | undefined>;
       proofRequest: PodspecProofRequest;
+      circuitIdentifier?: GPCIdentifier;
       proving: boolean;
       resolve?: (result: ProveResult) => void;
     }
@@ -215,6 +218,7 @@ export function clientReducer(state: ClientState, action: ClientAction) {
           selectedPods: action.selectedPods,
           proofRequest: action.proofRequest,
           proving: action.proving,
+          circuitIdentifier: action.circuitIdentifier,
           resolve: action.resolve
         }
       };

diff --git a/examples/test-app/CHANGELOG.md b/examples/test-app/CHANGELOG.md
@@ -1,5 +1,15 @@
 # test-app
 
+## 1.0.15
+
+### Patch Changes
+
+- Updated dependencies [c02d469]
+  - @parcnet-js/app-connector@1.1.3
+  - @parcnet-js/client-rpc@1.1.2
+  - @parcnet-js/podspec@1.1.1
+  - @parcnet-js/ticket-spec@1.1.2
+
 ## 1.0.14
 
 ### Patch Changes

diff --git a/examples/test-app/package.json b/examples/test-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "test-app",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "private": true,
   "type": "module",
   "scripts": {

diff --git a/packages/app-connector/CHANGELOG.md b/packages/app-connector/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @parcnet-js/app-connector
 
+## 1.1.3
+
+### Patch Changes
+
+- c02d469: Support adding a circuit identifier to GPC proof requests
+- Updated dependencies [c02d469]
+  - @parcnet-js/client-rpc@1.1.2
+  - @parcnet-js/podspec@1.1.1
+
 ## 1.1.2
 
 ### Patch Changes

diff --git a/packages/app-connector/package.json b/packages/app-connector/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@parcnet-js/app-connector",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "license": "GPL-3.0-or-later",
   "type": "module",
   "main": "dist/index.cjs",

diff --git a/packages/app-connector/src/api_wrapper.ts b/packages/app-connector/src/api_wrapper.ts
@@ -5,7 +5,12 @@ import type {
   ProveResult
 } from "@parcnet-js/client-rpc";
 import type * as p from "@parcnet-js/podspec";
-import type { GPCBoundConfig, GPCProof, GPCRevealedClaims } from "@pcd/gpc";
+import type {
+  GPCBoundConfig,
+  GPCIdentifier,
+  GPCProof,
+  GPCRevealedClaims
+} from "@pcd/gpc";
 import type { PODEntries } from "@pcd/pod";
 import { type Emitter, createNanoEvents } from "nanoevents";
 import type { ModalEmitter } from "./adapters/iframe.js";
@@ -176,6 +181,7 @@ export class ParcnetGPCWrapper {
 
   async prove(args: {
     request: p.PodspecProofRequest;
+    circuitIdentifier: GPCIdentifier;
     collectionIds?: string[];
   }): Promise<ProveResult> {
     return new Promise((resolve, reject) => {

diff --git a/packages/app-connector/src/rpc_client.ts b/packages/app-connector/src/rpc_client.ts
@@ -18,7 +18,12 @@ import {
   RPCMessageType
 } from "@parcnet-js/client-rpc";
 import type { PodspecProofRequest } from "@parcnet-js/podspec";
-import type { GPCBoundConfig, GPCProof, GPCRevealedClaims } from "@pcd/gpc";
+import type {
+  GPCBoundConfig,
+  GPCIdentifier,
+  GPCProof,
+  GPCRevealedClaims
+} from "@pcd/gpc";
 import type { PODEntries } from "@pcd/pod";
 import { type Emitter, createNanoEvents } from "nanoevents";
 import * as v from "valibot";
@@ -177,14 +182,16 @@ export class ParcnetRPCConnector implements ParcnetRPC, ParcnetEvents {
     this.gpc = {
       prove: async ({
         request,
-        collectionIds
+        collectionIds,
+        circuitIdentifier
       }: {
         request: PodspecProofRequest;
         collectionIds?: string[];
+        circuitIdentifier?: GPCIdentifier;
       }): Promise<ProveResult> => {
         return this.#typedInvoke(
           "gpc.prove",
-          [{ collectionIds, request }],
+          [{ collectionIds, request, circuitIdentifier }],
           ParcnetRPCSchema.gpc.prove
         );
       },

diff --git a/packages/client-helpers/CHANGELOG.md b/packages/client-helpers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @parcnet-js/client-helpers
 
+## 1.0.3
+
+### Patch Changes
+
+- Updated dependencies [c02d469]
+  - @parcnet-js/client-rpc@1.1.2
+
 ## 1.0.2
 
 ### Patch Changes

diff --git a/packages/client-helpers/package.json b/packages/client-helpers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@parcnet-js/client-helpers",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "license": "GPL-3.0-or-later",
   "type": "module",
   "main": "dist/index.js",

diff --git a/packages/client-rpc/CHANGELOG.md b/packages/client-rpc/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @parcnet-js/client-rpc
 
+## 1.1.2
+
+### Patch Changes
+
+- c02d469: Support adding a circuit identifier to GPC proof requests
+- Updated dependencies [c02d469]
+  - @parcnet-js/podspec@1.1.1
+
 ## 1.1.1
 
 ### Patch Changes

diff --git a/packages/client-rpc/package.json b/packages/client-rpc/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@parcnet-js/client-rpc",
   "type": "module",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": "GPL-3.0-or-later",
   "main": "dist/index.js",
   "module": "dist/index.js",

diff --git a/packages/client-rpc/src/rpc_interfaces.ts b/packages/client-rpc/src/rpc_interfaces.ts
@@ -3,7 +3,12 @@ import type {
   PODSchema,
   PodspecProofRequest
 } from "@parcnet-js/podspec";
-import type { GPCBoundConfig, GPCProof, GPCRevealedClaims } from "@pcd/gpc";
+import type {
+  GPCBoundConfig,
+  GPCIdentifier,
+  GPCProof,
+  GPCRevealedClaims
+} from "@pcd/gpc";
 import type { PODEntries } from "@pcd/pod";
 import type { PODData } from "./pod_data.js";
 
@@ -41,13 +46,16 @@ export interface ParcnetGPCRPC {
     collectionIds
   }: {
     request: PodspecProofRequest;
+    circuitIdentifier?: GPCIdentifier;
     collectionIds?: string[];
   }) => Promise<ProveResult>;
   canProve: ({
     request,
+    circuitIdentifier,
     collectionIds
   }: {
     request: PodspecProofRequest;
+    circuitIdentifier: GPCIdentifier;
     collectionIds?: string[];
   }) => Promise<boolean>;
   verify: (

diff --git a/packages/client-rpc/src/schema.ts b/packages/client-rpc/src/schema.ts
@@ -1,3 +1,4 @@
+import type { GPCIdentifier } from "@pcd/gpc";
 import * as v from "valibot";
 import type { ParcnetRPC } from "./rpc_interfaces.js";
 import {
@@ -9,8 +10,17 @@ import {
 
 const CollectionIdSchema = v.string();
 
+const CircuitIdentifierSchema = v.pipe(
+  v.string(),
+  v.check((s): s is GPCIdentifier => {
+    return s.includes("_") && s.split("_").length === 2;
+  }),
+  v.transform<string, GPCIdentifier>((s) => s as GPCIdentifier)
+);
+
 const ProveArgsSchema = v.object({
   request: PodspecProofRequestSchema,
+  circuitIdentifier: v.optional(CircuitIdentifierSchema),
   collectionIds: v.optional(v.array(CollectionIdSchema))
 });
 

diff --git a/packages/podspec/CHANGELOG.md b/packages/podspec/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @parcnet-js/podspec
 
+## 1.1.1
+
+### Patch Changes
+
+- c02d469: Support adding a circuit identifier to GPC proof requests
+
 ## 1.1.0
 
 ### Minor Changes

diff --git a/packages/podspec/package.json b/packages/podspec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@parcnet-js/podspec",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "license": "GPL-3.0-or-later",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -36,8 +36,8 @@
   },
   "files": ["dist", "./README.md", "./LICENSE"],
   "dependencies": {
-    "@pcd/gpc": "0.2.0",
-    "@pcd/pod": "0.3.0"
+    "@pcd/gpc": "^0.2.0",
+    "@pcd/pod": "^0.3.0"
   },
   "devDependencies": {
     "@parcnet-js/eslint-config": "workspace:*",

diff --git a/packages/ticket-spec/CHANGELOG.md b/packages/ticket-spec/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @parcnet-js/ticket-spec
 
+## 1.1.2
+
+### Patch Changes
+
+- Updated dependencies [c02d469]
+  - @parcnet-js/client-rpc@1.1.2
+  - @parcnet-js/podspec@1.1.1
+
 ## 1.1.1
 
 ### Patch Changes

diff --git a/packages/ticket-spec/package.json b/packages/ticket-spec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@parcnet-js/ticket-spec",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": "GPL-3.0-or-later",
   "type": "module",
   "main": "dist/index.js",