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

join_split: Require same account flag for 'merge' #70

Merged
merged 2 commits into from
Jan 20, 2023
Merged

join_split: Require same account flag for 'merge' #70

merged 2 commits into from
Jan 20, 2023

Conversation

ludamad
Copy link
Collaborator

@ludamad ludamad commented Jan 18, 2023 •
edited
Loading

Description

See #66 for writeup
Modifies the definition of a "merge" (which, critically, is used when deciding to skip signature checks) to include checking the account flag

Checklist:

  • I have reviewed my diff in github, line by line.
  • Every change is related to the PR description.
  • I have linked this pull request to the issue(s) that it resolves.
  • There are no unexpected formatting changes, superfluous debug logs, or commented-out code.
  • There are no circuit changes, OR specifications in /markdown/specs have been updated.
  • There are no circuit changes, OR a cryptographer has been assigned for review.
  • I've updated any terraform that needs updating (e.g. environment variables) for deployment.
  • The branch has been rebased against the head of its merge target.
  • I'm happy for the PR to be merged at the reviewer's next convenience.
  • New functions, classes, etc. have been documented according to the doxygen comment format. Classes and structs must have @brief describing the intended functionality.
  • If existing code has been modified, such documentation has been added or updated.

@ludamad
Copy link
Collaborator Author

ludamad commented Jan 18, 2023 •
edited
Loading

@LeilaWang for the join split changes (in general) is there anything we need to update in markdown/specs per the PR template?

@ludamad ludamad force-pushed the adam/auth_sdk/allow_no_sig_if_match branch from 30f8e62 to d79d43d Compare January 18, 2023 21:00
@LeilaWang
Copy link
Contributor

Yes, we should add this to the join_split_circuit.md in the internal repo.

@LeilaWang LeilaWang merged commit 0c5e8e7 into defi-bridge-project Jan 20, 2023
@LeilaWang LeilaWang deleted the adam/auth_sdk/allow_no_sig_if_match branch January 20, 2023 17:52
@LeilaWang LeilaWang mentioned this pull request Jan 20, 2023
Closed
dbanks12 pushed a commit that referenced this pull request Jan 24, 2023
@ludamad @ludamad0 @dbanks12
join_split: Require same account flag for 'merge' (#70)
dbc39a0 
* fix(join_split): Check account flag. Fixes #66

* fix(constants): redo verification keys

Co-authored-by: ludamad <adam@aztecprotocol.com>
dbanks12 pushed a commit that referenced this pull request Jan 24, 2023
@ludamad @ludamad0 @dbanks12
join_split: Require same account flag for 'merge' (#70)
e5e51ba 
* fix(join_split): Check account flag. Fixes #66

* fix(constants): redo verification keys

Co-authored-by: ludamad <adam@aztecprotocol.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sirasistant sirasistant sirasistant approved these changes

Assignees

@sirasistant sirasistant

@suyash67 suyash67

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ludamad @LeilaWang @sirasistant @suyash67 @ludamad0