chore: bump all major dependencies

Cargo.toml

@@ -60,57 +60,75 @@ libraries = [{ path = "lint/tracing_debug_field" }]
 
 [workspace.dependencies]
 async-trait = "0.1.52"
-axum = "0.6.16"
+axum = "0.7.9"
 base64 = "0.21"
 base64-serde = "0.7.0"
 bytes = "1"
-celestia-tendermint = "0.32.1"
-celestia-types = "0.1.1"
+celestia-types = "0.10.0"
 clap = "4.5.4"
 const_format = "0.2.32"
 divan = "0.1.14"
 ethers = { version = "2.0.11", default-features = false }
 futures = "0.3"
 hex = "0.4"
 hex-literal = "0.4.1"
+http = "1.2.0"
 humantime = "2.1.0"
-hyper = "0.14"
-ibc-types = "0.12"
+hyper = "1.6.0"
+ibc-types = "0.15.0"
 indexmap = "2.1.0"
 insta = "1.36.1"
 itertools = "0.12.1"
 itoa = "1.0.10"
-jsonrpsee = { version = "0.20" }
-pbjson-types = "0.6"
+jsonrpsee = "0.24.8"
+pbjson-types = "0.7.0"
+
 # Note that when updating the penumbra versions, vendored types in `proto/sequencerapis/astria_vendored` may need to be updated as well.
 # can update to a tagged version when https://github.com/penumbra-zone/penumbra/commit/ac7abacc9bb09503d6fd6a396bc0b6850079084e is released
-penumbra-ibc = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "ac7abacc9bb09503d6fd6a396bc0b6850079084e", default-features = false }
-penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "ac7abacc9bb09503d6fd6a396bc0b6850079084e" }
-penumbra-tower-trace = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "ac7abacc9bb09503d6fd6a396bc0b6850079084e" }
+penumbra-ibc = { package = "penumbra-sdk-ibc", version = "1.0.1", default-features = false }
+penumbra-proto = { package = "penumbra-sdk-proto", version = "1.0.1" }
+
 pin-project-lite = "0.2.13"
-prost = "0.12"
+prost = "0.13.4"
 rand = "0.8.5"
 regex = "1.9"
 # disable default features and explicitly enable rustls-tls to ensure openssl is disabled
 # in the entire workspace
-reqwest = { version = "0.11", default-features = false, features = [
+reqwest = { version = "0.12.12", default-features = false, features = [
   "rustls-tls",
 ] }
 serde = "1"
 serde_json = "1"
 sha2 = "0.10"
 tempfile = "3.6.0"
-tendermint = "0.34.0"
-tendermint-config = "0.34.0"
-tendermint-proto = "0.34.0"
-tendermint-rpc = "0.34.0"
+tendermint = "0.40.1"
+tendermint-config = "0.40.1"
+tendermint-proto = "0.40.1"
+tendermint-rpc = "0.40.1"
 thiserror = "1"
-tokio = "1.28"
+tokio = { version = "1.28", default-features = false }
 tokio-stream = { version = "0.1.14" }
 tokio-test = "0.4.2"
 tokio-util = "0.7.13"
-tonic = "0.10"
+tonic = "0.12.3"
 tracing = "0.1"
+tower = { version = "0.5.2", default-features = false }
 tryhard = "0.5.1"
 which = "4.4.0"
 wiremock = "0.5"
+
+[patch.crates-io]
+penumbra-sdk-ibc = { git = "https://github.com/penumbra-zone/penumbra", rev = "refs/pull/5055/head" }
+penumbra-sdk-proto = { git = "https://github.com/penumbra-zone/penumbra", rev = "refs/pull/5055/head" }
+penumbra-sdk-tower-trace = { git = "https://github.com/penumbra-zone/penumbra", rev = "refs/pull/5055/head" }
+
+# This is current main as of Feb 28, 2025, which already contains tonic v0.13.0 and thus
+# does not work as a patch for tonic v0.12.3 (the version of this workspace toml).
+# tonic = { git = "https://github.com/hyperium/tonic", rev = "fc940ce158513d5d989772c571a34ee5f6f43292" }
+# 
+# This is the version that has bumped tower to 0.5 without also bumping tonic.
+tonic = { git = "https://github.com/hyperium/tonic", rev = "58345a6bf29b4c17eccc949dd6d7640928dff0cc" }
+tonic-build = { git = "https://github.com/hyperium/tonic", rev = "58345a6bf29b4c17eccc949dd6d7640928dff0cc" }
+tonic-health = { git = "https://github.com/hyperium/tonic", rev = "58345a6bf29b4c17eccc949dd6d7640928dff0cc" }
+
+tower-actor = { git = "https://github.com/penumbra-zone/tower-actor", rev = "refs/pull/5/head" }

charts/composer/templates/configmap.yaml

@@ -20,7 +20,6 @@ data:
   ASTRIA_COMPOSER_NO_METRICS: "{{ not .Values.metrics.enabled }}"
   ASTRIA_COMPOSER_METRICS_HTTP_LISTENER_ADDR: "0.0.0.0:{{ .Values.ports.metrics }}"
   ASTRIA_COMPOSER_FORCE_STDOUT: "{{ .Values.global.useTTY }}"
-  ASTRIA_COMPOSER_PRETTY_PRINT: "{{ .Values.global.useTTY }}"
   NO_COLOR: "{{ .Values.global.useTTY }}"
   ASTRIA_COMPOSER_NO_OTEL: "{{ not .Values.otel.enabled }}"
   OTEL_EXPORTER_OTLP_ENDPOINT: "{{ tpl .Values.otel.endpoint . }}"
@@ -31,6 +30,7 @@ data:
   OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ tpl .Values.otel.traceHeaders . }}"
   OTEL_SERVICE_NAME: "{{ tpl .Values.otel.serviceName . }}"
   {{- if not .Values.global.dev }}
