Amsterdam: EIP-8037: State Creation Gas Cost Increase by daniellehrner · Pull Request #9815 · besu-eth/besu

daniellehrner · 2026-02-16T15:50:58Z

PR description

Adds support for EIP-8037 for Amsterdam:

State gas infrastructure: New StateGasCostCalculator interface + Eip8037StateGasCostCalculator with dynamic cost_per_state_byte (quantized, from block gas limit). Two new AtomicLong fields in TxValues: stateGasUsed and
stateGasReservoir.
Reservoir model: MainnetTransactionProcessor splits execution gas into gasLeft (capped at 16.7M) and reservoir (overflow). MessageFrame.consumeStateGas() draws from reservoir first, then regular gas.
Gas cost splits: AmsterdamGasCalculator reduces regular gas for all state-creation operations (CREATE 32K→9K, SSTORE set 20K→2.9K, new account 25K→0, etc). State portion charged via charge*StateGas() methods at each
operation call site.
2D block accounting: gas_used = max(block_regular_gas, block_state_gas). Calldata floor applies to regular dimension only. TransactionProcessingResult carries both dimensions. GasState record tracks both during block
building.
Pre-Amsterdam unchanged: StateGasCostCalculator.NONE is a no-op, reservoir is always 0, all charge* methods return true.
Block building: BlockTransactionSelector tracks cumulative regular and state gas separately via GasState. A transaction is rejected if adding it would exceed the block gas limit in either dimension. Post-execution
validation checks both dimensions since state gas is only known after execution.

Copilot

Pull request overview

This PR implements EIP-8037, which introduces multidimensional gas metering for the Amsterdam hard fork. The main purpose is to split gas costs into regular gas and state gas dimensions, with state-creation operations (CREATE, SSTORE, code deposits, etc.) having their costs dynamically calculated based on block gas limits.

Changes:

Introduces StateGasCostCalculator interface and Eip8037StateGasCostCalculator implementation with dynamic cost-per-state-byte calculations
Implements reservoir gas model where transaction gas is split between regular gas (capped at 16.7M) and overflow reservoir for state gas consumption
Adds 2D block gas accounting where gas_metered = max(regular_gas, state_gas) for block capacity checks

Reviewed changes

Copilot reviewed 29 out of 29 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
`StateGasCostCalculator.java`	Defines strategy interface for state gas calculations with default no-op implementation
`Eip8037StateGasCostCalculator.java`	Implements EIP-8037 state gas cost calculations with quantized cost-per-state-byte formula
`AmsterdamGasCalculator.java`	Extends OsakaGasCalculator with reduced regular gas costs for state-creation operations
`TxValues.java`	Adds atomic fields for tracking state gas used and reservoir
`MessageFrame.java`	Adds state gas consumption methods and reservoir management
`TransactionProcessingResult.java`	Adds stateGasUsed field to track state gas dimension
`MainnetTransactionProcessor.java`	Implements reservoir initialization and runtime TX_MAX_GAS_LIMIT enforcement on regular gas
`BlockGasAccountingStrategy.java`	Extends interface to support 2D gas accounting with regular and state dimensions
`GasState.java`	New record tracking cumulative regular and state gas during block building
`BlockSizeTransactionSelector.java`	Updates to use 2D gas state for transaction selection with capacity checks across both dimensions

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

evm/src/main/java/org/hyperledger/besu/evm/gascalculator/StateGasCostCalculator.java

...rc/main/java/org/hyperledger/besu/ethereum/blockcreation/txselection/selectors/GasState.java

...eum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockGasAccountingStrategy.java

Implement state gas tracking in the EVM layer: - StateGasCostCalculator and Eip8037StateGasCostCalculator for cost-per-state-byte - AmsterdamGasCalculator with split regular/state gas costs - MessageFrame state gas reservoir, spill, and collision tracking - State gas charging in SSTORE, CREATE, CALL, and SELFDESTRUCT operations Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

Wire state gas into transaction processing, block building, and validation: - MainnetTransactionProcessor: intrinsic state gas, reservoir init, spill handling - BlockGasAccountingStrategy.AMSTERDAM: 2D gas metering (max of regular, state) - BlockGasUsedValidator.AMSTERDAM: pre-refund 2D validation - OsakaTargetingGasLimitCalculator: Amsterdam constructor with uncapped tx gas limit - Block creation: 2D headroom checks for transaction selection - TransactionProcessingResult: carry state gas used Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

Update reference test fixtures to bal@v5.2.0 for EIP-8037 compatibility. Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

Extract gas accounting logic from MainnetTransactionProcessor into a testable TransactionGasAccounting class with builder pattern. Add tests for SSTORE state gas, block gas accounting strategy, state gas spill, and regular gas limit enforcement. Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

e.g. ./gradlew --no-daemon :ethereum:core:jmh -Pincludes=Mod -Pexcludes=Mul,Add,SMod -Pcases=MOD_256_128,MOD_256_192 Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

…eth#9972) * preserve caller-provided gas prices in TransactionSimulator When isAllowExceedingBalance is true but the caller explicitly provided non-zero gas pricing parameters, preserve them and the block header's baseFee so effective gas price is computed correctly during execution. This ensures gas fees are actually charged so that stateRoot and block hash are correct in eth_simulateV1 results. When gas params are absent or zero (typical eth_call, or explicitly zero maxFeePerGas), behavior is unchanged - all fields stay zero and baseFee is zeroed to avoid validation failures. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

daniellehrner · 2026-03-09T10:39:53Z

Tests with the latest version of the spec tests can be run with:

./gradlew referenceTestsDevnet --tests "*_amsterdam_*"

…adle task Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

daniellehrner · 2026-03-09T15:46:12Z

ethereum/referencetests/build.gradle

        'src/reference-test/resources/custom'
    }
  }
