Merge commit 'b912780cc3f16962a52dffe2c1532213a2ae036d' into lacchain…

…_pipeline

.github/workflows/checks.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
  spotless:
- runs-on: [besu,Linux,self-hosted,X64,nodocker]
+ runs-on: [besu-research-ubuntu-16]
  if: ${{ github.actor != 'dependabot[bot]' }}
  steps:
  - name: Checkout Repo
@@ -21,7 +21,7 @@ jobs:
  - name: spotless
  run: ./gradlew --no-daemon --parallel clean spotlessCheck
  javadoc_17:
- runs-on: [besu,Linux,self-hosted,X64,nodocker]
+ runs-on: [besu-research-ubuntu-8]
  if: ${{ github.actor != 'dependabot[bot]' }}
  steps:
  - name: Checkout Repo

.github/workflows/codeql.yml

@@ -24,7 +24,7 @@ on:
 jobs:
  analyze:
  name: Analyze
- runs-on: [besu,Linux,self-hosted,X64,nodocker]
+ runs-on: [besu-research-ubuntu-16]
  permissions:
  actions: read
  contents: read

.github/workflows/dco-merge-group.yml

@@ -4,7 +4,7 @@ on:
 
 jobs:
  dco:
- runs-on: [besu,Linux,self-hosted,nodocker]
+ runs-on: [besu-research-ubuntu-8]
  if: ${{ github.actor != 'dependabot[bot]' }}
  steps:
- - run: echo "This DCO job runs on merge_queue event and doesn't check PR contents"
+ - run: echo "This DCO job runs on merge_queue event and doesn't check PR contents"

.github/workflows/dco.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
  dco:
- runs-on: [besu,Linux,self-hosted,nodocker]
+ runs-on: [besu-research-ubuntu-8]
  if: ${{ github.actor != 'dependabot[bot]' }}
  steps:
  - run: echo "This DCO job runs on pull_request event and workflow_dispatch"
@@ -17,4 +17,4 @@ jobs:
  - name: DCO Check
  uses: tim-actions/[email protected]
  with:
- commits: ${{ steps.get-pr-commits.outputs.commits }}
+ commits: ${{ steps.get-pr-commits.outputs.commits }}

.github/workflows/gradle-wrapper-validation.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
  validation:
  name: "Gradle Wrapper Validation"
- runs-on: [besu,Linux,self-hosted,nodocker]
+ runs-on: [besu-research-ubuntu-8]
  steps:
  - uses: actions/checkout@v3
  - uses: gradle/wrapper-validation-action@v1

.github/workflows/pr-checklist-on-open.yml

@@ -6,7 +6,7 @@ on:
 jobs:
  checklist:
  name: "add checklist as a comment on newly opened PRs"
- runs-on: [besu,Linux,self-hosted,nodocker]
+ runs-on: [besu-research-ubuntu-8]
  steps:
  - uses: actions/github-script@v5
  with:

.github/workflows/release.yml

@@ -4,7 +4,7 @@ on:
  types: released
 jobs:
  dockerPromoteX64:
- runs-on: [besu,Linux,self-hosted,nodocker]
+ runs-on: [besu-research-ubuntu-16]
  steps:
  - uses: actions/checkout@v3
  - uses: actions/setup-java@v3

.github/workflows/repolinter.yml

@@ -15,7 +15,7 @@ on:
 
 jobs:
  build:
- runs-on: [besu,Linux,self-hosted,X64,docker]
+ runs-on: [besu-research-ubuntu-16]
  container: ghcr.io/todogroup/repolinter:v0.10.1
  steps:
  - name: Checkout Code

CHANGELOG.md

@@ -1,21 +1,97 @@
 # Changelog
 
-## 23.4.5
+## Next release
 
 ### Breaking Changes
