Skip to content
This repository was archived by the owner on Oct 31, 2025. It is now read-only.

Commit 6d9c8b1

Browse files
jframematktgaryschultemacfarlajflo
authored
Merge Besu main (#34)
* mark deleted slot during clear storage step (besu-eth#6305) Signed-off-by: Karim Taam <karim.t2am@gmail.com> Co-authored-by: garyschulte <garyschulte@gmail.com> * made directory structure of tests match source; fixed one typo (besu-eth#6337) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * migrate controller tests to junit 5 (besu-eth#6338) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * add new forkids for testnets, update forkid test to Junit5, no longer need named network specific trusted setups (besu-eth#6322) Signed-off-by: jflo <justin+github@florentine.us> * Fix trielog shipping issue during self destruct (besu-eth#6340) * fix trielog shipping issue Signed-off-by: Karim Taam <karim.t2am@gmail.com> * bump gradle properties version and adjust changelog to match release (besu-eth#6347) Signed-off-by: garyschulte <garyschulte@gmail.com> * finalized cancun spec (besu-eth#6351) * finalized cancun spec Signed-off-by: jflo <justin+github@florentine.us> * finalized cancun spec Signed-off-by: jflo <justin+github@florentine.us> --------- Signed-off-by: jflo <justin+github@florentine.us> * Optimize RocksDB WAL file (besu-eth#6328) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Make RPC reason settable, pass execution failure reason in RPC error message (besu-eth#6343) * Make RPC reason settable, pass execution failure reason in RPC error message Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Update unit tests Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Update tests Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Update change log Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Update integration tests Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> --------- Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * TestWatcher junit5 (besu-eth#6339) * TestWatcher junit5 * add test class and method name to context * moved the testwatcher junit5 function to a new junit5 superclass * one qbft test to junit5 superclass 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> * Migrate BFT tests to junit 5 (besu-eth#6350) * bft tests to junit 5 * base class for pki extend AcceptanceTestBaseJunit5 * try/catch in case of empty optionals * fixed parameterization method Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * fixing on selfdestruct (besu-eth#6359) Signed-off-by: Karim Taam <karim.t2am@gmail.com> * migrate clique tests fully to junit5 (besu-eth#6362) * migrate clique tests fully to junit5 Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * fixed link to logging docs (besu-eth#6366) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Move logging to RunnerBuilder (besu-eth#6367) Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> * Use synchronized call to access the chain head block in `eth_estimateGas` (besu-eth#6345) * Use synchronized call to access the chain head block in estimateGas() Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Add error log entries when throwing internal error from estimateGas() Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Update unit tests Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Update changelog Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> --------- Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Add --X-trie-log subcommand (besu-eth#6303) * Add x-trie-log subcommand for one-off trie log backlog prune Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> --------- Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Co-authored-by: Simon Dudley <simon.dudley@consensys.net> * fix typos (besu-eth#6368) Signed-off-by: vuittont60 <81072379+vuittont60@users.noreply.github.com> * Added alias --sync-min-peers for --fast-sync-min-peers (besu-eth#6372) * sync-min-peers as an alias * added unit tests Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Fix: Fallback to getName when canonicalName is null in BlockHeaderValidator DEBUG log (besu-eth#6332) * fallback to simple name when canonical name is null * use getName instead of getSimpleName to include the package name Signed-off-by: Manoj P R <manojpramesh@gmail.com> --------- Signed-off-by: Manoj P R <manojpramesh@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> * fix: use UID 1000 for besu user (besu-eth#6358) (besu-eth#6360) The openjdk-latest Docker image is using UID 1001 for besu, because its base image ubuntu:23.10 now contains a default "ubuntu" user with UID 1000. (This UID change causes the besu user with UID 1001 to not have access to files created for past versions with UID 1000.) We now remove the default ubuntu user and explicitly use UID 1000 when creating the besu user. Signed-off-by: Hal Blackburn <hwtb2@cam.ac.uk> * Ignore generated files when running the spdx license check (besu-eth#6379) Signed-off-by: Meredith Baxter <mbaxter.dev@gmail.com> * full sync - don't fail startup if sync-min-peers specified (besu-eth#6373) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Copy also computed fields, when doing a Transaction detached copy (besu-eth#6329) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Disable txpool when not in sync (besu-eth#6302) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump to nex release snapshot 24.1.1 (besu-eth#6383) * release next snapshot 24.1.1 Signed-off-by: garyschulte <garyschulte@gmail.com> * move recent changelog items to 24.1.1-SNAPSHOT Signed-off-by: garyschulte <garyschulte@gmail.com> --------- Signed-off-by: garyschulte <garyschulte@gmail.com> * Correct Tangerine Whistle definition in Fluent EVM APIs. (besu-eth#6382) The fluent API incorrectly added the code size limit in Tangerine Whistle instead of first adding it in Spurious Dragon. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> * [MINOR] Fix pki tests condition check on mac (besu-eth#6387) Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> * Upgrade dependencies (besu-eth#6377) * Bump com.github.oshi:oshi-core to 6.4.10 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump com.github.tomakehurst to org.wiremock 3.3.1 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump com.google.auto.service:auto-service to 1.1.1 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump com.google.dagger group to 2.50 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump com.graphql-java:graphql-java to 21.3 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump com.splunk.logging:splunk-library-javalogging to 1.11.8 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump com.squareup.okhttp3:okhttp to 4.12.0 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump commons-io:commons-io to 2.15.1 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump dnsjava:dnsjava to 3.5.3 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump info.picocli group to 4.7.5 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump io.grpc group to 1.60.1 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump io.kubernetes:client-java to 18.0.1 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump io.netty group to 4.1.104.Final Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump net.java.dev.jna:jna to 5.14.0 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.apache.commons:commons-compress to 1.25.0 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.apache.commons:commons-lang3 to 3.14.0 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.apache.commons:commons-text to 1.11.0 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.apache.logging.log4j group to 2.22.1 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Redorder io.tmio group Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.assertj:assertj-core to 3.25.1 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.bouncycastle group to 1.77 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.fusesource.jansi:jansi to 2.4.1 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.immutables group 2.10.0 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.java-websocket:Java-WebSocket to 1.5.5 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.jetbrains.kotlin:kotlin-stdlib to 1.9.22 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.junit.jupiter group to 5.10.1 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.jupnp group to 2.7.1 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.rocksdb:rocksdbjni to 8.9.1 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.slf4j group to 2.0.10 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.springframework.security:spring-security-crypto to 6.2.1 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.testcontainers:testcontainers to 1.19.3 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.web3j group to 4.10.3 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Bump org.xerial.snappy:snappy-java to 1.1.10.5 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Regenerate gradle verification metadata Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Update commons-codec:commons-codec to 1.16.0 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Update org.junit.vintage:junit-vintage-engine to 5.10.1 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Update CHANGELOG Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> --------- Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * add a fallback for docker detection on Mac (besu-eth#6356) Signed-off-by: garyschulte <garyschulte@gmail.com> * Fix test flackyness of acceptanceTestsPermissioning (besu-eth#6384) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> * Upgrade `com.fasterxml.jackson` dependencies (besu-eth#6378) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Use mining beneficiary from protocol spec in TraceServiceImpl (besu-eth#6390) * use mining beneficiary from protocol spec Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> --------- Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> * Update verification metadata and allowed licenses for Linea-Besu --------- Signed-off-by: Karim Taam <karim.t2am@gmail.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: jflo <justin+github@florentine.us> Signed-off-by: garyschulte <garyschulte@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Signed-off-by: vuittont60 <81072379+vuittont60@users.noreply.github.com> Signed-off-by: Manoj P R <manojpramesh@gmail.com> Signed-off-by: Hal Blackburn <hwtb2@cam.ac.uk> Signed-off-by: Meredith Baxter <mbaxter.dev@gmail.com> Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> Co-authored-by: Karim TAAM <karim.t2am@gmail.com> Co-authored-by: garyschulte <garyschulte@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Justin Florentine <justin+github@florentine.us> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Matt Whitehead <matthew1001@gmail.com> Co-authored-by: Stefan Pingel <16143240+pinges@users.noreply.github.com> Co-authored-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Co-authored-by: Simon Dudley <simon.dudley@consensys.net> Co-authored-by: vuittont60 <81072379+vuittont60@users.noreply.github.com> Co-authored-by: Manoj P R <manojpramesh@gmail.com> Co-authored-by: Hal Blackburn <hal.blackburn@gmail.com> Co-authored-by: mbaxter <mbaxter.dev@gmail.com> Co-authored-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Co-authored-by: daniellehrner <daniel.lehrner@consensys.net>
1 parent dcb6f27 commit 6d9c8b1

File tree

53 files changed

+2404
-2101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2404
-2101
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Breaking Changes
66
- New `EXECUTION_HALTED` error returned if there is an error executing or simulating a transaction, with the reason for execution being halted. Replaces the generic `INTERNAL_ERROR` return code in certain cases which some applications may be checking for [#6343](https://github.com/hyperledger/besu/pull/6343)
7+
- The Besu Docker images with `openjdk-latest` tags since 23.10.3 were incorrectly using UID 1001 instead of 1000 for the container's `besu` user. The user now uses 1000 again. Containers created from or migrated to images using UID 1001 will need to chown their persistent database files to UID 1000 [#6360](https://github.com/hyperledger/besu/pull/6360)
78

89
### Deprecations
910
- Forest pruning (`pruning-enabled` options) is deprecated and will be removed soon. To save disk space consider switching to Bonsai data storage format [#6230](https://github.com/hyperledger/besu/pull/6230)
@@ -15,9 +16,15 @@
1516
- Add custom genesis file name to config overview if specified [#6297](https://github.com/hyperledger/besu/pull/6297)
1617
- Update Gradle plugins and replace unmaintained License Gradle Plugin with the actively maintained Gradle License Report [#6275](https://github.com/hyperledger/besu/pull/6275)
1718
- Optimize RocksDB WAL files, allows for faster restart and a more linear disk space utilization [#6328](https://github.com/hyperledger/besu/pull/6328)
19+
- Disable transaction handling when the node is not in sync, to avoid unnecessary transaction validation work [#6302](https://github.com/hyperledger/besu/pull/6302)
20+
- Upgrade dependencies [#6377](https://github.com/hyperledger/besu/pull/6377)
21+
- Upgrade `com.fasterxml.jackson` dependencies [#6378](https://github.com/hyperledger/besu/pull/6378)
1822

1923
### Bug fixes
2024
- INTERNAL_ERROR from `eth_estimateGas` JSON/RPC calls [#6344](https://github.com/hyperledger/besu/issues/6344)
25+
- Fix Besu Docker images with `openjdk-latest` tags since 23.10.3 using UID 1001 instead of 1000 for the `besu` user [#6360](https://github.com/hyperledger/besu/pull/6360)
26+
- Fluent EVM API definition for Tangerine Whistle had incorrect code size validation configured [#6382](https://github.com/hyperledger/besu/pull/6382)
27+
- Correct mining beneficiary for Clique networks in TraceServiceImpl [#6390](https://github.com/hyperledger/besu/pull/6390)
2128

2229
## 23.10.3
2330

acceptance-tests/dsl/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ dependencies {
2626
implementation project(':testutil')
2727
implementation project(':util')
2828

29-
implementation 'com.github.tomakehurst:wiremock-jre8'
3029
implementation 'com.google.guava:guava'
3130
implementation 'com.google.dagger:dagger'
3231
annotationProcessor 'com.google.dagger:dagger-compiler'
@@ -45,6 +44,7 @@ dependencies {
4544
implementation 'org.web3j:abi'
4645
implementation 'org.web3j:besu'
4746
implementation 'org.web3j:crypto'
47+
implementation 'org.wiremock:wiremock'
4848

4949
implementation 'org.testcontainers:testcontainers'
5050
implementation 'org.junit.jupiter:junit-jupiter'

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/EthConditions.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ public Condition miningStatus(final boolean isMining) {
7777
return new MiningStatusCondition(transactions.mining(), isMining);
7878
}
7979

80+
public Condition syncingStatus(final boolean isSyncing) {
81+
return new SyncingStatusCondition(transactions.syncing(), isSyncing);
82+
}
83+
8084
public Condition expectNewPendingTransactions(
8185
final BigInteger filterId, final List<String> transactionHashes) {
8286
return new NewPendingTransactionFilterChangesCondition(
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Copyright Hyperledger Besu Contributors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
5+
* the License. You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
10+
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
11+
* specific language governing permissions and limitations under the License.
12+
*
13+
* SPDX-License-Identifier: Apache-2.0
14+
*/
15+
package org.hyperledger.besu.tests.acceptance.dsl.condition.eth;
16+
17+
import static org.assertj.core.api.Assertions.assertThat;
18+
19+
import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
20+
import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
21+
import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
22+
import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthSyncingTransaction;
23+
24+
public class SyncingStatusCondition implements Condition {
25+
26+
private final EthSyncingTransaction transaction;
27+
private final boolean syncingMiningStatus;
28+
29+
public SyncingStatusCondition(
30+
final EthSyncingTransaction transaction, final boolean syncingStatus) {
31+
this.transaction = transaction;
32+
this.syncingMiningStatus = syncingStatus;
33+
}
34+
35+
@Override
36+
public void verify(final Node node) {
37+
WaitUtils.waitFor(
38+
10, () -> assertThat(node.execute(transaction)).isEqualTo(syncingMiningStatus));
39+
}
40+
}

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,8 @@ public void start(final List<? extends RunnableNode> nodes) {
8686
final Optional<? extends RunnableNode> bootnode = selectAndStartBootnode(nodes);
8787

8888
nodes.parallelStream()
89-
.filter(
90-
node -> {
91-
LOG.info("starting non-bootnode {}", node.getName());
92-
return bootnode.map(boot -> boot != node).orElse(true);
93-
})
89+
.filter(node -> bootnode.map(boot -> boot != node).orElse(true))
90+
.peek(node -> LOG.info("starting non-bootnode {}", node.getName()))
9491
.forEach(this::startNode);
9592

9693
if (clusterConfiguration.isAwaitPeerDiscovery()) {
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Copyright Hyperledger Besu Contributors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
5+
* the License. You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
10+
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
11+
* specific language governing permissions and limitations under the License.
12+
*
13+
* SPDX-License-Identifier: Apache-2.0
14+
*/
15+
package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth;
16+
17+
import static org.assertj.core.api.Assertions.assertThat;
18+
19+
import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
20+
import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
21+
22+
import java.io.IOException;
23+
24+
import org.web3j.protocol.core.methods.response.EthSyncing;
25+
26+
public class EthSyncingTransaction implements Transaction<Boolean> {
27+
28+
EthSyncingTransaction() {}
29+
30+
@Override
31+
public Boolean execute(final NodeRequests node) {
32+
try {
33+
EthSyncing response = node.eth().ethSyncing().send();
34+
assertThat(response).isNotNull();
35+
return response.isSyncing();
36+
} catch (final IOException e) {
37+
throw new RuntimeException(e);
38+
}
39+
}
40+
}

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthTransactions.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ public EthMiningTransaction mining() {
7373
return new EthMiningTransaction();
7474
}
7575

76+
public EthSyncingTransaction syncing() {
77+
return new EthSyncingTransaction();
78+
}
79+
7680
public EthNewPendingTransactionFilterTransaction newPendingTransactionsFilter() {
7781
return new EthNewPendingTransactionFilterTransaction();
7882
}

acceptance-tests/tests/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ dependencies {
5555
testImplementation project(':testutil')
5656
testImplementation project(':util')
5757

58-
testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone'
5958
testImplementation 'commons-io:commons-io'
6059
testImplementation 'io.grpc:grpc-all'
6160
testImplementation 'io.grpc:grpc-core'
@@ -84,6 +83,7 @@ dependencies {
8483
testImplementation 'org.web3j:abi'
8584
testImplementation 'org.web3j:besu'
8685
testImplementation 'org.web3j:core'
86+
testImplementation 'org.wiremock:wiremock'
8787

8888
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
8989
}

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ public void setUp() {
4949

5050
permissionedNode.verify(admin.addPeer(bootnode));
5151
permissionedNode.verify(admin.addPeer(allowedNode));
52+
53+
allowedNode.verify(eth.syncingStatus(false));
54+
bootnode.verify(eth.syncingStatus(false));
55+
permissionedNode.verify(eth.syncingStatus(false));
56+
forbiddenNode.verify(eth.syncingStatus(false));
5257
}
5358

5459
@Test

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ public void setUp() {
4646

4747
permissionedNode.execute(allowNode(permissionedNode));
4848
permissionedNode.verify(connectionIsAllowed(permissionedNode));
49+
50+
allowedNode.verify(eth.syncingStatus(false));
51+
bootnode.verify(eth.syncingStatus(false));
52+
permissionedNode.verify(eth.syncingStatus(false));
53+
forbiddenNode.verify(eth.syncingStatus(false));
4954
}
5055

5156
@Test

0 commit comments

Comments
 (0)