Skip to content

Cancel timeout in NewPayload fast-path #9597

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
benaadams merged 1 commit into from
Oct 30, 2025
Merged

Cancel timeout in NewPayload fast-path #9597

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
8 changes: 7 additions & 1 deletion src/Nethermind/Nethermind.Merge.Plugin/Handlers/NewPayloadHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using Nethermind.Core;
using Nethermind.Core.Caching;
using Nethermind.Core.Crypto;
using Nethermind.Core.Extensions;
using Nethermind.Core.Threading;
using Nethermind.Crypto;
using Nethermind.Int256;
Expand Down Expand Up @@ -49,7 +50,7 @@ public sealed class NewPayloadHandler : IAsyncHandler<ExecutionPayload, PayloadS
private readonly IInvalidChainTracker _invalidChainTracker;
private readonly IStateReader _stateReader;
private readonly ILogger _logger;
private readonly LruCache<ValueHash256, (bool valid, string? message)>? _latestBlocks;
private readonly LruCache<Hash256AsKey, (bool valid, string? message)>? _latestBlocks;
private readonly ProcessingOptions _defaultProcessingOptions;
private readonly TimeSpan _timeout;

Expand Down Expand Up @@ -386,6 +387,11 @@ ValidationResult TryCacheResult(ValidationResult result, string? errorMessage)
await _processingQueue.Enqueue(block, processingOptions);
(result, validationMessage) = await blockProcessed.Task.TimeoutOn(timeoutTask, cts);
}
else
{
// Already known block with known processing result, cancel the timeout task
cts.Cancel();
}
}
catch (TimeoutException)
{
Expand Down