NethermindEth
diff --git a/‎cspell.json‎
Lines changed: 1 addition & 0 deletions b/‎cspell.json‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs‎
Lines changed: 2 additions & 2 deletions b/‎src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Nethermind/Ethereum.Test.Base/BlockchainTestJson.cs‎
Lines changed: 15 additions & 0 deletions b/‎src/Nethermind/Ethereum.Test.Base/BlockchainTestJson.cs‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎src/Nethermind/Ethereum.Test.Base/JsonToEthereumTest.cs‎
Lines changed: 23 additions & 6 deletions b/‎src/Nethermind/Ethereum.Test.Base/JsonToEthereumTest.cs‎
Lines changed: 23 additions & 6 deletions
diff --git a/‎src/Nethermind/Nethermind.Blockchain.Test/PrecompileCachedCodeInfoRepositoryTests.cs‎
Lines changed: 1 addition & 0 deletions b/‎src/Nethermind/Nethermind.Blockchain.Test/PrecompileCachedCodeInfoRepositoryTests.cs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Nethermind/Nethermind.Blockchain.Test/Validators/BlockValidatorTests.cs‎
Lines changed: 45 additions & 4 deletions b/‎src/Nethermind/Nethermind.Blockchain.Test/Validators/BlockValidatorTests.cs‎
Lines changed: 45 additions & 4 deletions
diff --git a/‎src/Nethermind/Nethermind.Blockchain/BlockAccessLists/BlockAccessListStore.cs‎
Lines changed: 42 additions & 0 deletions b/‎src/Nethermind/Nethermind.Blockchain/BlockAccessLists/BlockAccessListStore.cs‎
Lines changed: 42 additions & 0 deletions
diff --git a/‎src/Nethermind/Nethermind.Blockchain/BlockAccessLists/IBlockAccessListStore.cs‎
Lines changed: 29 additions & 0 deletions b/‎src/Nethermind/Nethermind.Blockchain/BlockAccessLists/IBlockAccessListStore.cs‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎src/Nethermind/Nethermind.Blockchain/BlockTree.cs‎
Lines changed: 6 additions & 0 deletions b/‎src/Nethermind/Nethermind.Blockchain/BlockTree.cs‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Nethermind/Nethermind.Blockchain/PrecompileCachedCodeInfoRepository.cs‎
Lines changed: 1 addition & 0 deletions b/‎src/Nethermind/Nethermind.Blockchain/PrecompileCachedCodeInfoRepository.cs‎
Lines changed: 1 addition & 0 deletions
@@ -53,6 +53,7 @@
     "auxdata",
     "backpressure",
     "badreq",
+    "bals",
     "barebone",
     "baseblock",
     "basefee",
 
@@ -89,7 +89,7 @@ protected async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch?
         List<(ForkActivation Activation, IReleaseSpec Spec)> transitions =
             isEngineTest ?
             [((ForkActivation)0, test.Network)] :
