test: add engine blockchain pyspec fixtures and fix BAL gas budget tracking

.github/workflows/nethermind-tests-checked.yml

@@ -187,6 +187,7 @@ jobs:
         env:
           TEST_CHUNK: ${{ matrix.test.chunk }}
           DOTNET_EnableHWIntrinsic: ${{ matrix.variant.hw-intrinsic }}
+          TEST_SKIP_HEAVY: 1
         run: |
           dotnet test --project ${{ matrix.test.project }}.csproj -c release \
             ${{ matrix.variant.dotnet-args }}

.github/workflows/nethermind-tests-flat.yml

@@ -96,6 +96,7 @@ jobs:
         working-directory: src/Nethermind/${{ matrix.project }}
         env:
           TEST_CHUNK: ${{ matrix.chunk }}
+          TEST_SKIP_HEAVY: 1
         run: |
           dotnet test --project ${{ matrix.project }}.csproj -c release
 

.github/workflows/nethermind-tests.yml

@@ -282,6 +282,7 @@ jobs:
         working-directory: src/Nethermind/${{ matrix.test.project }}
         env:
           TEST_CHUNK: ${{ matrix.test.chunk }}
+          TEST_SKIP_HEAVY: 1
         run: |
           set +e
           dotnet test --project ${{ matrix.test.project }}.csproj -c release

.gitignore

@@ -454,3 +454,4 @@ keystore/
 
 # Worktrees
 .worktrees/
+/.dotnet-cli

cspell.json

@@ -6,6 +6,7 @@
   "ignoreRandomStrings": true,
   "unknownWords": "report-common-typos",
   "ignorePaths": [
+    ".gitignore",
     "**/*.json",
     "**/*.zst",
     "**/artifacts/**",

src/Nethermind/Ethereum.Blockchain.Pyspec.Test/Amsterdam/AmsterdamTestFixture.cs

@@ -13,13 +13,17 @@ namespace Ethereum.Blockchain.Pyspec.Test.Amsterdam;
 /// <summary>
 /// Generic base for Amsterdam EIP blockchain tests.
 /// Wildcard is read from <see cref="EipWildcardAttribute"/> on <typeparamref name="TSelf"/>.
+/// In CI, only runs on Linux x64 to stay within the job timeout budget.
 /// </summary>
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
 public abstract class AmsterdamBlockChainTestFixture<TSelf> : BlockchainTestBase
 {
+    [SetUp]
+    public void SkipInCiOnSlowRunners() => CiRunnerGuard.SkipIfNotLinuxX64();
+
     [TestCaseSource(nameof(LoadTests))]
-    public async Task Test(BlockchainTest test) => await RunTest(test);
+    public async Task Test(BlockchainTest test) => (await RunTest(test)).Pass.Should().BeTrue();
 
     public static IEnumerable<BlockchainTest> LoadTests() =>
         new TestsSourceLoader(new LoadPyspecTestsStrategy
@@ -29,6 +33,29 @@ public static IEnumerable<BlockchainTest> LoadTests() =>
         }, "fixtures/blockchain_tests/for_amsterdam", typeof(TSelf).GetCustomAttribute<EipWildcardAttribute>()!.Wildcard).LoadTests<BlockchainTest>();
 }
 
+/// <summary>
+/// Generic base for Amsterdam EIP engine blockchain tests.
+/// Wildcard is read from <see cref="EipWildcardAttribute"/> on <typeparamref name="TSelf"/>.
+/// In CI, only runs on Linux x64 to stay within the job timeout budget.
+/// </summary>
+[TestFixture]
+[Parallelizable(ParallelScope.All)]
+public abstract class AmsterdamEngineBlockChainTestFixture<TSelf> : BlockchainTestBase
+{
+    [SetUp]
+    public void SkipInCiOnSlowRunners() => CiRunnerGuard.SkipIfNotLinuxX64();
+
+    [TestCaseSource(nameof(LoadTests))]
+    public async Task Test(BlockchainTest test) => (await RunTest(test)).Pass.Should().BeTrue();
+
+    public static IEnumerable<BlockchainTest> LoadTests() =>
+        new TestsSourceLoader(new LoadPyspecTestsStrategy
+        {
+            ArchiveVersion = Constants.BalArchiveVersion,
+            ArchiveName = Constants.BalArchiveName
+        }, "fixtures/blockchain_tests_engine/for_amsterdam", typeof(TSelf).GetCustomAttribute<EipWildcardAttribute>()!.Wildcard).LoadTests<BlockchainTest>();
+}
+
 /// <summary>
 /// Generic base for Amsterdam EIP state tests.
 /// Wildcard is read from <see cref="EipWildcardAttribute"/> on <typeparamref name="TSelf"/>.

