Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

v1.16: [zk-token-sdk] Make ElGamalKeypair fields private (backport of #32190) #32235

Merged
merged 2 commits into from
Jun 25, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 22, 2023

This is an automatic backport of pull request #32190 done by Mergify.
Cherry-pick of 1452ed7 has failed:

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

You are currently cherry-picking commit 1452ed704.
  (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
	modified:   zk-keygen/src/main.rs
	modified:   zk-token-sdk/src/encryption/elgamal.rs
	modified:   zk-token-sdk/src/encryption/grouped_elgamal.rs
	modified:   zk-token-sdk/src/instruction/batched_grouped_ciphertext_validity.rs
	modified:   zk-token-sdk/src/instruction/ciphertext_ciphertext_equality.rs
	modified:   zk-token-sdk/src/instruction/ciphertext_commitment_equality.rs
	modified:   zk-token-sdk/src/instruction/grouped_ciphertext_validity.rs
	modified:   zk-token-sdk/src/instruction/pubkey_validity.rs
	modified:   zk-token-sdk/src/instruction/transfer/with_fee.rs
	modified:   zk-token-sdk/src/instruction/transfer/without_fee.rs
	modified:   zk-token-sdk/src/instruction/withdraw.rs
	modified:   zk-token-sdk/src/instruction/zero_balance.rs
	modified:   zk-token-sdk/src/sigma_proofs/batched_grouped_ciphertext_validity_proof.rs
	modified:   zk-token-sdk/src/sigma_proofs/ciphertext_ciphertext_equality_proof.rs
	modified:   zk-token-sdk/src/sigma_proofs/ciphertext_commitment_equality_proof.rs
	modified:   zk-token-sdk/src/sigma_proofs/grouped_ciphertext_validity_proof.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/decryption.rs
	modified:   zk-token-sdk/src/zk_token_elgamal/ops.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   programs/zk-token-proof/benches/verify_proofs.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

@mergify mergify bot added the conflicts label Jun 22, 2023
@samkim-crypto samkim-crypto force-pushed the mergify/bp/v1.16/pr-32190 branch from ca45558 to 055d54c Compare June 24, 2023 21:45
@codecov
Copy link

codecov bot commented Jun 24, 2023

Codecov Report

Merging #32235 (5a7035c) into v1.16 (ba76e34) will decrease coverage by 0.1%.
The diff coverage is 97.0%.

❗ Current head 5a7035c differs from pull request most recent head 2ac06f6. Consider uploading reports for the commit 2ac06f6 to get more accurate results

@@            Coverage Diff            @@
##            v1.16   #32235     +/-   ##
=========================================
- Coverage    81.9%    81.9%   -0.1%     
=========================================
  Files         760      761      +1     
  Lines      207432   207494     +62     
=========================================
+ Hits       169952   169971     +19     
- Misses      37480    37523     +43     

* make `ElGamalKeypair` fields private

* update the rest of `zk-token-sdk` for the visibility update

* update `zk-token-proof-tests` for the visibility update

* update `zk-keygen` for the visibility update

* update `zk-token-proof` benches for the updated visibility

* cargo fmt

* rename `ElGamalKeypair::new` to `ElGamalKeypair::new_for_tests`

(cherry picked from commit 1452ed7)

# Conflicts:
#	programs/zk-token-proof/benches/verify_proofs.rs
@samkim-crypto samkim-crypto force-pushed the mergify/bp/v1.16/pr-32190 branch from 5a7035c to 2ac06f6 Compare June 25, 2023 03:13
@samkim-crypto samkim-crypto merged commit ca1be35 into v1.16 Jun 25, 2023
@samkim-crypto samkim-crypto deleted the mergify/bp/v1.16/pr-32190 branch June 25, 2023 05:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants