Merge with main

Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,50 @@
+---
+name: Bug Report
+about: necessary information to help us resolve the issue
+title: ''
+labels: 'bug'
+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 -->
+<!--   * 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 -->
+
+### Steps to Reproduce
+1. [Step 1]
+2. [Step 2]
+3. [Step ...]
+
+**Expected behavior:** [What you expect to happen]
+
+**Actual behavior:** [What actually happens]
+
+**Frequency:** [What percentage of the time does it occur?]
+
+### Logs
+Please post relevant logs from Besu (and the consensus client, if running proof of stake) from before and after the issue.
+
+### Versions (Add all that apply)
+* Software version: [`besu --version`]
+* Java version: [`java -version`]
+* OS Name & Version: [`cat /etc/*release`]
+* Kernel Version: [`uname -a`]
+* Virtual Machine software & version: [`vmware -v`]
+* Docker Version: [`docker version`]
+* Cloud VM, type, size: [Amazon Web Services I3-large]
+* Consensus Client & Version if using Proof of Stake: [e.g. Teku, Lighthouse, Prysm, Nimbus, Lodestar]
+
+### Smart contract information (If you're reporting an issue arising from deploying or calling a smart contract, please supply related information)
+* Solidity version [`solc --version`]
+* Repo with minimal set of deployable/reproducible contract code - please provide a link
+* Please include specifics on how you are deploying/calling the contract
+* Have you reproduced the issue on other eth clients
+
+### Additional Information (Add any of the following or anything else that may be relevant)
+* Besu setup info - genesis file, config options
+* System info - memory, CPU

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,45 @@
+---
+name: Feature Request
+about: suggesting new or altered functionality
+title: ''
+labels: ''
+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 -->
+
+### Description
+As an [Actor], I want [feature] so that [why].
+
+### Acceptance Criteria
+* [Criteria 1]
+* [Criteria 2]
+* [Criteria 3...]
+
+### Logs (if a change in behavior)
+Please post relevant logs from Besu (and the consensus client, if running proof of stake) illustrating behavior to be altered
+
+### Versions (Add all that apply)
+* Software version: [`besu --version`]
+* Java version: [`java -version`]
+* OS Name & Version: [`cat /etc/*release`]
+* Kernel Version: [`uname -a`]
+* Virtual Machine software & version: [`vmware -v`]
+* Docker Version: [`docker version`]
+* Cloud VM, type, size: [Amazon Web Services I3-large]
+* Consensus Client & Version if using Proof of Stake: [e.g. Teku, Lighthouse, Prysm, Nimbus, Lodestar]
+
+### Smart contract information (If you're reporting an issue arising from deploying or calling a smart contract, please supply related information)
+* Solidity version [`solc --version`]
+* Repo with minimal set of deployable/reproducible contract code - please provide a link
+* Please include specifics on how you are deploying/calling the contract
+* Have you reproduced the issue on other eth clients
+
+### Additional Information (Add any of the following or anything else that may be relevant)
+* Besu setup info - genesis file, config options
+* System info - memory, CPU

.github/ISSUE_TEMPLATE/release-checklist.md

@@ -12,25 +12,34 @@ assignees: ''
   - [ ] Notify maintainers about updating changelog for in-flight PRs 
 - [ ] Optional: for hotfixes, create a release branch and cherry-pick, e.g. `release-<version>-hotfix`
   - [ ] Optional: for hotfixes, create a PR into main from the hotfix branch to see the CI checks pass
-- [ ] On the appropriate branch/commit, create a calver tag for the release candidate, format example: `24.4.0-RC2`
-  - [ ] git tag 24.4.0-RC2
-  - [ ] git push upstream 24.4.0-RC2
+- [ ] On the appropriate branch/commit, create a calver tag for the release candidate, format example: `24.4.0-RC1`
+  - [ ] 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-RC2
+  - [ ] Targeting this tag for the burn-in: https://github.com/hyperledger/besu/releases/tag/24.4.0-RC1
 - [ ] Consensys staff start burn-in using this tag
 - [ ] Seek sign off for burn-in
   - [ ] Pass? Go ahead and complete the release process
   - [ ] Fail? Put a message in #besu-release in Discord indicating the release will be aborted because it failed burn-in 
-- [ ] Using the same git sha, create a calver tag for the FULL RELEASE, example format `24.4.0`
-- [ ] Using the FULL RELEASE tag, create a release in github to trigger the workflows. Once published:
+- [ ] Optional: Perform a dry run with https://github.com/consensys/protocols-release-sandbox to test the workflows
+  - [ ] Sync fork
+  - [ ] git checkout <sha of 24.4.0-RC1>
+  - [ ] git tag 24.4.0
+  - [ ] git push origin 24.4.0
+  - [ ] Manually run https://github.com/Consensys/protocols-release-sandbox/actions/workflows/draft-release.yml using `main` branch and `24.4.0` tag
+- [ ] Back on besu, using the same git sha as 24.4.0-RC1, create a calver tag for the FULL RELEASE, example format `24.4.0`
+  - [ ] 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)
+    - 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
+- [ ] Update release notes in the GitHub draft release, save draft and sign-off with team
+- [ ] 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 artefacts and version-specific docker tags
     - publishes the docker `latest` tag variants
