-
Notifications
You must be signed in to change notification settings - Fork 295
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
Fix missing dependency in solana-curve25519's Cargo.toml #4301
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your contribution! I confirm that this is an issue. Just a little nit to make it clear what's going on for future readers -- let me know what you think
Co-authored-by: Jon C <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CI will also fail due to uncommitted Cargo.lock changes -- can you run ./scripts/cargo-for-all-lock-files.sh tree
and commit those changes too?
updated 😀 thanks for reviewing |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We're almost there, I swear!
hope everything is fixed. BTW, is there a way for me to check these rules next time I submit a PR? |
To be honest, it's a bit annoying to do locally, which is why I didn't bring it up. But you can run |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your contribution!
Problem
Currently,
solana-curve25519
indirectly depends on cratesubtle
throughcurve25519-dalek
.here,
solana-curve25519
usesinto_option
provided by cratesubtle
(provided insubtle
>=2.6)agave/curves/curve25519/src/scalar.rs
Line 22 in aaee37d
agave/curves/curve25519/src/scalar.rs
Line 38 in aaee37d
but dependency
curve25519-dalek
only requiresubtle
version >=2.3. (https://docs.rs/crate/curve25519-dalek/4.1.3/source/Cargo.toml)Currently, we specify subtle version 2.6.1 in agave workspace Cargo.toml.
That's why the compilation of validator can succeed.
agave/Cargo.toml
Line 640 in b6a3aa0
But there is no one in
solana-curve25519
's Cargo.tomlFor users who only use the crate
solana-curve25519
,this will cause Cargo to resolve the lower version of
subtle
and reportinto_option
cannot be found.Summary of Changes
Fixes # add it in
solana-curve25519
's Cargo.toml to fix potential compile error