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

upate tendermint to 0.40.0 #4963

Closed
wants to merge 3 commits into from
Closed

upate tendermint to 0.40.0 #4963

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bfcde2
upate tendermint to 0.40.0
SuperFluffy Dec 13, 2024
0b4d928
actually bump the proto compiler tool's prost
SuperFluffy Dec 16, 2024
dda5aa2
inject span data using tower http
SuperFluffy Dec 17, 2024
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
1,821 changes: 1,059 additions & 762 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

80 changes: 47 additions & 33 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,9 @@ ark-std = { default-features = false, version = "0.4" }
assert_cmd = { version = "2.0" }
async-stream = { version = "0.3.5" }
async-trait = { version = "0.1.52" }
axum = { version = "0.6" }
axum-server = { version = "0.5" }
axum = { version = "0.7.9" }
axum-extra = { version = "0.9.6" }
axum-server = { version = "0.7.1" }
base64 = { version = "0.21.2" }
bech32 = { version = "0.8.1" }
bincode = { version = "1.3.3" }
Expand All @@ -135,7 +136,7 @@ camino = { version = "1" }
chacha20poly1305 = { version = "0.9.0" }
chrono = { default-features = false, version = "0.4" }
clap = { version = "3.2" }
cnidarium = { default-features = false, path = "crates/cnidarium" }
cnidarium = { default-features = false, version = "0.81.0" }
cnidarium-component = { default-features = false, path = "crates/cnidarium-component" }
cometindex = { path = "crates/util/cometindex" }
criterion = { version = "0.4" }
Expand All @@ -149,25 +150,26 @@ ed25519-consensus = { version = "2.1" }
ethnum = { version = "1.3" }
futures = { version = "0.3.28" }
hex = { version = "0.4.3" }
http = { version = "0.2.9" }
http-body = { version = "0.4.5" }
http = { version = "1.2.0" }
http-body = { version = "1.0.1" }
http-body-util = { version = "0.1.2" }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Adaptors on the http::Body trait have been moved to http-body-util