+    ASTRIA_COMPOSER_PRETTY_PRINT: "{{ .Values.global.useTTY }}"
   {{- else }}
   {{- end }}
 ---

charts/evm-bridge-withdrawer/templates/configmaps.yaml

@@ -21,7 +21,6 @@ data:
   ASTRIA_BRIDGE_WITHDRAWER_NO_METRICS: "{{ not .Values.metrics.enabled }}"
   ASTRIA_BRIDGE_WITHDRAWER_METRICS_HTTP_LISTENER_ADDR: "0.0.0.0:{{ .Values.ports.metrics }}"
   ASTRIA_BRIDGE_WITHDRAWER_FORCE_STDOUT: "{{ .Values.global.useTTY }}"
-  ASTRIA_BRIDGE_WITHDRAWER_PRETTY_PRINT: "{{ .Values.global.useTTY }}"
   ASTRIA_BRIDGE_WITHDRAWER_NO_OTEL: "{{ not .Values.otel.enabled }}"
 
   NO_COLOR: "{{ .Values.global.useTTY }}"
@@ -33,6 +32,7 @@ data:
   OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ tpl .Values.otel.traceHeaders . }}"
   OTEL_SERVICE_NAME: "{{ tpl .Values.otel.serviceName . }}"
   {{- if not .Values.global.dev }}
+    ASTRIA_BRIDGE_WITHDRAWER_PRETTY_PRINT: "{{ .Values.global.useTTY }}"
   {{- else }}
   {{- end }}
 ---

charts/evm-rollup/templates/configmap.yaml

@@ -19,7 +19,6 @@ data:
   ASTRIA_CONDUCTOR_METRICS_HTTP_LISTENER_ADDR: "0.0.0.0:{{ .Values.ports.conductorMetrics }}"
   ASTRIA_CONDUCTOR_SEQUENCER_REQUESTS_PER_SECOND: "{{ .Values.config.conductor.sequencerRequestsPerSecond }}"
   ASTRIA_CONDUCTOR_FORCE_STDOUT: "{{ .Values.global.useTTY }}"
-  ASTRIA_CONDUCTOR_PRETTY_PRINT: "{{ .Values.global.useTTY }}"
   NO_COLOR: "{{ .Values.global.useTTY }}"
   ASTRIA_CONDUCTOR_NO_OTEL: "{{ not .Values.otel.enabled }}"
   ASTRIA_CONDUCTOR_NO_CELESTIA_AUTH: "{{ not .Values.config.celestia.token }}"
@@ -31,6 +30,7 @@ data:
   OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ tpl .Values.otel.traceHeaders .}}"
   OTEL_SERVICE_NAME: "{{ tpl .Values.otel.serviceNamePrefix . }}-conductor"
   {{- if not .Values.global.dev }}
+    ASTRIA_CONDUCTOR_PRETTY_PRINT: "{{ .Values.global.useTTY }}"
   {{- else }}
   {{- end }}
 ---

charts/sequencer-relayer/templates/configmaps.yaml

