Merge branch 'master' into fix/array-pool-leaks

Author: batrr

.github/workflows/run-expb-reproducible-benchmarks.yml

@@ -50,6 +50,16 @@ on:
           disable. Ignored for non-flat layouts and when additional_extra_flags already sets it.
         required: false
         default: "67108864"
+      expb_env:
+        description: >-
+          Optional environment variables passed to the expb process (KEY=VALUE,
+          comma- or newline-separated). Applies to both single-image and
+          multi-image runs. Enables expb env-gated options, e.g.
+          EXPB_EVM_WARMUP=1 (per-block eth_simulateV1 warmup). Values that
+          themselves contain commas must use the newline-separated form, since
+          commas are treated as entry separators.
+        required: false
+        default: ""
       rebuild_docker:
         description: Rebuild Nethermind Docker image before running benchmarks
         required: false
@@ -119,6 +129,7 @@ jobs:
       delay_seconds: ${{ steps.resolve.outputs.delay_seconds }}
       amount: ${{ steps.resolve.outputs.amount }}
       additional_extra_flags: ${{ steps.resolve.outputs.additional_extra_flags }}
+      expb_env: ${{ steps.resolve.outputs.expb_env }}
       cleanup_grace_seconds: ${{ steps.resolve.outputs.cleanup_grace_seconds }}
       scenario_name: ${{ steps.resolve.outputs.scenario_name }}
       run_count: ${{ steps.resolve.outputs.run_count }}
@@ -148,6 +159,7 @@ jobs:
           DISPATCH_AMOUNT: ${{ inputs.amount }}
           DISPATCH_ADDITIONAL_EXTRA_FLAGS: ${{ inputs.additional_extra_flags }}
           DISPATCH_FLAT_WRITE_BUFFER_FLOOR: ${{ inputs.flat_write_buffer_floor }}
+          DISPATCH_EXPB_ENV: ${{ inputs.expb_env }}
           DISPATCH_REBUILD_DOCKER: ${{ inputs.rebuild_docker }}
           DISPATCH_RUN_COUNT: ${{ inputs.run_count }}
           DISPATCH_DOCKER_IMAGES: ${{ inputs.docker_images }}
@@ -162,6 +174,7 @@ jobs:
           mode="single"
           # Default FlatDb write-buffer floor (bytes) for flat layout; overridden by the dispatch input.
           flat_write_buffer_floor="67108864"
+          expb_env=""
           if [[ "${EVENT_NAME}" == "workflow_dispatch" ]]; then
             branch="${PUSH_BRANCH}"
             state_layout="${DISPATCH_STATE_LAYOUT}"
@@ -179,6 +192,7 @@ jobs:
             fi
             additional_extra_flags="${DISPATCH_ADDITIONAL_EXTRA_FLAGS:-}"
             flat_write_buffer_floor="${DISPATCH_FLAT_WRITE_BUFFER_FLOOR-67108864}"
+            expb_env="${DISPATCH_EXPB_ENV:-}"
             cleanup_grace_seconds="90"
             rebuild_docker="${DISPATCH_REBUILD_DOCKER:-true}"
             run_count="${DISPATCH_RUN_COUNT:-1}"
@@ -333,6 +347,9 @@ jobs:
             echo "additional_extra_flags<<EOF"
             printf '%s\n' "${additional_extra_flags}"
             echo "EOF"
+            echo "expb_env<<EOF"
+            printf '%s\n' "${expb_env}"
+            echo "EOF"
           } >> "${GITHUB_OUTPUT}"
 
   prepare-docker:
@@ -664,11 +681,27 @@ jobs:
         env:
           RAW_RUN_LOG: ${{ runner.temp }}/expb-run.log
           DOTTRACE: ${{ needs.resolve.outputs.dottrace }}
+          EXPB_ENV_PASSTHROUGH: ${{ needs.resolve.outputs.expb_env }}
         run: |
           set -euo pipefail
           expb_pid=""
           : > "${RAW_RUN_LOG}"
 
