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

v1.14: [zk-token-sdk] rename and restructure CloseAccount and WithdrawWithheld proof instructions (backport of #31608) #31704

Merged
merged 2 commits into from May 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 17, 2023

This is an automatic backport of pull request #31608 done by Mergify.
Cherry-pick of f9b0691 has failed:

On branch mergify/bp/v1.14/pr-31608
Your branch is up to date with 'origin/v1.14'.

You are currently cherry-picking commit f9b0691eb4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   programs/zk-token-proof-tests/tests/process_transaction.rs
	new file:   zk-token-sdk/src/instruction/ctxt_ctxt_equality.rs
	modified:   zk-token-sdk/src/instruction/mod.rs
	modified:   zk-token-sdk/src/instruction/pubkey_validity.rs
	modified:   zk-token-sdk/src/instruction/transfer.rs
	modified:   zk-token-sdk/src/instruction/transfer_with_fee.rs
	modified:   zk-token-sdk/src/instruction/withdraw.rs
	new file:   zk-token-sdk/src/instruction/zero_balance.rs
	renamed:    zk-token-sdk/src/sigma_proofs/equality_proof.rs -> zk-token-sdk/src/sigma_proofs/ctxt_comm_equality_proof.rs
	new file:   zk-token-sdk/src/sigma_proofs/ctxt_ctxt_equality_proof.rs
	modified:   zk-token-sdk/src/sigma_proofs/mod.rs
	modified:   zk-token-sdk/src/sigma_proofs/pubkey_proof.rs
	modified:   zk-token-sdk/src/sigma_proofs/zero_balance_proof.rs
	modified:   zk-token-sdk/src/zk_token_elgamal/convert.rs
	modified:   zk-token-sdk/src/zk_token_elgamal/pod.rs
	modified:   zk-token-sdk/src/zk_token_proof_instruction.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   programs/zk-token-proof/src/lib.rs
	deleted by them: zk-token-sdk/src/instruction/close_account.rs
	deleted by them: zk-token-sdk/src/instruction/withdraw_withheld.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…hheld` proof instructions (#31608)

* rename and restruct ProofInstruction::VerifyCloseAccount to ProofInstruction::VerifyZeroBalance

* rename `PubkeySigmaProof` to `PubkeyValidityProof`

* refactor equality proofs into separate modules

* rename and restructure ProofInstruction::VerifyWithdrawWithheld to ProofInstruction::VerifyCiphertextCiphertextEquality

* add and reorg documentation for the proof instructions

* generalize ciphertext-ciphertext equality proof data constructor

* Update zk-token-sdk/src/instruction/ctxt_ctxt_equality.rs

Co-authored-by: Jon Cinque <joncinque@pm.me>

---------

Co-authored-by: Jon Cinque <joncinque@pm.me>
(cherry picked from commit f9b0691)

# Conflicts:
#	programs/zk-token-proof/src/lib.rs
#	zk-token-sdk/src/instruction/close_account.rs
#	zk-token-sdk/src/instruction/withdraw_withheld.rs
@codecov
Copy link

codecov bot commented May 18, 2023

Codecov Report

Merging #31704 (47d8bf4) into v1.14 (e54bd6d) will decrease coverage by 0.1%.
The diff coverage is 80.3%.

@@            Coverage Diff            @@
##            v1.14   #31704     +/-   ##
=========================================
- Coverage    82.1%    82.1%   -0.1%     
=========================================
  Files         664      665      +1     
  Lines      185210   185216      +6     
=========================================
+ Hits       152156   152157      +1     
- Misses      33054    33059      +5     

@samkim-crypto samkim-crypto merged commit 4e51391 into v1.14 May 19, 2023
20 checks passed
@samkim-crypto samkim-crypto deleted the mergify/bp/v1.14/pr-31608 branch May 19, 2023 11:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants