Skip to content

fix: Resolve blocking receive on oneshot receiver panic issue, better refactor #60

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

Merged
sieniven merged 1 commit into from
Jan 19, 2026
Merged

fix: Resolve blocking receive on oneshot receiver panic issue, better refactor #60

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
40 changes: 9 additions & 31 deletions crates/op-rbuilder/src/builders/flashblocks/payload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ use std::{
sync::Arc,
time::Instant,
};
use tokio::sync::{mpsc, oneshot};
use tokio::sync::mpsc;
use tokio_util::sync::CancellationToken;
use tracing::{debug, error, info, metadata::Level, span, warn};

Expand Down Expand Up @@ -912,7 +912,7 @@ where
let fallback_payload_for_resolve =
if self.config.specific.disable_async_calculate_state_root {
// Use the fallback payload with state root calculated to ensure the full payload is valid
fallback_payload.clone()
fallback_payload
} else {
// Use the best payload as empty state root payloads are acceptable
best_payload.0.clone()
Expand All @@ -928,42 +928,20 @@ where
// Async calculate state root
match self.client.state_by_block_hash(ctx.parent().hash()) {
Ok(state_provider) => {
let (sync_tx, sync_rx) =
if self.config.specific.disable_async_calculate_state_root {
let (tx, rx) = oneshot::channel();
(Some(tx), Some(rx))
} else {
(None, None)
};

self.task_executor.spawn(Box::pin(async move {
let result = resolve_zero_state_root(state_root_ctx, state_provider)
if self.config.specific.disable_async_calculate_state_root {
resolve_zero_state_root(state_root_ctx, state_provider)
.unwrap_or_else(|err| {
warn!(
target: "payload_builder",
error = %err,
"Failed to calculate state root, falling back to fallback payload"
);
// Use the fallback payload with state root calculated on failures as a safety
// net so that the full built payload is assured to be valid.
fallback_payload
});

// Only send via channel in sync mode
if let Some(tx) = sync_tx {
let _ = tx.send(result);
}
}));

if let Some(rx) = sync_rx {
rx.blocking_recv().unwrap_or_else(|_| {
warn!(
target: "payload_builder",
"Failed to calculate state root, state root task stopped. Falling back to fallback payload"
);
fallback_payload_for_resolve
})
fallback_payload_for_resolve
})
} else {
self.task_executor.spawn(Box::pin(async move {
let _ = resolve_zero_state_root(state_root_ctx, state_provider);
}));
fallback_payload_for_resolve
}
}
Expand Down