+          # Export caller-provided expb env tuning (comma- or newline-separated KEY=VALUE;
+          # values containing commas must use the newline-separated form).
+          if [[ -n "${EXPB_ENV_PASSTHROUGH:-}" ]]; then
+            while IFS= read -r _kv; do
+              _kv="$(printf '%s' "${_kv}" | sed 's/^[[:space:]]*//; s/[[:space:]]*$//')"
+              [[ -z "${_kv}" ]] && continue
+              if [[ "${_kv}" =~ ^[A-Za-z_][A-Za-z0-9_]*= ]]; then
+                export "${_kv}"
+                echo "Exported expb env: ${_kv%%=*}=<value>"
+              else
+                echo "::warning::Skipping invalid expb_env entry (expected KEY=VALUE): ${_kv}"
+              fi
+            done < <(printf '%s\n' "${EXPB_ENV_PASSTHROUGH}" | tr ',' '\n')
+          fi
+
           on_terminate() {
             echo "Termination signal received. Waiting up to ${CLEANUP_GRACE_SECONDS}s for expb cleanup."
             if [[ -n "${expb_pid}" ]] && kill -0 "${expb_pid}" 2>/dev/null; then
@@ -1727,11 +1760,27 @@ jobs:
         env:
           RAW_RUN_LOG: ${{ runner.temp }}/expb-run-${{ matrix.tag }}-run${{ matrix.run }}.log
           DOTTRACE: ${{ needs.resolve.outputs.dottrace }}
+          EXPB_ENV_PASSTHROUGH: ${{ needs.resolve.outputs.expb_env }}
         run: |
           set -euo pipefail
           expb_pid=""
           : > "${RAW_RUN_LOG}"
 
+          # Export caller-provided expb env tuning (comma- or newline-separated KEY=VALUE;
+          # values containing commas must use the newline-separated form).
+          if [[ -n "${EXPB_ENV_PASSTHROUGH:-}" ]]; then
+            while IFS= read -r _kv; do
+              _kv="$(printf '%s' "${_kv}" | sed 's/^[[:space:]]*//; s/[[:space:]]*$//')"
+              [[ -z "${_kv}" ]] && continue
+              if [[ "${_kv}" =~ ^[A-Za-z_][A-Za-z0-9_]*= ]]; then
+                export "${_kv}"
+                echo "Exported expb env: ${_kv%%=*}=<value>"
+              else
+                echo "::warning::Skipping invalid expb_env entry (expected KEY=VALUE): ${_kv}"
+              fi
+            done < <(printf '%s\n' "${EXPB_ENV_PASSTHROUGH}" | tr ',' '\n')
+          fi
+
           on_terminate() {
             echo "Termination signal received. Waiting up to ${CLEANUP_GRACE_SECONDS}s for expb cleanup."
             if [[ -n "${expb_pid}" ]] && kill -0 "${expb_pid}" 2>/dev/null; then

AGENTS.md

@@ -203,4 +203,5 @@ This repository contains a dedicated workflow for reproducible payload benchmark
 - The benchmark config is rendered to a temporary file and removed afterward; no source config revert is required.
 - For `pull_request` and `push` auto-runs, default mode is `flat` layout with both `superblocks` and `realblocks` payload sets.
 - Keep benchmark-related changes isolated to the workflow and benchmark guidance unless explicitly asked otherwise.
+- Optional low-variance mode: pass `-f expb_env="EXPB_EVM_WARMUP=1"` to enable expb's per-block EVM warmup (`eth_simulateV1` before each measured block). It serves the measured block's reads from warm caches, which lowers both run-to-run CV (~1.8%→~0.55% on flat-realblocks) and AVG. Pair it with a raised RPC gas cap — `-f additional_extra_flags="--JsonRpc.GasCap=1000000000000"` — otherwise the per-request gas budget (default 100M) is exhausted on dense blocks and the warmup `eth_simulateV1` calls fail with `-38013` (intrinsic gas), silently leaving those blocks un-warmed. Caveat: warmup minimizes cold RocksDB/storage interaction, so it is a low-variance *compute* signal, not a substitute for the default cold benchmark — don't use it when measuring storage-layer changes.
 - dotTrace XML reports are 50-70MB. **Never load full XML into context.** Use [`scripts/dottrace-report.sh`](./scripts/dottrace-report.sh): `top <report.xml> [N]` for hot spots, `compare <a.xml> <b.xml> [N]` for regressions/improvements. Runs in <2 seconds via grep+awk.

scripts/known-failing-hive-tests.txt

@@ -2,15 +2,8 @@
 
 testing_buildBlockV1/build-block-empty-transactions (nethermind)
 testing_buildBlockV1/build-block-with-transactions (nethermind)
-
-# eth_simulateV1 — execution-apis spec ↔ test fixture mismatches. Tracked in
-# https://github.com/NethermindEth/nethermind/issues/11412
-eth_simulateV1/ethSimulate-basefee-too-low-with-validation-38012 (nethermind)
-eth_simulateV1/ethSimulate-check-invalid-nonce (nethermind)
-eth_simulateV1/ethSimulate-gas-fees-and-value-error-38014-with-validation (nethermind)
-eth_simulateV1/ethSimulate-simple-no-funds-with-validation (nethermind)
-eth_simulateV1/ethSimulate-simple-no-funds-with-validation-without-nonces (nethermind)
-eth_simulateV1/ethSimulate-simple-send-from-contract-with-validation (nethermind)
+eth_config/get-config (nethermind)
+eth_capabilities/get-capabilities (nethermind)
 
 # graphql
 

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

@@ -6,6 +6,6 @@ namespace Ethereum.Blockchain.Pyspec.Test;
 public class Constants
 {
     public const string ARCHIVE_URL_TEMPLATE = "https://github.com/ethereum/execution-specs/releases/download/{0}/{1}";
-    public const string DEFAULT_ARCHIVE_VERSION = "tests-bal@v7.3.1";
+    public const string DEFAULT_ARCHIVE_VERSION = "tests-bal@v7.3.2";
     public const string DEFAULT_ARCHIVE_NAME = "fixtures_bal.tar.gz";
 }

src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs

@@ -448,7 +448,7 @@ private static readonly (string ExpectedError, string Substring)[] ValidationErr
         ("TransactionException.INITCODE_SIZE_EXCEEDED", "max initcode size exceeded"),
         ("TransactionException.NONCE_MISMATCH_TOO_LOW", "nonce too low"),
         ("TransactionException.NONCE_MISMATCH_TOO_HIGH", "nonce too high"),
-        ("TransactionException.INSUFFICIENT_MAX_FEE_PER_BLOB_GAS", "InsufficientMaxFeePerBlobGas: Not enough to cover blob gas fee"),
+        ("TransactionException.INSUFFICIENT_MAX_FEE_PER_BLOB_GAS", "max fee per blob gas less than block blob gas fee"),
         ("TransactionException.TYPE_1_TX_PRE_FORK", "InvalidTxType: Transaction type in"),
         ("TransactionException.TYPE_2_TX_PRE_FORK", "InvalidTxType: Transaction type in"),
         ("TransactionException.TYPE_3_TX_PRE_FORK", "InvalidTxType: Transaction type in"),

src/Nethermind/Ethereum.Test.Base/TransactionTestBase.cs

@@ -137,7 +137,7 @@ private static bool ExceptionMatches(string expected, string observed)
         ["TransactionException.TYPE_3_TX_ZERO_BLOBS"] = ["blob transaction must have at least 1 blob"],
         ["TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH"] = ["InvalidBlobVersionedHashVersion"],
         ["TransactionException.TYPE_3_TX_CONTRACT_CREATION"] = ["blob transaction of type create"],
-        ["TransactionException.INSUFFICIENT_MAX_FEE_PER_BLOB_GAS"] = ["InsufficientMaxFeePerBlobGas"],
+        ["TransactionException.INSUFFICIENT_MAX_FEE_PER_BLOB_GAS"] = ["max fee per blob gas less than block blob gas fee"],
     };
 }
 