+  referenceTestDevnet {


Before we were always bulding the referenceTestDevnet classes, but not running them in the CI. Now we are not enough buidling them. This separation of referenceTestDevnet from referenceTests is needed, because the new test v5.3 contains all tests back to Frontier and not only the Amsterdam ones. This makes buidling them too strainous in the CI where we only want to run the referenceTests task

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessor.java

evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCreateOperation.java

# Conflicts: # ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/OsakaTargetingGasLimitCalculator.java

matkt

For safety reason it will be nice to have a second reviewer (@fab-10 ) and hoodi fullsync

...creation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessor.java

...um/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java

evm/src/main/java/org/hyperledger/besu/evm/operation/SStoreOperation.java

evm/src/main/java/org/hyperledger/besu/evm/processor/ContractCreationProcessor.java

evm/src/main/java/org/hyperledger/besu/evm/frame/MessageFrame.java

...rc/main/java/org/hyperledger/besu/ethereum/blockcreation/txselection/selectors/GasState.java

fab-10 · 2026-03-11T16:32:04Z

...erledger/besu/ethereum/blockcreation/txselection/selectors/BlockSizeTransactionSelector.java

-    setWorkingState(getWorkingState() + gasUsedByTransaction);
-
+    final long regularGasUsed =
+        gasAccountingStrategy.calculateBlockGas(


the method name calculateBlockGas is not clear, since it seems related to the block, while it is for a tx

I see that you renamed the variable, that's fine but also the method could named to better reflect what it does

...erledger/besu/ethereum/blockcreation/txselection/selectors/BlockSizeTransactionSelector.java

...um/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionGasAccounting.java

...encetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/AccountChangesJson.java

evm/src/main/java/org/hyperledger/besu/evm/frame/MessageFrame.java

Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

fab-10

LGTM just a nit: a method naming

fab-10 · 2026-03-12T16:49:51Z

...erledger/besu/ethereum/blockcreation/txselection/selectors/BlockSizeTransactionSelector.java

-    setWorkingState(getWorkingState() + gasUsedByTransaction);
-
+    final long regularGasUsed =
+        gasAccountingStrategy.calculateBlockGas(


I see that you renamed the variable, that's fine but also the method could named to better reflect what it does

fab-10 · 2026-03-12T17:15:32Z

...erledger/besu/ethereum/blockcreation/txselection/selectors/BlockSizeTransactionSelector.java

-  private boolean blockOccupancyAboveThreshold(final long cumulativeGasUsed) {
-    final long gasRemaining = blockGasLimit - cumulativeGasUsed;
-    final double occupancyRatio = (double) cumulativeGasUsed / (double) blockGasLimit;
+  private boolean blockOccupancyAboveThreshold(final GasState state) {


…sactionRegularGas Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

…Processor.java, AbstractBlockProcessorTest.java 2. move handleStateGasSpill into its own method 3. Added CREATE state gas underflow guard 4. Improved failCodeDepositWithoutRollback documentation Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

daniellehrner · 2026-03-16T10:12:52Z

For safety reason it will be nice to have a second reviewer (@fab-10 ) and hoodi fullsync

@fab-10 @matkt Hoodi full sync has finished over the weekend without issues:

* EIP-8037: multidimensional gas metering - EVM core Implement state gas tracking in the EVM layer: - StateGasCostCalculator and Eip8037StateGasCostCalculator for cost-per-state-byte - AmsterdamGasCalculator with split regular/state gas costs - MessageFrame state gas reservoir, spill, and collision tracking - State gas charging in SSTORE, CREATE, CALL, and SELFDESTRUCT operations Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * EIP-8037: protocol-level 2D gas accounting integration Wire state gas into transaction processing, block building, and validation: - MainnetTransactionProcessor: intrinsic state gas, reservoir init, spill handling - BlockGasAccountingStrategy.AMSTERDAM: 2D gas metering (max of regular, state) - BlockGasUsedValidator.AMSTERDAM: pre-refund 2D validation - OsakaTargetingGasLimitCalculator: Amsterdam constructor with uncapped tx gas limit - Block creation: 2D headroom checks for transaction selection - TransactionProcessingResult: carry state gas used Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * EIP-8037: update execution spec tests for bal-devnet-3 Update reference test fixtures to bal@v5.2.0 for EIP-8037 compatibility. Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * EIP-8037: extract TransactionGasAccounting and add test coverage Extract gas accounting logic from MainnetTransactionProcessor into a testable TransactionGasAccounting class with builder pattern. Add tests for SSTORE state gas, block gas accounting strategy, state gas spill, and regular gas limit enforcement. Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * trigger DCO re-check Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * Add -Pcases to jmh (besu-eth#9982) e.g. ./gradlew --no-daemon :ethereum:core:jmh -Pincludes=Mod -Pexcludes=Mul,Add,SMod -Pcases=MOD_256_128,MOD_256_192 Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * Preserve caller-provided gas pricing in eth_simulateV1 results (besu-eth#9972) * preserve caller-provided gas prices in TransactionSimulator When isAllowExceedingBalance is true but the caller explicitly provided non-zero gas pricing parameters, preserve them and the block header's baseFee so effective gas price is computed correctly during execution. This ensures gas fees are actually charged so that stateRoot and block hash are correct in eth_simulateV1 results. When gas params are absent or zero (typical eth_call, or explicitly zero maxFeePerGas), behavior is unchanged - all fields stay zero and baseFee is zeroed to avoid validation failures. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * trigger DCO re-check Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * spotless Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * update to BAL v5.3.0 spec tests Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * remove referenceTestDevnet test compilation from the referenceTest gradle task Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * addressed comments Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * renamed BlockGasAccountingStrategy.calculateBlockGas to calculateTransactionRegularGas Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * 1. use BlockGasAccountingStrategy.hasBlockCapacity() in AbstractBlockProcessor.java, AbstractBlockProcessorTest.java 2. move handleStateGasSpill into its own method 3. Added CREATE state gas underflow guard 4. Improved failCodeDepositWithoutRollback documentation Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> --------- Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Simon Dudley <simon.dudley@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

@macfarla

* Add -Pcases to jmh (#9982) e.g. ./gradlew --no-daemon :ethereum:core:jmh -Pincludes=Mod -Pexcludes=Mul,Add,SMod -Pcases=MOD_256_128,MOD_256_192 Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * Preserve caller-provided gas pricing in eth_simulateV1 results (#9972) * preserve caller-provided gas prices in TransactionSimulator When isAllowExceedingBalance is true but the caller explicitly provided non-zero gas pricing parameters, preserve them and the block header's baseFee so effective gas price is computed correctly during execution. This ensures gas fees are actually charged so that stateRoot and block hash are correct in eth_simulateV1 results. When gas params are absent or zero (typical eth_call, or explicitly zero maxFeePerGas), behavior is unchanged - all fields stay zero and baseFee is zeroed to avoid validation failures. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * Fix edge cases for MOD variants (#9934) This commit fixes 2 issues: - in mulSubOverflow there was no addBack in case of limb overflow; - reductions were too few in the case that the higher limb exceeds modulus. Co-authored-by: Luis Pinto <luis.pinto@consensys.net> Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * Removing memoize from the signature algorithm (#8619) (#9777) Removing memoize from the signature algorithm (#8619) Signed-off-by: mamoralesiob <miguelangel@io.builders> Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * Benchmarking docs (#9998) * Update benchmarking docs with -Pcases Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * CHANGELOG for #9982 Signed-off-by: Simon Dudley <simon.dudley@consensys.net> --------- Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * Disconnect reason (#9901) * return the correct disconnect reason Signed-off-by: stefan.pingel@consensys.net <stefan.pingel@consensys.net> Signed-off-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> * Migrate JSR305 nullness annotations to JSpecify (#9995) - Replace javax.annotation.Nullable and javax.annotation.CheckForNull with org.jspecify.annotations.Nullable across 18 Java files - Update platform constraint to org.jspecify:jspecify:1.0.0 - Replace compileOnly com.google.code.findbugs:jsr305 with compileOnly org.jspecify:jspecify in affected modules Signed-off-by: Mykim <38449976+Apisapple@users.noreply.github.com> Co-authored-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Mykim <kimminyong2034@gmail.com> * Fix flaky BundleSelectorPluginTest on slow CI runners (#9999) Increase poa-block-txs-selection-max-time to 95% for the bundle failure tests so the plugin has ~712ms instead of ~562ms to process transactions. The failure tests are not testing timeout behaviour, so the tighter budget was only causing intermittent PLUGIN_SELECTION_TIMEOUT events on loaded CI machines before the invalid transaction could be reached. Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * Fix flaky BackwardSyncContextTest on slow CI runners (#10000) shouldSyncUntilHash and shouldSyncUntilRemoteBranch used isCompleted() inside untilAsserted, which only passes for normal completion. On slow CI machines the backward sync occasionally completes the future exceptionally, causing isCompleted() to fail on every retry until the 30s Awaitility timeout, which then rethrows the AssertionError. Change to isDone() inside the Awaitility block (matching the fix applied to shouldAddExpectedBlock in #9856) so Awaitility exits as soon as the future reaches any terminal state. The subsequent future.get() will then surface the real exception if the sync failed. Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * potential fix for race condidion affecting ATs (#9929) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Use sha256 hardware implementation (#9924) * use sha256 hardware implementation if available, if not fall back to sun.security.provider.SHA2$SHA256 Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> --------- Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * Log ENR URL at startup alongside enode URL (#10003) When discovery produces a local ENR, log it at INFO level right after the enode URL so operators can easily find both identifiers. Closes #9967 Signed-off-by: Usman Saleem <usman@usmans.info> * fix(metrics): prevent duplicate OTel callback registration (#9653) (#9957) Signed-off-by: kkaur01 <kanchan.kaur@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Kanchan Kaur <87459628+kkaur01@users.noreply.github.com> * disable forest TraceJsonRpcHttpBySpecTest (#10005) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Add config option for max blobs per block (#9983) * add max-blobs-per-block CLI option Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update GitHub repository references from hyperledger/besu to besu-eth/besu (#10015) Prepare for org migration by updating all GitHub repository references to the new besu-eth organization. External service URLs (Docker Hub, Artifactory, docs site, homebrew, wiki, email) are intentionally left unchanged for a separate rebranding phase. Closes #9911 (Phase 1 final step) Signed-off-by: jflo <justin+github@florentine.us> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Justin Florentine <justin+github@florentine.us> * 26.3.0-rc0 prep (#10017) * Update GitHub repository references from hyperledger/besu to besu-eth/besu Prepare for org migration by updating all GitHub repository references to the new besu-eth organization. External service URLs (Docker Hub, Artifactory, docs site, homebrew, wiki, email) are intentionally left unchanged for a separate rebranding phase. Closes #9911 (Phase 1 final step) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: jflo <justin+github@florentine.us> * Update platform/build.gradle Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Justin Florentine <justin+github@florentine.us> * updated changelog and version Signed-off-by: jflo <justin+github@florentine.us> --------- Signed-off-by: jflo <justin+github@florentine.us> Signed-off-by: Justin Florentine <justin+github@florentine.us> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * enable local gradle caching (#10008) * enable gradle caching and configureondemand Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * comment Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * add comment and remove configureondemand Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Use existing RLP methods in trie log prune batch files (#10009) * feat: replace Java serialization with RLP in trie log prune batch files Replace saveTrieLogsInFile/readTrieLogsFromFile with the existing RLP-based saveTrieLogsAsRlpInFile/readTrieLogsAsRlpFromFile methods. Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * Add compressed ECDH key agreement to SecurityModule (#10007) Add `calculateECDHKeyAgreementCompressed` to the `SecurityModule` plugin API and its implementations, returning the full SEC1 compressed EC point (33 bytes) instead of just the x-coordinate. This is needed by the DiscV5 handshake which requires the compressed shared secret. Changes: - Add `calculateECDHKeyAgreementCompressed` default method to `SecurityModule` - Implement in `KeyPairSecurityModule` and expose via `NodeKey` - Extract shared `ecdhScalarMultiply` helper in `AbstractSECP256` to eliminate duplication between the x-only and compressed ECDH variants - Use `ECAlgorithms.cleanPoint` for EC point validation (curve membership check) - Add unit tests for ECDH key agreement across SECP256K1, SECP256R1, KeyPairSecurityModule, and NodeKey - Update plugin-api known checksum --------- Signed-off-by: Usman Saleem <usman@usmans.info> * Delay chain download if no peers, and handle cancellation ex (#9979) * delay snap chain download if zero peers * handle cancellation eg if no peers Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Add ENR v5 bootnodes support for DiscV5 discovery (#9970) Add ENR (enr:) bootnode support for DiscV5 discovery by introducing a new v5Bootnodes section in genesis config alongside the existing bootnodes (enode) section. Genesis config changes: - Add v5Bootnodes to config.discovery for ENR-format bootnodes - Add getV5BootNodes() to DiscoveryOptions to parse the new section - Populate mainnet.json with 17 ENR bootnodes and hoodi.json with 9 Bootnode parsing simplification: - Use --Xv5-discovery-enabled flag to determine expected format (ENR vs enode) instead of prefix detection heuristic - EthNetworkConfig reads bootnodes and v5Bootnodes independently - CLI --bootnodes overrides the active protocol's list and clears the unused protocol's list; genesis defaults keep both intact - Replace heuristic fallback in getBootnodeIdentifiers() with explicit discoveryV5Enabled flag check DiscV5 peer connection pipeline fixes: - Handle compressed public keys (33-byte SEC1) in NodeKeySigner.deriveECDHKeyAgreement - Fix candidatePeers() to use isListening() instead of isReadyForConnections() which requires DiscV4 bonding status - Filter out the local node record from streamLiveNodes() - Explicitly use secp256k1 for ENR identity scheme v4 Cleanup: - Remove dead MAINNET fallback null-checks in RunnerBuilder --------- Signed-off-by: Usman Saleem <usman@usmans.info> * Remove Clique RPC APIs and remaining DSL test infrastructure (Phase 2) (#9992) Delete the Clique JSON-RPC method implementations (clique_getSigners, clique_propose, clique_discard, clique_proposals, clique_getSignerMetrics, clique_getSignersAtHash) and all supporting classes: - consensus/clique/.../jsonrpc/ (production + test, 12 files) - CliqueQueryPluginServiceFactory (replaced with NoopPluginServiceFactory) - Acceptance-test DSL: condition/clique/ and transaction/clique/ packages - NodeRequests: drop CliqueRequestFactory field and clique() accessor - AcceptanceTestBase: drop clique/cliqueTransactions fields - BesuNode: remove CliqueRequestFactory from NodeRequests construction - NodeConfigurationFactory: remove createJsonRpcWithCliqueEnabledConfig() - BftConditions / AwaitValidatorSetChange: inline "latest" constant Remove RpcMethod entries CLIQUE_* and RpcApis.CLIQUE enum value. CliqueBesuControllerBuilder no longer overrides createAdditionalJsonRpcMethodFactory. Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * Implement EIP-7975: eth/70 - partial block receipt lists (#9910) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * Remove pre-eth/68 transaction announcement support and limit pooled tx requests by size (#9990) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Fix addMod case in Modulus256 (#10001) Fixes case in addMod for 256bit modulus, changes some strange logic in 64bit modulus for reduceNormalised with UInt256 and UInt257 dividends and refactor of unit tests to use parameterized tests. Signed-off-by: Luis Pinto <luis.pinto@consensys.net> * Use VarHandle in UInt256::fromBytesBE and uInt256::toBytesBE (#9976) Signed-off-by: Luis Pinto <luis.pinto@consensys.net> * Update --bootnodes description and throw exception is mixed enode and ENR bootnodes are present (#9955) * Update --bootnodes description and throw exception is mixed enode and ENR bootnodes are present Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> * Fix BesuCommandTest Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> * Revert changes to BesuCommand Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> * Revert changes to BesuCommand Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> * Apply suggestion from @macfarla Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Matilda-Clerke <matilda.clerke@consensys.net> --------- Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> Signed-off-by: Matilda-Clerke <matilda.clerke@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> * Remove Peer Task System feature toggle from DownloadBodiesStep (#9952) * Remove Peer Task System feature toggle from DownloadBodiesStep Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> * Fix FullSyncChainDownloaderForkTest Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> * Remove invalid test Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> * spotless Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> * Fix FullSyncChainDownloaderTotalTerminalDifficultyTest Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> * Remove unneeded old code Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> * Fix infinite loop in CompleteBlocksWithPeerTask and add unit test Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> --------- Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> Signed-off-by: Matilda-Clerke <matilda.clerke@consensys.net> * Support IPv6 subnets in --net-restrict (#10028) * Replace commons-net SubnetUtils with IPAddress library for IPv6 subnet support Apache Commons Net SubnetUtils only supports IPv4 CIDR notation, causing --net-restrict to fail at CLI parse time for IPv6 subnets (e.g. fd00::/64). Replace it with the IPAddress library (com.github.seancfoley:ipaddress) which supports both IPv4 and IPv6 CIDR notation natively. Closes #10026 Signed-off-by: Usman Saleem <usman@usmans.info> * Address PR review: rename SubnetInfoConverter and add mixed IPv4+IPv6 test - Rename SubnetInfoConverter to SubnetCidrConverter to match new IPAddress return type - Add mixed IPv4+IPv6 test case ("127.0.0.0/24,fd00::/64") to BesuCommandTest parameterized net-restrict tests Signed-off-by: Usman Saleem <usman@usmans.info> * Add changelog entry for IPv6 --net-restrict support Signed-off-by: Usman Saleem <usman@usmans.info> --------- Signed-off-by: Usman Saleem <usman@usmans.info> * Implement `txpool_status` RPC method (#10002) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * fix: add missing return for failed future in TransactionPool SaveRest… (#10020) * fix: add missing return for failed future in TransactionPool SaveRestoreManager The serializeAndDedupOperation() method creates a CompletableFuture.failedFuture() when the disk access lock times out, but does not return it. Execution falls through to return CompletableFuture.completedFuture(null), silently swallowing the timeout error. This can cause the transaction pool save/restore to silently fail, leading to loss of all pending transactions during sync state transitions. Signed-off-by: Shridhar Panigrahi <sridharpanigrahi2006@gmail.com> * test: add test verifying timeout failure is propagated in SaveRestoreManager Add diskLockTimeoutIsPropagatedNotSwallowed test that acquires the disk access lock to simulate contention, then verifies that loadFromDisk() returns a failed future with TimeoutException rather than silently returning completedFuture(null). Also adds @VisibleForTesting accessors for getSaveRestoreManager() and getDiskAccessLock() to support the test. Signed-off-by: Shridhar Panigrahi <sridharpanigrahi2006@gmail.com> * refactor: make SaveRestoreManager lock timeout configurable and simplify test assertion Address PR review feedback: make the disk access lock timeout configurable via a package-private setter so tests can use a short timeout (100ms) instead of blocking for 60 seconds. Simplify the test assertion to use assertThatThrownBy for cleaner style. Signed-off-by: Shridhar Panigrahi <sridharpanigrahi2006@gmail.com> * refactor: expose save-restore lock timeout as unstable CLI option Add --Xtx-pool-save-restore-timeout as a hidden unstable option in TransactionPoolOptions, wired through TransactionPoolConfiguration, so SaveRestoreManager reads the timeout from config instead of using a @VisibleForTesting setter. This avoids modifying production code solely for testing and allows operators to tune the timeout for special use cases. Signed-off-by: Shridhar Panigrahi <sridharpanigrahi2006@gmail.com> --------- Signed-off-by: Shridhar Panigrahi <sridharpanigrahi2006@gmail.com> Signed-off-by: Cyrus <sridharpanigrahi2006@gmail.com> * Remove deprecation warning from `--block-txs-selection-max-time` still used in PoS networks (#10037) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Change log level to debug (#10023) Signed-off-by: stefan.pingel@consensys.net <stefan.pingel@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> * Throw RLPException that is handled correctly instead of IllegalArgumentException (#10025) * throw RLPException that is handled correctly instead of IllegalArgumentException Signed-off-by: stefan.pingel@consensys.net <stefan.pingel@consensys.net> Signed-off-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * remove invalid warning pre glamsterdam (#10049) Signed-off-by: Karim Taam <karim.t2am@gmail.com> * Remove Clique block production and mining infrastructure (Phase 3) (#10035) Delete the blockcreation sub-package (6 production files + 6 test files): CliqueBlockCreator, CliqueBlockMiner, CliqueBlockScheduler, CliqueMinerExecutor, CliqueMiningCoordinator, CliqueProposerSelector, and CliqueMiningTracker. CliqueBesuControllerBuilder.createMiningCoordinator() now returns NoopMiningCoordinator. The overrideMiningConfiguration() override is removed (no longer forcing mining on). The localAddress field is removed as it was only needed for mining setup. CliqueProposerSelector is moved from blockcreation/ to the main clique package since it is still needed by CliqueHelpers.getProposerForBlockAfter(), which is called by CliqueDifficultyCalculator for block validation on Clique→PoS chains. EthStatsService no longer special-cases CliqueMiningCoordinator for isMining reporting; it falls through to the standard miningCoordinator.isMining() path. Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: use block's own hash for balance lookup in eth_estimateGas (#10042) calculateGasLimitUpperBound() was using blockHeader.getParentHash() to look up the sender's account balance. For historical and "latest" blocks this queries the state one block behind the state actually used by the transaction simulator, which can produce wrong gas estimates or spurious TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE errors when the sender's balance changed in the target block. Use the block's own hash (BlockHeader.getHash()) for concrete headers, keeping getParentHash() only for synthetic pending headers whose block does not yet exist. Signed-off-by: Shridhar Panigrahi <sridharpanigrahi2006@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: Cyrus <sridharpanigrahi2006@gmail.com> * Amsterdam: EIP-8037: State Creation Gas Cost Increase (#9815) * EIP-8037: multidimensional gas metering - EVM core Implement state gas tracking in the EVM layer: - StateGasCostCalculator and Eip8037StateGasCostCalculator for cost-per-state-byte - AmsterdamGasCalculator with split regular/state gas costs - MessageFrame state gas reservoir, spill, and collision tracking - State gas charging in SSTORE, CREATE, CALL, and SELFDESTRUCT operations Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * EIP-8037: protocol-level 2D gas accounting integration Wire state gas into transaction processing, block building, and validation: - MainnetTransactionProcessor: intrinsic state gas, reservoir init, spill handling - BlockGasAccountingStrategy.AMSTERDAM: 2D gas metering (max of regular, state) - BlockGasUsedValidator.AMSTERDAM: pre-refund 2D validation - OsakaTargetingGasLimitCalculator: Amsterdam constructor with uncapped tx gas limit - Block creation: 2D headroom checks for transaction selection - TransactionProcessingResult: carry state gas used Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * EIP-8037: update execution spec tests for bal-devnet-3 Update reference test fixtures to bal@v5.2.0 for EIP-8037 compatibility. Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * EIP-8037: extract TransactionGasAccounting and add test coverage Extract gas accounting logic from MainnetTransactionProcessor into a testable TransactionGasAccounting class with builder pattern. Add tests for SSTORE state gas, block gas accounting strategy, state gas spill, and regular gas limit enforcement. Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * trigger DCO re-check Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * Add -Pcases to jmh (#9982) e.g. ./gradlew --no-daemon :ethereum:core:jmh -Pincludes=Mod -Pexcludes=Mul,Add,SMod -Pcases=MOD_256_128,MOD_256_192 Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * Preserve caller-provided gas pricing in eth_simulateV1 results (#9972) * preserve caller-provided gas prices in TransactionSimulator When isAllowExceedingBalance is true but the caller explicitly provided non-zero gas pricing parameters, preserve them and the block header's baseFee so effective gas price is computed correctly during execution. This ensures gas fees are actually charged so that stateRoot and block hash are correct in eth_simulateV1 results. When gas params are absent or zero (typical eth_call, or explicitly zero maxFeePerGas), behavior is unchanged - all fields stay zero and baseFee is zeroed to avoid validation failures. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * trigger DCO re-check Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * spotless Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * update to BAL v5.3.0 spec tests Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * remove referenceTestDevnet test compilation from the referenceTest gradle task Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * addressed comments Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * renamed BlockGasAccountingStrategy.calculateBlockGas to calculateTransactionRegularGas Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * 1. use BlockGasAccountingStrategy.hasBlockCapacity() in AbstractBlockProcessor.java, AbstractBlockProcessorTest.java 2. move handleStateGasSpill into its own method 3. Added CREATE state gas underflow guard 4. Improved failCodeDepositWithoutRollback documentation Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> --------- Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Simon Dudley <simon.dudley@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * snap server - log enabled/disabled in config overview (#10039) * log snap server enabled/disabled in config overview * starting snapserver msg at info Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * fix: avoid TOCTOU race in eth_getBlockByNumber latestResult (#10051) * fix: avoid TOCTOU race in eth_getBlockByNumber latestResult getSyncStatus() was being called twice in latestResult() — once to check isEmpty() and again to call .get(). If sync completed between those two calls (clearSyncTarget() fires on the sync thread), the second call returned Optional.empty() and .get() threw NoSuchElementException, crashing the RPC handler. Fixed by capturing the result in a local variable so both the check and the read operate on the same snapshot. Added a test that reproduces the race: getSyncStatus() returns a present Optional on the first call and an empty one on the second, confirming the handler no longer throws. Signed-off-by: Shridhar Panigrahi <sridharpanigrahi2006@gmail.com> --------- Signed-off-by: Shridhar Panigrahi <sridharpanigrahi2006@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Cyrus <sridharpanigrahi2006@gmail.com> * reduce number of scenarios tested (#10055) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * PeerTaskValidation accept NO_RESULTS_RETURNED (#10056) Per the ETH spec, a peer may return an empty response to GetBlockHeaders if it does not have the requested block. This is not a protocol violation. Treating it as a useless response causes the peer to be disconnected and denylisted after 5 retries, which is particularly harmful when only one server peer is available (e.g. during snap sync pivot selection). A server that is slightly behind the current safe block will always return empty for pivot header requests. The client should wait for the next safe block announcement rather than disconnecting its only peer. Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * reduce the number of iterations (#10057) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * BySpecTests: run setup once instead of for each spec file (#10059) * run setup once instead of for each spec file * volatile boolean Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Fix eth_simulateV1 to accept both input and data fields with differen… (#9996) * Fix eth_simulateV1 to accept both input and data fields with different values * Added details of the fix to changelog Signed-off-by: kkaur01 <kanchan.kaur@consensys.net> --------- Signed-off-by: kkaur01 <kanchan.kaur@consensys.net> Signed-off-by: Kanchan Kaur <87459628+kkaur01@users.noreply.github.com> * logging improvements for breach of protocol for rlp (#10038) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> * Plugin API: pass pending block header when creating selectors (#10034) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Use cache locality to improve Shift opcodes (#9878) * Use CPU cache locality and avoid on-CPU cache misses Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net> Signed-off-by: ahamlat <ameziane.hamlat@consensys.net> * refactor stateroot commiter (#9879) Signed-off-by: Karim Taam <karim.t2am@gmail.com> * Deprecate `--min-block-occupancy-ratio` for removal and make it noop (#10036) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Add max used gas to eth_simulateV1 (#10066) * add max-gas-used to eth_simulateV1 results * pre-refund gas amounts for EIP-7702 delegation transactions Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * fix: send slim account encoding in snap AccountRange responses (#9877) * fix: send slim account encoding in snap AccountRange responses The snap protocol spec requires accounts to be sent in slim RLP encoding on the wire, where empty storageRoot and codeHash fields are encoded as 0x80 (RLP empty bytes) rather than the full 32-byte default hashes. Besu was sending the full encoding, causing response sizes to be larger than expected and failing hive snap protocol AccountRange tests. * test: verify AccountRangeMessage uses slim encoding on wire Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> * Fix typed receipt encoding in putSyncTransactionReceipts (#10044) * Fix typed receipt encoding in putSyncTransactionReceipts Receipts received via snap sync (eth/68) arrive through ReceiptsMessage.deserializeReceiptLists() which calls readBytes(), stripping the outer RLP bytes-element wrapper and leaving raw typeCode||rlp_body bytes (first byte in 0x01-0x7f). When these were passed directly to SimpleNoCopyRlpEncoder.encodeList(), the single-byte type code (e.g. 0x02 for EIP-1559) was stored as a standalone RLP item and the rlp_body as another, splitting one receipt into two items. On read-back, TransactionReceiptDecoder.readFrom() saw only the 1-byte type code, called slice(1) producing Bytes.EMPTY, and enterList() threw RLPException -- causing the server to disconnect peers with BREACH_OF_PROTOCOL_MALFORMED_MESSAGE_RECEIVED. Fix by checking if the raw bytes start with a byte < 0x80 (raw EIP-2718 type code with no RLP wrapper) and, if so, encoding them as a proper RLP bytes element via NO_COPY_RLP_ENCODER.encode(). Receipts that already carry a valid RLP element header (>= 0x80: either a string prefix 0x80-0xbf or list prefix 0xc0-0xff) are stored unchanged. Adds a test that simulates the network receive path (readBytes() stripping the outer wrapper) for EIP-1559 and ACCESS_LIST receipts. Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * review comments Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> * fix: add blockchain-head guard to handleBlockTimerExpiry (#10052) * fix: add blockchain-head guard to handleBlockTimerExpiry Signed-off-by: Qian-Cheng-nju <Qian-Cheng-nju@users.noreply.github.com> Signed-off-by: Qian Cheng <91401632+Qian-Cheng-nju@users.noreply.github.com> * Fix eth/69 receipt encoding for Frontier tx (#9900) * test: combine snap fixes and enable Besu-to-Besu snap sync test Cherry-pick all snap fixes (#9876, #9877, #9855) and Fabio's CliqueToPoSTest from #9852 with the snap sync section uncommented. * allow pivot distance to be customized for test * request tracking bug * Frontier receipts were never detected as Frontier Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * fix: use getEthSerializedType in SyncTransactionReceiptDecoder for Frontier receipts The decoder was storing Frontier type code as getSerializedType() (0xf8) but the encoder checks getEthSerializedType() (0x00). When a peer sends Frontier receipts with empty type bytes (e.g. reth), the decoder stored 0xf8, the encoder didn't recognize it as Frontier, and encoded it as a typed receipt - producing wrong receipt roots and disconnecting the peer. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * logging improvements for breach of protocol for rlp * Fix typed receipt encoding in putSyncTransactionReceipts Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * fallback to resync (#10019) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Revert tracer aggregator (#10068) * Revert "Tracer aggregator (#9745)" This reverts commit 219b28e. TracerAggregator iterates a List<OperationTracer> on every per-opcode call (tracePreExecution, tracePostExecution, traceContextEnter, etc.), which is a performance hit on the hot path. The InterruptibleOperationTracer single-delegate pattern is preferred for tracer composition. EthTransferLogOperationTracer and custom tracers remain mutually exclusive in BlockSimulator for now (isTraceTransfers will go away with Glamsterdam). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * Add tests for parallel block processing (optimistic and BAL) (#10010) Signed-off-by: Karim Taam <karim.t2am@gmail.com> * report 10 slowest tests (#10063) * report slowest tests once from unittests-passed, not per-runner * report total test and class counts in summary * suppress Gradle job summaries from unit test matrix runners on success Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * reduce volume of chain data pruner test (#10062) * reduce volume of chain data pruner test * address matkt review: restore timeline comments and fix loop boundary - Restore the detailed pruning timeline explanation in pruningWithFrequency and balPruningWithTwoBatches, adapted to use derived variable names - Fix forkBlocksRemovedInBalOnlyMode: the second loop was starting at 45 instead of 25; pruningMark = 280 - 256 = 24, so block 25 is the first unpruned block. Also fix stale comment "i <= 44" -> "i <= 24" and extend the upper bound to 280 (the full canonical chain length) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * EIP-8159: eth/71 - Block Access List Exchange (#9966) Signed-off-by: Miroslav Kovar <miroslavkovar@protonmail.com> Signed-off-by: Miroslav Kovář <miroslavkovar@protonmail.com> * Implement div sdiv with long limbs (#9923) Signed-off-by: Luis Pinto <luis.pinto@consensys.net> * Bonsai archive seperate column families (#10058) Signed-off-by: Jason Frame <jason.frame@consensys.net> * fix: prevent unsigned underflow in eth_feeHistory reward bounds (#10060) * fix: prevent unsigned underflow in eth_feeHistory reward bounds Wei.subtract() wraps around on underflow since Wei is unsigned 256-bit. In boundRewards(), when nextBaseFee exceeds gasPriceLowerBound (happens when querying historical blocks from a higher-fee period), the subtraction produces a near-2^256 value. This corrupts every reward entry in the response, causing wallets to suggest absurd gas prices. Floor the priority fee delta at zero when nextBaseFee is larger. Signed-off-by: Shridhar Panigrahi <sridharpanigrahi2006@gmail.com> * test: address review feedback on eth_feeHistory underflow fix - Shorten verbose comment in boundRewards to a single line - Replace indirect <= 2L assertion with exact expected reward values - Add equal-case test (nextBaseFee == lowerBoundGasPrice) confirming lowerBoundPriorityFee is Wei.ZERO and rewards are correct Signed-off-by: Shridhar Panigrahi <sridharpanigrahi2006@gmail.com> --------- Signed-off-by: Shridhar Panigrahi <sridharpanigrahi2006@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Cyrus <sridharpanigrahi2006@gmail.com> * Log block number/hash on receipts root mismatch for debugging (#10071) When GetSyncReceiptsFromPeerTask returns RESULTS_DO_NOT_MATCH_QUERY, log the block number, hash, expected receiptsRoot, and calculated receiptsRoot at DEBUG level so the failing blocks can be identified without enabling TRACE logging. Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * fix UInt256: Take result from addBack in mulSubOverflow (#10078) Signed-off-by: Luis Pinto <luis.pinto@consensys.net> * BlockchainUtilParameterizedTest - reduce key-pair generations (#10072) * reduce key-pair generations Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Pre-size ArrayList instances in BlockchainUtilParameterizedTest Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * minimize setup for BesuCommandTest (#10074) * minimize setup for BesuCommandTest Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Defer Snappy decompression of P2P messages until worker thread processing (#10048) * Defer Snappy decompression of P2P messages until worker thread processing RawMessage now supports a compressed constructor that defers Snappy decompression until getData() is first called on the worker thread. Messages stay in their compressed form while queued in the tx worker pool. Additionally, worker threads now skip processing for messages from already-disconnected peers, and decompression/deserialization failures disconnect the peer with BREACH_OF_PROTOCOL. Signed-off-by: stefan.pingel@consensys.net <stefan.pingel@consensys.net> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> * return -38015 when tx gas exceeds block gas limit (#10073) * return -38015 when tx gas exceeds block gas limit * added tets for mid-block partial consumption Signed-off-by: kkaur01 <kanchan.kaur@consensys.net> --------- Signed-off-by: kkaur01 <kanchan.kaur@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Kanchan Kaur <87459628+kkaur01@users.noreply.github.com> * Reduce memory usage of debug_trace* calls #9584 (#9938) * use latest snapshot if no memory wright op Signed-off-by: Ali <alijakparov.kz@gmail.com> Co-authored-by: ahamlat <ameziane.hamlat@consensys.net> Signed-off-by: Ali Zhagparov <alijakparov.kz@gmail.com> * Update Amsterdam to bal@v5.4.0 spec (#10075) * update devnet test Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * oversized code no longer charges state gas Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * do not force-charge state gas when code deposit state gas is insufficient When charge_state_gas fails (OutOfGasError), the spec modifies nothing: no reservoir drain, no stateGasUsed increment. Remove consumeStateGasForced which was incorrectly inflating stateGasUsed on failure, fixing short_one_gas reference tests. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * Track collision-burned gas in regular_gas_used so 2D block gas accounting correctly reflects gas consumed on EIP-684 address collisions Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * addressed pr comments Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> --------- Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * oversized code no longer charges state gas Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * charge SSTORE regular gas before state gas per EIP-8037 ordering requirement EIP-8037 specifies that regular gas must be deducted before state gas so the reservoir/gasRemaining split is correct when state gas overflows. Also updates devnet reference tests to bal@v5.5.1. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * charge SELFDESTRUCT and CREATE regular gas before state gas per EIP-8037 ordering requirement Same fix as the prior SSTORE commit: deduct regular gas before charging state gas so the reservoir/gasRemaining split is correct. Fixes the remaining 6 failing amsterdam devnet reference tests (bal@v5.5.1). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * spotless Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> --------- Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> Signed-off-by: mamoralesiob <miguelangel@io.builders> Signed-off-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> Signed-off-by: Mykim <kimminyong2034@gmail.com> Signed-off-by: Usman Saleem <usman@usmans.info> Signed-off-by: Kanchan Kaur <87459628+kkaur01@users.noreply.github.com> Signed-off-by: Justin Florentine <justin+github@florentine.us> Signed-off-by: jflo <justin+github@florentine.us> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: Luis Pinto <luis.pinto@consensys.net> Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> Signed-off-by: Matilda-Clerke <matilda.clerke@consensys.net> Signed-off-by: Cyrus <sridharpanigrahi2006@gmail.com> Signed-off-by: stefan.pingel@consensys.net <stefan.pingel@consensys.net> Signed-off-by: Karim Taam <karim.t2am@gmail.com> Signed-off-by: kkaur01 <kanchan.kaur@consensys.net> Signed-off-by: ahamlat <ameziane.hamlat@consensys.net> Signed-off-by: Qian Cheng <91401632+Qian-Cheng-nju@users.noreply.github.com> Signed-off-by: Miroslav Kovář <miroslavkovar@protonmail.com> Signed-off-by: Jason Frame <jason.frame@consensys.net> Signed-off-by: Ali Zhagparov <alijakparov.kz@gmail.com> Co-authored-by: Simon Dudley <simon.dudley@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> Co-authored-by: mamoralesiob <miguelangel@io.builders> Co-authored-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> Co-authored-by: Mykim <kimminyong2034@gmail.com> Co-authored-by: Usman Saleem <usman@usmans.info> Co-authored-by: Kanchan Kaur <87459628+kkaur01@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Justin Florentine <justin+github@florentine.us> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Luis Pinto <luis.pinto@consensys.net> Co-authored-by: Matilda-Clerke <matilda.clerke@consensys.net> Co-authored-by: Cyrus <sridharpanigrahi2006@gmail.com> Co-authored-by: Karim Taam <karim.t2am@gmail.com> Co-authored-by: ahamlat <ameziane.hamlat@consensys.net> Co-authored-by: Qian Cheng <91401632+Qian-Cheng-nju@users.noreply.github.com> Co-authored-by: Miroslav Kovář <miroslavkovar@protonmail.com> Co-authored-by: Jason Frame <jason.frame@consensys.net> Co-authored-by: Ali Zhagparov <alijakparov.kz@gmail.com>

* EIP-8037: multidimensional gas metering - EVM core Implement state gas tracking in the EVM layer: - StateGasCostCalculator and Eip8037StateGasCostCalculator for cost-per-state-byte - AmsterdamGasCalculator with split regular/state gas costs - MessageFrame state gas reservoir, spill, and collision tracking - State gas charging in SSTORE, CREATE, CALL, and SELFDESTRUCT operations Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * EIP-8037: protocol-level 2D gas accounting integration Wire state gas into transaction processing, block building, and validation: - MainnetTransactionProcessor: intrinsic state gas, reservoir init, spill handling - BlockGasAccountingStrategy.AMSTERDAM: 2D gas metering (max of regular, state) - BlockGasUsedValidator.AMSTERDAM: pre-refund 2D validation - OsakaTargetingGasLimitCalculator: Amsterdam constructor with uncapped tx gas limit - Block creation: 2D headroom checks for transaction selection - TransactionProcessingResult: carry state gas used Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * EIP-8037: update execution spec tests for bal-devnet-3 Update reference test fixtures to bal@v5.2.0 for EIP-8037 compatibility. Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * EIP-8037: extract TransactionGasAccounting and add test coverage Extract gas accounting logic from MainnetTransactionProcessor into a testable TransactionGasAccounting class with builder pattern. Add tests for SSTORE state gas, block gas accounting strategy, state gas spill, and regular gas limit enforcement. Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * trigger DCO re-check Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * Add -Pcases to jmh (besu-eth#9982) e.g. ./gradlew --no-daemon :ethereum:core:jmh -Pincludes=Mod -Pexcludes=Mul,Add,SMod -Pcases=MOD_256_128,MOD_256_192 Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * Preserve caller-provided gas pricing in eth_simulateV1 results (besu-eth#9972) * preserve caller-provided gas prices in TransactionSimulator When isAllowExceedingBalance is true but the caller explicitly provided non-zero gas pricing parameters, preserve them and the block header's baseFee so effective gas price is computed correctly during execution. This ensures gas fees are actually charged so that stateRoot and block hash are correct in eth_simulateV1 results. When gas params are absent or zero (typical eth_call, or explicitly zero maxFeePerGas), behavior is unchanged - all fields stay zero and baseFee is zeroed to avoid validation failures. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * trigger DCO re-check Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * spotless Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * update to BAL v5.3.0 spec tests Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * remove referenceTestDevnet test compilation from the referenceTest gradle task Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * addressed comments Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * renamed BlockGasAccountingStrategy.calculateBlockGas to calculateTransactionRegularGas Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> * 1. use BlockGasAccountingStrategy.hasBlockCapacity() in AbstractBlockProcessor.java, AbstractBlockProcessorTest.java 2. move handleStateGasSpill into its own method 3. Added CREATE state gas underflow guard 4. Improved failCodeDepositWithoutRollback documentation Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> --------- Signed-off-by: daniellehrner <daniel.lehrner@consensys.net> Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Simon Dudley <simon.dudley@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

daniellehrner added the amsterdam relating to Glamsterdam fork label Feb 16, 2026

daniellehrner requested a review from Copilot February 16, 2026 15:51

Copilot AI reviewed Feb 16, 2026

View reviewed changes

daniellehrner added this to Amsterdam Feb 17, 2026

github-project-automation bot moved this to Backlog in Amsterdam Feb 17, 2026

daniellehrner moved this from Backlog to In progress in Amsterdam Feb 17, 2026

daniellehrner self-assigned this Feb 17, 2026

daniellehrner added 4 commits March 6, 2026 06:21

EIP-8037: update execution spec tests for bal-devnet-3

09a4901

Update reference test fixtures to bal@v5.2.0 for EIP-8037 compatibility. Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

daniellehrner force-pushed the feat/eip_8037 branch from 1805f66 to d825f0d Compare March 6, 2026 05:23

daniellehrner and others added 7 commits March 6, 2026 06:27

trigger DCO re-check

2d0cc4a

Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

Add -Pcases to jmh (besu-eth#9982)

9e59609

e.g. ./gradlew --no-daemon :ethereum:core:jmh -Pincludes=Mod -Pexcludes=Mul,Add,SMod -Pcases=MOD_256_128,MOD_256_192 Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

trigger DCO re-check

da5c5b0

Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

spotless

92afb9f

Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

update to BAL v5.3.0 spec tests

f3822d7

Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

Merge branch 'main' into feat/eip_8037

2da8d84

daniellehrner marked this pull request as ready for review March 9, 2026 10:33

remove referenceTestDevnet test compilation from the referenceTest gr…

b57f47f

…adle task Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

daniellehrner commented Mar 9, 2026

View reviewed changes

matkt reviewed Mar 10, 2026

View reviewed changes

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessor.java Outdated Show resolved Hide resolved

evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCreateOperation.java Show resolved Hide resolved

Merge remote-tracking branch 'upstream/main' into feat/eip_8037

1990cd7

# Conflicts: # ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/OsakaTargetingGasLimitCalculator.java

matkt reviewed Mar 11, 2026

View reviewed changes

fab-10 reviewed Mar 11, 2026

View reviewed changes

addressed comments

4ae8e10

Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

fab-10 approved these changes Mar 12, 2026

View reviewed changes

renamed BlockGasAccountingStrategy.calculateBlockGas to calculateTran…

c6b32bd

…sactionRegularGas Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

daniellehrner added 2 commits March 13, 2026 09:50

Merge branch 'main' into feat/eip_8037

57bdfc9

Merge branch 'main' into feat/eip_8037

5209c33

daniellehrner enabled auto-merge (squash) March 16, 2026 16:39

daniellehrner merged commit fd4c0f1 into besu-eth:main Mar 16, 2026
46 checks passed

github-project-automation bot moved this from In progress to Done in Amsterdam Mar 16, 2026

daniellehrner deleted the feat/eip_8037 branch March 16, 2026 17:03

Conversation

daniellehrner commented Feb 16, 2026

PR description

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

daniellehrner commented Mar 9, 2026

Uh oh!

daniellehrner Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

matkt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fab-10 Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

fab-10 Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fab-10 left a comment

Choose a reason for hiding this comment

Uh oh!

fab-10 Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

fab-10 Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

daniellehrner commented Mar 16, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants