From 05cb4fd8984bf38901d77fac0848b01df1eac083 Mon Sep 17 00:00:00 2001 From: evalir Date: Wed, 2 Jul 2025 00:40:02 +0200 Subject: [PATCH] chore(deps): bump bin-base Accomodates the new shared token changes. --- Cargo.lock | 73 +++++++++++++++++++++++++++++++++++---- Cargo.toml | 3 +- src/quincey.rs | 6 ++-- src/tasks/cache/bundle.rs | 9 ++--- 4 files changed, 74 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9ce2e1a..17ac2c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1676,7 +1676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.4.5", "bytes", "futures-util", "http 1.3.1", @@ -1685,7 +1685,41 @@ dependencies = [ "hyper 1.6.0", "hyper-util", "itoa", - "matchit", + "matchit 0.7.3", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.2", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5" +dependencies = [ + "axum-core 0.5.2", + "bytes", + "form_urlencoded", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.6.0", + "hyper-util", + "itoa", + "matchit 0.8.4", "memchr", "mime", "percent-encoding", @@ -1724,6 +1758,26 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum-core" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6" +dependencies = [ + "bytes", + "futures-core", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.2", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "backtrace" version = "0.3.75" @@ -1896,10 +1950,9 @@ name = "builder" version = "0.2.0" dependencies = [ "alloy", - "axum", + "axum 0.7.9", "eyre", "init4-bin-base", - "oauth2", "openssl", "reqwest 0.11.27", "serde", @@ -3212,14 +3265,15 @@ dependencies = [ [[package]] name = "init4-bin-base" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f299de55bfd9934cd77ffdfb38b583be3565274fa7ec873d4f446c5041ca3" +checksum = "100791001b102736de187914994c7b359bd5ddedc4346b825f9ed0353af47045" dependencies = [ "alloy", "async-trait", "aws-config", "aws-sdk-kms", + "axum 0.8.4", "chrono", "eyre", "init4-from-env-derive", @@ -3236,6 +3290,7 @@ dependencies = [ "signet-tx-cache", "thiserror 2.0.12", "tokio", + "tower", "tracing", "tracing-core", "tracing-opentelemetry", @@ -3536,6 +3591,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "memchr" version = "2.7.5" diff --git a/Cargo.toml b/Cargo.toml index b836659..4d86a7a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ path = "bin/submit_transaction.rs" integration = [] [dependencies] -init4-bin-base = { version = "0.4.3", features = ["perms"] } +init4-bin-base = { version = "0.5.0", features = ["perms"] } signet-constants = { version = "0.4.2" } signet-sim = { version = "0.4.2" } @@ -55,7 +55,6 @@ reqwest = { version = "0.11.24", features = ["blocking", "json"] } serde_json = "1.0" tokio = { version = "1.36.0", features = ["full", "macros", "rt-multi-thread"] } -oauth2 = "5" tokio-stream = "0.1.17" url = "2.5.4" tracing = "0.1.41" diff --git a/src/quincey.rs b/src/quincey.rs index cb80a03..2d05ecd 100644 --- a/src/quincey.rs +++ b/src/quincey.rs @@ -5,7 +5,6 @@ use init4_bin_base::{ perms::SharedToken, utils::signer::LocalOrAws, }; -use oauth2::TokenResponse; use reqwest::Client; use signet_types::{SignRequest, SignResponse}; @@ -53,12 +52,13 @@ impl Quincey { async fn sup_remote(&self, sig_request: &SignRequest) -> eyre::Result { let Self::Remote { client, url, token } = &self else { bail!("not a remote client") }; - let Some(token) = token.read() else { bail!("no token available") }; + let token = + token.secret().await.map_err(|e| eyre::eyre!("failed to retrieve token: {e}"))?; let resp: reqwest::Response = client .post(url.clone()) .json(sig_request) - .bearer_auth(token.access_token().secret()) + .bearer_auth(token) .send() .await? .error_for_status()?; diff --git a/src/tasks/cache/bundle.rs b/src/tasks/cache/bundle.rs index 9a8bf42..e9dfe76 100644 --- a/src/tasks/cache/bundle.rs +++ b/src/tasks/cache/bundle.rs @@ -1,11 +1,9 @@ //! Bundler service responsible for fetching bundles and sending them to the simulator. use crate::config::BuilderConfig; -use eyre::bail; use init4_bin_base::{ deps::tracing::{Instrument, debug, debug_span, error, trace}, perms::SharedToken, }; -use oauth2::TokenResponse; use reqwest::{Client, Url}; use signet_tx_cache::types::{TxCacheBundle, TxCacheBundlesResponse}; use tokio::{ @@ -46,13 +44,12 @@ impl BundlePoller { /// Fetches bundles from the transaction cache and returns them. pub async fn check_bundle_cache(&mut self) -> eyre::Result> { let bundle_url: Url = Url::parse(&self.config.tx_pool_url)?.join("bundles")?; - let Some(token) = self.token.read() else { - bail!("No token available, skipping bundle fetch"); - }; + let token = + self.token.secret().await.map_err(|e| eyre::eyre!("Failed to read token: {e}"))?; self.client .get(bundle_url) - .bearer_auth(token.access_token().secret()) + .bearer_auth(token) .send() .await? .error_for_status()?