From 5e8ac6bad13ce8ef202e00e88eea99a01c9d848c Mon Sep 17 00:00:00 2001 From: James Date: Mon, 15 Dec 2025 14:57:27 -0500 Subject: [PATCH 1/2] chore: bump sdk and add more tracing cleanup --- Cargo.lock | 52 +++++++++++++++++++-------------------- src/tasks/block/sim.rs | 3 +-- src/tasks/cache/bundle.rs | 6 ++--- src/tasks/cache/tx.rs | 9 ++----- src/tasks/env.rs | 4 ++- 5 files changed, 35 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5551916a..6a21751f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1424,9 +1424,9 @@ checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" [[package]] name = "async-compression" -version = "0.4.35" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07a926debf178f2d355197f9caddb08e54a9329d44748034bba349c5848cb519" +checksum = "98ec5f6c2f8bc326c994cb9e241cc257ddaba9afa8555a43cffbb5dd86efaa37" dependencies = [ "compression-codecs", "compression-core", @@ -2548,9 +2548,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" +checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48" dependencies = [ "serde_core", ] @@ -2822,9 +2822,9 @@ dependencies = [ [[package]] name = "compression-codecs" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34a3cbbb8b6eca96f3a5c4bf6938d5b27ced3675d69f95bb51948722870bc323" +checksum = "b0f7ac3e5b97fdce45e8922fb05cae2c37f7bbd63d30dd94821dacfd8f3f2bf2" dependencies = [ "brotli", "compression-core", @@ -7307,9 +7307,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.25" +version = "0.12.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6eff9328d40131d43bd911d42d79eb6a47312002a4daefc9e37f17e74a7701a" +checksum = "3b4c14b2d9afca6a60277086b0cc6a6ae0b568f6f7916c943a8cdc79f8be240f" dependencies = [ "base64 0.22.1", "bytes", @@ -10977,9 +10977,9 @@ dependencies = [ [[package]] name = "signet-bundle" -version = "0.16.0-rc.1" +version = "0.16.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21473126105ccafe090afba9604977f5487dd0e614e806e1ccc45d9bbf408382" +checksum = "1e7d8f75a65c722e770cf1ab5c1e1f9e4a9c8ec0b76a5f2d1e91ef2ea692ed7c" dependencies = [ "alloy", "serde", @@ -10992,9 +10992,9 @@ dependencies = [ [[package]] name = "signet-constants" -version = "0.16.0-rc.1" +version = "0.16.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "130b5aca0f24859877830c063302df5ad4723abc72be6450629f2d1e456a3c97" +checksum = "400b78415e974a152264ae25043a4b43acf26395f5c2baa4a95e779216b11bab" dependencies = [ "alloy", "serde", @@ -11027,9 +11027,9 @@ dependencies = [ [[package]] name = "signet-evm" -version = "0.16.0-rc.1" +version = "0.16.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe39dcaf6cde803334330265efb66f88a1018dc49a3f3f57e72bee5ad53c01c0" +checksum = "7fc7e39afb0290915b56fae7d22dc5941604b3cd8e81acfe3ecbe1a42dac7044" dependencies = [ "alloy", "signet-extract", @@ -11043,9 +11043,9 @@ dependencies = [ [[package]] name = "signet-extract" -version = "0.16.0-rc.1" +version = "0.16.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d506b0c4090c26b3632f7d9d33647c82a34b46052fbb4c7ff2baff46f6a0ab33" +checksum = "cbf1e96ad1e7fe20226f8bb496c590f2048ef7b8028732d53ce3cfe26fb2e438" dependencies = [ "alloy", "signet-types", @@ -11068,9 +11068,9 @@ dependencies = [ [[package]] name = "signet-journal" -version = "0.16.0-rc.1" +version = "0.16.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e410a32e281ebb4504e010e889a75807db98094997ace82e58b41865422e14" +checksum = "6f2a4e7d6808f534f8e922e1f6589c4f5fc13630f72a1aba6b8598f6b2b8465b" dependencies = [ "alloy", "futures-util", @@ -11096,9 +11096,9 @@ dependencies = [ [[package]] name = "signet-sim" -version = "0.16.0-rc.1" +version = "0.16.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36001f7d65f30b8750c54d10ab44364ab8e109f0c2e568c9c45aecb890c52213" +checksum = "4879db028badb035d290ebfc4289fc6d82b1cdf95fa3fccac128468e9122d53f" dependencies = [ "alloy", "parking_lot", @@ -11114,9 +11114,9 @@ dependencies = [ [[package]] name = "signet-tx-cache" -version = "0.16.0-rc.1" +version = "0.16.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b15c5453d132ea2a7d98fea0a08208fb0d8d1c4b045c1817adf710ac6090403" +checksum = "1317f058cea863c441f9a3f0cfbb035b95e6906f7c6326b2268a1c644a53b2af" dependencies = [ "alloy", "eyre", @@ -11131,9 +11131,9 @@ dependencies = [ [[package]] name = "signet-types" -version = "0.16.0-rc.1" +version = "0.16.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ba8bb787ab1000c36b6350ba81d65ff6a85551b4d95f39971ba8403ba836435" +checksum = "0b6ec867caa3f75393afee4c37653dc8b004754bfde931ed84923bff6d899913" dependencies = [ "alloy", "chrono", @@ -11145,9 +11145,9 @@ dependencies = [ [[package]] name = "signet-zenith" -version = "0.16.0-rc.1" +version = "0.16.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73410e0a4e7cbb34efb49186f3bcb46a45edc814d131b4b4020596eb9adcb1b8" +checksum = "f2fc53981adbd064967608180ab4ea012bf099a79ff06f1a393c0005fc142235" dependencies = [ "alloy", "alloy-core", diff --git a/src/tasks/block/sim.rs b/src/tasks/block/sim.rs index 97f434b6..f33a4e67 100644 --- a/src/tasks/block/sim.rs +++ b/src/tasks/block/sim.rs @@ -116,8 +116,7 @@ impl SimulatorTask { /// /// A `Result` containing the built block or an error. #[instrument(skip_all, fields( - tx_count = sim_items.len(), - millis_to_deadline = finish_by.duration_since(Instant::now()).as_millis() + starting_cache_size = sim_items.len() ))] pub async fn handle_build( &self, diff --git a/src/tasks/cache/bundle.rs b/src/tasks/cache/bundle.rs index b27c568d..ab0ad24c 100644 --- a/src/tasks/cache/bundle.rs +++ b/src/tasks/cache/bundle.rs @@ -8,7 +8,7 @@ use tokio::{ task::JoinHandle, time::{self, Duration}, }; -use tracing::{Instrument, debug, debug_span, error, trace}; +use tracing::{Instrument, debug, error, trace, trace_span}; /// Poll interval for the bundle poller in milliseconds. const POLL_INTERVAL_MS: u64 = 1000; @@ -71,7 +71,7 @@ impl BundlePoller { async fn task_future(mut self, outbound: UnboundedSender) { loop { - let span = debug_span!("BundlePoller::loop", url = %self.config.tx_pool_url); + let span = trace_span!("BundlePoller::loop", url = %self.config.tx_pool_url); // Enter the span for the next check. let _guard = span.enter(); @@ -92,7 +92,7 @@ impl BundlePoller { .inspect_err(|err| debug!(%err, "Error fetching bundles")) { let _guard = span.entered(); - debug!(count = ?bundles.len(), "found bundles"); + trace!(count = ?bundles.len(), "found bundles"); for bundle in bundles.into_iter() { if let Err(err) = outbound.send(bundle) { error!(err = ?err, "Failed to send bundle - channel is dropped"); diff --git a/src/tasks/cache/tx.rs b/src/tasks/cache/tx.rs index df8e274b..bc1efe29 100644 --- a/src/tasks/cache/tx.rs +++ b/src/tasks/cache/tx.rs @@ -9,7 +9,7 @@ use reqwest::{Client, Url}; use serde::{Deserialize, Serialize}; use std::time::Duration; use tokio::{sync::mpsc, task::JoinHandle, time}; -use tracing::{Instrument, debug, debug_span, trace}; +use tracing::{Instrument, debug, debug_span, trace, trace_span}; /// Poll interval for the transaction poller in milliseconds. const POLL_INTERVAL_MS: u64 = 1000; @@ -114,10 +114,7 @@ impl TxPoller { async fn task_future(mut self, outbound: mpsc::UnboundedSender) { loop { - let span = debug_span!("TxPoller::loop", url = %self.config.tx_pool_url); - - // Enter the span for the next check. - let _guard = span.enter(); + let span = trace_span!("TxPoller::loop", url = %self.config.tx_pool_url); // Check this here to avoid making the web request if we know // we don't need the results. @@ -125,8 +122,6 @@ impl TxPoller { trace!("No receivers left, shutting down"); break; } - // exit the span after the check. - drop(_guard); if let Ok(transactions) = self.check_tx_cache().instrument(span.clone()).await.inspect_err(|err| { diff --git a/src/tasks/env.rs b/src/tasks/env.rs index 2123f6ed..8135fc0e 100644 --- a/src/tasks/env.rs +++ b/src/tasks/env.rs @@ -307,7 +307,9 @@ impl EnvTask { self.host_provider .get_block_by_number(host_block_number.into()) .into_future() - .instrument(debug_span!(parent: &span, "EnvTask::fetch_host_block")), + .instrument( + debug_span!(parent: &span, "EnvTask::fetch_host_block").or_current() + ), // We want to check that we're able to sign for the block we're gonna start building. // If not, we just want to skip all the work. self.quincey.preflight_check(host_block_number + 1).in_current_span(), From c93615bc201ea02f54b2afdd1aa0cc39613209a2 Mon Sep 17 00:00:00 2001 From: Swanny Date: Mon, 15 Dec 2025 15:03:10 -0500 Subject: [PATCH 2/2] chore: bump 0.6.2 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a21751f..d89fef32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2440,7 +2440,7 @@ dependencies = [ [[package]] name = "builder" -version = "0.6.1" +version = "0.6.2" dependencies = [ "alloy", "alloy-chains", diff --git a/Cargo.toml b/Cargo.toml index ffc8c30a..e36b70cc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "builder" -version = "0.6.1" +version = "0.6.2" description = "signet builder example" edition = "2024"