-
Notifications
You must be signed in to change notification settings - Fork 18
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
Locking by spending and creating UTXOs #121
Merged
+4,722
−3,509
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
97f3894
spend inputs for locking
jimthematrix 0e3de1a
Squashed commit of the following:
jimthematrix 5a8e9f2
zeto lock with nullifiers
jimthematrix ac8c0f9
remove lock verifiers
jimthematrix 4725fba
transfer() and transferLocked() with new circuits
jimthematrix 61a0902
fix anon_nullifier and add locking support to nf_anon
jimthematrix e710d01
add locking support for NF token implementations
jimthematrix 8a2504e
Add escrow contract based on Zeto_Anon for testing purposes
jimthematrix 444a062
add escrow contracts to test locking flows
jimthematrix 1a5a3a9
fix tests
jimthematrix eb8723f
fix circuit tests
jimthematrix 7660df1
fix go-sdk integration test
jimthematrix 7b3861b
update checks of inputs and output
jimthematrix a6a911e
update circuit integration tests
jimthematrix 121185b
fix nf nullifier integration test
jimthematrix 518cd5b
fix nf anon nullifier integration test
jimthematrix ff3fe10
fix test for the escrow flow
jimthematrix 63a902a
fix anon_nullifier build and tests for batching
jimthematrix 5f1a2df
fix deployment parameters for the factory
jimthematrix f4dff77
change the verifier initialization params to a struct
jimthematrix 64966b5
move verifiers to the contracts/verifiers folder
jimthematrix c6c2d7e
fix factory unit tests
jimthematrix e7e96b7
fix tests for using the cloneable factory
jimthematrix 073918c
consolidate solidity interfaces
jimthematrix 7323357
use proof to check for existence in the locked commitments tree
jimthematrix a9c95c7
renaming of internal variables
jimthematrix 1c54398
Update doc-site/docs/advanced/erc20-tokens-integration.md
jimthematrix 8ced077
test for duplicate output utxos
Chengxuan 925ee0c
Update inline comments in the transferLocked circuit
jimthematrix File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading status checks…
fix nf nullifier integration test
Signed-off-by: Jim Zhang <[email protected]>
commit 121185bda4d0a738d9a29387498e080a84357037
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where do we set
_lockedUtxos
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK I see that it's in another method,
processInputsAndOutputs
. It's slightly confusing that the setup of the locked states is split up. Maybe this method just needs a different name?