-            [((ForkActivation)0, test.GenesisSpec), ((ForkActivation)1, test.Network)]; // TODO: this thing took a lot of time to find after it was removed!, genesis block is always initialized with Frontier
+            [((ForkActivation)0, test.GenesisSpec), ((ForkActivation)1, test.Network)]; // genesis block is always initialized with Frontier
 
         if (test.NetworkAfterTransition is not null)
         {
@@ -312,7 +312,7 @@ private static BlockHeader SuggestBlocks(BlockchainTest test, bool failOnInvalid
 
     private async static Task RunNewPayloads(TestEngineNewPayloadsJson[]? newPayloads, IEngineRpcModule engineRpcModule)
     {
-        (ExecutionPayloadV3, string[]?, string[]?, int, int)[] payloads = [.. JsonToEthereumTest.Convert(newPayloads)];
+        (ExecutionPayloadV4, string[]?, string[]?, int, int)[] payloads = [.. JsonToEthereumTest.Convert(newPayloads)];
 
         // blockchain test engine
         foreach ((ExecutionPayload executionPayload, string[]? blobVersionedHashes, string[]? validationError, int newPayloadVersion, int fcuVersion) in payloads)
 
@@ -20,6 +20,7 @@ public class BlockchainTestJson
         public IReleaseSpec? EthereumNetworkAfterTransition { get; set; }
         public ForkActivation? TransitionForkActivation { get; set; }
         public string? LastBlockHash { get; set; }
+        public ConfigJson? Config { get; set; }
         public string? GenesisRlp { get; set; }
 
         public TestBlockJson[]? Blocks { get; set; }
@@ -34,4 +35,18 @@ public class BlockchainTestJson
         public string? SealEngine { get; set; }
         public string? LoadFailure { get; set; }
     }
+
+    public class ConfigJson
+    {
+        public string? Network { get; set; }
+        public string? Chainid { get; set; }
+        public Dictionary<string, BlobScheduleEntryJson>? BlobSchedule;
+    }
+
+    public class BlobScheduleEntryJson
+    {
+        public string? Target;
+        public string? Max;
+        public string? BaseFeeUpdateFraction;
+    }
 }
@@ -19,6 +19,7 @@
 using Nethermind.Serialization.Json;
 using Nethermind.Serialization.Rlp;
 using Nethermind.Specs;
+using Nethermind.Specs.Test;
 
 namespace Ethereum.Test.Base
 {
@@ -74,7 +75,7 @@ public static BlockHeader Convert(TestBlockHeaderJson? headerJson)
                 StateRoot = new Hash256(headerJson.StateRoot),
                 TxRoot = new Hash256(headerJson.TransactionsTrie),
                 WithdrawalsRoot = headerJson.WithdrawalsRoot is null ? null : new Hash256(headerJson.WithdrawalsRoot),
-                // BlockAccessListHash = headerJson.BlockAccessListHash is null ? null : new Hash256(headerJson.BlockAccessListHash),
+                BlockAccessListHash = headerJson.BlockAccessListHash is null ? null : new Hash256(headerJson.BlockAccessListHash),
             };
 
             if (headerJson.BaseFeePerGas is not null)
@@ -85,7 +86,7 @@ public static BlockHeader Convert(TestBlockHeaderJson? headerJson)
             return header;
         }
 
