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

deps: Upgrade to Solana v2 #6908

Merged
merged 12 commits into from
Jun 25, 2024
Merged

deps: Upgrade to Solana v2 #6908

merged 12 commits into from
Jun 25, 2024

Conversation

joncinque
Copy link
Contributor

@joncinque joncinque commented Jun 24, 2024

Problem

As part of fixing up #6897, we need to upgrade SPL to use all the v2 crates.

Solution

Taking this commit by commit:

  • First we just update everything to v2
  • Next we update the lockfile. There's some manual work here to force the SPL dependencies from the monorepo to use v2 to avoid issues
  • Update the main toolchain version
  • Update the nightly toolchain version
  • Fix issues that arise from cargo check
  • Fix issues that arise from cargo clippy
  • Undo the upgrade on account-compression, since it uses anchor
  • Fixup the token-2022 serde build, which requires a protobuf compiler
  • Set the version properly everywhere
  • Fix the twoxtx build
  • Actually, don't set the solana-install version since 2.0.0 doesn't exist yet
  • Nevermind, it does work with a new url!

This should be pretty straightforward, but let me know if there's any issues!

@joncinque joncinque requested a review from samkim-crypto June 24, 2024 21:56
Copy link
Contributor

@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 thorough PR description!

@joncinque joncinque merged commit af8e295 into solana-labs:master Jun 25, 2024
47 checks passed
@joncinque joncinque deleted the deps2 branch June 25, 2024 09:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants