Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zk-jwt Refactor #2

Open
wants to merge 80 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
26a0e65
feat: jwt-verifier working w/ tests
shreyas-londhe Sep 11, 2024
f533983
chore: updated gh workflow
shreyas-londhe Sep 11, 2024
e0448ea
chore: updated gh workflow
shreyas-londhe Sep 11, 2024
cce19d5
chore: updated workflow
shreyas-londhe Sep 13, 2024
6383f63
feat: modifier helper functions to output jwt indices
shreyas-londhe Sep 17, 2024
635a58d
feat: added checks for jwt header params
shreyas-londhe Sep 17, 2024
3bb1a3f
chore: updated workflow name
shreyas-londhe Sep 17, 2024
ae9f8a3
feat: added a check for unique 'command' key in payload
shreyas-londhe Sep 17, 2024
97ee4a8
feat: added sample frontend to generate auth jwt
shreyas-londhe Sep 18, 2024
9aee0fe
feat: added azp check
shreyas-londhe Sep 20, 2024
a6656a0
feat: added command check
shreyas-londhe Sep 23, 2024
8d7a3d0
chore: updated the workflow file
shreyas-londhe Sep 23, 2024
e7665e1
chore: updated the workflow file
shreyas-londhe Sep 23, 2024
dbf5595
chore: updated the workflow file
shreyas-londhe Sep 23, 2024
e116d14
fix: minor refactoring
shreyas-londhe Sep 24, 2024
d42ce19
feat: added email-auth checks
shreyas-londhe Sep 24, 2024
0aeef69
feat: zk-jwt auth tests working
shreyas-londhe Sep 25, 2024
4dec2cb
chore: updated action.yml
shreyas-londhe Sep 26, 2024
9fce41f
chore: updated action.yml
shreyas-londhe Sep 26, 2024
5267b8b
chore: updated action.yml
shreyas-londhe Sep 26, 2024
4c0d9a9
chore: minor fix
shreyas-londhe Sep 26, 2024
93a6d88
chore: minor fix
shreyas-londhe Sep 26, 2024
1da53f5
fix: fixed helper build issues
shreyas-londhe Sep 26, 2024
9928d14
Update package.json
wshino Oct 2, 2024
4fea8ea
feat: added actual google sign in test
shreyas-londhe Oct 2, 2024
f7513c1
Fix snarkjs version
SoraSuegami Oct 2, 2024
16ffd29
Update package.json
wshino Oct 2, 2024
0a03dce
Fix snarkjs version
SoraSuegami Oct 2, 2024
9e36b2c
Update jwt-verifier-test.circom
wshino Oct 3, 2024
5a25a54
Add contracts
wshino Oct 3, 2024
cbf52b1
Remove CommandUtils and DecimalUtils
wshino Oct 3, 2024
698b420
Add deploy script and env sample file
wshino Oct 3, 2024
7cf9cce
feat: generating jwt in frontend
shreyas-londhe Oct 3, 2024
fdb0aa5
feat: made the ui pretty
shreyas-londhe Oct 3, 2024
4be5cf7
feat: added web worker
shreyas-londhe Oct 3, 2024
e9bb24a
feat: made ui pretty
shreyas-londhe Oct 3, 2024
56bdffe
fix: updated lockfile
shreyas-londhe Oct 3, 2024
269036e
Merge branch 'feat/refactor' of https://github.com/zkemail/zk-jwt int…
SoraSuegami Oct 3, 2024
c248b0d
fix: skipped actual jwt test
shreyas-londhe Oct 3, 2024
6419808
Add prover
SoraSuegami Oct 3, 2024
83007b7
change branch name
SoraSuegami Oct 3, 2024
59043fd
Fix prover
SoraSuegami Oct 4, 2024
937e5ab
Upload Update prover and verifier
SoraSuegami Oct 7, 2024
63b1966
Fix circuit name
SoraSuegami Oct 7, 2024
e71a93f
Update AZP_FIELDS
wshino Oct 7, 2024
70de4f8
fix: generate build files
shreyas-londhe Oct 8, 2024
dcceed2
Add test for JwtVerifiter
wshino Oct 9, 2024
9c876fe
fix (wip): prover modal integration into frontend
shreyas-londhe Oct 10, 2024
0588442
Merge branch 'feat/refactor' of https://github.com/zkemail/zk-jwt int…
SoraSuegami Oct 10, 2024
0e0dd17
Fix frontend compile errors.
SoraSuegami Oct 11, 2024
a8ff317
Inherit IVerifier
wshino Oct 11, 2024
69e5fff
Add disableAzp
wshino Oct 11, 2024
7c73abd
Update gen-input file
wshino Oct 11, 2024
f977e37
fix: removed alg check
shreyas-londhe Oct 11, 2024
d3d6b4f
fix (wip): frontend build error
shreyas-londhe Oct 12, 2024
9b99a74
Fix package.json in helpers
SoraSuegami Oct 12, 2024
18d9046
Fix path to input-generators
SoraSuegami Oct 12, 2024
cf95802
Fix import path
SoraSuegami Oct 12, 2024
d92c998
fix: updated jwt verifier contract
shreyas-londhe Oct 12, 2024
9d3566f
add deploy instructions to contract readme and fix .env.sample
Divide-By-0 Oct 12, 2024
7caa7ce
Update verifier name and prover
SoraSuegami Oct 12, 2024
6e2631a
updated base sep deploy address again
Divide-By-0 Oct 12, 2024
a82e69b
added sepolia dkimregistry address
Divide-By-0 Oct 12, 2024
f6f7d5e
Merge branch 'feat/prover' into feat/refactor
wshino Oct 12, 2024
008631d
Add docs into Deploy_jwtRegistry.s.sol
wshino Oct 12, 2024
f04645d
Add Deploy_jwtVerifier.s.sol
wshino Oct 12, 2024
d31bb35
Add Deploy_jwtVerifier.s.sol
wshino Oct 12, 2024
019169b
fix: proof gen working on frontend
shreyas-londhe Oct 12, 2024
b7c3f00
chore: minor refactor
shreyas-londhe Oct 12, 2024
18641b7
chore: update prover
Bisht13 Oct 13, 2024
28c8a95
chore: update modal
Bisht13 Oct 13, 2024
64c5f9c
chore: update modal
Bisht13 Oct 13, 2024
d691c6d
feat: complete e2e demo flow
shreyas-londhe Oct 13, 2024
36335fb
chore: Fix linting errors
wryonik Oct 13, 2024
65fb469
chore: add declaration file for @zk-email/relayer-utils
wryonik Oct 13, 2024
e3756f3
chore: update yarn.lock file
wryonik Oct 13, 2024
fc82187
Add onlyOwner modifier
wshino Oct 14, 2024
57ff775
Merge branch 'feat/refactor' of github.com:zkemail/zk-jwt into feat/r…
wshino Oct 14, 2024
d967e67
Update integration tests using dynamic proof and pub signals
wshino Oct 15, 2024
27b1093
Fix maskedCommand
wshino Oct 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
## Description