@@ -15,7 +15,6 @@ data:
   ASTRIA_SEQUENCER_RELAYER_NO_METRICS: "{{ not .Values.config.relayer.metrics.enabled }}"
   ASTRIA_SEQUENCER_RELAYER_METRICS_HTTP_LISTENER_ADDR: "0.0.0.0:{{ .Values.ports.metrics }}"
   ASTRIA_SEQUENCER_RELAYER_FORCE_STDOUT: "{{ .Values.global.useTTY }}"
-  ASTRIA_SEQUENCER_RELAYER_PRETTY_PRINT: "{{ .Values.global.useTTY }}"
   NO_COLOR: "{{ .Values.global.useTTY }}"
   ASTRIA_SEQUENCER_RELAYER_NO_OTEL: "{{ not .Values.otel.enabled }}"
   OTEL_EXPORTER_OTLP_ENDPOINT: "{{ tpl .Values.otel.endpoint . }}"
@@ -29,6 +28,7 @@ data:
   ASTRIA_SEQUENCER_RELAYER_SEQUENCER_CHAIN_ID: "{{ .Values.config.relayer.sequencerChainId }}"
   ASTRIA_SEQUENCER_RELAYER_CELESTIA_CHAIN_ID: "{{ .Values.config.relayer.celestiaChainId }}"
   {{- if not .Values.global.dev }}
+    ASTRIA_SEQUENCER_RELAYER_PRETTY_PRINT: "{{ .Values.global.useTTY }}"
   {{- else }}
   {{- end }}
 ---

charts/sequencer/templates/configmaps.yaml

@@ -62,7 +62,6 @@ data:
   ASTRIA_SEQUENCER_NO_METRICS: "{{ not .Values.sequencer.metrics.enabled }}"
   ASTRIA_SEQUENCER_METRICS_HTTP_LISTENER_ADDR: "0.0.0.0:{{ .Values.ports.sequencerMetrics }}"
   ASTRIA_SEQUENCER_FORCE_STDOUT: "{{ .Values.global.useTTY }}"
-  ASTRIA_SEQUENCER_PRETTY_PRINT: "{{ .Values.global.useTTY }}"
   NO_COLOR: "{{ .Values.global.useTTY }}"
   ASTRIA_SEQUENCER_NO_OTEL: "{{ not .Values.sequencer.otel.enabled }}"
   OTEL_EXPORTER_OTLP_ENDPOINT: "{{ .Values.sequencer.otel.endpoint }}"
@@ -74,6 +73,7 @@ data:
   OTEL_SERVICE_NAME: "{{ tpl .Values.sequencer.otel.serviceName . }}"
   {{- if not .Values.global.dev }}
   ASTRIA_SEQUENCER_LISTEN_ADDR: "127.0.0.1:{{ .Values.ports.sequencerABCI }}"
+  ASTRIA_SEQUENCER_PRETTY_PRINT: "{{ .Values.global.useTTY }}"
   {{- else }}
   ASTRIA_SEQUENCER_ABCI_LISTEN_URL: "{{ include "sequencer.abci_url" . }}"
   ASTRIA_SEQUENCER_NO_OPTIMISTIC_BLOCKS: "{{ not .Values.sequencer.optimisticBlockApis.enabled }}"

crates/astria-auctioneer/Cargo.toml

@@ -41,11 +41,10 @@ tryhard = { workspace = true }
 tonic = { workspace = true }
 tokio-stream = { workspace = true, features = ["sync"] }
 
-http = "0.2.11"
-http-body = "0.4.5"
+http = { workspace = true }
 pin-project-lite = "0.2.15"