humantime = { version = "2.1" }
ibc-proto = { default-features = false, version = "0.41.0" }
ibc-types = { default-features = false, version = "0.12.0" }
ibc-proto = { default-features = false, version = "0.51.1" }
ibc-types = { default-features = false, version = "0.15.0" }
ibig = { version = "0.3" }
ics23 = { version = "0.11.3" }
ics23 = { version = "0.12.0" }
im = { version = "^15.1.0" }
indicatif = { version = "0.16" }
jmt = { version = "0.10", features = ["migration"] }
metrics = { version = "0.22" }
metrics-exporter-prometheus = { version = "0.13", features = ["http-listener"] }
metrics-tracing-context = { version = "0.15" }
jmt = { version = "0.11", features = ["migration"] }
metrics = { version = "0.24.1" }
metrics-exporter-prometheus = { version = "0.16", features = ["http-listener"] }
metrics-tracing-context = { version = "0.17.0" }
num-bigint = { version = "0.4" }
num-traits = { default-features = false, version = "0.2.15" }
once_cell = { version = "1.8" }
parking_lot = { version = "0.12.1" }
pbjson = { version = "0.6" }
pbjson-types = { version = "0.6.0" }
pbjson = { version = "0.7.0" }
pbjson-types = { version = "0.7.0" }
penumbra-app = { default-features = false, path = "crates/core/app" }
penumbra-asset = { default-features = false, path = "crates/core/asset" }
penumbra-community-pool = { default-features = false, path = "crates/core/component/community-pool" }
Expand Down Expand Up @@ -197,14 +199,13 @@ penumbra-transaction = { default-features = false, path = "crates/co
penumbra-txhash = { default-features = false, path = "crates/core/txhash" }
penumbra-view = { path = "crates/view" }
penumbra-wallet = { path = "crates/wallet" }
penumbra-extension = { path = "crates/penumbra-extension", default-features = false }
pin-project = { version = "1.0.12" }
pin-project-lite = { version = "0.2.9" }
poseidon377 = { version = "1.2.0" }
proptest = { version = "1" }
proptest-derive = { version = "0.3" }
prost = { version = "0.12.3" }
prost-types = { version = "0.12" }
prost = { version = "0.13.4" }
prost-types = { version = "0.13.4" }
r2d2 = { version = "0.8" }
r2d2_sqlite = { version = "0.25" }
rand = { version = "0.8.5" }
Expand All @@ -220,33 +221,46 @@ sha2 = { version = "0.10" }
sqlx = { version = "0.8", features = ["bigdecimal", "postgres", "runtime-tokio", "tls-rustls"] }
tap = "1.0.1"
tempfile = { version = "3.3.0" }
tendermint = { default-features = false, version = "0.34.0" }
tendermint-config = { version = "0.34.0" }
tendermint-light-client-verifier = { version = "0.34.0" }
tendermint-proto = { version = "0.34.0" }
tendermint-rpc = { version = "0.34.0" }
tendermint = { default-features = false, version = "0.40.0" }
tendermint-config = { version = "0.40.0" }
tendermint-light-client-verifier = { version = "0.40.0" }
tendermint-proto = { version = "0.40.0" }
tendermint-rpc = { version = "0.40.0" }
termion = { version = "3" }
thiserror = { version = "1.0" }
time = { version = "0.3" }
tokio = { version = "1.3" }
tokio = { version = "1.39.0" }
tokio-stream = { version = "0.1.8" }
tokio-util = { version = "0.7" }
toml = { version = "0.7" }
tonic = { version = "0.10" }
tonic-reflection = { version = "0.10.0" }
tonic-web = { version = "0.10.0" }
tonic = { version = "0.12.3" }
tonic-reflection = { version = "0.12.3" }
tonic-web = { version = "0.12.3" }
tower = { version = "0.4.0" }
tower-http = { version = "0.4" }
tower-http = { version = "0.6.2" }
tower-service = { version = "0.3.2" }
tracing = { version = "0.1" }
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
url = { version = "2.2" }
getrandom = { version = "0.2", default-features = false }

# TODO(kate):
# temporarily point these dependencies to a tag in the penumbra-zone fork.
# see #4392, #4400, and hyperium/tonic#1701 for more information.
# TODO: Don't use main; very bad bad. Use a rev.
# TODO: wait for informalsystems to release a patch; see https://github.com/informalsystems/tendermint-rs/pull/1479.
[patch.crates-io]
tonic = { git = "https://github.com/penumbra-zone/tonic.git", tag = "v0.10.3-penumbra" }
tonic-reflection = { git = "https://github.com/penumbra-zone/tonic.git", tag = "v0.10.3-penumbra" }
tonic-web = { git = "https://github.com/penumbra-zone/tonic.git", tag = "v0.10.3-penumbra" }
tendermint = { git = "https://github.com/informalsystems/tendermint-rs/", rev = "refs/pull/1480/head" }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Merged, I shall point them to their main repo. We should create an issue to followup with their patch release.

tendermint-config = { git = "https://github.com/informalsystems/tendermint-rs/", rev = "refs/pull/1480/head" }
tendermint-light-client-verifier = { git = "https://github.com/informalsystems/tendermint-rs/", rev = "refs/pull/1480/head" }
tendermint-proto = { git = "https://github.com/informalsystems/tendermint-rs/", rev = "refs/pull/1480/head" }
tendermint-rpc = { git = "https://github.com/informalsystems/tendermint-rs/", rev = "refs/pull/1480/head" }
# tendermint = { path = "../tendermint-rs/tendermint" }
# tendermint-config = { path = "../tendermint-rs/config" }
# tendermint-light-client-verifier = { path = "../tendermint-rs/light-client-verifier" }
# tendermint-proto = { path = "../tendermint-rs/proto" }
# tendermint-rpc = { path = "../tendermint-rs/rpc" }
# # TODO(kate):
# # temporarily point these dependencies to a tag in the penumbra-zone fork.
# # see #4392, #4400, and hyperium/tonic#1701 for more information.
# [patch.crates-io]
# tonic = { git = "https://github.com/penumbra-zone/tonic.git", tag = "v0.10.3-penumbra" }
# tonic-reflection = { git = "https://github.com/penumbra-zone/tonic.git", tag = "v0.10.3-penumbra" }
# tonic-web = { git = "https://github.com/penumbra-zone/tonic.git", tag = "v0.10.3-penumbra" }
2 changes: 1 addition & 1 deletion crates/bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = {workspace = true}

[build-dependencies]
regex = { version = "1", optional = true }
reqwest = { version = "0.11.14", optional = true, features = [
reqwest = { version = "0.12.9", optional = true, features = [
"blocking",
"json",
] }
Expand Down
2 changes: 1 addition & 1 deletion crates/bin/pclientd/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ impl Opt {
.register_encoded_file_descriptor_set(
penumbra_proto::FILE_DESCRIPTOR_SET,
)
.build()
.build_v1()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

build() was deprecated

.with_context(|| "could not configure grpc reflection service")?,
))
.serve(config.bind_addr);
Expand Down
Loading