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

Re-export curve25519-dalek from solana-zk-token-sdk #1657

Merged

Conversation

andreisilviudragnea
Copy link

Problem

The spl-token-client crate from solana-program-library repository started depending directly on curve-25519-dalek v3.2.1 since solana-labs/solana-program-library#5258. This blocks #513 which tries to update curve-25519-dalek to a newer version.

Summary of Changes

Re-exported curve25519-dalek crate from solana-zk-token-sdk crate in order to remove specifying an explicit version (in Cargo.toml) for curve-25519-dalek in solana-program-library repository.

@samkim-crypto

@mergify mergify bot requested a review from a team June 8, 2024 14:14
@samkim-crypto samkim-crypto added the CI Pull Request is ready to enter CI label Jun 10, 2024
@anza-team anza-team removed the CI Pull Request is ready to enter CI label Jun 10, 2024
Copy link

@samkim-crypto samkim-crypto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR! I think we just need to exclude the re-export from sbf target.

zk-token-sdk/src/lib.rs Show resolved Hide resolved
@andreisilviudragnea andreisilviudragnea force-pushed the re-export-curve25519-dalek branch 2 times, most recently from 49bb736 to 0735715 Compare June 10, 2024 11:48
@andreisilviudragnea andreisilviudragnea force-pushed the re-export-curve25519-dalek branch from 0735715 to 054c684 Compare June 10, 2024 11:48
@samkim-crypto samkim-crypto added the CI Pull Request is ready to enter CI label Jun 10, 2024
@anza-team anza-team removed the CI Pull Request is ready to enter CI label Jun 10, 2024
@samkim-crypto samkim-crypto merged commit ac00bea into anza-xyz:master Jun 10, 2024
42 checks passed
@andreisilviudragnea andreisilviudragnea deleted the re-export-curve25519-dalek branch June 10, 2024 13:09
@andreisilviudragnea
Copy link
Author

andreisilviudragnea commented Jun 10, 2024

@samkim-crypto Does this PR need backporting to v1.18 for solana-labs/solana-program-library#6822 to work?

@samkim-crypto
Copy link

Yeah SPL is currently on Solana version 1.18. We have two options here:

  • Backport to v1.18, wait for the next v.18 release, and then bump Solana version in SPL
  • Wait until v2.0 is cut, and then upgrade SPL to v2.0

Generally backporting is discouraged for non-security related changes and there is also a strict review process. It seems like we can wait until v2.0 is cut, which I believe is just around the corner. @yihau wdyt?

@yihau
Copy link
Member

yihau commented Jun 11, 2024

I think we can wait for 2.0. we will cut that branch soon!

btw, we also can do a trick here to pass the spl downstream tests.

sed -i 's/solana-geyser-plugin-interface/agave-geyser-plugin-interface/g' ./Cargo.toml

let's fix the failed test first, I will take care of this hack

samkim-crypto pushed a commit to samkim-crypto/agave that referenced this pull request Jul 31, 2024
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.

4 participants