src/Nethermind/Ethereum.Blockchain.Pyspec.Test/Amsterdam/Tests.cs

@@ -8,24 +8,45 @@ namespace Ethereum.Blockchain.Pyspec.Test.Amsterdam;
 [EipWildcard("eip7708_eth_transfer_logs")]
 public class Eip7708BlockChainTests : AmsterdamBlockChainTestFixture<Eip7708BlockChainTests>;
 
+[EipWildcard("eip7708_eth_transfer_logs")]
+public class Eip7708EngineBlockChainTests : AmsterdamEngineBlockChainTestFixture<Eip7708EngineBlockChainTests>;
+
 [EipWildcard("eip7778_block_gas_accounting_without_refunds")]
 public class Eip7778BlockChainTests : AmsterdamBlockChainTestFixture<Eip7778BlockChainTests>;
 
+[EipWildcard("eip7778_block_gas_accounting_without_refunds")]
+public class Eip7778EngineBlockChainTests : AmsterdamEngineBlockChainTestFixture<Eip7778EngineBlockChainTests>;
+
 [EipWildcard("eip7843_slotnum")]
 public class Eip7843BlockChainTests : AmsterdamBlockChainTestFixture<Eip7843BlockChainTests>;
 
+[EipWildcard("eip7843_slotnum")]
+public class Eip7843EngineBlockChainTests : AmsterdamEngineBlockChainTestFixture<Eip7843EngineBlockChainTests>;
+
 [EipWildcard("eip7928_block_level_access_lists")]
 public class Eip7928BlockChainTests : AmsterdamBlockChainTestFixture<Eip7928BlockChainTests>;
 
+[EipWildcard("eip7928_block_level_access_lists")]
+public class Eip7928EngineBlockChainTests : AmsterdamEngineBlockChainTestFixture<Eip7928EngineBlockChainTests>;
+
 [EipWildcard("eip7954_increase_max_contract_size")]
 public class Eip7954BlockChainTests : AmsterdamBlockChainTestFixture<Eip7954BlockChainTests>;
 
+[EipWildcard("eip7954_increase_max_contract_size")]
+public class Eip7954EngineBlockChainTests : AmsterdamEngineBlockChainTestFixture<Eip7954EngineBlockChainTests>;
+
 [EipWildcard("eip8024_dupn_swapn_exchange")]
 public class Eip8024BlockChainTests : AmsterdamBlockChainTestFixture<Eip8024BlockChainTests>;
 
+[EipWildcard("eip8024_dupn_swapn_exchange")]
+public class Eip8024EngineBlockChainTests : AmsterdamEngineBlockChainTestFixture<Eip8024EngineBlockChainTests>;
+
 [EipWildcard("eip8037_state_creation_gas_cost_increase")]
 public class Eip8037BlockChainTests : AmsterdamBlockChainTestFixture<Eip8037BlockChainTests>;
 
+[EipWildcard("eip8037_state_creation_gas_cost_increase")]
+public class Eip8037EngineBlockChainTests : AmsterdamEngineBlockChainTestFixture<Eip8037EngineBlockChainTests>;
+
 // State tests
 
 [EipWildcard("eip7708_eth_transfer_logs")]

src/Nethermind/Ethereum.Blockchain.Pyspec.Test/PyspecTestFixture.cs

@@ -1,7 +1,9 @@
 // SPDX-FileCopyrightText: 2026 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
+using System;
 using System.Collections.Generic;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Ethereum.Test.Base;
 using FluentAssertions;
@@ -25,6 +27,26 @@ public static IEnumerable<BlockchainTest> LoadTests() =>
             $"fixtures/blockchain_tests/for_{TestDirectoryHelper.GetDirectoryByConvention<TSelf>("BlockchainTests")}").LoadTests<BlockchainTest>();
 }
 