-        public static IEnumerable<(ExecutionPayloadV3, string[]?, string[]?, int, int)> Convert(TestEngineNewPayloadsJson[]? executionPayloadsJson)
+        public static IEnumerable<(ExecutionPayloadV4, string[]?, string[]?, int, int)> Convert(TestEngineNewPayloadsJson[]? executionPayloadsJson)
         {
             if (executionPayloadsJson is null)
             {
@@ -98,7 +99,7 @@ public static BlockHeader Convert(TestBlockHeaderJson? headerJson)
                 string[]? blobVersionedHashes = engineNewPayload.Params.Length > 1 ? engineNewPayload.Params[1].Deserialize<string[]?>(EthereumJsonSerializer.JsonOptions) : null;
                 string? parentBeaconBlockRoot = engineNewPayload.Params.Length > 2 ? engineNewPayload.Params[2].Deserialize<string?>(EthereumJsonSerializer.JsonOptions) : null;
                 string[]? validationError = engineNewPayload.Params.Length > 3 ? engineNewPayload.Params[3].Deserialize<string[]?>(EthereumJsonSerializer.JsonOptions) : null;
-                yield return (new ExecutionPayloadV3()
+                yield return (new ExecutionPayloadV4()
                 {
                     BaseFeePerGas = (ulong)Bytes.FromHexString(executionPayload.BaseFeePerGas).ToUnsignedBigInteger(),
                     BlockHash = new(executionPayload.BlockHash),
@@ -113,7 +114,7 @@ public static BlockHeader Convert(TestBlockHeaderJson? headerJson)
                     ReceiptsRoot = new(executionPayload.ReceiptsRoot),
                     StateRoot = new(executionPayload.StateRoot),
                     Timestamp = (ulong)Bytes.FromHexString(executionPayload.Timestamp).ToUnsignedBigInteger(),
-                    // BlockAccessList = executionPayload.BlockAccessList is null ? null : Bytes.FromHexString(executionPayload.BlockAccessList),
+                    BlockAccessList = executionPayload.BlockAccessList is null ? null : Bytes.FromHexString(executionPayload.BlockAccessList),
                     BlobGasUsed = executionPayload.BlobGasUsed is null ? null : (ulong)Bytes.FromHexString(executionPayload.BlobGasUsed).ToUnsignedBigInteger(),
                     ExcessBlobGas = executionPayload.ExcessBlobGas is null ? null : (ulong)Bytes.FromHexString(executionPayload.ExcessBlobGas).ToUnsignedBigInteger(),
                     ParentBeaconBlockRoot = parentBeaconBlockRoot is null ? null : new(parentBeaconBlockRoot),
@@ -432,11 +433,11 @@ public static IEnumerable<BlockchainTest> ConvertToBlockchainTests(string json)
                 string[] transitionInfo = testSpec.Network.Split("At");
                 string[] networks = transitionInfo[0].Split("To");
 
-                testSpec.EthereumNetwork = SpecNameParser.Parse(networks[0]);
+                testSpec.EthereumNetwork = LoadSpec(networks[0], testSpec.Config?.BlobSchedule);
                 if (transitionInfo.Length > 1)
                 {
                     testSpec.TransitionForkActivation = TransitionForkActivation(transitionInfo[1]);
-                    testSpec.EthereumNetworkAfterTransition = SpecNameParser.Parse(networks[1]);
+                    testSpec.EthereumNetworkAfterTransition = LoadSpec(networks[1], testSpec.Config?.BlobSchedule);
                 }
 
                 (string name, string category) = GetNameAndCategory(testName);
@@ -446,6 +447,22 @@ public static IEnumerable<BlockchainTest> ConvertToBlockchainTests(string json)
             return testsByName;
         }
 
+        private static IReleaseSpec LoadSpec(string name, Dictionary<string, BlobScheduleEntryJson>? blobSchedule)
+        {
+            IReleaseSpec spec = SpecNameParser.Parse(name);
+            if (blobSchedule is null || !blobSchedule.TryGetValue(name, out BlobScheduleEntryJson? blobCount))
+            {
+                return spec;
+            }
+
+            return new OverridableReleaseSpec(spec)
+            {
+                MaxBlobCount = System.Convert.ToUInt64(blobCount.Max, 16),
+                TargetBlobCount = System.Convert.ToUInt64(blobCount.Target, 16),
+                BlobBaseFeeUpdateFraction = System.Convert.ToUInt64(blobCount.BaseFeeUpdateFraction, 16)
+            };
+        }
+
         private static (string name, string category) GetNameAndCategory(string key)
         {
             key = key.Replace('\\', '/');
 
@@ -12,6 +12,7 @@
 using Nethermind.Evm;
 using Nethermind.Evm.CodeAnalysis;
 using Nethermind.Evm.Precompiles;
+using Nethermind.Evm.State;
 using Nethermind.Specs.Forks;
 using Nethermind.State;
 using NSubstitute;
 
@@ -15,6 +15,8 @@
 using NUnit.Framework;
 using System.Collections.Generic;
 using FluentAssertions;
+using Nethermind.Core.BlockAccessLists;
+using Nethermind.Serialization.Rlp;
 using Nethermind.Core.Test;
 
 namespace Nethermind.Blockchain.Test.Validators;
@@ -252,15 +254,17 @@ private static IEnumerable<TestCaseData> BadSuggestedBlocks()
                 .TestObject,
             parent,
             Substitute.For<ISpecProvider>(),
-            "InvalidUnclesHash");
+            "InvalidUnclesHash")
+        { TestName = "InvalidUnclesHash" };
 
         yield return new TestCaseData(
             Build.A.Block
                 .WithHeader(Build.A.BlockHeader.WithParent(parent).WithTransactionsRoot(Keccak.Zero).TestObject)
                 .TestObject,
             parent,
             Substitute.For<ISpecProvider>(),
-            "InvalidTxRoot");
+            "InvalidTxRoot")
+        { TestName = "InvalidTxRoot" };
 
         yield return new TestCaseData(
             Build.A.Block.WithBlobGasUsed(131072)
@@ -275,13 +279,50 @@ private static IEnumerable<TestCaseData> BadSuggestedBlocks()
                 .TestObject,
             parent,
             new CustomSpecProvider(((ForkActivation)0, Cancun.Instance)),
-            "InsufficientMaxFeePerBlobGas");
+            "InsufficientMaxFeePerBlobGas")
+        { TestName = "InsufficientMaxFeePerBlobGas" };
 
         yield return new TestCaseData(
             Build.A.Block.WithParent(parent).WithEncodedSize(Eip7934Constants.DefaultMaxRlpBlockSize + 1).TestObject,
             parent,
             new CustomSpecProvider(((ForkActivation)0, Osaka.Instance)),
-            "ExceededBlockSizeLimit");
+            "ExceededBlockSizeLimit")
+        { TestName = "ExceededBlockSizeLimit" };
+
+        yield return new TestCaseData(
+            Build.A.Block
+                .WithParent(parent)
+                .WithBlobGasUsed(0)
+                .WithWithdrawals([])
+                .WithBlockAccessList(new())
+                .WithEncodedBlockAccessList(Rlp.Encode(new BlockAccessList()).Bytes).TestObject,
+            parent,
+            new CustomSpecProvider(((ForkActivation)0, Amsterdam.Instance)),
+            "InvalidBlockLevelAccessListHash")
+        { TestName = "InvalidBlockLevelAccessListHash" };
+
+        yield return new TestCaseData(
+            Build.A.Block
+                .WithParent(parent)
+                .WithBlobGasUsed(0)
+                .WithWithdrawals([])
+                .WithBlockAccessList(new())
+                .WithEncodedBlockAccessList([0xfa]).TestObject,
+            parent,
+            new CustomSpecProvider(((ForkActivation)0, Amsterdam.Instance)),
+            "InvalidBlockLevelAccessList")
+        { TestName = "InvalidBlockLevelAccessList" };
+
+        yield return new TestCaseData(
+            Build.A.Block
+                .WithParent(parent)
+                .WithBlobGasUsed(0)
+                .WithWithdrawals([])
+                .WithBlockAccessList(new()).TestObject,
+            parent,
+            new CustomSpecProvider(((ForkActivation)0, Osaka.Instance)),
+            "BlockLevelAccessListNotEnabled")
+        { TestName = "BlockLevelAccessListNotEnabled" };
     }
 
     [TestCaseSource(nameof(BadSuggestedBlocks))]
 
