Merge branch 'refactor_upstream' into fe-refactor

package.json

@@ -1,9 +1,8 @@
 {
-  "name": "double-blind",
+  "name": "zk-email",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@openzeppelin/contracts": "^4.8.3",
     "@rainbow-me/rainbowkit": "^0.8.0",
     "@testing-library/jest-dom": "^5.16.3",
     "@testing-library/react": "^12.1.4",
@@ -17,6 +16,8 @@
     "atob": "^2.1.2",
     "base64-sol": "^1.1.0",
     "buffer": "^6.0.3",
+    "chai": "^4.3.7",
+    "circom_tester": "^0.0.19",
     "circomlibjs": "^0.1.2",
     "cryo": "^0.0.6",
     "crypto-browserify": "^3.12.0",
@@ -27,6 +28,7 @@
     "libmime": "^5.1.0",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
+    "mocha": "^10.2.0",
     "next": "^12.3.1",
     "node-forge": "^1.3.1",
     "pako": "^2.1.0",
@@ -42,7 +44,7 @@
     "react-use": "^17.3.2",
     "readline": "^1.3.0",
     "serve": "^14.0.1",
-    "snarkjs": "https://github.com/sampritipanda/snarkjs.git#fef81fc51d17a734637555c6edbd585ecda02d9e",
+    "snarkjs": "latest",
     "sshpk": "^1.17.0",
     "styled-components": "^5.3.5",
     "ts-node": "^10.9.1",
@@ -64,10 +66,11 @@
     "serve": "vite preview",
     "test": "jest --runInBand --testPathIgnorePatterns='e2e' --reporters=default --reporters=jest-junit",
     "start-e2e-test-server": "serve -s dist -p 3000",
-    "test:e2e-ui": "CI=true jest ./e2e-ui*.test.*",
-    "test:e2e-zkp": "CI=true jest ./e2e-dl-zkp.test.ts",
+    "test:e2e-ui": "CI=true jest ./src/e2e-ui*.test.*",
+    "test:e2e-zkp": "CI=true jest ./src/e2e-dl-zkp.test.ts",
+    "jest": "jest",
     "compile": "node circuits/scripts/compile.js",
-    "gen-input": "npx tsx ./scripts/generate_input.ts",
+    "gen-input": "npx tsx ./src/scripts/generate_input.ts",
     "compile-all": "yarn gen-input && yarn compile email true",
     "prepare": "husky install"
   },
@@ -97,8 +100,10 @@
     "@babel/preset-typescript": "^7.21.5",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
+    "@openzeppelin/contracts": "^4.9.0",
     "@types/atob": "^2.1.2",
-    "@types/jest": "^29.4.0",
+    "@types/jest": "^29.5.1",
+    "@types/mocha": "^10.0.1",
     "@types/node": "^18.0.6",
     "@types/node-forge": "^1.3.2",
     "@types/tar-stream": "^2.2.2",