src/Nethermind/Nethermind.Api/IApiWithBlockchain.cs

@@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using Nethermind.Blockchain;
-using Nethermind.Config;
 using Nethermind.Consensus;
 using Nethermind.Consensus.Comparers;
 using Nethermind.Consensus.Processing;
@@ -26,8 +24,6 @@ public interface IApiWithBlockchain : IApiWithStores
         IBlockProducer? BlockProducer { get; set; }
         IBlockProducerRunner BlockProducerRunner { get; set; }
 
-        IEnode? Enode { get; set; }
-
         IManualBlockProductionTrigger ManualBlockProductionTrigger { get; }
         ISealer Sealer { get; }
         ISealEngine SealEngine { get; }
@@ -47,14 +43,6 @@ public interface IApiWithBlockchain : IApiWithStores
         [SkipServiceCollection]
         ITxValidator? HeadTxValidator { get; }
 
-        /// <summary>
-        /// Manager of block finalization
-        /// </summary>
-        /// <remarks>
-        /// Currently supported in <see cref="SealEngineType.AuRa"/> and Eth2Merge.
-        /// </remarks>
-        IBlockFinalizationManager? FinalizationManager { get; set; }
-
         IBlockProducerEnvFactory BlockProducerEnvFactory { get; }
 
         IBlockProductionPolicy? BlockProductionPolicy { get; set; }

