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.17: [zk-token-sdk] Add a length check on range proof commitment length (backport of #34165) #34182

Merged
merged 2 commits into from
Nov 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 20, 2023

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

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

You are currently cherry-picking commit e251b8607c.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   zk-token-sdk/src/errors.rs
	both modified:   zk-token-sdk/src/instruction/batched_range_proof/batched_range_proof_u128.rs
	both modified:   zk-token-sdk/src/instruction/batched_range_proof/batched_range_proof_u256.rs
	both modified:   zk-token-sdk/src/instruction/batched_range_proof/batched_range_proof_u64.rs

no changes added to commit (use "git add" and/or "git commit -a")

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

…34165)

add a length check on range proof commitment length

(cherry picked from commit e251b86)

# Conflicts:
#	zk-token-sdk/src/errors.rs
#	zk-token-sdk/src/instruction/batched_range_proof/batched_range_proof_u128.rs
#	zk-token-sdk/src/instruction/batched_range_proof/batched_range_proof_u256.rs
#	zk-token-sdk/src/instruction/batched_range_proof/batched_range_proof_u64.rs
Copy link

codecov bot commented Nov 21, 2023

Codecov Report

Merging #34182 (f845b92) into v1.17 (3776775) will decrease coverage by 0.1%.
The diff coverage is 54.5%.

Additional details and impacted files
@@            Coverage Diff            @@
##            v1.17   #34182     +/-   ##
=========================================
- Coverage    81.8%    81.8%   -0.1%     
=========================================
  Files         803      803             
  Lines      217969   217979     +10     
=========================================
- Hits       178452   178411     -41     
- Misses      39517    39568     +51     

@samkim-crypto samkim-crypto merged commit 7800f0e into v1.17 Nov 21, 2023
31 checks passed
@samkim-crypto samkim-crypto deleted the mergify/bp/v1.17/pr-34165 branch November 21, 2023 21:49
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.

2 participants