-tower = { version = "0.5.1", features = ["util"] }
-tower-http = { version = "0.4.4", features = ["map-response-body", "trace"] }
+tower = { version = "0.5.2", features = ["util"] }
+tower-http = { version = "0.6.2", features = ["map-response-body", "trace"] }
 
 [dev-dependencies]
 config = { package = "astria-config", path = "../astria-config", features = [

crates/astria-auctioneer/local.env.example

@@ -36,12 +36,6 @@ ASTRIA_AUCTIONEER_LOG="info"
 # If false span data is written to stdout only if it is connected to a tty.
 ASTRIA_AUCTIONEER_FORCE_STDOUT=false
 
-# If true uses an exceedingly pretty human readable format to write to stdout.
-# If false uses JSON formatted OTEL traces.
-# This does nothing unless stdout is connected to a tty or
-# `ASTRIA_AUCTIONEER_FORCE_STDOUT` is set to `true`.
-ASTRIA_AUCTIONEER_PRETTY_PRINT=false
-
 # If set to any non-empty value removes ANSI escape characters from the pretty
 # printed output. Note that this does nothing unless `ASTRIA_AUCTIONEER_PRETTY_PRINT`
 # is set to `true`.

crates/astria-auctioneer/src/config.rs

@@ -45,8 +45,6 @@ pub struct Config {
     pub no_metrics: bool,
     /// The endpoint which will be listened on for serving prometheus metrics
     pub metrics_http_listener_addr: String,
-    /// Writes a human readable format to stdout instead of JSON formatted OTEL trace data.
-    pub pretty_print: bool,
 }
 
 impl config::Config for Config {

crates/astria-auctioneer/src/main.rs

@@ -45,7 +45,6 @@ async fn main() -> ExitCode {
     let mut astria_telemetry_conf = astria_telemetry::configure()
         .set_no_otel(cfg.no_otel)
         .set_force_stdout(cfg.force_stdout)
-        .set_pretty_print(cfg.pretty_print)
         .set_filter_directives(&cfg.log);
 
     if !cfg.no_metrics {

crates/astria-auctioneer/src/streaming_utils.rs

@@ -11,7 +11,6 @@ use astria_eyre::eyre::{
     self,
     WrapErr as _,
 };
-use bytes::Bytes;
 use futures::{
     Future,
     FutureExt as _,
@@ -22,12 +21,8 @@ use http::{
     Request,
     Response,
 };
-use http_body::combinators::UnsyncBoxBody;
 use pin_project_lite::pin_project;
-use tonic::{
-    transport::Channel,
-    Status,
-};
+use tonic::transport::Channel;
 use tower::{
     util::BoxCloneService,
     ServiceBuilder,
@@ -41,8 +36,8 @@ use tower_http::{
 };
 
 pub(crate) type InstrumentedChannel = BoxCloneService<
-    Request<UnsyncBoxBody<Bytes, Status>>,
-    Response<UnsyncBoxBody<Bytes, hyper::Error>>,
+    Request<tonic::body::BoxBody>,
+    Response<tonic::body::BoxBody>,
     tonic::transport::Error,
 >;
 
@@ -66,7 +61,7 @@ pub(crate) fn make_instrumented_channel(uri: &str) -> eyre::Result<InstrumentedC
         .connect_lazy();
 
     let channel = ServiceBuilder::new()
-        .layer(MapResponseBodyLayer::new(UnsyncBoxBody::new))
+        .layer(MapResponseBodyLayer::new(tonic::body::BoxBody::new))
         .layer(
             TraceLayer::new_for_grpc().make_span_with(DefaultMakeSpan::new().include_headers(true)),
         )

crates/astria-bridge-withdrawer/Cargo.toml

@@ -9,14 +9,13 @@ repository = "https://github.com/astriaorg/astria"
 homepage = "https://astria.org"
 
 [dependencies]
-http = "0.2.9"
-
 axum = { workspace = true }
 futures = { workspace = true }
 hex = { workspace = true }
 ethers = { workspace = true, features = ["ws"] }
-hyper = { workspace = true }
+http = { workspace = true }
 humantime = { workspace = true }
+hyper = { workspace = true }
 ibc-types = { workspace = true }
 pin-project-lite = { workspace = true }
 prost = { workspace = true }

crates/astria-bridge-withdrawer/local.env.example

@@ -8,15 +8,8 @@ ASTRIA_BRIDGE_WITHDRAWER_NO_OTEL=false
 # If false span data is written to stdout only if it is connected to a tty.
 ASTRIA_BRIDGE_WITHDRAWER_FORCE_STDOUT=false
 
-# If true uses an exceedingly pretty human readable format to write to stdout.
-# If false uses JSON formatted OTEL traces.
-# This does nothing unless stdout is connected to a tty or
-# `ASTRIA_BRIDGE_WITHDRAWER_FORCE_STDOUT` is set to `true`.
-ASTRIA_BRIDGE_WITHDRAWER_PRETTY_PRINT=false
-
 # If set to any non-empty value removes ANSI escape characters from the pretty
-# printed output. Note that this does nothing unless
-# `ASTRIA_BRIDGE_WITHDRAWER_PRETTY_PRINT` is set to `true`.
+# printed output.
 NO_COLOR=
 
 # The sequencer application gRPC service used for fetching the pending nonce.