Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
saleel committed Feb 5, 2024
2 parents c4d3127 + f829c75 commit 0f0ec47
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 32 deletions.
3 changes: 2 additions & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"@proof-of-twitter/circuits": "workspace:^",
"@proof-of-twitter/contracts": "workspace:^",
"@rainbow-me/rainbowkit": "^1.3.3",
"@zk-email/helpers": "^3.1.1",
"@zk-email/helpers": "^3.1.3",
"lodash": "^4.17.21",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down Expand Up @@ -73,6 +73,7 @@
"stream-browserify": "^3.0.0",
"typescript": "^5.3.2",
"vite": "^5.0.8",
"vite-plugin-commonjs": "^0.10.1",
"vite-tsconfig-paths": "^4.3.1"
},
"jest": {
Expand Down
5 changes: 2 additions & 3 deletions packages/app/src/pages/MainPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import _ from "lodash";
import { useAccount, useContractWrite, usePrepareContractWrite } from "wagmi";
import {
rawEmailToBuffer,
DKIMVerificationResult,
verifyDKIMSignature,
} from "@zk-email/helpers";
} from "@zk-email/helpers/dist/input-helpers";
import { verifyDKIMSignature, DKIMVerificationResult } from "@zk-email/helpers/dist/dkim";
import {
downloadProofFiles,
generateProof,
Expand Down
3 changes: 2 additions & 1 deletion packages/app/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import react from "@vitejs/plugin-react";
import tsconfig from "vite-tsconfig-paths";
import "rollup-plugin-node-polyfills";
import commonjs from 'vite-plugin-commonjs'

export default {
server: {
Expand All @@ -10,7 +11,7 @@ export default {
port: 3000,
},
publicDir: "public",
plugins: [react(), tsconfig()],
plugins: [commonjs(), react(), tsconfig()],
resolve: {
alias: {
buffer: "buffer",
Expand Down
2 changes: 1 addition & 1 deletion packages/circuits/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"@zk-email/circuits": "^3.2.0",
"@zk-email/contracts": "^5.0.0",
"@zk-email/helpers": "^3.0.2",
"@zk-email/helpers": "^3.1.3",
"@zk-email/zk-regex-circom": "^1.1.1",
"commander": "^11.1.0",
"snarkjs": "git+https://github.com/vb7401/snarkjs.git#24981febe8826b6ab76ae4d76cf7f9142919d2b8"
Expand Down
83 changes: 57 additions & 26 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3065,7 +3065,7 @@ __metadata:
"@types/pako": ^2.0.3
"@zk-email/circuits": ^3.2.0
"@zk-email/contracts": ^5.0.0
"@zk-email/helpers": ^3.0.2
"@zk-email/helpers": ^3.1.3
"@zk-email/zk-regex-circom": ^1.1.1
chai: ^4.3.7
circom_tester: ^0.0.19
Expand Down Expand Up @@ -4534,28 +4534,9 @@ __metadata:
languageName: node
linkType: hard

"@zk-email/helpers@npm:^3.0.2":
version: 3.0.2
resolution: "@zk-email/helpers@npm:3.0.2"
dependencies:
addressparser: ^1.0.1
atob: ^2.1.2
circomlibjs: ^0.1.7
ethers: ^6.8.0
libmime: ^5.2.1
localforage: ^1.10.0
lodash: ^4.17.21
node-forge: ^1.3.1
pako: ^2.1.0
psl: ^1.9.0
snarkjs: "https://github.com/sampritipanda/snarkjs.git#fef81fc51d17a734637555c6edbd585ecda02d9e"
checksum: 4ba12d53b91f83d3725ae145931c0cc025c6df94dd88abc63d44b3ff556a94beb6dd97634fe69eb189ccc3566a2d3e7407ad071b2ad6f62ea45b366b36797d1b
languageName: node
linkType: hard

"@zk-email/helpers@npm:^3.1.1":
version: 3.1.1
resolution: "@zk-email/helpers@npm:3.1.1"
"@zk-email/helpers@npm:^3.1.3":
version: 3.1.3
resolution: "@zk-email/helpers@npm:3.1.3"
dependencies:
addressparser: ^1.0.1
atob: ^2.1.2
Expand All @@ -4569,7 +4550,7 @@ __metadata:
pki: ^1.1.0
psl: ^1.9.0
snarkjs: "https://github.com/sampritipanda/snarkjs.git#fef81fc51d17a734637555c6edbd585ecda02d9e"
checksum: 620466da5070d6d00d87ad9e8594d30e898a13877c96900f27198bc9dcb9294847c0b1252ff3ba21ef70693aeff80e0da270222bb30bc76988feed4e0aec9e69
checksum: 36eab61ae9b6fdd2f19a38f278fd96d6fd289cda30fd0b7501ea79a6c6adc0678782cb01a7ec514e8acb126f2d4f807764665105e6e6ea67bf2953dcec1c9663
languageName: node
linkType: hard

Expand Down Expand Up @@ -4598,7 +4579,7 @@ __metadata:
"@types/node-forge": ^1.3.11
"@types/styled-components": ^5.1.34
"@vitejs/plugin-react": ^4.2.1
"@zk-email/helpers": ^3.1.1
"@zk-email/helpers": ^3.1.3
crypto-browserify: ^3.12.0
jest: ^29.7.0
jest-environment-jsdom: ^29.7.0
Expand All @@ -4621,6 +4602,7 @@ __metadata:
typescript: ^5.3.2
viem: ^2.2.0
vite: ^5.0.8
vite-plugin-commonjs: ^0.10.1
vite-tsconfig-paths: ^4.3.1
wagmi: ^1.3.10
languageName: unknown
Expand Down Expand Up @@ -4719,6 +4701,15 @@ __metadata:
languageName: node
linkType: hard

"acorn@npm:^8.8.2":
version: 8.11.3
resolution: "acorn@npm:8.11.3"
bin:
acorn: bin/acorn
checksum: 76d8e7d559512566b43ab4aadc374f11f563f0a9e21626dd59cb2888444e9445923ae9f3699972767f18af61df89cd89f5eaaf772d1327b055b45cb829b4a88c
languageName: node
linkType: hard

"addressparser@npm:^1.0.1":
version: 1.0.1
resolution: "addressparser@npm:1.0.1"
Expand Down Expand Up @@ -6844,6 +6835,13 @@ __metadata:
languageName: node
linkType: hard

"es-module-lexer@npm:^1.2.1":
version: 1.4.1
resolution: "es-module-lexer@npm:1.4.1"
checksum: a11b5a256d4e8e9c7d94c2fd87415ccd1591617b6edd847e064503f8eaece2d25e2e9078a02c5ce3ed5e83bb748f5b4820efbe78072c8beb07ac619c2edec35d
languageName: node
linkType: hard

"esbuild@npm:^0.19.3":
version: 0.19.11
resolution: "esbuild@npm:0.19.11"
Expand Down Expand Up @@ -7261,7 +7259,7 @@ __metadata:
languageName: node
linkType: hard

"fast-glob@npm:^3.2.9":
"fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.9":
version: 3.3.2
resolution: "fast-glob@npm:3.3.2"
dependencies:
Expand Down Expand Up @@ -9663,6 +9661,15 @@ __metadata:
languageName: node
linkType: hard

"magic-string@npm:^0.30.1":
version: 0.30.5
resolution: "magic-string@npm:0.30.5"
dependencies:
"@jridgewell/sourcemap-codec": ^1.4.15
checksum: da10fecff0c0a7d3faf756913ce62bd6d5e7b0402be48c3b27bfd651b90e29677e279069a63b764bcdc1b8ecdcdb898f29a5c5ec510f2323e8d62ee057a6eb18
languageName: node
linkType: hard

"make-dir@npm:^4.0.0":
version: 4.0.0
resolution: "make-dir@npm:4.0.0"
Expand Down Expand Up @@ -13241,6 +13248,30 @@ __metadata:
languageName: node
linkType: hard

"vite-plugin-commonjs@npm:^0.10.1":
version: 0.10.1
resolution: "vite-plugin-commonjs@npm:0.10.1"
dependencies:
acorn: ^8.8.2
fast-glob: ^3.2.12
magic-string: ^0.30.1
vite-plugin-dynamic-import: ^1.5.0
checksum: 64e4a995bcf598d443e484bb3063251ba6c1ca4a45b383fe8c303ad5a35cd480632d74eb1e1107a4ecb90afb6b7ce28fa90817a63447736c336442cb49605c40
languageName: node
linkType: hard

"vite-plugin-dynamic-import@npm:^1.5.0":
version: 1.5.0
resolution: "vite-plugin-dynamic-import@npm:1.5.0"
dependencies:
acorn: ^8.8.2
es-module-lexer: ^1.2.1
fast-glob: ^3.2.12
magic-string: ^0.30.1
checksum: 68efd897daa0c72a9f9d3481095dd3f7ec9a822be5a15eef60413734a4c894c5bbd1c1762f02daeef5df59cef212c9f1e7e056315e2a7780816ccafe5c74da6e
languageName: node
linkType: hard

"vite-tsconfig-paths@npm:^4.3.1":
version: 4.3.1
resolution: "vite-tsconfig-paths@npm:4.3.1"
Expand Down

0 comments on commit 0f0ec47

Please sign in to comment.