Skip to content

fix(spammer): timestamp catch-up blocks individually #229

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

Open
mehmetkr-31 wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −6
Open

fix(spammer): timestamp catch-up blocks individually #229

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
17 changes: 11 additions & 6 deletions crates/spammer/src/latency/block_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ struct HeaderNotification {
/// header-arrival timestamp for latency measurement.
pub(super) struct BlockEvent {
pub block: RpcBlock,
/// Propagated from [`HeaderNotification::received_at`].
/// Wall-clock time at which this block was observed: propagated from
/// [`HeaderNotification::received_at`] for notified blocks, or captured at
/// fetch time for blocks recovered by a catch-up scan.
pub received_at: u64,
}

Expand Down Expand Up @@ -306,7 +308,6 @@ impl BlockStream {
&mut ws_client,
*next_expected_height,
height - 1,
notification.received_at,
block_sender,
)
.await?;
Expand Down Expand Up @@ -345,13 +346,16 @@ impl BlockStream {
/// Fetch blocks from `start_height` through `end_height`
/// (inclusive) and send them as [`BlockEvent`]s.
///
/// Each block is timestamped with `timestamp_now()` at the moment it is
/// fetched, so a scan covering many heights does not collapse into a
/// single observation time.
///
/// Returns `Err` if a block cannot be fetched after retries, so
/// the caller can rebuild the client and retry the scan.
async fn catch_up_scan(
ws_client: &mut WsClient,
start_height: u64,
end_height: u64,
received_at: u64,
block_sender: &Sender<BlockEvent>,
) -> Result<()> {
if start_height > end_height {
Expand All @@ -365,10 +369,11 @@ impl BlockStream {
let hex_height = format!("0x{height:x}");
match Self::fetch_block(ws_client, ETH_GET_BLOCK_BY_NUMBER, &hex_height).await {
FetchResult::Ok(block) => {
// Send the block to the tracker.
// The timestamp for catch-up blocks is the
// arrival time of the first notification.
// Send the block to the tracker, timestamped at the moment
// it was actually observed rather than at the arrival time
// of the notification that triggered the scan.
// TODO: should we use the blocks' timestamps?
let received_at = timestamp_now();
if block_sender
.send(BlockEvent { block, received_at })
.await
Expand Down