Fix mina-attestations integration

.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 bun run lint

apps/extension/package.json

@@ -23,7 +23,7 @@
     "@palladco/web-provider": "workspace:*",
     "@plasmohq/messaging": "0.7.1",
     "buffer": "6.0.3",
-    "mina-attestations": "0.4.3",
+    "mina-attestations": "0.5.2",
     "mitt": "3.0.1",
     "next-themes": "0.4.6",
     "o1js": "2.3.0",

apps/extension/src/background/handlers/mina-attestations-schemas.ts

@@ -10,16 +10,6 @@ const RequestWithContext = z
   })
   .strict()
 
-const PublicKeySchema = z.string().length(55).startsWith("B62")
-
-const MinaScanNetwork = z.enum(["devnet", "mainnet"])
-
-const zkAppAccountSchema = z.object({
-  address: PublicKeySchema,
-  tokenId: z.string(),
-  network: MinaScanNetwork,
-})
-
 export const StorePrivateCredentialRequestParamsSchema =
   RequestWithContext.extend({
     method: z.literal("mina_storePrivateCredential"),
@@ -33,7 +23,6 @@ export const PresentationRequestParamsSchema = RequestWithContext.extend({
       .object({
         presentationRequest:
           PresentationRequestSchema as unknown as z.ZodType<any>,
-        zkAppAccount: zkAppAccountSchema.optional(),
       })
       .strict(),
   ),

apps/extension/src/sandbox/index.ts

@@ -33,24 +33,21 @@ type Result = {
 type PresentationRequestPayload = {
   presentationRequest: PresentationRequest
   selectedCredentials: string[]
-  verifierIdentity:
-    | string
-    | {
-        address: string
-        tokenId: string
-        network: "devnet" | "mainnet"
-      }
+  origin: string
 }
 
 let presentationSignaturePromise: {
   resolve: (value: any) => void
   reject: (reason: any) => void
 } | null = null
 
+// TODO can we get this from an environment variable?
+const IS_DEV = false
+
 window.addEventListener("message", async (event) => {
   const allowedOrigin = "chrome-extension://bboennpbcdmjdgmbggdlemijpijnaflh"
-  if (event.origin !== allowedOrigin) {
-    throw new Error("Invalid origin")
+  if (event.origin !== allowedOrigin && !IS_DEV) {
+    throw new Error(`Invalid origin ${event.origin}`)
   }
   const message = MessageSchema.parse(event.data)
 
@@ -103,11 +100,8 @@ window.addEventListener("message", async (event) => {
               payload,
             ) as PresentationRequestPayload
 
-            const {
-              presentationRequest,
-              selectedCredentials,
-              verifierIdentity,
-            } = parsedPayload
+            const { presentationRequest, selectedCredentials, origin } =
+              parsedPayload
 
             const stringifiedPresentationRequest =
               JSON.stringify(presentationRequest)
@@ -127,19 +121,16 @@ window.addEventListener("message", async (event) => {
               stringifiedPresentationRequest,
             )
 
-            // format verifierIdentity
-            const verifierIdentityString =
-              presentationRequest.type === "zk-app"
-                ? JSON.stringify(verifierIdentity)
-                : (verifierIdentity as string)
-
             // TODO: cache compiled presentation request?
 
             // prepare presentation request and get fields to sign
             const prepared = await Presentation.prepare({
               request: deserialized,
               credentials: storedCredentials,
-              context: { verifierIdentity: verifierIdentityString },
+              context:
+                presentationRequest.type === "https"
+                  ? { verifierIdentity: origin }
+                  : undefined,
             })
 
             // ask wallet to sign fields

packages/features/src/web-connector/utils/render-payload.tsx

@@ -19,13 +19,11 @@ const handleRenderError = (error: Error) => {
 const containsPresentationRequest = (
   value: unknown,
 ): value is {
+  origin: string
   presentationRequest: PresentationRequestJSON
-  verifierIdentity:
-    | string
-    | { address: string; tokenId: string; network: "devnet" | "mainnet" }
 } => {
   if (typeof value !== "object" || value === null) return false
-  return "presentationRequest" in value
+  return "presentationRequest" in value && "origin" in value
 }
 
 const isCredential = (
@@ -45,10 +43,7 @@ export const renderPayload = (payload: string) => {
       const request = parsedPayload.presentationRequest
       const formatted = [
         PrettyPrinter.printPresentationRequest(request),
-        PrettyPrinter.printVerifierIdentity(
-          request.type as any, // TODO
-          parsedPayload.verifierIdentity as string,
-        ),
+        PrettyPrinter.printVerifierIdentity(request, parsedPayload.origin),
       ].join("\n")
 
       return <div className="whitespace-pre-wrap break-all">{formatted}</div>

packages/web-provider/src/mina-network/mina-provider.ts

@@ -468,10 +468,7 @@ export const createMinaProvider = async (): Promise<
             const [request] = params
             if (!request) throw createProviderRpcError(4000, "Invalid Request")
 
-            const { presentationRequest, zkAppAccount } = request
-
-            const verifierIdentity =
-              presentationRequest.type === "zk-app" ? zkAppAccount : origin
+            const { presentationRequest } = request
 
             // Ask for approval to proceed with the presentation request
             const { value: userConfirmed } = await showUserPrompt<boolean>({
@@ -481,7 +478,6 @@ export const createMinaProvider = async (): Promise<
                 payload: JSON.stringify({
                   origin,
                   presentationRequest,
-                  verifierIdentity: verifierIdentity,
                 }),
               },
             })
@@ -523,7 +519,7 @@ export const createMinaProvider = async (): Promise<
               metadata: {
                 title: "Create presentation",
                 payload: JSON.stringify({
-                  verifierIdentity,
+                  origin,
                   presentationRequest,
                   selectedCredentials: JSON.parse(selectedCredentials),
                 }),