Skip to content

feat: Add configurable EIP-2935 ring buffer size #9611

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
AnkushinDaniil merged 4 commits into from
Oct 31, 2025
Merged

feat: Add configurable EIP-2935 ring buffer size #9611

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8498d0c
feat: Add configurable EIP-2935 ring buffer size
AnkushinDaniil Oct 30, 2025
cff6799
fix tests
AnkushinDaniil Oct 30, 2025
fd24d4c
fix tests
AnkushinDaniil Oct 30, 2025
84d1fe5
address comments
AnkushinDaniil Oct 31, 2025
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
6 changes: 3 additions & 3 deletions src/Nethermind/Nethermind.Blockchain/Blocks/BlockhashStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void ApplyBlockhashStateChanges(BlockHeader blockHeader, IReleaseSpec spe
if (!worldState.IsContract(eip2935Account)) return;

Hash256 parentBlockHash = blockHeader.ParentHash;
var parentBlockIndex = new UInt256((ulong)((blockHeader.Number - 1) % Eip2935Constants.RingBufferSize));
var parentBlockIndex = new UInt256((ulong)((blockHeader.Number - 1) % spec.Eip2935RingBufferSize));
StorageCell blockHashStoreCell = new(eip2935Account, parentBlockIndex);
worldState.Set(blockHashStoreCell, parentBlockHash!.Bytes.WithoutLeadingZeros().ToArray());
}
Expand All @@ -41,11 +41,11 @@ public void ApplyBlockhashStateChanges(BlockHeader blockHeader, IReleaseSpec spe
public Hash256? GetBlockHashFromState(BlockHeader currentHeader, long requiredBlockNumber, IReleaseSpec? spec)
Comment thread
AnkushinDaniil marked this conversation as resolved.
Outdated
{
if (requiredBlockNumber >= currentHeader.Number ||
requiredBlockNumber + Eip2935Constants.RingBufferSize < currentHeader.Number)
requiredBlockNumber + (spec?.Eip2935RingBufferSize ?? Eip2935Constants.RingBufferSize) < currentHeader.Number)
{
return null;
}
var blockIndex = new UInt256((ulong)(requiredBlockNumber % Eip2935Constants.RingBufferSize));
var blockIndex = new UInt256((ulong)(requiredBlockNumber % (spec?.Eip2935RingBufferSize ?? Eip2935Constants.RingBufferSize)));
Comment thread
AnkushinDaniil marked this conversation as resolved.
Outdated
Address? eip2935Account = spec.Eip2935ContractAddress ?? Eip2935Constants.BlockHashHistoryAddress;
StorageCell blockHashStoreCell = new(eip2935Account, blockIndex);
ReadOnlySpan<byte> data = worldState.Get(blockHashStoreCell);
Expand Down
6 changes: 6 additions & 0 deletions src/Nethermind/Nethermind.Core/Specs/IReleaseSpec.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,12 @@ public interface IReleaseSpec : IEip1559Spec, IReceiptSpec
bool IsEip7709Enabled { get; }
Address Eip2935ContractAddress { get; }

/// <summary>
/// EIP-2935 ring buffer size for historical block hash storage.
/// Defaults to 8,191 blocks for Ethereum mainnet.
/// </summary>
long Eip2935RingBufferSize => Eip2935Constants.RingBufferSize;

/// <summary>
/// SELFDESTRUCT only in same transaction
/// </summary>
Expand Down
1 change: 1 addition & 0 deletions src/Nethermind/Nethermind.Specs/ChainSpecStyle/ChainParameters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ public class ChainParameters
public Address Eip7251ContractAddress { get; set; }
public ulong? Eip2935TransitionTimestamp { get; set; }
public Address Eip2935ContractAddress { get; set; }
public long Eip2935RingBufferSize { get; set; } = Eip2935Constants.RingBufferSize;
public ulong? Eip7951TransitionTimestamp { get; set; }
public ulong? Rip7212TransitionTimestamp { get; set; }
public ulong? Eip7692TransitionTimestamp { get; set; }
Expand Down
1 change: 1 addition & 0 deletions src/Nethermind/Nethermind.Specs/ChainSpecStyle/ChainSpecBasedSpecProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ protected virtual ReleaseSpec CreateReleaseSpec(ChainSpec chainSpec, long releas
releaseSpec.IsEip2935Enabled = (chainSpec.Parameters.Eip2935TransitionTimestamp ?? ulong.MaxValue) <= releaseStartTimestamp;
releaseSpec.IsEofEnabled = (chainSpec.Parameters.Eip7692TransitionTimestamp ?? ulong.MaxValue) <= releaseStartTimestamp;
releaseSpec.Eip2935ContractAddress = chainSpec.Parameters.Eip2935ContractAddress;
releaseSpec.Eip2935RingBufferSize = chainSpec.Parameters.Eip2935RingBufferSize;

releaseSpec.IsEip7702Enabled = (chainSpec.Parameters.Eip7702TransitionTimestamp ?? ulong.MaxValue) <= releaseStartTimestamp;
releaseSpec.IsEip7823Enabled = (chainSpec.Parameters.Eip7823TransitionTimestamp ?? ulong.MaxValue) <= releaseStartTimestamp;
Expand Down
1 change: 1 addition & 0 deletions src/Nethermind/Nethermind.Specs/ChainSpecStyle/ChainSpecLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ bool GetForInnerPathExistence(KeyValuePair<string, JsonElement> o) =>
Eip4788ContractAddress = chainSpecJson.Params.Eip4788ContractAddress ?? Eip4788Constants.BeaconRootsAddress,
Eip2935TransitionTimestamp = chainSpecJson.Params.Eip2935TransitionTimestamp,
Eip2935ContractAddress = chainSpecJson.Params.Eip2935ContractAddress ?? Eip2935Constants.BlockHashHistoryAddress,
Eip2935RingBufferSize = chainSpecJson.Params.Eip2935RingBufferSize ?? Eip2935Constants.RingBufferSize,
TransactionPermissionContract = chainSpecJson.Params.TransactionPermissionContract,
TransactionPermissionContractTransition = chainSpecJson.Params.TransactionPermissionContractTransition,
ValidateChainIdTransition = chainSpecJson.Params.ValidateChainIdTransition,
Expand Down
1 change: 1 addition & 0 deletions src/Nethermind/Nethermind.Specs/ChainSpecStyle/Json/ChainSpecParamsJson.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ public class ChainSpecParamsJson
public Address Eip4788ContractAddress { get; set; }
public ulong? Eip2935TransitionTimestamp { get; set; }
public Address Eip2935ContractAddress { get; set; }
public long? Eip2935RingBufferSize { get; set; }
public UInt256? Eip4844BlobGasPriceUpdateFraction { get; set; }
public UInt256? Eip4844MinBlobGasPrice { get; set; }
public ulong? Eip4844FeeCollectorTransitionTimestamp { get; set; }
Expand Down
1 change: 1 addition & 0 deletions src/Nethermind/Nethermind.Specs/ReleaseSpec.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ public Address Eip2935ContractAddress

private FrozenSet<AddressAsKey>? _precompiles;
FrozenSet<AddressAsKey> IReleaseSpec.Precompiles => _precompiles ??= BuildPrecompilesCache();
public long Eip2935RingBufferSize { get; set; } = Eip2935Constants.RingBufferSize;

public virtual FrozenSet<AddressAsKey> BuildPrecompilesCache()
{
Expand Down