src/Nethermind/Nethermind.Api/NethermindApi.cs

@@ -67,7 +67,6 @@ ILifetimeScope Context
         public IDbProvider DbProvider => Context.Resolve<IDbProvider>();
         public ISigner? EngineSigner { get; set; }
         public ISignerStore? EngineSignerStore { get; set; }
-        public IEnode? Enode { get; set; }
         public IEthereumEcdsa EthereumEcdsa => Context.Resolve<IEthereumEcdsa>();
         public IFileSystem FileSystem => Context.Resolve<IFileSystem>();
         public IEngineRequestsTracker EngineRequestsTracker => Context.Resolve<IEngineRequestsTracker>();
@@ -111,7 +110,6 @@ ILifetimeScope Context
         public ITxPool? TxPool { get; set; }
         public TxValidator? TxValidator => Context.Resolve<TxValidator>();
         public ITxValidator? HeadTxValidator => Context.ResolveOptionalKeyed<ITxValidator>(ITxValidator.HeadTxValidatorKey);
-        public IBlockFinalizationManager? FinalizationManager { get; set; }
 
         public IBlockProducerEnvFactory BlockProducerEnvFactory => Context.Resolve<IBlockProducerEnvFactory>();
         public IBlockProductionPolicy? BlockProductionPolicy { get; set; }

src/Nethermind/Nethermind.AuRa.Test/Validators/ContractBasedValidatorTests.cs

@@ -158,7 +158,7 @@ public void initializes_pendingValidators_from_db()
         IAuRaValidator validator = new ContractBasedValidator(_validatorContract, _blockTree, _receiptsStorage, _validatorStore, _validSealerStrategy, _blockFinalizationManager, default, _logManager, 1);
 
         _blockFinalizationManager.BlocksFinalized +=
-            Raise.EventWith(new FinalizeEventArgs(_block.Header,
+            Raise.EventWith(new AuRaFinalizeEventArgs(_block.Header,
                 Build.A.BlockHeader.WithNumber(blockNumber).WithHash(blockHash).TestObject));
 
         Assert.That(validator.Validators, Is.EqualTo(validators));
@@ -526,7 +526,7 @@ public void consecutive_initiate_change_gets_finalized_and_switch_validators(Con
             int finalizedNumber = blockNumber - validator.Validators.MinSealersForFinalization() + 1;
             _blockFinalizationManager.GetLastLevelFinalizedBy(_block.Header.Hash).Returns(finalizedNumber);
             _blockFinalizationManager.BlocksFinalized += Raise.EventWith(
-                new FinalizeEventArgs(_block.Header, Build.A.BlockHeader.WithNumber(finalizedNumber)
+                new AuRaFinalizeEventArgs(_block.Header, Build.A.BlockHeader.WithNumber(finalizedNumber)
                         .WithHash(Keccak.Compute((finalizedNumber + hashSeeds[finalizedNumber]).ToString())).TestObject));
 
             currentValidators = test.GetCurrentValidators(blockNumber);

src/Nethermind/Nethermind.AuRa.Test/Validators/MultiValidatorTests.cs

@@ -100,7 +100,7 @@ public void creates_inner_validators()
 
             foreach (long blockNumber in _validator.Validators.Keys.Skip(1))
             {
-                _finalizationManager.BlocksFinalized += Raise.EventWith(new FinalizeEventArgs(
+                _finalizationManager.BlocksFinalized += Raise.EventWith(new AuRaFinalizeEventArgs(
                     Build.A.BlockHeader.WithNumber(blockNumber + 1).TestObject, Build.A.BlockHeader.WithNumber(blockNumber).TestObject));
             }
 
@@ -191,7 +191,7 @@ private void ProcessBlocks(long count, IAuRaValidator validator, int blocksToFin
                 int finalizedBlock = i - blocksToFinalization;
                 if (finalizedBlock >= 1)
                 {
-                    _finalizationManager.BlocksFinalized += Raise.EventWith(new FinalizeEventArgs(
+                    _finalizationManager.BlocksFinalized += Raise.EventWith(new AuRaFinalizeEventArgs(
                         Build.A.BlockHeader.WithNumber(i).TestObject,
                         Build.A.BlockHeader.WithNumber(finalizedBlock).TestObject));
                 }