Merge main, latest spec tests and their fixes into bal-devnet-3

.github/ISSUE_TEMPLATE/bug-report.md

@@ -10,10 +10,10 @@ assignees: ''
 <!-- Have you done the following? -->
 <!--   * read the Code of Conduct? By filing an Issue, you are expected to -->  
 <!--     comply with it, including treating everyone with respect: -->
-<!--     https://github.com/hyperledger/besu/blob/main/CODE_OF_CONDUCT.md -->
+<!--     https://github.com/besu-eth/besu/blob/main/CODE_OF_CONDUCT.md -->
 <!--   * Reproduced the issue in the latest version of the software -->
 <!--   * Read the debugging docs: https://besu.hyperledger.org/private-networks/how-to -->
-<!--   * Duplicate Issue check:  https://github.com/search?q=+is%3Aissue+repo%3Ahyperledger/Besu -->
+<!--   * Duplicate Issue check:  https://github.com/search?q=+is%3Aissue+repo%3Abesu-eth/besu -->
 
 ### Steps to Reproduce
 1. [Step 1]

.github/ISSUE_TEMPLATE/feature-request.md

@@ -10,8 +10,8 @@ assignees: ''
 <!-- Have you done the following? -->
 <!--   * read the Code of Conduct? By filing an Issue, you are expected to -->  
 <!--     comply with it, including treating everyone with respect: -->
-<!--     https://github.com/hyperledger/besu/blob/main/CODE_OF_CONDUCT.md -->
-<!--   * Duplicate Issue check:  https://github.com/search?q=+is%3Aissue+repo%3Ahyperledger/Besu -->
+<!--     https://github.com/besu-eth/besu/blob/main/CODE_OF_CONDUCT.md -->
+<!--   * Duplicate Issue check:  https://github.com/search?q=+is%3Aissue+repo%3Abesu-eth/besu -->
 
 ### Description
 As an [Actor], I want [feature] so that [why].

.github/ISSUE_TEMPLATE/release-checklist.md

@@ -17,7 +17,7 @@ assignees: ''
   - [ ] `git tag 24.4.0-RC1`
   - [ ] `git push upstream 24.4.0-RC1`
 - [ ] Sign-off with team; announce the tag in #besu-release in Discord
-  - [ ] Targeting this tag for the burn-in: https://github.com/hyperledger/besu/releases/tag/24.4.0-RC1
+  - [ ] Targeting this tag for the burn-in: https://github.com/besu-eth/besu/releases/tag/24.4.0-RC1
 - [ ] Consensys staff start burn-in using this tag
   - [ ] start a new burn-in fleet with comparison nodes from previous release
   - [ ] update existing canaries and validators
@@ -34,18 +34,18 @@ assignees: ''
   - [ ] `git checkout 24.4.0-RC1`
   - [ ] `git tag 24.4.0`
   - [ ] `git push upstream 24.4.0`
-- [ ] Manually run https://github.com/hyperledger/besu/actions/workflows/draft-release.yml using `main` branch` and the FULL RELEASE tag name, i.e. `24.4.0`. Note, this workflow should always be run from `main` branch (hotfix tags will still be released even if they were created based on another branch)
+- [ ] Manually run https://github.com/besu-eth/besu/actions/workflows/draft-release.yml using `main` branch` and the FULL RELEASE tag name, i.e. `24.4.0`. Note, this workflow should always be run from `main` branch (hotfix tags will still be released even if they were created based on another branch)
     - publishes artefacts and version-specific docker tags but does not fully publish the GitHub release so subscribers are not yet notified
 - [ ] Check all draft-release workflow jobs went green
 - [ ] Check binary SHAs are correct on the release page
 - [ ] Check artifacts exist in https://hyperledger.jfrog.io/ui/repos/tree/General/besu-maven
 - [ ] Update release notes in the GitHub draft release, save draft and sign-off with team
-- [ ] IMPORTANT: confirm the tag name is the ONLY text in the "Release title", otherwise it will break the Docker Promote workflow https://github.com/hyperledger/besu/actions/workflows/docker-promote.yml
+- [ ] IMPORTANT: confirm the tag name is the ONLY text in the "Release title", otherwise it will break the Docker Promote workflow https://github.com/besu-eth/besu/actions/workflows/docker-promote.yml
 - [ ] Publish draft release ensuring it is marked as latest release (if appropriate)
     - this is now public and notifies subscribed users
     - makes the release "latest" in github
     - publishes the docker `latest` tag variants