+- Removed support for Kotti network (ETC) [#5816](https:/hyperledger/besu/pull/5816)
+- Layered transaction pool implementation is now stable and enabled by default, so the following changes to experimental options have been done [#5772](https:/hyperledger/besu):
+ - `--Xlayered-tx-pool` is gone, to select the implementation use the new `--tx-pool` option with values `layered` (default) or `legacy`
+ - `--Xlayered-tx-pool-layer-max-capacity`, `--Xlayered-tx-pool-max-prioritized` and `--Xlayered-tx-pool-max-future-by-sender` just drop the `X` and keep the same behavior
 
 ### Additions and Improvements
+- Add access to an immutable world view to start/end transaction hooks in the tracing API[#5836](https:/hyperledger/besu/pull/5836)
+- Layered transaction pool implementation is now stable and enabled by default. If you want still to use the legacy implementation, use `--tx-pool=legacy` [#5772](https:/hyperledger/besu)
+- Tune G1GC to reduce Besu memory footprint, and new `besu-untuned` start scripts to run without any specific G1GC flags [#5879](https:/hyperledger/besu/pull/5879)
+
+### Bug Fixes
+- do not create ignorable storage on revert storage-variables subcommand [#5830](https:/hyperledger/besu/pull/5830) 
+- fix duplicate key errors in EthScheduler-Transactions [#5857](https:/hyperledger/besu/pull/5857)
+
+### Download Links
+
+
+## 23.7.3
+
+### Additions and Improvements
+- Update Holešky config for re-launch [#5890](https:/hyperledger/besu/pull/5890)
+
+### Download Links
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/23.7.3/besu-23.7.3.tar.gz / sha256: c12ca6a9861557e0bf8f27076f8c8afcce6f1564687e5f02bfdc96c2b18846ff
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/23.7.3/besu-23.7.3.zip / sha256: 136596454f647c706130e3e2983bdbb4a1cbfaf2bbf6e999466754f9213c11f6
+
+
+## 23.7.2
+
+### Additions and Improvements
+- Add new methods to `OperationTracer` to capture contexts enter/exit [#5756](https:/hyperledger/besu/pull/5756)
+- Add Holešky as predefined network name [#5797](https:/hyperledger/besu/pull/5797)
+
+### Breaking Changes
+- Add ABI-decoded revert reason to `eth_call` and `eth_estimateGas` responses [#5705](https:/hyperledger/besu/issues/5705)
+
+### Additions and Improvements
+- Add missing methods to the `Transaction` interface [#5732](https:/hyperledger/besu/pull/5732)
+- Add `benchmark` subcommand to `evmtool` [#5754](https:/hyperledger/besu/issues/5754)
+- JSON output is now compact by default. This can be overridden by the new `--json-pretty-print-enabled` CLI option. [#5766](https:/hyperledger/besu/pull/5766)
+- New `eth_getBlockReceipts` JSON-RPC method to retrieve all transaction receipts for a block in a single call [#5771](https:/hyperledger/besu/pull/5771) 
+- Add new methods to `OperationTracer` to capture contexts enter/exit [#5756](https:/hyperledger/besu/pull/5756)
+
+### Bug Fixes
+- Make smart contract permissioning features work with london fork [#5727](https:/hyperledger/besu/pull/5727)
+- Add type to PendingTransactionDetail, fix eth_subscribe [#5729](https:/hyperledger/besu/pull/5729)
+- EvmTool "run" mode did not reflect contracts created within the transaction. [#5755](https:/hyperledger/besu/pull/5755)
+- Fixing snapsync issue with forest during the heal step [#5776](https:/hyperledger/besu/pull/5776)
+
+### Download Links
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/23.7.2/besu-23.7.2.tar.gz / sha256: f74b32c1a343cbad90a88aa59276b4c5eefea4643ee542aba2bbf898f85ae242
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/23.7.2/besu-23.7.2.zip / sha256: a233c83591fc277e3d1530c84bb5ea896abad717d796b5e3b856c79199132b75
+
+## 23.7.1
+
+### Breaking Changes
+- Removed deprecated GoQuorum permissioning interop [#5607](https:/hyperledger/besu/pull/5607)
+- Removed support for version 0 of the database as it is no longer used by any active node. [#5698](https:/hyperledger/besu/pull/5698)
+
+### Additions and Improvements
+- `evmtool` launcher binaries now ship as part of the standard distribution. [#5701](https:/hyperledger/besu/pull/5701)
 - EvmTool now executes the `execution-spec-tests` via the `t8n` and `b11r`. See the [README](ethereum/evmtool/README.md) in EvmTool for more instructions.
 - Improve lifecycle management of the transaction pool [#5634](https:/hyperledger/besu/pull/5634)
+- Add extension points in AbstractCreateOperation for EVM libraries to react to contract creations [#5656](https:/hyperledger/besu/pull/5656)
+- Update to Tuweni 2.4.2. [#5684](https:/hyperledger/besu/pull/5684)
+- Decouple data field from Enum JsonRpcError by creating new enum holder RpcErrorType[#5629](https:/hyperledger/besu/pull/5629)
+- Update to bouncycastle 1.75 [#5675](https:/hyperledger/besu/pull/5675)
+- Extend OperationTracer with new methods [#5662](https:/hyperledger/besu/pull/5662)
+- Eip 6780 selfdestruct [#5430](https:/hyperledger/besu/pull/5430)
+- Add new debug_getRawTransaction to the DEBUG engine [#5635](https:/hyperledger/besu/pull/5635)
 
 ### Bug Fixes
 - Use the node's configuration to determine if DNS enode URLs are allowed in calls to `admin_addPeer` and `admin_removePeer` [#5584](https:/hyperledger/besu/pull/5584)
 - Align the implementation of Eth/68 `NewPooledTransactionHashes` to other clients, using unsigned int for encoding size. [#5640](https:/hyperledger/besu/pull/5640)
 - Failure at startup when enabling layered txpool before initial sync done [#5636](https:/hyperledger/besu/issues/5636)
+- Remove miner-related option warnings if the change isn't using Ethash consensus algorithm [#5669](https:/hyperledger/besu/pull/5669)
+- Fix for pending transactions reference leak [#5693](https:/hyperledger/besu/pull/5693)
+- Address a performance regression observed in import testing [#5734](https:/hyperledger/besu/pull/5734)
+- Update native libraries that have JPMS friendly module names [#5749](https:/hyperledger/besu/pull/5749)
 
 ### Download Links
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/23.7.1/besu-23.7.1.tar.gz / sha256: 85dce66c2dbd21b4e5d3310770434dd373018a046b78d5037f6d4955256793cd
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/23.7.1/besu-23.7.1.zip / sha256: dfac11b2d6d9e8076ab2f86324d48d563badf76fd2a4aadc4469a97aef374ef5
+
+
+## 23.7.0
+
+- Was not released (failed burn-in test)
 
----
 
 ## 23.4.4
 

MAINTAINERS.md

@@ -15,23 +15,22 @@
 | Daniel Lehrner | daniellehrner | daniellehrner |
 | Diego López León | diega | diega |
 | Fabio Di Fabio | fab-10 | fab-10 |
-| Gary Schulte | garyschulte | GarySchulte | 
 | Gabriel Trintinalia | gabriel-trintinalia | gabrieltrintinalia |
+| Gary Schulte | garyschulte | GarySchulte | 
 | Jiri Peinlich | gezero | JiriPeinlich |
 | Gabriel Fukushima| gfukushima | gfukushima |
 | Justin Florentine| jflo | RoboCopsGoneMad |
 | Jason Frame | jframe | jframe |
 | Joshua Fernandes | joshuafernandes | joshuafernandes |
 | Lucas Saldanha | lucassaldanha | lucassaldanha |
 | Sally MacFarlane | macfarla | macfarla |
-| Mark Terry | mark-terry | m.terry |
 | Karim Taam | matkt | matkt |
+| Matthew Whitehead| matthew1001 | matthew.whitehead |
 | Meredith Baxter | mbaxter | mbaxter |
 | Stefan Pingel | pinges | pinges |
 | Danno Ferrin | shemnon | shemnon |
 | Simon Dudley | siladu | siladu |
 | Usman Saleem | usmansaleem | usmansaleem |
-| Zhenyang Shi | wcgcyx | wcgcyx |
 
 
 ## Emeritus Maintainers
@@ -47,6 +46,7 @@
 | Frank Li | frankisawesome | frankliawesome |
 | Ivaylo Kirilov | iikirilov | iikirilov |
 | Madeline Murray | MadelineMurray | madelinemurray |
+| Mark Terry | mark-terry | m.terry |
 | Nicolas Massart | NicolasMassart | NicolasMassart |
 | Trent Mohay | rain-on | trent.mohay |
 | Rai Sur | RatanRSur | ratanraisur |
@@ -55,6 +55,7 @@
 | Taccat Isid | taccatisid | taccatisid |
 | Tim Beiko | timbeiko | timbeiko |
 | Vijay Michalik | vmichalik | VijayMichalik |
+| Zhenyang Shi | wcgcyx | wcgcyx |
 
 ## Becoming a Maintainer
 

README.md

@@ -28,7 +28,7 @@ If you have any questions, queries or comments, [Besu channel on Hyperledger Dis
 
 ## Besu Users
 
-To install the Besu binary, follow [these instructions](https://besu.hyperledger.org/HowTo/Get-Started/Install-Binaries/). 
+To install the Besu binary, follow [these instructions](https://besu.hyperledger.org/public-networks/get-started/install/binary-distribution). 
 
 ## Besu Developers
 

acceptance-tests/dsl/build.gradle

@@ -36,9 +36,9 @@ dependencies {
  implementation 'io.vertx:vertx-core'
  implementation 'junit:junit'
  implementation 'io.opentelemetry:opentelemetry-api'
- implementation 'org.apache.tuweni:tuweni-bytes'
- implementation 'org.apache.tuweni:tuweni-io'
- implementation 'org.apache.tuweni:tuweni-units'
+ implementation 'io.tmio:tuweni-bytes'
+ implementation 'io.tmio:tuweni-io'
+ implementation 'io.tmio:tuweni-units'
  implementation 'org.assertj:assertj-core'
  implementation 'org.awaitility:awaitility'
  implementation 'org.java-websocket:Java-WebSocket'

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java

@@ -56,6 +56,8 @@ public static BlockHeader createBlockHeader(
  null,
  null,
  null,
+ null,
+ null,
  blockHeaderFunctions);
  }
 }

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/ExpectJsonRpcError.java

@@ -17,6 +17,7 @@
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
@@ -34,6 +35,10 @@ public ExpectJsonRpcError(final Transaction<?> transaction, final JsonRpcError e
  this.error = error;
  }
 
+ public ExpectJsonRpcError(final Transaction<?> transaction, final RpcErrorType error) {
+ this(transaction, new JsonRpcError(error));
+ }
+
  @Override
  public void verify(final Node node) {
  try {

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivConditions.java

@@ -16,7 +16,7 @@
 
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
@@ -109,7 +109,7 @@ public Condition getInvalidTransactionReceipt(final Hash transactionHash) {
  }
 
  public Condition multiTenancyValidationFail(
- final Transaction<?> transaction, final JsonRpcError error) {
+ final Transaction<?> transaction, final RpcErrorType error) {
  return new ExpectJsonRpcError(transaction, error);
  }
 }

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java

@@ -43,16 +43,19 @@
 import org.hyperledger.besu.plugin.services.BesuConfiguration;
 import org.hyperledger.besu.plugin.services.BesuEvents;
 import org.hyperledger.besu.plugin.services.PicoCLIOptions;
+import org.hyperledger.besu.plugin.services.PluginTransactionValidatorService;
 import org.hyperledger.besu.plugin.services.SecurityModuleService;
 import org.hyperledger.besu.plugin.services.StorageService;
 import org.hyperledger.besu.plugin.services.TransactionSelectionService;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBPlugin;
 import org.hyperledger.besu.plugin.services.txselection.TransactionSelectorFactory;
+import org.hyperledger.besu.plugin.services.txvalidator.PluginTransactionValidatorFactory;
 import org.hyperledger.besu.services.BesuConfigurationImpl;
 import org.hyperledger.besu.services.BesuEventsImpl;
 import org.hyperledger.besu.services.BesuPluginContextImpl;
 import org.hyperledger.besu.services.PermissioningServiceImpl;
 import org.hyperledger.besu.services.PicoCLIOptionsImpl;
+import org.hyperledger.besu.services.PluginTransactionValidatorServiceImpl;
 import org.hyperledger.besu.services.RpcEndpointServiceImpl;
 import org.hyperledger.besu.services.SecurityModuleServiceImpl;
 import org.hyperledger.besu.services.StorageServiceImpl;
@@ -97,7 +100,8 @@ private BesuPluginContextImpl buildPluginContext(
  besuPluginContext.addService(PicoCLIOptions.class, new PicoCLIOptionsImpl(commandLine));
  besuPluginContext.addService(
  TransactionSelectionService.class, new TransactionSelectionServiceImpl());
-
+ besuPluginContext.addService(
+ PluginTransactionValidatorService.class, new PluginTransactionValidatorServiceImpl());
  final Path pluginsPath;
  final String pluginDir = System.getProperty("besu.plugins.dir");
  if (pluginDir == null || pluginDir.isEmpty()) {
@@ -184,6 +188,8 @@ public void startNode(final BesuNode node) {
  final Optional<TransactionSelectorFactory> transactionSelectorFactory =
  getTransactionSelectorFactory(besuPluginContext);
 
+ final PluginTransactionValidatorFactory pluginTransactionValidatorFactory =
+ getPluginTransactionValidatorFactory(besuPluginContext);
  builder
  .synchronizerConfiguration(new SynchronizerConfiguration.Builder().build())
  .dataDirectory(node.homeDirectory())
@@ -206,7 +212,8 @@ public void startNode(final BesuNode node) {
  .maxRemotelyInitiatedPeers(15)
  .networkConfiguration(node.getNetworkingConfiguration())
  .randomPeerPriority(false)
- .transactionSelectorFactory(transactionSelectorFactory);
+ .transactionSelectorFactory(transactionSelectorFactory)
+ .pluginTransactionValidatorFactory(pluginTransactionValidatorFactory);
 
  node.getGenesisConfig()
  .map(GenesisConfigFile::fromConfig)
@@ -322,4 +329,11 @@ private Optional<TransactionSelectorFactory> getTransactionSelectorFactory(
  besuPluginContext.getService(TransactionSelectionService.class);
  return txSelectionService.isPresent() ? txSelectionService.get().get() : Optional.empty();
  }
+
+ private PluginTransactionValidatorFactory getPluginTransactionValidatorFactory(
+ final BesuPluginContextImpl besuPluginContext) {
+ final Optional<PluginTransactionValidatorService> txValidatorService =
+ besuPluginContext.getService(PluginTransactionValidatorService.class);
+ return txValidatorService.map(PluginTransactionValidatorService::get).orElse(null);
+ }
 }

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java

@@ -117,6 +117,7 @@ public BesuNode createMinerNodeWithExtraCliOptions(
  .name(name)
  .miningEnabled()
  .jsonRpcEnabled()
+ .jsonRpcTxPool()
  .webSocketEnabled()
  .extraCLIOptions(extraCliOptions);
  builder = configModifier.apply(builder);
@@ -398,7 +399,7 @@ public BesuNode createIbft2NodeWithLocalAccountPermissioning(
  config.setAccountAllowlist(accountAllowList);
  config.setAccountPermissioningConfigFilePath(configFile.getAbsolutePath());
  final PermissioningConfiguration permissioningConfiguration =
- new PermissioningConfiguration(Optional.of(config), Optional.empty(), Optional.empty());
+ new PermissioningConfiguration(Optional.of(config), Optional.empty());
  return create(
  new BesuNodeConfigurationBuilder()
  .name(name)

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java

@@ -186,7 +186,7 @@ public BesuNode build() {
  }
 
  final PermissioningConfiguration permissioningConfiguration =
- new PermissioningConfiguration(localPermConfig, smartContractPermConfig, Optional.empty());
+ new PermissioningConfiguration(localPermConfig, smartContractPermConfig);
 
  final BesuNodeConfigurationBuilder builder = new BesuNodeConfigurationBuilder();
  builder

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java

@@ -15,7 +15,7 @@
 package org.hyperledger.besu.tests.acceptance.dsl.transaction.account;
 
 import org.hyperledger.besu.crypto.SignatureAlgorithm;
-import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;