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.

Sign up for GitHub

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

Jump to bottom

feat: Merge NFT Demo branch #68

Merged
merged 91 commits into from
Apr 29, 2024
Merged

feat: Merge NFT Demo branch #68

merged 91 commits into from
Apr 29, 2024

Conversation

Bisht13
Copy link
Member

@Bisht13 Bisht13 commented Mar 18, 2024

No description provided.

SoraSuegami and others added 30 commits February 19, 2024 09:55
@SoraSuegami
Generalize relayer.
78197ea
@SoraSuegami
Implementing main.rs.
dd3d078
@SoraSuegami
Catch all events in main.rs.
47418c1
@SoraSuegami
Fix htmls.
602e59d
@SoraSuegami
Fix argument to generate_account_creation_input.
0803a93
@SoraSuegami
Add nft_relayer.
35a29e7
@SoraSuegami
Prepare necessary dirs and email templates for nft relayer.
c417509
@SoraSuegami
Merge branch 'feat/v1.1' of https://github.com/zkemail/zk-email-wallet …
50a4d96 
…into feat/nft-demo
@Bisht13
NFT Relayer running
c59eb80
@SoraSuegami
Add NFT image support.
ef88f4b
@SoraSuegami
Merge branch 'feat/nft-demo' of https://github.com/zkemail/zk-email-w…
31be50c 
…allet into feat/nft-demo
@SoraSuegami
Add api test to nft relayer.
c0f2b4b
@SoraSuegami
Fix test in nft_relayer.
147474c
@Bisht13
Working on Sepolia
ffaceee
@Bisht13
Minor deployment script change
51f77ed
@Bisht13
Update Cargo.toml
a2ae0f0
@SoraSuegami
Fix test_nft_mint.
d48a699
@SoraSuegami
Fix test in nft_relayer.
1bd07bf
@SoraSuegami
Fix register_unclaimed_fund/state funcs in chain.rs.
361f40d
@SoraSuegami
FIx register_psi_point.
026d587
@SoraSuegami
FIx definition of EventConsumer.
7ff6d98
@SoraSuegami
Fix html rendering and claimer issues.
7b63e45
@SoraSuegami
Fix sql typo.
10c35d5
@SoraSuegami
Not fork new tasks
4e32b03
@SoraSuegami
Fix modal_server.
49b763c
@Bisht13
Fix unclaims handler
a91dd88
@SoraSuegami
Fix prover.
ba89a36
@SoraSuegami
Merge branch 'feat/nft-demo' of https://github.com/zkemail/zk-email-w…
4db1409 
…allet into feat/nft-demo
@SoraSuegami
Fix error handlings in relayer/src/lib.rs.
0a88c70
@SoraSuegami
Worked with sepolia+local relayer+modal prover.
c1a7c45
@Bisht13 Bisht13 changed the title [WIP] feat: Merge NFT Demo branch feat: Merge NFT Demo branch Mar 23, 2024
@SoraSuegami
Copy link
Collaborator

https://github.com/zkemail/email-wallet/blob/feat/merge-nft-demo/packages/circuits/scripts/account_creation.ts#L11
I think you missed the circuits/helpers directory.

@Bisht13
Copy link
Member Author

Bisht13 commented Mar 23, 2024

https://github.com/zkemail/email-wallet/blob/feat/merge-nft-demo/packages/circuits/scripts/account_creation.ts#L11 I think you missed the circuits/helpers directory.

I removed it since it was no longer needed to be called from the relayer.

@SoraSuegami
Copy link
Collaborator

I understand.
However, its codes are imported in the circuit tests.
Could you make alternative functions to generate inputs for each circuit in the utils package and call them in the circuit tests?

@Bisht13
Copy link
Member Author

Bisht13 commented Mar 23, 2024

I understand. However, its codes are imported in the circuit tests. Could you make alternative functions to generate inputs for each circuit in the utils package and call them in the circuit tests?

I understand, so do you mean to expose the rust functions for circuit inputs as wasm bindings and use them to pass the tests?

@SoraSuegami
Copy link
Collaborator

Yes, but instead of exposing the functions as wasm, you can expose them as nodejs functions as neon. Please refer to the functions with the suffix "node" and the lib.rs in the utils package to know how to do that.

@Bisht13
Copy link
Member Author

Bisht13 commented Mar 23, 2024

Yes, but instead of exposing the functions as wasm, you can expose them as nodejs functions as neon. Please refer to the functions with the suffix "node" and the lib.rs in the utils package to know how to do that.

Sure, I'll expose them via neon and pass the tests.

