Skip to content

Commit 47364bf

Browse files
jfloshemnonmatthew1001macfarladlutzardo
authored
Release 23.10.3-RC4 (#6310)
* Increase scope of reference tests (#6287) Add new forks to transaction tests, add bad rlp to rlp ref tests. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: jflo <justin+github@florentine.us> * Add trace to web socket JSON/RPC responses (#6285) * Add trace to web socket JSON/RPC responses Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Don't throw runtime exception if we can't parse JSON for trace Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> --------- Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> Signed-off-by: jflo <justin+github@florentine.us> * [MINOR] Include Enode URL in error message if parsing exception (#6288) * include the actual Enode URL in the error message if IP can't be resolved --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: jflo <justin+github@florentine.us> * Execute the terminatedImmediately method only once (#6284) Signed-off-by: David Lutzardo <jdlutzardo@izertis.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: jflo <justin+github@florentine.us> * move forest class to a specific package (#6293) cleaning up the worldstate section, moving and renaming everything that is forest into a specific package in order to clarify the difference between Bonsai and Forest in the code. --------- Signed-off-by: Karim Taam <karim.t2am@gmail.com> Signed-off-by: matkt <karim.t2am@gmail.com> Signed-off-by: jflo <justin+github@florentine.us> * removed vintage junit dependency (#6296) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: jflo <justin+github@florentine.us> * updated cli and chainimport/export tests to junit 5 (#6281) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: jflo <justin+github@florentine.us> * [MINOR] CLI Subcommands migrate to junit 5 (#6282) * updated cli and chainimport/export tests to junit 5 Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * subcommands and besucommand test to junit5 Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * removed duplicate line Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * removed vintage junit dep Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: jflo <justin+github@florentine.us> * [MINOR] add genesis file name to config overview (#6297) * add genesis file name to config overview Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: jflo <justin+github@florentine.us> * create trie package for bonsai and forest (#6300) Signed-off-by: Karim Taam <karim.t2am@gmail.com> Signed-off-by: matkt <karim.t2am@gmail.com> Signed-off-by: jflo <justin+github@florentine.us> * [MINOR] More cli tests to junit 5 (#6283) * more CLI and services tests to junit5 --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: jflo <justin+github@florentine.us> * Update Gradle plugins and replace unmaintained license plugin (#6275) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: jflo <justin+github@florentine.us> * Quick fix to avoid a tight loop when processing added blocks in txpool (#6309) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: jflo <justin+github@florentine.us> * uprev to version 23.10.3-RC4 Signed-off-by: jflo <justin+github@florentine.us> * mark deleted slot during clear storage step Signed-off-by: Karim Taam <karim.t2am@gmail.com> --------- Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: jflo <justin+github@florentine.us> Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: David Lutzardo <jdlutzardo@izertis.com> Signed-off-by: Karim Taam <karim.t2am@gmail.com> Signed-off-by: matkt <karim.t2am@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Co-authored-by: Matt Whitehead <matthew1001@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: David Lutzardo <jdlutzardo@izertis.com> Co-authored-by: Karim TAAM <karim.t2am@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net>
1 parent 536c444 commit 47364bf

File tree

162 files changed

+2878
-1439
lines changed

Some content is hidden

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

162 files changed

+2878
-1439
lines changed

‎.github/workflows/checks.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
- name: Checkout Repo
1414
uses: actions/checkout@v4
1515
- name: Set up Java
16-
uses: actions/setup-java@v3
16+
uses: actions/setup-java@v4
1717
with:
18-
distribution: adopt
18+
distribution: 'temurin'
1919
java-version: 17
2020
cache: gradle
2121
- name: spotless
@@ -27,9 +27,9 @@ jobs:
2727
- name: Checkout Repo
2828
uses: actions/checkout@v4
2929
- name: Set up Java 17
30-
uses: actions/setup-java@v3
30+
uses: actions/setup-java@v4
3131
with:
32-
distribution: adopt
32+
distribution: 'temurin'
3333
java-version: 17
3434
cache: gradle
3535
- name: javadoc (JDK 17)

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ jobs:
4242
uses: actions/checkout@v4
4343

4444
- name: Set up Java
45-
uses: actions/setup-java@v3
45+
uses: actions/setup-java@v4
4646
with:
47-
distribution: adopt
47+
distribution: 'temurin'
4848
java-version: 17
49+
cache: gradle
4950

5051
# Initializes the CodeQL tools for scanning.
5152
- name: Initialize CodeQL

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ jobs:
77
runs-on: [besu-research-ubuntu-16]
88
steps:
99
- uses: actions/checkout@v4
10-
- uses: actions/setup-java@v3
10+
- uses: actions/setup-java@v4
1111
with:
1212
distribution: 'temurin' # See 'Supported distributions' for available options
1313
java-version: '17'
14+
cache: gradle
1415
- name: Login to DockerHub
1516
run: echo '${{ secrets.DOCKER_PASSWORD_RW }}' | docker login -u '${{ secrets.DOCKER_USER_RW }}' --password-stdin
1617
- name: Setup Gradle

‎.github/workflows/sonarcloud.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,17 @@ jobs:
1919
- name: checkout
2020
uses: actions/checkout@v4
2121
- name: Set up JDK 17
22-
uses: actions/setup-java@v3
22+
uses: actions/setup-java@v4
2323
with:
2424
distribution: 'temurin'
2525
java-version: '17'
26+
cache: gradle
2627
- name: Cache SonarCloud packages
2728
uses: actions/cache@v3
2829
with:
2930
path: ~/.sonar/cache
3031
key: ${{ runner.os }}-sonar
3132
restore-keys: ${{ runner.os }}-sonar
32-
- name: Cache Gradle packages
33-
uses: actions/cache@v3
34-
with:
35-
path: ~/.gradle/caches
36-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
37-
restore-keys: ${{ runner.os }}-gradle
3833
- name: Build and analyze
3934
env:
4035
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
- Add error messages on authentication failures with username and password [#6212](https://github.com/hyperledger/besu/pull/6212)
1212
- New `Sequenced` transaction pool. The pool is an evolution of the `legacy` pool and is likely to be more suitable to enterprise or permissioned chains than the `layered` transaction pool. Select to use this pool with `--tx-pool=sequenced`. Supports the same options as the `legacy` pool [#6211](https://github.com/hyperledger/besu/issues/6211)
1313
- Set Ethereum Classic mainnet activation block for Spiral network upgrade [#6267](https://github.com/hyperledger/besu/pull/6267)
14+
- Add custom genesis file name to config overview if specified [#6297](https://github.com/hyperledger/besu/pull/6297)
15+
- Update Gradle plugins and replace unmaintained License Gradle Plugin with the actively maintained Gradle License Report [#6275](https://github.com/hyperledger/besu/pull/6275)
1416

1517
### Bug fixes
1618

‎besu/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,8 @@ dependencies {
9999
testImplementation 'org.awaitility:awaitility'
100100
testImplementation 'org.junit.jupiter:junit-jupiter'
101101
testImplementation 'org.mockito:mockito-core'
102-
testImplementation 'org.mockito:mockito-junit-jupiter'
103102
testImplementation 'org.testcontainers:testcontainers'
104103
testImplementation 'tech.pegasys.discovery:discovery'
105104

106-
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
107105
annotationProcessor 'com.google.dagger:dagger-compiler'
108106
}

‎besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
147147
import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProvider;
148148
import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder;
149-
import org.hyperledger.besu.ethereum.worldstate.PrunerConfiguration;
149+
import org.hyperledger.besu.ethereum.trie.forest.pruner.PrunerConfiguration;
150150
import org.hyperledger.besu.evm.precompile.AbstractAltBnPrecompiledContract;
151151
import org.hyperledger.besu.evm.precompile.BigIntegerModularExponentiationPrecompiledContract;
152152
import org.hyperledger.besu.evm.precompile.KZGPointEvalPrecompiledContract;
@@ -3246,7 +3246,7 @@ private List<EnodeURL> buildEnodes(
32463246
}
32473247

32483248
/**
3249-
* Besu CLI Paramaters exception handler used by VertX. Visible for testing.
3249+
* Besu CLI Parameters exception handler used by VertX. Visible for testing.
32503250
*
32513251
* @return instance of BesuParameterExceptionHandler
32523252
*/
@@ -3526,6 +3526,9 @@ private String generateConfigurationOverview() {
35263526
}
35273527

35283528
builder.setHasCustomGenesis(genesisFile != null);
3529+
if (genesisFile != null) {
3530+
builder.setCustomGenesis(genesisFile.getAbsolutePath());
3531+
}
35293532
builder.setNetworkId(ethNetworkConfig.getNetworkId());
35303533

35313534
builder

‎besu/src/main/java/org/hyperledger/besu/cli/ConfigurationOverviewBuilder.java‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public class ConfigurationOverviewBuilder {
4242
private String network;
4343
private BigInteger networkId;
4444
private boolean hasCustomGenesis;
45+
private String customGenesisFileName;
4546
private String dataStorage;
4647
private String syncMode;
4748
private Integer rpcPort;
@@ -98,6 +99,17 @@ public ConfigurationOverviewBuilder setHasCustomGenesis(final boolean hasCustomG
9899
return this;
99100
}
100101

102+
/**
103+
* Sets location of custom genesis file specified.
104+
*
105+
* @param customGenesisFileName the filename of the custom genesis file, only set if specified
106+
* @return the builder
107+
*/
108+
public ConfigurationOverviewBuilder setCustomGenesis(final String customGenesisFileName) {
109+
this.customGenesisFileName = customGenesisFileName;
110+
return this;
111+
}
112+
101113
/**
102114
* Sets data storage.
103115
*
@@ -269,7 +281,9 @@ public String build() {
269281
}
270282

271283
if (hasCustomGenesis) {
272-
lines.add("Network: Custom genesis file specified");
284+
lines.add("Network: Custom genesis file");
285+
lines.add(
286+
customGenesisFileName == null ? "Custom genesis file is null" : customGenesisFileName);
273287
}
274288

275289
if (networkId != null) {

‎besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/BackupState.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.hyperledger.besu.ethereum.api.query.StateBackupService.BackupStatus;
2727
import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
2828
import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
29-
import org.hyperledger.besu.ethereum.worldstate.DefaultWorldStateArchive;
29+
import org.hyperledger.besu.ethereum.trie.forest.ForestWorldStateArchive;
3030
import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
3131
import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
3232

@@ -82,7 +82,7 @@ public void run() {
8282
final BesuController besuController = createBesuController();
8383
final MutableBlockchain blockchain = besuController.getProtocolContext().getBlockchain();
8484
final WorldStateStorage worldStateStorage =
85-
((DefaultWorldStateArchive) besuController.getProtocolContext().getWorldStateArchive())
85+
((ForestWorldStateArchive) besuController.getProtocolContext().getWorldStateArchive())
8686
.getWorldStateStorage();
8787
final EthScheduler scheduler = new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem());
8888
try {

‎besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/RestoreState.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.hyperledger.besu.ethereum.trie.Node;
3737
import org.hyperledger.besu.ethereum.trie.PersistVisitor;
3838
import org.hyperledger.besu.ethereum.trie.RestoreVisitor;
39-
import org.hyperledger.besu.ethereum.worldstate.DefaultWorldStateArchive;
39+
import org.hyperledger.besu.ethereum.trie.forest.ForestWorldStateArchive;
4040
import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
4141
import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
4242
import org.hyperledger.besu.util.io.RollingFileReader;
@@ -250,7 +250,7 @@ private void newWorldStateUpdater() {
250250
updater.commit();
251251
}
252252
final WorldStateStorage worldStateStorage =
253-
((DefaultWorldStateArchive) besuController.getProtocolContext().getWorldStateArchive())
253+
((ForestWorldStateArchive) besuController.getProtocolContext().getWorldStateArchive())
254254
.getWorldStateStorage();
255255
updater = worldStateStorage.updater();
256256
}

0 commit comments

Comments
 (0)