Skip to content

Merge main into bal-devnet-4#10293

Merged
daniellehrner merged 16 commits intobesu-eth:bal-devnet-4from
daniellehrner:bal-devnet-4
Apr 21, 2026
Merged

Merge main into bal-devnet-4#10293
daniellehrner merged 16 commits intobesu-eth:bal-devnet-4from
daniellehrner:bal-devnet-4

Conversation

@daniellehrner
Copy link
Copy Markdown
Contributor

@daniellehrner daniellehrner commented Apr 21, 2026

PR description

Fixed Issue(s)

Thanks for sending a pull request! Have you done the following?

  • Checked out our contribution guidelines?
  • Considered documentation and added the doc-change-required label to this PR if updates are required.
  • Considered the changelog and included an update if required.
  • For database changes (e.g. KeyValueSegmentIdentifier) considered compatibility and performed forwards and backwards compatibility tests

Locally, you can run these tests to catch failures early:

  • spotless: ./gradlew spotlessApply
  • unit tests: ./gradlew build
  • acceptance tests: ./gradlew acceptanceTest
  • integration tests: ./gradlew integrationTest
  • reference tests: ./gradlew ethereum:referenceTests:referenceTests
  • hive tests: Engine or other RPCs modified?

matkt and others added 16 commits April 16, 2026 12:52
@matkt
enable bal parallelization for all blocks and not only head (besu-eth…
226a8f9 
…#10234)

Signed-off-by: Karim Taam <karim.t2am@gmail.com>
@siladu
Add MULMOD to EVMv2 (besu-eth#10168)
fad1968 
- Add MulModOperationV2, tests and benchmarks
- Rename c -> m in benchmarks following (a * b) % m formula
- Add MulModOperationV2Test covering stack management and underflow

Tests verify correct stack depth reduction (3→1), result placement, zero-modulus special case, cross-limb arithmetic, and that underflow with 0 or 2 items returns INSUFFICIENT_STACK_ITEMS without mutating the stack.

---------

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
@Filter94 @garyschulte
BlockSimulator fix (besu-eth#10251)
41cad99 
* BlockSimulator fix

Signed-off-by: Roman <4833306+Filter94@users.noreply.github.com>

Signed-off-by: Roman <4833306+Filter94@users.noreply.github.com>
Co-authored-by: garyschulte <garyschulte@gmail.com>
@Apisapple @siladu
Enable NullAway static null-safety analysis for util module (besu-eth…
eaba57a 
…#10046)

* Migrate JSR305 nullness annotations to JSpecify

- 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>

* feat(util): add opt-in NullAway configuration for Error Prone

Signed-off-by: mykim <kimminyong2034@gmail.com>

* feat(util): enable NullAway with comprehensive nullability fixes

- Add NullAway 0.12.4 to util errorprone dependencies
- Annotate nullable fields/returns in 6 util classes with @nullable
- Fix nullable dereferences: RollingFileWriter, StackTraceMatchFilter, PlatformDetector
- Enable NullAway:ERROR for util main compile, OFF for tests
- Add optional CI job (run-nullaway label) for gradual monitoring
- All util compilation passes with NullAway ERROR by default

Fixes:
  - MemoryBoundCache: mark getIfPresent() return as @nullable
  - ExceptionUtils: annotate rootCause() for nullable input/output
  - RollingFileWriter: guard Path.getParent() null dereference
  - PlatformDetector: make static fields @nullable, add fallback to UNKNOWN
  - BesuVersionUtils: mark VERSION/COMMIT fields as @nullable
  - StackTraceMatchFilter: fix nullable message comparison, builder fields
Signed-off-by: mykim <kimminyong2034@gmail.com>

* style(util): format code for improved readability in StackTraceMatchFilter

Signed-off-by: mykim <kimminyong2034@gmail.com>

* fix(util): PlatformDetector.normalizeGLibcVersion returns UNKNOWN not null

Replace null return with UNKNOWN to satisfy NullAway @nonnull contract.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* fix(util): update getGlibc to return null instead of UNKNOWN

- Return null to account for existing code that expects and handles null values.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* fix(util): remove NullAway flag from util compile command

- Remove the unnecessary -PenableNullAway flag

Signed-off-by: mykim <kimminyong2034@gmail.com>

* docs(util): update getGlibc Javadoc to clarify return value can be null

- Update the Javadoc to reflect the actual behavior of the getGlibc function.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* docs(util): update NullAway optional check job name for clarity

Signed-off-by: mykim <kimminyong2034@gmail.com>

* fix(util): update getGlibc to always return a value instead of null

Signed-off-by: mykim <kimminyong2034@gmail.com>

* fix(util): remove NullAway optional check job from pre-review workflow

Signed-off-by: mykim <kimminyong2034@gmail.com>

* Fix YAML indentation in pre-review workflow

Adjust indentation of GRADLEW_UNIT_TEST_ARGS in .github/workflows/pre-review.yml under unitTests.env to align with surrounding keys.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* feat: Improve version metadata null-safety and bump NullAway to 0.13.1

Signed-off-by: mykim <kimminyong2034@gmail.com>

* chroe: Add jspecify compileOnly dependency

Add org.jspecify:jspecify as a compileOnly dependency to util/build.gradle. This brings JSpecify annotations into the module for static nullness/type-checking without introducing a runtime dependency.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* feat: Use shortVersion() and improve StackTraceMatchFilter

Update acceptance tests to call BesuVersionUtils.shortVersion() directly instead of using orElse("unknown"). In StackTraceMatchFilter, mark the Throwable parameter as @nullable and simplify toString() to return stackContains directly. These changes clarify nullability and streamline version usage/representation.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* docs: Fix Javadoc reference for UNKNOWN constant

Update Javadoc in util/src/main/java/org/hyperledger/besu/util/BesuVersionUtils.java to use {@value #UNKNOWN} instead of {@value UNKNOWN} in shortVersion() and commit() docs so the UNKNOWN field is referenced correctly. No behavioral changes.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* chroe: Remove old verification metadata entries

Delete verification-metadata entries for com.uber.nullaway:nullaway:0.12.4 and org.checkerframework:dataflow-nullaway:3.48.0 (their artifact SHA entries were removed). These versions are superseded in the file by nullaway:0.13.1 and dataflow-nullaway:3.53.0, so the stale metadata was cleaned up.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* Merge pull request besu-eth#7 from Apisapple/feature/nullaway-util

Feature/nullaway util

Signed-off-by: mykim <kimminyong2034@gmail.com>

* Use UNKNOWN constant in version regex tests

Replace hardcoded "UNKNOWN" literal in regex assertions with BesuVersionUtils.UNKNOWN constant in three unit tests (versionStringIsEthstatsFriendly, noIdentityNodeNameIsEthstatsFriendly, userIdentityNodeNameIsEthstatsFriendly) in BesuVersionUtilsTest. This keeps the tests consistent with the source constant and avoids duplicating the literal value; no behavioral change.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* Use BesuVersionUtils.UNKNOWN constant

Remove the local BESU_VERSION_UNKNOWN constant and use BesuVersionUtils.UNKNOWN instead. Simplify getRuntimeVersionString() to return BesuVersionUtils.shortVersion() directly, construct VersionMetadata with BesuVersionUtils.UNKNOWN on FileNotFoundException, and compare metadata versions against BesuVersionUtils.UNKNOWN. Centralizes the unknown-version sentinel in BesuVersionUtils.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* docs: Clarify rootCause javadoc null behavior

Update Javadoc for ExceptionUtils.rootCause to state it returns the root cause or {@code null} when the input throwable is {@code null}. This documents the method's existing behavior, which already returns null for a null input.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* style: Wrap long regex in BesuVersionUtilsTest

Reformat the long regex in userIdentityNodeNameIsEthstatsFriendly test to improve readability by splitting the string across lines. This is a purely formatting change in util/src/test/java/org/hyperledger/besu/util/BesuVersionUtilsTest.java and does not alter test behavior.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* chore: Use compileOnlyApi for jspecify dependency

Replace compileOnly with compileOnlyApi for org.jspecify:jspecify in util/build.gradle so jspecify annotations are exposed on the compile classpath to consumers of this module. This ensures downstream modules compiling against this artifact can see the jspecify types without packaging the dependency.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* feat: Quote UNKNOWN in version regex tests

Use Pattern.quote(BesuVersionUtils.UNKNOWN) in regex assertions to ensure the UNKNOWN token is matched literally and not treated as a regex. Added import java.util.regex.Pattern and updated three assertions in BesuVersionUtilsTest (versionStringIsEthstatsFriendly, noIdentityNodeNameIsEthstatsFriendly, userIdentityNodeNameIsEthstatsFriendly) to avoid accidental regex interpretation and potential test flakiness.

Signed-off-by: mykim <kimminyong2034@gmail.com>

* style: Apply Spotless formatting

Apply Spotless formatting

Signed-off-by: mykim <kimminyong2034@gmail.com>

---------

Signed-off-by: Mykim <38449976+Apisapple@users.noreply.github.com>
Signed-off-by: mykim <kimminyong2034@gmail.com>
Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
@fab-10 @jflo
Layered txpool: enable balance check by default (besu-eth#10175)
6529db0 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Co-authored-by: Justin Florentine <justin+github@florentine.us>
@pinges @jflo
remove pre EIP8 handshake support (besu-eth#10257)
d203201 
Signed-off-by: stefan.pingel@consensys.net <stefan.pingel@consensys.net>
Co-authored-by: Justin Florentine <justin+github@florentine.us>
@siladu
Minor Mulmod v2 refactor (besu-eth#10253)
4f54a6d 
* Refactor stack index logic
* Refactor test helper
* Remove redundant stack param
* Inline mulmod method

---------

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
@siladu @claude
Increase disconnect await timeout in flaky P2P rejection tests (besu-…
cb40f89 
…eth#10267)

Under full test suite load, the multi-hop async disconnect path
(local denies inbound → TCP close → remote Netty event loop →
subscriber callback) can exceed 5s due to thread pool contention.
Raise peerFuture/reasonFuture timeouts to 30s in P2PNetworkTest
and P2PPlainNetworkTest to tolerate CI load without masking bugs.

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
@fab-10 @usmansaleem
Include slotNumber in payloadIdentifier generation (besu-eth#10242)
af1b318 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Co-authored-by: Usman Saleem <usman@usmans.info>
@fab-10
Update Gradle plugin for Besu plugin development to 0.2.0 (besu-eth#1…
52a8db8 
…0263)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@matkt
Change block access list index to uint32 (besu-eth#10279)
a942f49 
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
@macfarla
SystemCallProcessor: remove duplicate logging (besu-eth#10152)
570bc9f 
* remove duplicate logging

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
@siladu @claude @lu-pinto
EVMv2 AddOperationV2 (besu-eth#10255)
11a4595 
* AddOperationV2

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

* AddOperationV2Test: structural coverage

Drop redundant arithmetic cases (covered by UInt256PropertyBasedTest) and
focus on structural concerns: stack arity, limb-level read/write wiring,
256-bit wrap, deep-slot preservation, and gas cost.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

* Optimize for JIT

Signed-off-by: Luis Pinto <luis.pinto@consensys.net>

* Address review comments

Don't mutate top
Don't use fromHexStringLenient

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

---------

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Luis Pinto <luis.pinto@consensys.net>
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Co-authored-by: Luis Pinto <luis.pinto@consensys.net>
@macfarla
[CHANGELOG] add unreleased section (besu-eth#10286)
1feadbd 
Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
@fab-10
Enforce that blob_versioned_hashes match blobs (besu-eth#10278)
c8d4d04 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@ahamlat @siladu
Implement BaseFee, blobBaseFee, CallValue, GasPrice, Balance and Self…
131b1f7 
…Balance for EVM v2 (besu-eth#10229)

* Migrate wei operations to EVM v2 (first commit)

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* Update SelfBalance benchmarks

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* spotless

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* Address comments.

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* Add Javadoc

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* Add unit tests

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* spotless

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* Update datatypes/src/main/java/org/hyperledger/besu/datatypes/Wei.java

Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: ahamlat <ameziane.hamlat@consensys.net>

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

Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: ahamlat <ameziane.hamlat@consensys.net>

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

Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: ahamlat <ameziane.hamlat@consensys.net>

* Update datatypes/src/main/java/org/hyperledger/besu/datatypes/Wei.java

Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: ahamlat <ameziane.hamlat@consensys.net>

* Apply refactoring changes

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* remove basefee field

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* Fix merge issue

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* Address more comments

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* Remove not used field

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* spotless

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* Undo Balance operation change and add more unit tests

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

* Update AddOperationV2 after merge with main

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>

---------

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>
Signed-off-by: ahamlat <ameziane.hamlat@consensys.net>
Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
@daniellehrner daniellehrner merged commit e498408 into besu-eth:bal-devnet-4 Apr 21, 2026
5 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@daniellehrner @matkt @siladu @Filter94 @Apisapple @fab-10 @pinges @macfarla @ahamlat