@SoraSuegami SoraSuegami merged commit eec14a3 into feat/v1.1 Apr 29, 2024
4 checks passed
SoraSuegami added a commit that referenced this pull request Apr 29, 2024
@SoraSuegami @Bisht13
@wshino @Divide-By-0 @saleel @lakshyashishir
Feat/v1.1 (#69)
7b505a1 
* feat: simplify account key

* Rename function arg

* Update circom and its scripts.

* Set guarding wallet for a guardian.

* Solidity changes

* Remove randHash, relayerHash and accountKeyCommit(it still leaves in some functions).

* Fix test_AccountInitailization

* Remove unused variables.

* Fix test_CreateAccount

* Comment out tetsts which are related to randHash.

* Comment out tetsts which are related to account key commit.

* Do account creation + initialization in one step.

* Remove pointer.

* Remove pointer.

* removed bracket typo at end of macos latest

* removed bracket typo at end of macos latest

* removed bracket typo at end of macos latest

* Update utils package and fix some circuit tests.

* Fix unit-test ci.

* Fix email_sender.circom to mask codes in the subject.

* fix missing imports

* update EmailOp struct

* udpate verifier interface

* udpate event structs

* fix createAccount

* clean AccountHandler to new spec

* cleanup Core contract to new spec

* fix unclaim handlers

* update AllVerifier

* add announcement verifier to interface

* fix stack error in createAccount

* handle timestamp check with no timestamp is found in email

* update artifacts

* Fix the definition of invitation code.

* Revert "Set guarding wallet for a guardian."

This reverts commit bfdc312.

* update test verifier

* fix unit tests build

* Generate new verifier contracts.

* Remove unused contract script.

* Fix some failing contract tests and add relayer checks.

* Update email_sender circuit tests.

* fix timestmap possition in verifier

* Update verifiers.

* fix unit tests

* remove artifacts

* Update prover.

* Fix relayer partially.

* Add registerPSIPoint and isWalletSaltDeployed

* Fix relayer partially.

* Relayer can be compiled.

* Embed the creator into the claimer.

* Fix github ci.

* Claim unclaims after creating the account.

* Implement the subject prefix skip.

* feat: Simplify Account Key (#51)

* Remove some comments in the relayer.

* Fix build-test yaml.

* Remove account_creator crate.

* Fix utils test.

---------

Co-authored-by: SoraSuegami <[email protected]>

* Relayer compilable

* Relayer compilable

* Account creation working

* Tx working

* Check if acc creation mail contains command

* feat: Merge NFT Demo branch (#68)

* Generalize relayer.

* Implementing main.rs.

* Catch all events in main.rs.

* Fix htmls.

* Fix argument to generate_account_creation_input.

* Add nft_relayer.

* Prepare necessary dirs and email templates for nft relayer.

* NFT Relayer running

* Add NFT image support.

* Add api test to nft relayer.

* Fix test in nft_relayer.

* Working on Sepolia

* Minor deployment script change

* Update Cargo.toml

* Fix test_nft_mint.

* Fix test in nft_relayer.

* Fix register_unclaimed_fund/state funcs in chain.rs.

* FIx register_psi_point.

* FIx definition of EventConsumer.

* Fix html rendering and claimer issues.

* Fix sql typo.

* Not fork new tasks

* Fix modal_server.

* Fix unclaims handler

* Fix prover.

* Fix error handlings in relayer/src/lib.rs.

* Worked with sepolia+local relayer+modal prover.

* Add Dockerfile

* Image rendering worked.

* Add nft_transfer.html.

* Deployment changes

* Fix database error.

* NFT transfer by reply worked.

* FIx claimUnclaimedFund in contracts.

* Increase emailValidityDuration.

* Add ignore to nft_relayer tests for CI.

* Add nft images to emails from relayer.

* Cache Dockerfile

* Add API endpoints

* Change API return format

* Add account recovery API

* Add Chain RPC Explorer as ENV

* Update ECDSAOwnedDKIMRegistry.

* Update Subgraph.

* Update graph version.

* Add start block.

* [WIP] Email Templates (#65)

* Add invitation template, assets

* Add dark mode, Fix banner

* Change png to svg, Fix UI

* Add main.css, Modify email templates

* Fix dark mode

* Add NFT Relayer email template

* Fix email template

* Add email subject and content

* Template changes

* Fix templates

* Fix banner in templates

* simplify email copy and remove footer logo

* minor subject and url edits

* remove double periods in errors

* Add echo API

* Email revamp & fix

* svg to png

* Fixes

* Fixes

* Fixes

* Fixes

* Fixes

* simple rephrases of subjecs

* Fixes

* Fixes

* Fix token transfer bugs.

* Fixes

* Add log of proof

* Check test token balance.

* Fixes

* Fixes

* Remove pause

* Feat/fix integration testing (#63)

* feat: merge nft demo

* chore: restructure dir

* chore: remove ts for circuit input gen

* chore: remove svgs

* chore: minor fixes

* feat: add ack

* chore: fixes + refactor

* chore: fixes

* chore: update k8s manifests

* fix: pass tests

* Remove unused codes.

---------

Co-authored-by: SoraSuegami <[email protected]>
Co-authored-by: Lakshya <[email protected]>
Co-authored-by: Divide-By-0 <[email protected]>
Co-authored-by: wshino <[email protected]>

---------

Co-authored-by: Aditya Bisht <[email protected]>
Co-authored-by: wshino <[email protected]>
Co-authored-by: Divide-By-0 <[email protected]>
Co-authored-by: Saleel <[email protected]>
Co-authored-by: Aditya Bisht <[email protected]>
Co-authored-by: Lakshya <[email protected]>
@Bisht13 Bisht13 deleted the feat/merge-nft-demo branch April 29, 2024 07:55
@Bisht13 Bisht13 restored the feat/merge-nft-demo branch June 27, 2024 23:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Bisht13 @SoraSuegami @lakshyashishir @Divide-By-0 @wshino