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.

Sign up for GitHub

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.16: Bump and unpin tokio (backport of #32430) #32909

Closed
wants to merge 1 commit into from
Closed

v1.16: Bump and unpin tokio (backport of #32430) #32909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 70 additions & 41 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ tempfile = "3.5.0"
test-case = "2.2.2"
thiserror = "1.0.40"
tiny-bip39 = "0.8.2"
tokio = "~1.14.1"
tokio = "1.29.1"
Copy link
Member

Choose a reason for hiding this comment

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

It's too risky for us to upgrade the tokio dependency like this. We'd want the lockfile to keep tokio at 1.14.1 for the purposes of the entire v1.16 code base. But how about changing to tokio = "1" in the client/ crate? This should still enable the build to select 1.14.1 from the workspace lockfile, and when the next solana-client crate is published, the crates.io-dependency would revert back to tokio = "1" and be consistent with the tokio dependency in the v1.14 version of the client crate

Copy link

Choose a reason for hiding this comment

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

@mvines So, are ready to merge the PR #32879 and backport it to the v1.16?

Copy link
Member

Choose a reason for hiding this comment

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

maybe #32879 in v1.16 only. I don't think it's necessary in master

Copy link
Member

Choose a reason for hiding this comment

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

for master we can just upgrade tokio directly to the newest crate if that works

Copy link

Choose a reason for hiding this comment

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

@mvines I've created the PR #32943.
It solves issue #32878 as suggested.

tokio-serde = "0.8"
tokio-stream = "0.1.12"
tokio-tungstenite = "0.17.2"
Expand All @@ -404,10 +404,6 @@ zstd = "0.11.2"
# for details, see https://github.com/solana-labs/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf
crossbeam-epoch = { git = "https://github.com/solana-labs/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" }

# Rust 1.69+ broke ntapi v0.3.x, which doesn't contain proper fix:
# https://github.com/MSxDOS/ntapi/pull/12
ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "97ede981a1777883ff86d142b75024b023f04fad" }

# We include the following crates as our dependencies above from crates.io:
#
# * spl-associated-token-account
Expand Down
4 changes: 0 additions & 4 deletions programs/sbf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,6 @@ members = [
targets = ["x86_64-unknown-linux-gnu"]

[patch.crates-io]
# Rust 1.69+ broke ntapi v0.3.x, which doesn't contain proper fix:
# https://github.com/MSxDOS/ntapi/pull/12
ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "97ede981a1777883ff86d142b75024b023f04fad" }

# We include the following crates as our dependencies from crates.io:
#
# * spl-associated-token-account
Expand Down
5 changes: 1 addition & 4 deletions scripts/cargo-install-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,7 @@ mkdir -p "$installDir/bin"
if [[ -z "$validatorOnly" ]]; then
# the patch-related configs are needed for rust 1.69+ on Windows; see Cargo.toml
# shellcheck disable=SC2086 # Don't want to double quote $rust_version
"$cargo" $maybeRustVersion \
--config 'patch.crates-io.ntapi.git="https://github.com/solana-labs/ntapi"' \
--config 'patch.crates-io.ntapi.rev="97ede981a1777883ff86d142b75024b023f04fad"' \
install --locked spl-token-cli --root "$installDir"
"$cargo" $maybeRustVersion install --locked spl-token-cli --root "$installDir"
fi
)

Expand Down