Merge pull request #383 from privacy-scaling-explorations/dependabot/…

…npm_and_yarn/main/vercel/blob-0.25.0

chore(deps): bump @vercel/blob from 0.19.0 to 0.25.0

.eslintignore

@@ -14,4 +14,5 @@ packages/interface/playwright-report
 packages/interface/test-results
 packages/interface/next.config.js
 packages/interface/public/mockServiceWorker.js
+packages/interface/metamask/
 

.gitignore

@@ -35,6 +35,9 @@ yarn-error.log*
 deploy-config.json
 deployed-contracts.json
 
+# e2e
+packages/interface/metamask/
+
 # vercel
 .vercel
 

.prettierignore

@@ -17,4 +17,5 @@ test-results/
 packages/subgraph/templates/subgraph.template.yaml
 packages/subgraph/subgraph.yaml
 packages/subgraph/generated/
+packages/interface/metamask/
 

packages/coordinator/package.json

@@ -39,7 +39,7 @@
     "@nestjs/websockets": "^10.4.4",
     "@nomicfoundation/hardhat-ethers": "^3.0.8",
     "@nomicfoundation/hardhat-toolbox": "^5.0.0",
-    "@vercel/blob": "^0.19.0",
+    "@vercel/blob": "^0.25.0",
     "@zerodev/ecdsa-validator": "^5.3.1",
     "@zerodev/permissions": "^5.4.3",
     "@zerodev/sdk": "^5.3.8",

packages/interface/package.json

@@ -20,12 +20,12 @@
     "@hatsprotocol/sdk-v1-core": "^0.10.0",
     "@hookform/resolvers": "^3.3.4",
     "@nivo/line": "^0.84.0",
+    "@openzeppelin/merkle-tree": "^1.0.7",
     "@pcd/eddsa-pcd": "^0.6.5",
     "@pcd/pcd-types": "^0.11.4",
     "@pcd/util": "^0.5.4",
     "@pcd/zk-eddsa-event-ticket-pcd": "^0.6.6",
     "@pcd/zuauth": "^1.4.5",
-    "@openzeppelin/merkle-tree": "^1.0.7",
     "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@rainbow-me/rainbowkit": "^2.0.1",
@@ -37,7 +37,7 @@
     "@trpc/next": "11.0.0-next-beta.294",
     "@trpc/react-query": "11.0.0-next-beta.294",
     "@trpc/server": "11.0.0-next-beta.294",
-    "@vercel/blob": "^0.19.0",
+    "@vercel/blob": "^0.25.0",
     "clsx": "^2.1.0",
     "date-fns": "^3.6.0",
     "dotenv": "^16.4.1",
@@ -76,6 +76,7 @@
     "@tailwindcss/typography": "^0.5.10",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^16.0.0",
+    "@types/decompress": "^4.2.7",
     "@types/eslint": "^8.56.2",
     "@types/formidable": "^3.4.5",
     "@types/lowdb": "^1.0.15",
@@ -89,6 +90,7 @@
     "@typescript-eslint/parser": "^6.19.1",
     "@vitejs/plugin-react": "^4.3.1",
     "autoprefixer": "^10.4.17",
+    "decompress": "^4.2.1",
     "eslint": "^8.57.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-next": "14.2.4",

packages/interface/playwright/fixtures.ts

@@ -1,24 +1,34 @@
 import { test as base, chromium, type BrowserContext } from "@playwright/test";
 import { initialSetup } from "@synthetixio/synpress/commands/metamask";
 import { init, setExpectInstance } from "@synthetixio/synpress/commands/playwright";
-import { prepareMetamask } from "@synthetixio/synpress/helpers";
+import decompress from "decompress";
+
+import fs from "fs";
+import path from "path";
 
 import { NETWORKS, TEST_MNEMONIC, TEST_PASSWORD } from "./constants";
 
+const METAMASK_ARCHIVE_PATH = path.resolve(__dirname, "../metamask-chrome-11.15.1.zip");
+const METAMASK_OUTPUT_PATH = path.resolve(__dirname, "../metamask");
+
 export const test = base.extend<{
   context: BrowserContext;
 }>({
   context: async ({}, use) => {
+    if (!fs.existsSync(METAMASK_OUTPUT_PATH)) {
+      await decompress(METAMASK_ARCHIVE_PATH, METAMASK_OUTPUT_PATH);
+    } else if (process.env.FORCE === "true") {
+      await fs.promises.rmdir(METAMASK_OUTPUT_PATH);
+      await decompress(METAMASK_ARCHIVE_PATH, METAMASK_OUTPUT_PATH);
+    }
+
     // required for synpress as it shares same expect instance as playwright
     await setExpectInstance(test.expect);
 
-    // download metamask
-    const metamaskPath = await prepareMetamask(process.env.METAMASK_VERSION || "11.15.1");
-
     // prepare browser args
     const browserArgs = [
-      `--disable-extensions-except=${metamaskPath}`,
-      `--load-extension=${metamaskPath}`,
+      `--disable-extensions-except=${METAMASK_OUTPUT_PATH}`,
+      `--load-extension=${METAMASK_OUTPUT_PATH}`,
       "--disable-dev-shm-usage",
       "--no-sandbox",
       "--disable-gpu",

packages/interface/tsconfig.build.json

@@ -39,5 +39,5 @@
     ".next/types/**/*.ts",
     "./src/pages/api/indexer/webhook._ts"
   ],
-  "exclude": ["node_modules", "commitlint.config.js", "playwright", "e2e"]
+  "exclude": ["node_modules", "commitlint.config.js", "playwright", "e2e", "metamask", "playwright-report"]
 }

packages/interface/tsconfig.json

@@ -39,5 +39,5 @@
     ".next/types/**/*.ts",
     "src/pages/api/indexer/webhook._ts"
   ],
-  "exclude": ["node_modules", "commitlint.config.js"]
+  "exclude": ["node_modules", "commitlint.config.js", "metamask", "playwright-report"]
 }