@@ -0,0 +1,42 @@
+// SPDX-FileCopyrightText: 2026 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using Autofac.Features.AttributeFilters;
+using Nethermind.Core;
+using Nethermind.Core.BlockAccessLists;
+using Nethermind.Core.Crypto;
+using Nethermind.Db;
+using Nethermind.Serialization.Rlp;
+using Nethermind.Serialization.Rlp.Eip7928;
+using System;
+
+namespace Nethermind.Blockchain.Headers;
+
+public class BlockAccessListStore(
+    [KeyFilter(DbNames.BlockAccessLists)] IDb balDb,
+    BlockAccessListDecoder? decoder = null)
+    : IBlockAccessListStore
+{
+    private readonly BlockAccessListDecoder _balDecoder = decoder ?? new();
+
+    public void Insert(Hash256 blockHash, BlockAccessList bal)
+    {
+        using NettyRlpStream rlpStream = BlockAccessListDecoder.Instance.EncodeToNewNettyStream(bal);
+        balDb.Set(blockHash, rlpStream.AsSpan());
+    }
+
+    public void Insert(Hash256 blockHash, byte[] encodedBal)
+        => balDb.Set(blockHash, encodedBal);
+
+    public byte[]? GetRlp(Hash256 blockHash)
+        => balDb.Get(blockHash);
+
+    public BlockAccessList? Get(Hash256 blockHash)
+    {
+        ReadOnlySpan<byte> rlp = balDb.GetSpan(blockHash);
+        return rlp.IsEmpty ? null : _balDecoder.Decode(rlp);
+    }
+
+    public void Delete(Hash256 blockHash)
+        => balDb.Delete(blockHash);
+}
@@ -0,0 +1,29 @@
+// SPDX-FileCopyrightText: 2026 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using Nethermind.Core;
+using Nethermind.Core.BlockAccessLists;
+using Nethermind.Core.Crypto;
+
+namespace Nethermind.Blockchain.Headers;
+
+public interface IBlockAccessListStore
+{
+    void InsertFromBlock(Block block)
+    {
+        if (block.EncodedBlockAccessList is not null)
+        {
+            Insert(block.Hash, block.EncodedBlockAccessList);
+        }
+        else if (block.BlockAccessList is not null)
+        {
+            Insert(block.Hash, block.BlockAccessList);
+        }
+    }
+
+    void Insert(Hash256 blockHash, byte[] bal);
+    void Insert(Hash256 blockHash, BlockAccessList bal);
+    byte[]? GetRlp(Hash256 blockHash);
+    BlockAccessList? Get(Hash256 blockHash);
+    void Delete(Hash256 blockHash);
+}
@@ -44,6 +44,7 @@ public partial class BlockTree : IBlockTree
         private readonly IDb _blockInfoDb;
         private readonly IDb _metadataDb;
         private readonly IBadBlockStore _badBlockStore;