-- [ ] Check binary SHAs are correct on the release page
-- [ ] Check "Container Verify" GitHub workflow has run successfully
-- [ ] Update the besu-docs version [update-version workflow](https://github.com/hyperledger/besu-docs/actions/workflows/update-version.yml)
-  - If the PR has not been automatically created, create the PR manually using the created branch `besu-version-<version>`
 - [ ] Create homebrew release 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>`
   - Run commands `brew tap hyperledger/besu && brew install besu` on MacOSX and verify latest version has been installed

.github/issue_template.md

@@ -2,30 +2,10 @@
 <!--   * 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 -->
-<!--   * 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 -->
-<!-- Note:  Not all sections will apply to all issue types. -->
+<!--   * Considered using a specific template for submitting a Bug or Feature Request? -->
 
-### Description
-As an [Actor], I want [feature] so that [why]. 
 
-### Acceptance Criteria
-* [Criteria 1]
-
-### Steps to Reproduce (Bug)
-1. [Step 1]
-2. [Step 2]
-3. [Step ...]
-
-**Expected behavior:** [What you expect to happen]
-
-**Actual behavior:** [What actually happens]
-
-**Frequency:** [What percentage of the time does it occur?]
-
-### Logs (if a bug)
-Please post relevant logs from Besu (and the consensus client, if running proof of stake) from before and after the issue. 
 
 ### Versions (Add all that apply)
 * Software version: [`besu --version`]

.github/workflows/BesuContainerVerify.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-## Copyright contributors to Hyperledger Besu.
+## 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

.github/workflows/splitList.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 ##
-## Copyright contributors to Hyperledger Besu.
+## 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

.github/workflows/splitTestsByTime.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-## Copyright contributors to Hyperledger Besu.
+## 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

CHANGELOG.md

@@ -1,15 +1,32 @@
 # Changelog
 
 ## [Unreleased]
-- Add `--ephemery` network support for Ephemery Testnet [#7563](https://github.com/hyperledger/besu/pull/7563) thanks to [@gconnect](https://github.com/gconnect)
-- Add configuration of Consolidation Request Contract Address via genesis configuration [#7647](https://github.com/hyperledger/besu/pull/7647)
+- Added isLabelsObserved to LabelledGauge in plugin-api. Default implementation returns false.
+
+### Breaking Changes
+- Removed Retesteth rpc service and commands [#7833](https://github.com/hyperledger/besu/pull/7783)
 
 ### Upcoming Breaking Changes
-- k8s (KUBERNETES) Nat method is now deprecated and will be removed in a future release
+
+### Additions and Improvements
+- Fine tune already seen txs tracker when a tx is removed from the pool [#7755](https://github.com/hyperledger/besu/pull/7755)
+- Create and publish Besu BOM (Bill of Materials) [#7615](https://github.com/hyperledger/besu/pull/7615) 
+- Update Java dependencies [#7786](https://github.com/hyperledger/besu/pull/7786)
+- Add a method to get all the transaction in the pool, to the `TransactionPoolService`, to easily access the transaction pool content from plugins [#7813](https://github.com/hyperledger/besu/pull/7813)
+- Add a method to check if a metric category is enabled to the plugin API [#7832](https://github.com/hyperledger/besu/pull/7832)
+
+### Bug fixes
+- Fix registering new metric categories from plugins [#7825](https://github.com/hyperledger/besu/pull/7825)
+
+## 24.10.0
 
 ### Breaking Changes
 - Besu will now fail to start if any plugins encounter errors during initialization. To allow Besu to continue running despite plugin errors, use the `--plugin-continue-on-error` option. [#7662](https://github.com/hyperledger/besu/pull/7662)
 
+### Upcoming Breaking Changes
+- k8s (KUBERNETES) Nat method is now deprecated and will be removed in a future release
+- `--host-whitelist` has been deprecated in favor of `--host-allowlist` since 2020 and will be removed in a future release
+
 ### Additions and Improvements
 - Remove privacy test classes support [#7569](https://github.com/hyperledger/besu/pull/7569)
 - Add Blob Transaction Metrics [#7622](https://github.com/hyperledger/besu/pull/7622)
@@ -19,8 +36,9 @@
 - Interrupt pending transaction processing on block creation timeout [#7673](https://github.com/hyperledger/besu/pull/7673)
 - Align gas cap calculation for transaction simulation to Geth approach [#7703](https://github.com/hyperledger/besu/pull/7703)
 - Expose chainId in the `BlockchainService` [7702](https://github.com/hyperledger/besu/pull/7702)
-- Use head block instead of safe block for snap sync [7536](https://github.com/hyperledger/besu/issues/7536)
 - Add support for `chainId` in `CallParameters` [#7720](https://github.com/hyperledger/besu/pull/7720)
+- Add `--ephemery` network support for Ephemery Testnet [#7563](https://github.com/hyperledger/besu/pull/7563) thanks to [@gconnect](https://github.com/gconnect)
+- Add configuration of Consolidation Request Contract Address via genesis configuration [#7647](https://github.com/hyperledger/besu/pull/7647)
 - Experimental Bonsai Archive support [#7475](https://github.com/hyperledger/besu/pull/7475)
 
 ### Bug fixes
@@ -32,6 +50,7 @@
 - Fix an unhandled PeerTable exception [#7733](https://github.com/hyperledger/besu/issues/7733)
 - Fix RocksDBException: Busy leading to MerkleTrieException: Unable to load trie node value [#7745](https://github.com/hyperledger/besu/pull/7745)
 - If a BFT validator node is syncing, pause block production until sync has completed [#7657](https://github.com/hyperledger/besu/pull/7657)
+- Fix eth_feeHistory rewards when bounded by configuration [#7750](https://github.com/hyperledger/besu/pull/7750)
 
 ## 24.9.1
 

CONTRIBUTING.md

@@ -8,7 +8,7 @@ Welcome to the Besu repository! The following links are a set of guidelines for
 Having the following accounts is necessary for contributing code/issues to Besu.  
 * If you want to contribute code, you can make a [github account here](https://github.com).  
 * If you want to raise an issue, do so [in the issues tab](https://github.com/hyperledger/besu/issues).
-* To ask questions or chat with us, join our [Discord](https://discord.gg/hyperledger)
+* To ask questions or chat with us, join our [Discord](https://discord.com/invite/hyperledger)
 * To edit pages in our wiki, you'll need a [Linux Foundation (LF) account].
 
 ### Useful contributing links

DCO.md

@@ -5,4 +5,4 @@ As per section 13.a of the [Hyperledger Charter](https://www.hyperledger.org/abo
 
 The sign off needs to be using your legal name, not a pseudonym.  Git has a built-in mechanism to allow this with the `-s` or `--signoff` argument to `git commit` command, providing your `user.name` and `user.email` have been setup correctly.
 
-If you have any questions, you can reach us on Besu chat; first, [join the Discord server](https://discord.gg/hyperledger/) then [join the Besu channel](https://discord.com/channels/905194001349627914/938504958909747250).
+If you have any questions, you can reach us on Besu chat; first, [join the Discord server](https://discord.com/invite/hyperledger) then [join the Besu channel](https://discord.com/channels/905194001349627914/938504958909747250).

MAINTAINERS.md

@@ -9,6 +9,7 @@
 | Name             | Github           | LFID             |
 | ---------------- | ---------------- | ---------------- |
 | Ameziane Hamlat   | ahamlat         | ahamlat          |
+| Chaminda Divitotawela | cdivitotawela    | cdivitotawela    |
 | Daniel Lehrner   | daniellehrner    | daniellehrner    |
 | Diego López León | diega            | diega            |
 | Fabio Di Fabio   | fab-10           | fab-10           |
@@ -18,7 +19,7 @@
 | Justin Florentine| jflo             | RoboCopsGoneMad  |
 | Jason Frame      | jframe           | jframe           |
 | Joshua Fernandes | joshuafernandes  | joshuafernandes  |
-| Luis Pinto       | lu-pinto         | lu-pinto
+| Luis Pinto       | lu-pinto         | lu-pinto         |
 | Lucas Saldanha   | lucassaldanha    | lucassaldanha    |
 | Sally MacFarlane | macfarla         | macfarla         |
 | Karim Taam       | matkt            | matkt            |
@@ -83,7 +84,7 @@ The following steps must occur for a contributor to be "upgraded" as a maintaine
   - The proposed maintainer accepts the nomination and expresses a willingness
     to be a long-term (more than 6 month) committer by adding a comment in the proposal PR.
   - The PR will be communicated in all appropriate communication channels
-    including at least [besu-contributors channel on Discord](https://discord.gg/hyperledger),
+    including at least [besu-contributors channel on Discord](https://discord.com/invite/hyperledger),
     the [mailing list](https://lists.hyperledger.org/g/besu)
     and any maintainer/community call.
 - Approval by at least 3 current maintainers within two weeks of the proposal or