-- [ ] Verify https://github.com/hyperledger/besu/actions/workflows/docker-promote.yml went green
+- [ ] Verify https://github.com/besu-eth/besu/actions/workflows/docker-promote.yml went green
 - [ ] Create homebrew release PR using [update-version workflow](https://github.com/hyperledger/homebrew-besu/actions/workflows/update-version.yml)
   - If the PR has not been automatically created, create the PR manually using the created branch `update-<version>`
 - [ ] Verify homebrew release once the PR has merged using `brew tap hyperledger/besu && brew install besu` on MacOSX to verify latest version has been installed

.github/issue_template.md

@@ -1,8 +1,8 @@
 <!-- Have you done the following? -->
 <!--   * read the Code of Conduct? By filing an Issue, you are expected to -->  
 <!--     comply with it, including treating everyone with respect: -->
-<!--     https://github.com/hyperledger/besu/blob/main/CODE_OF_CONDUCT.md -->
-<!--   * Duplicate Issue check:  https://github.com/search?q=+is%3Aissue+repo%3Ahyperledger/Besu -->
+<!--     https://github.com/besu-eth/besu/blob/main/CODE_OF_CONDUCT.md -->
+<!--   * Duplicate Issue check:  https://github.com/search?q=+is%3Aissue+repo%3Abesu-eth/besu -->
 <!--   * Considered using a specific template for submitting a Bug or Feature Request? -->
 
 

.github/pull_request_template.md

@@ -8,7 +8,7 @@
 
 ### Thanks for sending a pull request! Have you done the following?
 
-- [ ] Checked out our [contribution guidelines](https://github.com/hyperledger/besu/blob/main/CONTRIBUTING.md)?
+- [ ] Checked out our [contribution guidelines](https://github.com/besu-eth/besu/blob/main/CONTRIBUTING.md)?
 - [ ] Considered documentation and added the `doc-change-required` label to this PR [if updates are required](https://wiki.hyperledger.org/display/BESU/Documentation).
 - [ ] Considered the changelog and included an [update if required](https://wiki.hyperledger.org/display/BESU/Changelog).
 - [ ] For database changes (e.g. KeyValueSegmentIdentifier) considered compatibility and performed forwards and backwards compatibility tests

.github/workflows/acceptance-tests.yml

@@ -47,7 +47,7 @@ jobs:
       - name: List all acceptance tests
         run: ./gradlew acceptanceTest --test-dry-run -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
       - name: Extract current test list
-        run: mkdir tmp; find . -type f -name TEST-*.xml | xargs -I{} bash -c "xmlstarlet sel -t -v '/testsuite/@name' '{}'; echo ' acceptanceTest'" | tee tmp/currentTests.list
+        run: mkdir tmp; find . -type f -name TEST-*.xml | xargs -I{} bash -c "xmlstarlet sel -t -v '/testsuite/testcase[1]/@classname' '{}'; echo ' acceptanceTest'" | tee tmp/currentTests.list
       - name: Get acceptance test reports
         uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d
         continue-on-error: true

.github/workflows/bft-soak-test.yml

@@ -24,7 +24,7 @@ on:
       besu_repo:
         required: false
         type: string
-        description: 'Custom git repository to checkout branch from. Expected format: owner/repo (e.g., hyperledger/besu)'
+        description: 'Custom git repository to checkout branch from. Expected format: owner/repo (e.g., besu-eth/besu)'
 
 env:
   GRADLE_OPTS: "-Xmx6g -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true"

.github/workflows/pre-review.yml

@@ -111,10 +111,11 @@ jobs:
         uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1
         with:
           cache-disabled: true
+          add-job-summary: on-failure
       - name: List unit tests
         run: ./gradlew test --test-dry-run -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
       - name: Extract current test list
-        run: mkdir tmp; find . -type f -name TEST-*.xml | xargs -I{} bash -c "xmlstarlet sel -t -v '/testsuite/@name' '{}'; echo '{}' | sed 's#\./\(.*\)/build/test-results/.*# \1#'" | tee tmp/currentTests.list
+        run: mkdir tmp; find . -type f -name TEST-*.xml | xargs -I{} bash -c "xmlstarlet sel -t -v '/testsuite/testcase[1]/@classname' '{}'; echo '{}' | sed 's#\./\(.*\)/build/test-results/.*# \1#'" | tee tmp/currentTests.list
       - name: Get unit test reports
         uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d
         continue-on-error: true
@@ -177,3 +178,17 @@ jobs:
             || contains(needs.*.result, 'cancelled')
             || contains(needs.*.result, 'skipped')
           }}
+      - name: Checkout Repo
+        if: always()
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}
+      - name: Download all unit test results
+        if: always()
+        uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe
+        with:
+          pattern: unit-*-test-results
+          merge-multiple: true
+      - name: Report 10 slowest tests
+        if: always()
+        run: python3 .github/workflows/reportSlowestTests.sh 10

.github/workflows/reportSlowestTests.sh

@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+##
+## Copyright contributors to Besu.
+##
+## Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+## an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations under the License.
+##
+## SPDX-License-Identifier: Apache-2.0
+##
+
+import glob
+import os
+import sys
+import xml.etree.ElementTree as ET
+
+count = int(sys.argv[1]) if len(sys.argv) > 1 else 10
+runner = sys.argv[2] if len(sys.argv) > 2 else None
+
+results = []
+total_tests = 0
+for f in glob.glob('**/build/test-results/**/TEST-*.xml', recursive=True):
+    try:
+        tree = ET.parse(f)
+    except ET.ParseError:
+        continue
+    root = tree.getroot()
+    suites = root.findall('testsuite') if root.tag == 'testsuites' else [root]
+    for suite in suites:
+        name = suite.get('name')
+        time = suite.get('time')
+        if name and time:
+            try:
+                results.append((float(time), name))
+                total_tests += int(suite.get('tests', 0))
+            except ValueError:
+                pass
+
+if not results:
+    sys.exit(0)
+
+results.sort(reverse=True)
+total_classes = len(results)
+
+heading = f'{count} Slowest Test Classes (runner {runner})' if runner else f'{count} Slowest Test Classes'
+summary_line = f'{total_tests:,} tests across {total_classes} classes'
+lines = [
+    f'<details open>\n',
+    f'<summary><b>{heading}</b> — {summary_line}</summary>\n\n',
+    '| Rank | Class | Time |\n',
+    '|------|-------|------|\n',
+]
+for i, (t, name) in enumerate(results[:count], 1):
+    mins = int(t // 60)
+    secs = t % 60
+    time_str = f'{mins}m {secs:.0f}s' if mins else f'{secs:.1f}s'
+    short = name.split('.')[-1]
+    lines.append(f'| {i} | `{short}` | {time_str} |\n')
+lines.append('\n</details>\n')
+
+summary_path = os.environ.get('GITHUB_STEP_SUMMARY')
+if summary_path:
+    with open(summary_path, 'a', encoding='utf-8') as f:
+        f.writelines(lines)
+else:
+    sys.stdout.writelines(lines)

.github/workflows/splitTestsByTime.sh

@@ -21,7 +21,7 @@ SPLIT_COUNT=$4
 SPLIT_INDEX=$5
 
 # extract tests time from Junit XML reports
-find "$REPORTS_DIR" -type f -name TEST-*.xml | xargs -I{} bash -c "xmlstarlet sel -t -v 'concat(sum(//testcase/@time), \" \", //testsuite/@name)' '{}'; echo '{}' | sed \"s#${REPORT_STRIP_PREFIX}/\(.*\)/${REPORT_STRIP_SUFFIX}.*# \1#\"" > tmp/timing.tsv
+find "$REPORTS_DIR" -type f -name TEST-*.xml | xargs -I{} bash -c "xmlstarlet sel -t -v 'concat(sum(//testcase/@time), \" \", //testsuite/testcase[1]/@classname)' '{}'; echo '{}' | sed \"s#${REPORT_STRIP_PREFIX}/\(.*\)/${REPORT_STRIP_SUFFIX}.*# \1#\"" > tmp/timing.tsv
 
 # Sort times in descending order
 IFS=$'\n' sorted=($(sort -nr tmp/timing.tsv))

.github/workflows/update-test-reports.yml

@@ -7,12 +7,12 @@ on:
 
 jobs:
   syncTestReports:
-    if: github.repository == 'hyperledger/besu'
+    if: github.repository == 'besu-eth/besu'
     runs-on: ubuntu-latest
     steps:
       - name: Get latest merge PR number
         id: latest_merged_pr_number
-        run: echo "PULL_REQUEST_NUMBER=$(gh pr list --repo hyperledger/besu --base main --state merged --json "number,mergedAt" --search "sort:updated-desc" --jq 'max_by(.mergedAt)|.number')" >> "$GITHUB_OUTPUT"
+        run: echo "PULL_REQUEST_NUMBER=$(gh pr list --repo besu-eth/besu --base main --state merged --json "number,mergedAt" --search "sort:updated-desc" --jq 'max_by(.mergedAt)|.number')" >> "$GITHUB_OUTPUT"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Get unit test reports from latest merged PR

.gitignore

@@ -5,6 +5,7 @@
 *.iml
 *.launch
 *.log
+*.orig
 .classpath
 .claude
 .DS_Store

BENCHMARKING.md

@@ -32,12 +32,12 @@ Gradle won't rerun a task by default with no changes, so to run subsequent times
 
 ---
 
-## 🎯 Filter Benchmarks by Name
+## 🎯 Filter Benchmarks by Name and Case
 
-To run a specific benchmark class, use the `-Pincludes` and/or `-Pexcludes` project properties:
+To run a specific benchmark class, use the `-Pincludes` and/or `-Pexcludes` project properties. To filter by case name, use `-Pcases`:
 
 ```bash
-./gradlew :ethereum:core:jmh -Pincludes=SomeBenchmark -Pexcludes=TransientStorage,BlockHash
+./gradlew :ethereum:core:jmh -Pincludes=Mod -Pexcludes=Mul,Add,SMod -Pcases=MOD_256_128,MOD_256_192 --rerun-tasks
 ```
 
 This uses a regex pattern so other kinds of regexes can be used.
@@ -62,7 +62,8 @@ To profile benchmarks with [Async Profiler](https://github.com/jvm-profiling-too
 ./gradlew :ethereum:core:jmh \
   -Pincludes=SomeBenchmark \
   -PasyncProfiler=/path/to/libasyncProfiler.so \
-  -PasyncProfilerOptions="output=flamegraph"
+  -PasyncProfilerOptions="output=flamegraph" \
+  --rerun-tasks
 ```
 
 This will generate two html profiling files flame-cpu-forward.html and flame-cpu-reverse.html after the benchmark run.