Please include a summary of the changes and the related issue. Please also include relevant motivation and context.
Mention the issue number that your changes are addressing. Use the format "Fixes #<issue number>" to automatically link your pull request to the relevant issue.

## Type of Change

Please delete options that are not relevant.

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] This change requires a documentation update

## Checklist:

- [ ] I have discussed with the team prior to submitting this PR
- [ ] I have performed a self-review of my code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] My changes generate no new warnings
- [ ] New and existing unit tests pass locally with my changes
67 changes: 67 additions & 0 deletions .github/workflows/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: ZK JWT tests
on: [push]
jobs:
run_circuit_tests:
runs-on: ubuntu-latest
environment: development
steps:
- uses: actions/checkout@v3

# Circom installation from https://github.com/erhant/circomkit/blob/main/.github/workflows/tests.yml
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install --yes \
build-essential \
libgmp-dev \
libsodium-dev \
nasm \
nlohmann-json3-dev

- name: Set Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18

- name: Setup Rust
uses: dtolnay/rust-toolchain@stable

- name: Download Circom Binary v2.1.8
run: |
wget -qO /home/runner/work/circom https://github.com/iden3/circom/releases/download/v2.1.8/circom-linux-amd64
chmod +x /home/runner/work/circom
sudo mv /home/runner/work/circom /bin/circom

- name: Print Circom version
run: circom --version

- name: Install Yarn dependencies
working-directory: ./packages/circuits
run: yarn install --immutable

- name: Run Tests
working-directory: ./packages/circuits
run: yarn test

run_helpers_tests:
runs-on: ubuntu-latest
environment: development
steps:
- uses: actions/checkout@v3

- name: Set Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18

- name: Install Yarn dependencies
working-directory: ./packages/helpers
run: yarn install --immutable

- name: Run build
working-directory: ./packages/helpers
run: yarn build

- name: Run Tests
working-directory: ./packages/helpers
run: yarn test
104 changes: 85 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,27 +1,93 @@
# node
node_modules/
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
#
#

# hardhat
cache
artifacts
dist
__pycache__

# Ignore the output from circom because we want people to build these
# Users can remove these lines and commit the artifacts
circuits/*.r1cs
circuits/*.vkey.json
# dependencies
/node_modules

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

circuits/*_js/*
*.r1cs
*.sym
circuits/*.wasm
circuits/*.zkey
circuits/*.ptau
circuits/*.wtns
packages/circuits/*.wasm
*.ptau
*.zkey
circuits/inputs/*.json

build/
keys/
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

secret.json
yarn.lock
out/
circuits/circuit*zkey*
circuits/email/
cache/
test.log
packages/contracts/out/
packages/contracts/lib/
packages/contracts/broadcast
.next
node_modules.nosync
*Wallet*
*wallet*
circuits/regexes/subject_regex*

.env
*input.json
dizkus-scripts/*input.json
circuits/example
circuits/*.json
*.debug
*.env
.vscode

.DS_Store
.DS_Store?
packages/circuits/tests/compiled-test-circuits/*
packages/helpers/tests/test-jwts/*

.vite
**/.vite
**/.yarn/*

*.tsbuildinfo

**/node_modules
**/build
tsconfig.tsbuildinfo

*.rvkey

# Generated by Cargo
# will have compiled files and executables
debug/
target/

# These are backup files generated by rustfmt
**/*.rs.bk

pyjwt-env/
# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb
packages/contracts/artifacts
783 changes: 783 additions & 0 deletions .yarn/releases/yarn-3.2.3.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.2.3.cjs
75 changes: 0 additions & 75 deletions README.md

This file was deleted.

17 changes: 0 additions & 17 deletions circuits/ascii.circom

This file was deleted.

Loading
Loading