Skip to content

Use BAL manager unconditionally #11181

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
LukaszRozmej merged 2 commits into from
Apr 17, 2026
+19 −21
Merged

Use BAL manager unconditionally #11181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8531b9f
Use BAL manager unconditionally
rubo Apr 16, 2026
46831fa
Merge branch 'feature/parallel-txs' into chore/nullbalmanager
rubo Apr 16, 2026
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: 0 additions & 8 deletions ...ockAccessListSystemContractHandler.std.cs → ...r.BlockAccessListSystemContractHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@ namespace Nethermind.Consensus.Processing;

public partial class BlockProcessor
{
private readonly BlockAccessListSystemContractHandler _balSystemContractHandler = new(
beaconBlockRootHandler,
blockHashStore,
withdrawalProcessor,
executionRequestsProcessor,
balManager
);

public class BlockAccessListSystemContractHandler(
IBeaconBlockRootHandler beaconBlockRootHandler,
IBlockhashStore blockHashStore,
Expand Down
32 changes: 19 additions & 13 deletions src/Nethermind/Nethermind.Consensus/Processing/BlockProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,22 @@ public partial class BlockProcessor(
IBlockAccessListManager balManager)
: IBlockProcessor
{
private readonly ILogger _logger = logManager.GetClassLogger<BlockProcessor>();
protected readonly ISpecProvider _specProvider = specProvider;
protected readonly ILogManager _logManager = logManager;
protected readonly IWorldState _stateProvider = stateProvider;
protected readonly IBlockAccessListManager _balManager = balManager;
protected readonly IBlockTransactionsExecutor _blockTransactionsExecutor = blockTransactionsExecutor;
private readonly SystemContractHandler _standardSystemContractHandler = new(
beaconBlockRootHandler, blockHashStore, withdrawalProcessor, executionRequestsProcessor);
protected readonly ILogManager _logManager = logManager;
private readonly ILogger _logger = logManager.GetClassLogger<BlockProcessor>();
private readonly Lazy<BlockAccessListSystemContractHandler> _balSystemContractHandler = new(() =>
new(
beaconBlockRootHandler,
blockHashStore,
withdrawalProcessor,
executionRequestsProcessor,
balManager
));
private readonly Lazy<SystemContractHandler> _standardSystemContractHandler = new(() =>
new(beaconBlockRootHandler, blockHashStore, withdrawalProcessor, executionRequestsProcessor));
private SystemContractHandler _systemContractHandler;

/// <summary>
Expand All @@ -64,12 +72,11 @@ public partial class BlockProcessor(
public (Block Block, TxReceipt[] Receipts) ProcessOne(Block suggestedBlock, ProcessingOptions options, IBlockTracer blockTracer, IReleaseSpec spec, CancellationToken token)
{
if (_logger.IsTrace) _logger.Trace($"Processing block {suggestedBlock.ToString(Block.Format.Short)} ({options})");
#if ZK_EVM
_systemContractHandler = _standardSystemContractHandler;
#else

_balManager.PrepareForProcessing(suggestedBlock, spec, options);
_systemContractHandler = _balManager.Enabled ? _balSystemContractHandler : _standardSystemContractHandler;
#endif

_systemContractHandler = _balManager.Enabled ? _balSystemContractHandler.Value : _standardSystemContractHandler.Value;

ApplyDaoTransition(suggestedBlock);
Block block = PrepareBlockForProcessing(suggestedBlock);
TxReceipt[] receipts = ProcessBlock(block, blockTracer, options, spec, token);
Expand Down Expand Up @@ -115,9 +122,9 @@ protected virtual TxReceipt[] ProcessBlock(
ReceiptsTracer.StartNewBlockTrace(block);

_blockTransactionsExecutor.SetBlockExecutionContext(CreateBlockExecutionContext(block.Header, spec));
#if !ZK_EVM

_balManager.Setup(block);
#endif

_systemContractHandler.StoreBeaconRoot(block, spec);
_systemContractHandler.ApplyBlockhashStateChanges(header, spec);
_stateProvider.Commit(spec, commitRoots: false);
Expand Down Expand Up @@ -164,9 +171,8 @@ protected virtual TxReceipt[] ProcessBlock(
header.StateRoot = _stateProvider.StateRoot;
}

#if !ZK_EVM
_balManager.SetBlockAccessList(block);
#endif

header.Hash = header.CalculateHash();

return receipts;
Expand Down
Loading