Merge branch 'main' into fix-mina-attestations

Author: mrcnk

packages/features/src/settings/routes/authorized-zkapps.tsx

@@ -10,6 +10,11 @@ export type ZkApp = {
   image: string
   url: string
 }
+
+// https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url
+const URLRegex =
+  /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/
+
 export const AuthorizedZkAppsRoute = () => {
   const navigate = useNavigate()
   const [connectedApps, setConnectedApps] = useState([] as ZkApp[])
@@ -22,16 +27,18 @@ export const AuthorizedZkAppsRoute = () => {
     const { permissions } = (await chrome.storage.local.get({
       permissions: [],
     })) as Record<string, "ALLOWED">
-    // https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url
-    const URLRegex =
-      /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/
     const appsWithMetadata = await Promise.all(
       Object.keys(permissions)
         .filter((key) => URLRegex.test(key))
         .map(async (url) => {
-          const metadata = (await fetcher(
-            `https://api.dub.co/metatags?url=${url}`,
-          )) as Omit<ZkApp, "url">
+          let metadata: Omit<ZkApp, "url"> = {
+            title: "",
+            description: "",
+            image: "",
+          }
+          try {
+            metadata = await fetcher(`https://api.dub.co/metatags?url=${url}`)
+          } catch (e) {}
           return { url, ...metadata }
         }),
     )
@@ -42,7 +49,19 @@ export const AuthorizedZkAppsRoute = () => {
     const filteredApps = connectedApps.filter(
       (app) => app.url !== appToDelete.url,
     )
-    await chrome.storage.local.set({ permissions: filteredApps })
+
+    const { permissions } = await chrome.storage.local.get({
+      permissions: {} as ZkApp[] & Record<string, "ALLOWED">,
+    })
+    const newPermissions = Object.assign({}, filteredApps) as ZkApp[] &
+      Record<string, "ALLOWED">
+    for (const k of Object.keys(permissions).filter(
+      (key) => URLRegex.test(key) && key !== appToDelete.url,
+    )) {
+      newPermissions[k] = permissions[k]
+    }
+    await chrome.storage.local.set({ permissions: newPermissions })
+
     setConnectedApps(filteredApps)
   }
 

packages/web-provider/src/vault-service/vault-service.ts

@@ -8,6 +8,11 @@ import dayjs from "dayjs"
 import Client from "mina-signer"
 
 import type { SignedTransaction } from "@mina-js/utils"
+import type {
+  Payment,
+  StakeDelegation,
+  ZkappCommand,
+} from "mina-signer/dist/node/mina-signer/src/types"
 import type { IVaultService } from "./types"
 
 export enum AuthorizationState {
@@ -74,9 +79,23 @@ export const createVaultService = (): IVaultService => {
       const accounts = await getAccounts()
       const publicKey = accounts?.[0]
       if (!publicKey) throw new Error("Wallet is not initialized.")
-      const validTransaction = signer.verifyTransaction(sendable.input as never)
-      if (!validTransaction) throw new Error("Invalid transaction.")
       const type = getTxType(sendable.input as never)
+      const signedData: StakeDelegation | Payment | ZkappCommand =
+        sendable.input as any
+      const verifyTransactionParams =
+        "feePayer" in signedData
+          ? {
+              signature: signedData.zkappCommand.feePayer.authorization,
+              publicKey: signedData.zkappCommand.feePayer.body.publicKey,
+              data: signedData,
+            }
+          : {
+              signature: (sendable as any).signature,
+              publicKey: signedData.from,
+              data: signedData,
+            }
+      if (!signer.verifyTransaction(verifyTransactionParams))
+        throw new Error("Invalid transaction.")
       const payload =
         type === "zkapp"
           ? { input: sendable.input }