Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull in Consensys/tuweni release #8330

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
+273 −97
Draft

Pull in Consensys/tuweni release #8330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
51b58ae
Pull in Consensys/tuweni release
siladu Feb 19, 2025
f9159cc
changelog
siladu Feb 19, 2025
1e7edbd
Switch version to tuweni 2.6.0 (semver)
siladu Feb 21, 2025
8a93eab
Merge branch 'main' into use-consensys-tuweni
siladu Feb 21, 2025
95ca240
Exclude io.tmio.tuweni libs across all projects
siladu Mar 6, 2025
50484b6
Merge branch 'main' into use-consensys-tuweni
siladu Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
- Change `Invalid block, unable to parse RLP` RPC error message to `Invalid block param (block not found)` [#8328](https://github.com/hyperledger/besu/pull/8328)
- Support pending transaction score when saving and restoring txpool [#8363](https://github.com/hyperledger/besu/pull/8363)
- Add era1 format to blocks import subcommand [#7935](https://github.com/hyperledger/besu/issues/7935)
- Replace tuweni libs with https://github.com/Consensys/tuweni
- Performance: Consensys/tuweni 2.6.0 reduces boxing/unboxing overhead on some EVM opcodes, like PushX and Caller


### Bug fixes
- Add missing RPC method `debug_accountRange` to `RpcMethod.java` so this method can be used with `--rpc-http-api-method-no-auth` [#8153](https://github.com/hyperledger/besu/issues/8153)
Expand Down
6 changes: 3 additions & 3 deletions acceptance-tests/dsl/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ dependencies {
implementation 'io.reactivex.rxjava2:rxjava'
implementation 'io.vertx:vertx-core'
implementation 'io.opentelemetry:opentelemetry-api'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-io'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-io'
implementation 'io.consensys.protocols:tuweni-units'
implementation 'org.assertj:assertj-core'
implementation 'org.awaitility:awaitility'
implementation 'org.java-websocket:Java-WebSocket'
Expand Down
2 changes: 1 addition & 1 deletion acceptance-tests/tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ dependencies {
testImplementation 'io.vertx:vertx-core'
testImplementation 'org.apache.commons:commons-compress'
testImplementation 'org.apache.logging.log4j:log4j-core'
testImplementation 'io.tmio:tuweni-crypto'
testImplementation 'io.consensys.protocols:tuweni-crypto'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.junit.jupiter:junit-jupiter'
Expand Down
12 changes: 6 additions & 6 deletions besu/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ dependencies {
implementation 'info.picocli:picocli'
implementation 'io.vertx:vertx-core'
implementation 'io.vertx:vertx-web'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-config'
implementation 'io.tmio:tuweni-toml'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-config'
implementation 'io.consensys.protocols:tuweni-toml'
implementation 'io.consensys.protocols:tuweni-units'
implementation 'org.apache.commons:commons-lang3'
implementation 'org.apache.logging.log4j:log4j-core'
implementation 'org.hibernate.validator:hibernate-validator'
Expand All @@ -97,8 +97,8 @@ dependencies {
testImplementation 'io.opentelemetry:opentelemetry-api'
testImplementation 'org.mockito:mockito-junit-jupiter'
testImplementation 'org.apache.commons:commons-text'
testImplementation 'io.tmio:tuweni-bytes'
testImplementation 'io.tmio:tuweni-units'
testImplementation 'io.consensys.protocols:tuweni-bytes'
testImplementation 'io.consensys.protocols:tuweni-units'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.junit.jupiter:junit-jupiter'
Expand Down
6 changes: 6 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,12 @@ configure(allprojects - project(':platform')) {
resolutionStrategy.capabilitiesResolution.withCapability('org.bouncycastle:bcpkix-jdk18on') {
selectHighestVersion()
}

// transitive versions conflict with io.protocols.tuweni, prefer ours
exclude group: 'io.tmio', module: 'tuweni-bytes'
exclude group: 'io.tmio', module: 'tuweni-crypto'
exclude group: 'io.tmio', module: 'tuweni-rlp'
exclude group: 'io.tmio', module: 'tuweni-units'
}


Expand Down
4 changes: 2 additions & 2 deletions config/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'com.google.dagger:dagger'
implementation 'info.picocli:picocli'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-units'
implementation "org.immutables:value-annotations"
annotationProcessor "org.immutables:value"
annotationProcessor 'com.google.dagger:dagger-compiler'
Expand Down
4 changes: 2 additions & 2 deletions consensus/clique/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-units'

testImplementation project(path: ':consensus:common', configuration: 'testArtifacts')
testImplementation project(path: ':crypto:services', configuration: 'testSupportArtifacts')
Expand Down
2 changes: 1 addition & 1 deletion consensus/common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies {

implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.google.guava:guava'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-bytes'

testImplementation project(':config')
testImplementation project(':crypto:algorithms')
Expand Down
4 changes: 2 additions & 2 deletions consensus/ibft/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-units'

integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts')
integrationTestImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
Expand Down
4 changes: 2 additions & 2 deletions consensus/merge/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ dependencies {
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-units'

testImplementation project(path: ':consensus:common', configuration: 'testArtifacts')
testImplementation project(':crypto:algorithms')
Expand Down
2 changes: 1 addition & 1 deletion consensus/qbft-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {
implementation project(':ethereum:rlp')

implementation 'com.google.guava:guava'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-bytes'

integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts')
integrationTestImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
Expand Down
4 changes: 2 additions & 2 deletions consensus/qbft/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-units'
implementation 'org.web3j:abi'

integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts')
Expand Down
4 changes: 2 additions & 2 deletions crypto/algorithms/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ dependencies {
api 'org.slf4j:slf4j-api'

implementation 'net.java.dev.jna:jna'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-units'
implementation 'org.hyperledger.besu:secp256k1'
implementation 'org.hyperledger.besu:secp256r1'
implementation 'org.hyperledger.besu:blake2bf'
Expand Down
4 changes: 2 additions & 2 deletions datatypes/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ dependencies {
implementation project(':crypto:algorithms')
implementation project(':ethereum:rlp')
implementation 'com.google.guava:guava'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-units'

testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter'
Expand Down
2 changes: 1 addition & 1 deletion enclave/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'io.vertx:vertx-web'
implementation 'io.tmio:tuweni-net'
implementation 'io.consensys.protocols:tuweni-net'

runtimeOnly('org.bouncycastle:bcpkix-jdk18on')

Expand Down
12 changes: 6 additions & 6 deletions ethereum/api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,19 @@ dependencies {
implementation 'io.vertx:vertx-web'
implementation 'io.vertx:vertx-codegen'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-net'
implementation 'io.tmio:tuweni-toml'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-net'
implementation 'io.consensys.protocols:tuweni-toml'
implementation 'io.consensys.protocols:tuweni-units'
implementation 'org.antlr:antlr4-runtime'
implementation 'org.bouncycastle:bcprov-jdk18on'
implementation 'org.springframework.security:spring-security-crypto'
implementation 'org.xerial.snappy:snappy-java'
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-units'
implementation 'org.web3j:abi'
implementation 'com.github.ben-manes.caffeine:caffeine'

Expand Down
4 changes: 2 additions & 2 deletions ethereum/blockcreation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ dependencies {

implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-units'

testImplementation project(':besu')
testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
Expand Down
16 changes: 8 additions & 8 deletions ethereum/core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ dependencies {

implementation 'net.java.dev.jna:jna'
implementation 'org.apache.commons:commons-lang3'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-concurrent'
implementation 'io.tmio:tuweni-units'
implementation 'io.tmio:tuweni-rlp'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-concurrent'
implementation 'io.consensys.protocols:tuweni-units'
implementation 'io.consensys.protocols:tuweni-rlp'
implementation 'org.immutables:value-annotations'
implementation 'io.consensys.protocols:jc-kzg-4844'

Expand All @@ -78,9 +78,9 @@ dependencies {
testImplementation project(path: ':plugins:rocksdb')

testImplementation 'org.apache.logging.log4j:log4j-core'
testImplementation 'io.tmio:tuweni-bytes'
testImplementation 'io.tmio:tuweni-io'
testImplementation 'io.tmio:tuweni-units'
testImplementation 'io.consensys.protocols:tuweni-bytes'
testImplementation 'io.consensys.protocols:tuweni-io'
testImplementation 'io.consensys.protocols:tuweni-units'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter-params'
Expand All @@ -94,7 +94,7 @@ dependencies {
integrationTestImplementation 'org.assertj:assertj-core'
integrationTestImplementation 'org.junit.jupiter:junit-jupiter-api'
integrationTestImplementation 'org.mockito:mockito-core'
integrationTestImplementation 'io.tmio:tuweni-bytes'
integrationTestImplementation 'io.consensys.protocols:tuweni-bytes'

integrationTestRuntimeOnly 'org.junit.jupiter:junit-jupiter'

Expand Down
6 changes: 3 additions & 3 deletions ethereum/eth/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.commons:commons-lang3'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-units'
implementation 'io.tmio:tuweni-rlp'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-units'
implementation 'io.consensys.protocols:tuweni-rlp'
implementation 'org.rocksdb:rocksdbjni'
implementation 'com.github.ben-manes.caffeine:caffeine'
implementation 'com.google.dagger:dagger'
Expand Down
2 changes: 1 addition & 1 deletion ethereum/ethstats/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'com.squareup.okhttp3:okhttp'
implementation 'io.vertx:vertx-core'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-bytes'

implementation project(':consensus:clique')
implementation project(':config')
Expand Down
2 changes: 1 addition & 1 deletion ethereum/mock-p2p/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies {
implementation project(':util')

implementation 'io.vertx:vertx-core'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-bytes'

testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter'
Expand Down
18 changes: 6 additions & 12 deletions ethereum/p2p/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ dependencies {
implementation 'io.vertx:vertx-core'
implementation 'javax.inject:javax.inject'

implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-crypto'
implementation 'io.tmio:tuweni-io'
implementation 'io.tmio:tuweni-rlp'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-crypto'
implementation 'io.consensys.protocols:tuweni-io'
implementation 'io.consensys.protocols:tuweni-rlp'
implementation 'io.consensys.protocols:tuweni-units'
implementation 'org.apache.commons:commons-collections4'
implementation 'org.jetbrains.kotlin:kotlin-stdlib'
implementation 'org.owasp.encoder:encoder'
Expand All @@ -60,13 +60,7 @@ dependencies {

annotationProcessor "org.immutables:value"
implementation "org.immutables:value-annotations"
implementation('tech.pegasys.discovery:discovery') {
// version conflicts, prefer ours
exclude group: 'org.apache.tuweni', module:'tuweni-bytes'
exclude group: 'org.apache.tuweni', module:'tuweni-crypto'
exclude group: 'org.apache.tuweni', module:'tuweni-rlp'
exclude group: 'org.apache.tuweni', module:'tuweni-units'
}
implementation 'tech.pegasys.discovery:discovery'

// test dependencies.
testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
Expand Down
6 changes: 3 additions & 3 deletions ethereum/permissioning/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ dependencies {

implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.google.guava:guava'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-toml'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-toml'
implementation 'io.consensys.protocols:tuweni-units'
implementation 'org.web3j:abi'

testImplementation project(':config')
Expand Down
6 changes: 3 additions & 3 deletions ethereum/referencetests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ dependencies {
implementation project(':evm')
implementation project(':services:kvstore')

implementation 'io.tmio:tuweni-rlp'
implementation 'io.consensys.protocols:tuweni-rlp'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.google.guava:guava'
implementation 'com.google.dagger:dagger'
Expand All @@ -201,8 +201,8 @@ dependencies {
referenceTestImplementation 'ethereum:execution-spec-tests:4.0.0:fixtures_develop@tar.gz'
referenceTestImplementation 'com.fasterxml.jackson.core:jackson-databind'
referenceTestImplementation 'com.google.guava:guava'
referenceTestImplementation 'io.tmio:tuweni-bytes'
referenceTestImplementation 'io.tmio:tuweni-units'
referenceTestImplementation 'io.consensys.protocols:tuweni-bytes'
referenceTestImplementation 'io.consensys.protocols:tuweni-units'
referenceTestImplementation 'org.assertj:assertj-core'
referenceTestImplementation 'org.junit.jupiter:junit-jupiter-api'
referenceTestImplementation 'org.junit.jupiter:junit-jupiter-params'
Expand Down
4 changes: 2 additions & 2 deletions ethereum/rlp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jar {
dependencies {
annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess'

implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-units'
implementation 'com.google.guava:guava'

jmh project(':util')
Expand Down
4 changes: 2 additions & 2 deletions ethereum/stratum/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-units'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-units'

testImplementation project(path: ':metrics:core', configuration: 'testSupportArtifacts')
testImplementation project(':testutil')
Expand Down
4 changes: 2 additions & 2 deletions ethereum/trie/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {
implementation 'org.immutables:value-annotations'
implementation 'com.google.guava:guava'
implementation 'io.opentelemetry:opentelemetry-api'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.consensys.protocols:tuweni-bytes'
implementation 'org.bouncycastle:bcprov-jdk18on'

annotationProcessor 'org.immutables:value'
Expand All @@ -46,7 +46,7 @@ dependencies {
testImplementation project(':testutil')

testImplementation 'com.fasterxml.jackson.core:jackson-databind'
testImplementation 'io.tmio:tuweni-units'
testImplementation 'io.consensys.protocols:tuweni-units'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.mockito:mockito-core'
Expand Down
Loading