267 Commits

Author SHA1 Message Date
Fabio Di Fabio
b19ae8cd26 Merge branch 'main' into zkbesu
# Conflicts:
#	.github/workflows/release.yml
#	besu/src/main/java/org/hyperledger/besu/controller/BesuController.java
#	ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java
#	ethereum/evmtool/build.gradle
#	evm/src/main/java/org/hyperledger/besu/evm/EvmSpecVersion.java
#	gradle/verification-metadata.xml
#	plugin-api/build.gradle
2024-07-16 17:22:21 +02:00
Matt Whitehead
609eb76ba0 Add build version option to prefix git hash with custom version property (#7222)
* Add build version option to prefix git hash with custom version property
* Refactor to make appending the git hash a boolean property. Include a commented-out example of how to use the properties in the gradle file

Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
2024-06-21 11:55:10 -07:00
Fabio Di Fabio
7e375ea72f build.gradle clean and switch to latest java version
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2024-04-02 11:58:31 +02:00
Karim TAAM
f2c2512ef6 storage format refactor for preparing verkle trie integration (#6721)
Splitting Bonsai code: This commit aims to divide Bonsai into two packages

- Common Classes with a Prefix: The common part will include classes prefixed with "DiffBased." These classes are designed to provide a base for both Bonsai and any future storage format that might use this diff-based approach.

- Bonsai's Specifics: Bonsai will retain its unique features in its own package. This means that while it shares the diff-based infrastructure with the common part, it also has its own specific functionalities that are not shared with other storage format.

- Extension to Verkle: this modification add the possibility of adding "Verkle" as a new storage format based on the diff-based architecture. Like Bonsai, Verkle would use the common diff-based classes but also have its own specific features.

---------

Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
2024-03-27 10:17:40 +00:00
Fabio Di Fabio
df45d38616 Merge branch 'main' into zkbesu 2024-03-25 11:07:26 +01:00
Simon Dudley
bb9ba13cf8 Refactor BackwardsSyncAlgorithm.pickNextStep for readability (#6775)
* Refactor BackwardsSyncAlgorithm.pickNextStep for readability

...mostly extracting methods

- Result null check
- Remove redundant BannedMethod suppressions
- Add sonar config back in that was removed by mistake

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
2024-03-25 04:45:19 +00:00
Fabio Di Fabio
b37f6451ea Merge branch 'main' into zkbesu 2024-03-22 15:21:24 +01:00
Stefan Pingel
42f4748ab9 Fix "Backward sync stuck in a loop" #6749 (#6756)
* minimal change to fix BWS

Signed-off-by: stefan.pingel@consensys.net <stefan.pingel@consensys.net>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
2024-03-23 00:08:49 +10:00
Fabio Di Fabio
b48324b859 Merge branch 'main' into zkbesu
# Conflicts:
#	.github/pull_request_template.md
#	.github/workflows/acceptance-tests.yml
#	.github/workflows/artifacts.yml
#	.github/workflows/integration-tests.yml
#	.github/workflows/pre-review.yml
#	.github/workflows/reference-tests.yml
#	.github/workflows/sonarcloud.yml
#	build.gradle
#	ethereum/evmtool/build.gradle
#	gradle.properties
2024-03-21 11:03:49 +01:00
garyschulte
39a356f824 proposed "develop" build versions (#6699)
* proposed "develop" build versions

Signed-off-by: garyschulte <garyschulte@gmail.com>
2024-03-13 17:52:41 +00:00
Fabio Di Fabio
9fb19f7e2d Merge branch 'main' into zkbesu 2024-02-16 10:44:18 +01:00
garyschulte
de9b301372 bump rev (#6575)
Signed-off-by: garyschulte <garyschulte@gmail.com>
2024-02-14 16:56:01 -08:00
Fabio Di Fabio
01e96b558a Merge branch 'main' into zkbesu 2024-01-22 11:51:19 +01:00
Sally MacFarlane
958a072378 24.1.2-SNAPSHOT (#6432)
Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
2024-01-19 17:20:20 +10:00
Fabio Di Fabio
da021868a8 Merge branch 'main' into zkbesu
# Conflicts:
#	.circleci/config.yml
#	CHANGELOG.md
#	gradle.properties
#	plugin-api/build.gradle
2024-01-12 09:57:43 +01:00
garyschulte
0f241206d0 Bump to nex release snapshot 24.1.1 (#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>
2024-01-11 09:52:31 +10:00
Fabio Di Fabio
99b9ab3f3f Merge Besu main (#32)
* mark deleted slot during clear storage step (#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 (#6337)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* migrate controller tests to junit 5 (#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 (#6322)

Signed-off-by: jflo <justin+github@florentine.us>

* Fix trielog shipping issue during self destruct (#6340)

* fix trielog shipping issue

Signed-off-by: Karim Taam <karim.t2am@gmail.com>

* bump gradle properties version and adjust changelog to match release (#6347)

Signed-off-by: garyschulte <garyschulte@gmail.com>

* finalized cancun spec (#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 (#6328)


Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Make RPC reason settable, pass execution failure reason in RPC error message (#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 (#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 (#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 (#6359)

Signed-off-by: Karim Taam <karim.t2am@gmail.com>

* migrate clique tests fully to junit5 (#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 (#6366)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* Move logging to RunnerBuilder (#6367)

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

* Use synchronized call to access the chain head block in `eth_estimateGas` (#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>

---------

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>
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: 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>
2024-01-08 15:18:10 +01:00
garyschulte
dbaa34dc69 bump gradle properties version and adjust changelog to match release (#6347)
Signed-off-by: garyschulte <garyschulte@gmail.com>
2024-01-03 13:14:08 -08:00
Fabio Di Fabio
1d4b97918c Merge branch 'main' into zkbesu
# Conflicts:
#	.github/workflows/checks.yml
#	.github/workflows/codeql.yml
#	.github/workflows/release.yml
#	.github/workflows/sonarcloud.yml
#	build.gradle
#	gradle.properties
2023-12-21 10:32:57 +01:00
Fabio Di Fabio
1a7244f808 Update Gradle plugins and replace unmaintained license plugin (#6275)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2023-12-18 11:08:32 +01:00
Fabio Di Fabio
a0edac552b Merge branch 'main' into zkbesu
# Conflicts:
#	.circleci/config.yml
#	gradle.properties
2023-12-06 13:47:35 +01:00
Justin Florentine
9f87ec48b2 Release 23.10.3 rc1 in progress, uprev main. (#6227)
moving on to 23.10.4 developmnet

---------

Signed-off-by: Justin Florentine <justin+github@florentine.us>
2023-12-01 15:41:17 -05:00
Fabio Di Fabio
c8a65ce268 Merge branch 'main' into zkbesu
# Conflicts:
#	.circleci/config.yml
#	gradle.properties
2023-11-20 14:56:04 +01:00
Justin Florentine
5542730c55 update version for snapshot (#6154)
Signed-off-by: Justin Florentine <justin+github@florentine.us>
2023-11-10 15:02:10 -05:00
Fabio Di Fabio
3313946683 Merge branch 'main' into zkbesu
# Conflicts:
#	ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java
#	gradle.properties
2023-10-27 10:39:37 +02:00
Gabriel-Trintinalia
f81088789e Update changelog release (#6062)
Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>
2023-10-20 12:02:52 +11:00
Fabio Di Fabio
8676e0f9df Merge branch 'main' into zkbesu
# Conflicts:
#	gradle.properties
2023-10-11 10:15:44 +02:00
Fabio Di Fabio
62159dc55d Bump version to 23.10.1-SNAPSHOT (#5990)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2023-10-05 16:02:42 +02:00
Fabio Di Fabio
8718a5f6e3 Merge branch 'main' into zkbesu 2023-09-25 14:21:38 +02:00
Simon Dudley
2dccfe7ce9 Bump version to 23.7.4-SNAPSHOT (#5913)
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
2023-09-21 06:34:27 +10:00
Fabio Di Fabio
f61e5703e8 Merge branch 'main' into fabio
# Conflicts:
#	.github/workflows/checks.yml
#	.github/workflows/codeql.yml
#	.github/workflows/dco-merge-group.yml
#	.github/workflows/dco.yml
#	.github/workflows/gradle-wrapper-validation.yml
#	.github/workflows/pr-checklist-on-open.yml
#	.github/workflows/release.yml
#	.github/workflows/repolinter.yml
#	besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
#	gradle.properties
2023-09-12 16:13:30 +02:00
Daniel Lehrner
a63bf3d8a1 bump version to 23.7.3-SNAPSHOT (#5854)
Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net>
2023-09-06 10:42:27 +02:00
Fabio Di Fabio
d6173efab5 Update docker dist properties
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2023-08-23 15:57:41 +02:00
Fabio Di Fabio
0dafa19894 Merge remote-tracking branch 'upstream/main' 2023-08-23 12:34:45 +02:00
garyschulte
0e55a9f3f5 update changelog and version for 23.7.2-SNAPSHOT (#5779)
* update changelog and version for 23.7.2-SNAPSHOT

Signed-off-by: garyschulte <garyschulte@gmail.com>
2023-08-21 16:14:58 -04:00
Fabio Di Fabio
46ffd0755c Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java
#	ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java
#	ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverter.java
#	ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcError.java
#	ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethodsFactory.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostAllowlistTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTestBase.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsClientAuthTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsMisconfigurationTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpec.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java
#	ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java
#	ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java
#	evm/src/main/java/org/hyperledger/besu/evm/EvmSpecVersion.java
2023-07-25 15:25:54 +02:00
garyschulte
1a7635bc3e Prepare for version 23.7.1-SNAPSHOT (#5723)
Signed-off-by: garyschulte <garyschulte@gmail.com>
2023-07-24 18:17:41 -07:00
garyschulte
a57aa1b81d 23.7.0 release (#5722)
Signed-off-by: garyschulte <garyschulte@gmail.com>
2023-07-24 17:11:06 -07:00
Stefan Pingel
f05367fa59 Prepare for version 23.4.5-SNAPSHOT (#5652)
Signed-off-by: Stefan <stefan.pingel@consensys.net>
2023-06-28 17:57:00 +10:00
Stefan Pingel
8f9882f768 Prepare for version 23.4.4-SNAPSHOT (#5621)
Signed-off-by: Stefan <stefan.pingel@consensys.net>
2023-06-20 13:55:18 +10:00
Stefan Pingel
b6a59b8ad0 23.4.3 release (#5620)
Signed-off-by: Stefan <stefan.pingel@consensys.net>
2023-06-20 13:34:25 +10:00
Stefan Pingel
50ea7268ee Prepare for version 23.4.3-SNAPSHOT (#5609)
Signed-off-by: Stefan <stefan.pingel@consensys.net>
2023-06-16 12:28:25 +10:00
Stefan Pingel
1e08cab5d6 23.4.2 release (#5608)
Signed-off-by: Stefan <stefan.pingel@consensys.net>
2023-06-16 11:31:23 +10:00
Fabio Di Fabio
f8c5db07fc Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	.circleci/config.yml
#	besu/src/main/java/org/hyperledger/besu/controller/BesuController.java
#	besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
#	ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java
#	ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelector.java
#	ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
2023-06-14 12:23:04 +02:00
Simon Dudley
ba2ecc01ba Prepare for next version (#5504)
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
2023-05-26 14:56:43 +10:00
Simon Dudley
4563ebbcec Release 23.4.1 (#5501)
* Update version to 23.4.1
* Changelog

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
2023-05-26 13:34:05 +10:00
Fabio Di Fabio
be37c24895 Merge remote-tracking branch 'upstream/main' 2023-05-02 13:39:43 +02:00
Fabio Di Fabio
7427275448 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
#	besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java
#	besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java
#	besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
#	consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeProtocolSchedule.java
#	consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java
#	ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethodsFactory.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractProtocolScheduleBuilder.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TimestampScheduleBuilder.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionInvalidReason.java
#	ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/DefaultTimestampScheduleTest.java
#	ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/TimestampScheduleBuilderTest.java
#	ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/MainnetGenesisFileModule.java
#	ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java
2023-05-02 11:51:03 +02:00
Justin Florentine
3ad365cf83 Release 23.4.1-SNAPSHOT (#5410)
* uprev to snapshot, update changelog, adds download links with shas
---------

Signed-off-by: Justin Florentine <justin+github@florentine.us>
2023-04-28 14:15:38 -04:00
Justin Florentine
d4c637b8e3 uprevving to 23.4.0 for release (#5409)
Signed-off-by: Justin Florentine <justin+github@florentine.us>
2023-04-28 13:18:58 -04:00