+/// <summary>
+/// Generic base for pyspec engine blockchain tests using <see cref="LoadPyspecTestsStrategy"/>.
+/// Directory is derived by convention: strip "EngineBlockchainTests" suffix, lowercase.
+/// In CI (TEST_CHUNK set), only runs on Linux x64 to stay within the job timeout budget.
+/// </summary>
+[TestFixture]
+[Parallelizable(ParallelScope.All)]
+public abstract class PyspecEngineBlockchainTestFixture<TSelf> : BlockchainTestBase
+{
+    [SetUp]
+    public void SkipInCiOnSlowRunners() => CiRunnerGuard.SkipIfNotLinuxX64();
+
+    [TestCaseSource(nameof(LoadTests))]
+    public async Task Test(BlockchainTest test) => (await RunTest(test)).Pass.Should().BeTrue();
+
+    public static IEnumerable<BlockchainTest> LoadTests() =>
+        new TestsSourceLoader(new LoadPyspecTestsStrategy(),
+            $"fixtures/blockchain_tests_engine/for_{TestDirectoryHelper.GetDirectoryByConvention<TSelf>("EngineBlockchainTests")}").LoadTests<BlockchainTest>();
+}
+
 /// <summary>
 /// Generic base for pyspec state tests using <see cref="LoadPyspecTestsStrategy"/>.
 /// Directory is derived by convention: strip "StateTests" suffix, lowercase.
@@ -40,3 +62,23 @@ public static IEnumerable<GeneralStateTest> LoadTests() =>
         new TestsSourceLoader(new LoadPyspecTestsStrategy(),
             $"fixtures/state_tests/for_{TestDirectoryHelper.GetDirectoryByConvention<TSelf>("StateTests")}").LoadTests<GeneralStateTest>();
 }
+
+/// <summary>
+/// Skips heavy tests in CI on runners that are too slow or running variant builds.
+/// Only active when TEST_CHUNK is set (CI). Local runs always execute.
+/// Set TEST_SKIP_HEAVY=1 to unconditionally skip (used by checked/no-intrinsics variants).
+/// </summary>
+internal static class CiRunnerGuard
+{
+    private static readonly bool s_isCi = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TEST_CHUNK"));
+    private static readonly bool s_isLinuxX64 = OperatingSystem.IsLinux() && RuntimeInformation.ProcessArchitecture == Architecture.X64;
+    private static readonly bool s_skipHeavy = Environment.GetEnvironmentVariable("TEST_SKIP_HEAVY") == "1";
+
+    public static void SkipIfNotLinuxX64()
+    {
+        if (s_skipHeavy)
+            Assert.Ignore("Skipped — TEST_SKIP_HEAVY is set");
+        if (s_isCi && !s_isLinuxX64)
+            Assert.Ignore("Skipped in CI — engine/Amsterdam tests only run on Linux x64");
+    }
+}

src/Nethermind/Ethereum.Blockchain.Pyspec.Test/Tests.cs

@@ -27,6 +27,16 @@ public class PragueBlockchainTests : PyspecBlockchainTestFixture<PragueBlockchai
 
 public class OsakaBlockchainTests : PyspecBlockchainTestFixture<OsakaBlockchainTests>;
 
+// Engine blockchain tests — only forks with meaningful Engine API differences
+// (e.g. blobs, execution requests, BAL). Regular BlockchainTests cover earlier forks.
+// Directory derived from class name by convention (strip "EngineBlockchainTests", lowercase)
+
+public class CancunEngineBlockchainTests : PyspecEngineBlockchainTestFixture<CancunEngineBlockchainTests>;
+
+public class PragueEngineBlockchainTests : PyspecEngineBlockchainTestFixture<PragueEngineBlockchainTests>;
+
+public class OsakaEngineBlockchainTests : PyspecEngineBlockchainTestFixture<OsakaEngineBlockchainTests>;
+
 // State tests - directory derived from class name by convention (strip "StateTests", lowercase)
 
 public class FrontierStateTests : PyspecStateTestFixture<FrontierStateTests>;