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

v1.17: [zk-token-sdk] Restrict Edwards and Ristretto multiscalar multiplication vector length to at most 512 (backport of #34763) #34849

Merged
merged 2 commits into from
Jan 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 18, 2024

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

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

You are currently cherry-picking commit 73218595c6.
  (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/bpf_loader/src/syscalls/mod.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/src/feature_set.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

…ion vector length to at most 512 (#34763)

* restrict curve25519 multiscalar multiplication vector length to 512

* add syscall tests for msm vector length

* add new feature gate `curve25519_restrict_msm_length`

* update tests for feature new gate

* Update programs/bpf_loader/src/syscalls/mod.rs

Co-authored-by: Trent Nelson <[email protected]>

* remove length guard on the multisicalar mult lib function

---------

Co-authored-by: Trent Nelson <[email protected]>
(cherry picked from commit 7321859)

# Conflicts:
#	sdk/src/feature_set.rs
Copy link

codecov bot commented Jan 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (407dfba) 81.6% compared to head (7891eac) 81.6%.
Report is 1 commits behind head on v1.17.

Additional details and impacted files
@@           Coverage Diff           @@
##            v1.17   #34849   +/-   ##
=======================================
  Coverage    81.6%    81.6%           
=======================================
  Files         805      805           
  Lines      218806   218844   +38     
=======================================
+ Hits       178747   178793   +46     
+ Misses      40059    40051    -8     

@samkim-crypto samkim-crypto merged commit 7e18276 into v1.17 Jan 20, 2024
34 checks passed
@samkim-crypto samkim-crypto deleted the mergify/bp/v1.17/pr-34763 branch January 20, 2024 00:53
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