45 Commits

Author SHA1 Message Date
Fabio Di Fabio
8b5b40d21e Merge branch 'main' into zkbesu
# Conflicts:
#	.github/workflows/acceptance-tests.yml
#	.github/workflows/codeql.yml
#	.github/workflows/integration-tests.yml
#	.github/workflows/pre-review.yml
#	.github/workflows/reference-tests.yml
#	build.gradle
2025-03-18 11:23:20 +01:00
garyschulte
c924e7686f Feature/required besu native (#8418)
* implement NativeRequirements for named networks

Signed-off-by: garyschulte <garyschulte@gmail.com>
2025-03-17 16:54:04 -07:00
Simon Dudley
789542f76d Pull in Consensys/tuweni v2.7.0 (#8330)
This replaces io.tmio/tuweni with the Consensys fork.

Also Includes:
- reduce check argument args allocations - https://github.com/Consensys/tuweni/pull/10
which should reduce Integer and int[] and therefore gc pressure

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
2025-03-17 19:42:25 +10:00
Bhanu Pulluri
2db46e964c Enable Quorum/IBFT1 to Besu migration (#8262)
* Enable Quorum/IBFT1 to Besu migration

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Fix BftMining acceptance test

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Introduce delay after London fork update in BFT mining test to prevent timing issues

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Update besu/src/main/java/org/hyperledger/besu/controller/IbftLegacyBesuControllerBuilder.java

Co-authored-by: Matt Whitehead <matthew1001@hotmail.com>
Signed-off-by: Bhanu Pulluri <59369753+pullurib@users.noreply.github.com>

* Review changes

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* update creating additional JSON RPC methods for all controllerbuidlers in consensus schedule

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Create ethprotocol manager and plugin factory for both consensus controllers in migration

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Refactor resource files

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* fix verification metadata

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* fix regression

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* update changelog

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Fix controller selection at the transition block

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Review changes

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Revert BftExtraData changes

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

---------

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
Signed-off-by: Bhanu Pulluri <59369753+pullurib@users.noreply.github.com>
Co-authored-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
Co-authored-by: Matt Whitehead <matthew1001@hotmail.com>
Co-authored-by: Matt Whitehead <matthew.whitehead@kaleido.io>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
2025-03-12 14:08:51 +00:00
Fabio Di Fabio
98c70654b7 Update dependencies (#8350)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2025-02-27 08:52:29 +10:00
Sally MacFarlane
887e6d5101 remove unused wiremock dependency (#8318)
* remove unused wiremock dependency

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

* updated metadata

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

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
2025-02-25 08:49:47 +10:00
Vaidik
65baa304d4 Update to new version of jc-kzg-4844 lib (#7849)
* Updating Dependencies
Signed-off-by: vaidikcode <vaidikbhardwaj00@gmail.com>

* Update CHANGELOG.md
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

---------

Signed-off-by: Vaidik <vaidikbhardwaj00@gmail.com>
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2025-02-19 17:00:37 +00:00
Sally MacFarlane
53040061c8 [build] update non-bom dependencies (#8315)
* update non-bom dependencies

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

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
2025-02-17 21:56:15 +00:00
Sally MacFarlane
873971acbf update dependency versions (#8293)
* update versions of dependencies

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

* update verification metadata for jackson

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

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
2025-02-16 20:39:55 +00:00
Sally MacFarlane
6791c5fea6 remove k8s NAT method (#8289)
* remove k8s NAT method

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

* changelog - update pr number in changelog

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

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
2025-02-14 09:53:40 +10:00
Joshua Fernandes
3d56e87fcd Merge branch 'hyperledger:main' into zkbesu 2025-02-14 07:32:46 +10:00
Matilda-Clerke
90015fca42 Refactor packet classes for dependency injection (#8271)
* Apply expiration checks in PacketData classes

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

* Fix broken unit tests

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

* spotless

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

* Fix failing test

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

* Refactor to use clock to validate expiry

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

* Refactor Packet and PacketData

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

* Move java.inject version to platform/build.gradle

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

* Update copyright notices on Packet and PacketData classes

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

* Update PeerDiscoveryControllerTest to avoid use of Thread.sleep

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

* Update copyright noticed on PeerDiscoveryControllerTest and MockPacketDataFactory

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

* Remove old PacketTest

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

* Reorder platform/build.gradle api platform dependencies to alphabetical order

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

---------

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>
2025-02-13 02:09:58 +00:00
Fabio Di Fabio
9d33e95471 Revert "Hotfix for gradle compile issue by locking in json-smart version (#8282)" (#8286)
This reverts commit 0ad85ecada.

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2025-02-13 05:51:19 +10:00
Fabio Di Fabio
bdc6423779 Merge branch 'main' into zkbesu
# Conflicts:
#	.github/workflows/pre-review.yml
#	.github/workflows/reference-tests.yml
2025-02-12 16:05:20 +01:00
Simon Dudley
0ad85ecada Hotfix for gradle compile issue by locking in json-smart version (#8282)
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
2025-02-12 10:40:29 +01:00
Matilda-Clerke
af842eb760 Update to Consensys/discovery 25.2.0 (#8278)
Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
2025-02-12 03:40:06 +00:00
Matt Whitehead
a45475d81d Update netty to 4.1.118 for CVE-2025-24970 (#8275)
* Update netty to 4.1.115 for CVE-2025-24970

Signed-off-by: Matthew Whitehead <matthew.whitehead@kaleido.io>

* Add entry to changelog

Signed-off-by: Matthew Whitehead <matthew.whitehead@kaleido.io>

---------

Signed-off-by: Matthew Whitehead <matthew.whitehead@kaleido.io>
2025-02-11 14:04:18 +00:00
Fabio Di Fabio
2abc4b6491 Merge branch 'main' into zkbesu
# Conflicts:
#	gradle/verification-metadata.xml
2025-02-07 18:20:34 +01:00
Jason Frame
a021feae03 Change Qbft to use its own QbftBlockHeader type (#8244)
Signed-off-by: Jason Frame <jason.frame@consensys.net>
2025-02-07 02:37:32 +00:00
garyschulte
e835cd07d2 bump besu-native to 1.1.2 (#8264)
* bump besu-native to 1.1.2

Signed-off-by: garyschulte <garyschulte@gmail.com>
2025-02-07 00:50:32 +00:00
Fabio Di Fabio
0b17320927 Merge branch 'main' into zkbesu 2025-01-13 17:28:36 +01:00
garyschulte
2aadbfcb0a implement the proposed gas changes for bls / eip-2537 (#8008)
* implement the proposed gas changes for bls / eip-2537 for pectra-devnet-5
* disable eip-2537 testing until we have new artifacts that reflect pectra gas costs

Signed-off-by: garyschulte <garyschulte@gmail.com>
2025-01-10 00:25:00 +00:00
Usman Saleem
01126c0853 Reimplement EthereumNodeRecord for DNS discovery (#7989)
* Reimplement EthereumNodeRecord and remove dependency on tuweni-devp2p
* Refactor EthereumNodeRecord for DNSDaemon
* Update EthereumNodeRecord to use Besu RLP
* additional unit tests
* Convert ENR to Java record
* regenerate equals and hashcode for enr record
---------

Signed-off-by: Usman Saleem <usman@usmans.info>
2025-01-07 13:14:39 +10:00
Fabio Di Fabio
6e255ceb6c Merge branch 'main' into zkbesu
# Conflicts:
#	build.gradle
#	gradle/verification-metadata.xml
2024-12-13 12:23:25 +01:00
Fabio Di Fabio
19119f1e0f Fix BOM pom publication to Artifactory (#8021)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2024-12-12 18:16:23 +00:00
garyschulte
c8ad1d12a0 Bump besu-native dep to 1.0.0 (#8019)
* remove evm dep on matter-labs bls12 lib

Signed-off-by: garyschulte <garyschulte@gmail.com>
2024-12-11 14:04:18 -08:00
Fabio Di Fabio
607e48a19b Merge branch 'main' into zkbesu
# Conflicts:
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetrySystem.java
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusHistogram.java
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java
#	metrics/core/src/test-support/java/org/hyperledger/besu/metrics/StubMetricsSystem.java
#	plugin-api/build.gradle
#	plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/Histogram.java
2024-11-27 16:09:57 +01:00
Fabio Di Fabio
5b2da5a068 Migrate to Prometheus lib 1.x (#7880)
* Upgrade to Promethus java client 1.x and adapt the code to the new version

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

* Update CHANGELOG.md

Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

---------

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
2024-11-27 11:04:31 +00:00
ahamlat
674a7bae58 Upgrade rocksdb jni lib from 8.3.2 to 9.7.3 (#7817)
* Upgrade rocksdb jni lib from 8.3.2 to 9.7.3
* Remove deprecated metrics
* Add changelog entry

Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>
2024-11-25 13:33:26 +01:00
Sally MacFarlane
96e9ed853f merge main
Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
2024-11-20 12:27:09 +10:00
Matt Whitehead
40b27a15d2 Upgrade netty to 4.1.115 (latest version) to resolve CVE (#7878)
* Upgrade netty to 4.1.115 (latest version) to resolve CVE

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>
2024-11-14 07:45:34 +00:00
Fabio Di Fabio
640d3bac0a Merge branch 'main' into zkbesu 2024-11-06 09:16:45 +01:00
Fabio Di Fabio
4099b3b322 Add more subprojects to BOM (#7859)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2024-11-06 08:14:07 +00:00
Fabio Di Fabio
85c771628e Merge branch 'main' into zkbesu 2024-10-31 13:56:29 +01:00
Sally MacFarlane
c318b6a5ff [TESTING] Remove dependency on test containers (#7790)
* removed dep for testcontainers

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

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
2024-10-29 13:33:46 +10:00
Fabio Di Fabio
0037615dc4 Merge branch 'main' into zkbesu
# Conflicts:
#	build.gradle
2024-10-24 12:01:44 +02:00
Fabio Di Fabio
71906fa9d4 Replace custom required options check with standard way (#7738)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2024-10-24 08:10:18 +00:00
Fabio Di Fabio
8e3735fae5 Include platform (BOM) project when publishing (#7803)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2024-10-24 07:31:12 +00:00
Fabio Di Fabio
829db2320d Duplicate publishing conf for platform project
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2024-10-23 12:57:50 +02:00
Fabio Di Fabio
e2516352c8 Fix publishing of the BOM artifact
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2024-10-23 12:11:02 +02:00
Fabio Di Fabio
30ef0ac24b Merge branch 'main' into zkbesu 2024-10-23 09:53:36 +02:00
Sally MacFarlane
76060a0416 [TESTING] remove junit4 dependency (#7793)
* migrate to junit5
* remove junit4 dep
* remove vintage dep

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

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
2024-10-23 07:52:51 +10:00
Fabio Di Fabio
6df40af630 Publish BOM to correct repo
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2024-10-22 17:21:52 +02:00
Fabio Di Fabio
937c25acdd Update Java dependencies (#7786)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2024-10-21 09:49:06 +00:00
Fabio Di Fabio
9a7744763a Create and publish Besu BOM (Bill of Materials) (#7615)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2024-10-18 10:50:55 +00:00