+        private readonly IBlockAccessListStore _balStore;
 
         private readonly LruCache<ValueHash256, Block> _invalidBlocks =
             new(128, 128, "invalid blocks");
@@ -113,6 +114,7 @@ public BlockTree(
             [KeyFilter(DbNames.BlockInfos)] IDb? blockInfoDb,
             [KeyFilter(DbNames.Metadata)] IDb? metadataDb,
             IBadBlockStore? badBlockStore,
+            IBlockAccessListStore? balStore,
             IChainLevelInfoRepository? chainLevelInfoRepository,
             ISpecProvider? specProvider,
             IBloomStorage? bloomStorage,
@@ -126,6 +128,7 @@ public BlockTree(
             _blockInfoDb = blockInfoDb ?? throw new ArgumentNullException(nameof(blockInfoDb));
             _metadataDb = metadataDb ?? throw new ArgumentNullException(nameof(metadataDb));
             _badBlockStore = badBlockStore ?? throw new ArgumentNullException(nameof(badBlockStore));
+            _balStore = balStore ?? throw new ArgumentNullException(nameof(balStore));
             SpecProvider = specProvider ?? throw new ArgumentNullException(nameof(specProvider));
             _bloomStorage = bloomStorage ?? throw new ArgumentNullException(nameof(bloomStorage));
             _syncConfig = syncConfig ?? throw new ArgumentNullException(nameof(syncConfig));
@@ -416,6 +419,7 @@ public AddBlockResult Insert(Block block, BlockTreeInsertBlockOptions insertBloc
 
             _blockStore.Insert(block, writeFlags: blockWriteFlags);
             _headerStore.InsertBlockNumber(block.Hash, block.Number);
+            _balStore.InsertFromBlock(block);
 
             bool saveHeader = (insertBlockOptions & BlockTreeInsertBlockOptions.SaveHeader) != 0;
             if (saveHeader)
@@ -483,6 +487,7 @@ protected virtual AddBlockResult Suggest(Block? block, BlockHeader header, Block
                 }
 
                 _blockStore.Insert(block);
+                _balStore.InsertFromBlock(block);
             }
 
             if (!isKnown)
@@ -1679,6 +1684,7 @@ public int DeleteChainSlice(in long startNumber, long? endNumber = null, bool fo
                         _blockInfoDb.Delete(blockHash);
                         _blockStore.Delete(i, blockHash);
                         _headerStore.Delete(blockHash);
+                        _balStore.Delete(blockHash);
                     }
                 }
             }
 
@@ -12,6 +12,7 @@
 using Nethermind.Evm;
 using Nethermind.Evm.CodeAnalysis;
 using Nethermind.Evm.Precompiles;
+using Nethermind.Evm.State;
 using Nethermind.State;
 
 namespace Nethermind.Blockchain;
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ protected async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch?`
`89`	`89`	`List<(ForkActivation Activation, IReleaseSpec Spec)> transitions =`
`90`	`90`	`isEngineTest ?`
`91`	`91`	`[((ForkActivation)0, test.Network)] :`
`92`		`- [((ForkActivation)0, test.GenesisSpec), ((ForkActivation)1, test.Network)]; // TODO: this thing took a lot of time to find after it was removed!, genesis block is always initialized with Frontier`
	`92`	`+ [((ForkActivation)0, test.GenesisSpec), ((ForkActivation)1, test.Network)]; // genesis block is always initialized with Frontier`
`93`	`93`
`94`	`94`	`if (test.NetworkAfterTransition is not null)`
`95`	`95`	`{`
`@@ -312,7 +312,7 @@ private static BlockHeader SuggestBlocks(BlockchainTest test, bool failOnInvalid`
`312`	`312`
`313`	`313`	`private async static Task RunNewPayloads(TestEngineNewPayloadsJson[]? newPayloads, IEngineRpcModule engineRpcModule)`
`314`	`314`	`{`
`315`		`- (ExecutionPayloadV3, string[]?, string[]?, int, int)[] payloads = [.. JsonToEthereumTest.Convert(newPayloads)];`
	`315`	`+ (ExecutionPayloadV4, string[]?, string[]?, int, int)[] payloads = [.. JsonToEthereumTest.Convert(newPayloads)];`
`316`	`316`
`317`	`317`	`// blockchain test engine`
`318`	`318`	`foreach ((ExecutionPayload executionPayload, string[]? blobVersionedHashes, string[]? validationError, int newPayloadVersion, int fcuVersion) in payloads)`