Pull in Consensys/tuweni v2.7.0 (#8330)

siladu · garyschulte · commit 7ce6969fb6a6 · 2025-04-16T17:17:42.000-07:00
This replaces io.tmio/tuweni with the Consensys fork. Also Includes: - reduce check argument args allocations - Consensys/tuweni#10 which should reduce Integer and int[] and therefore gc pressure Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,9 @@
 - Support pending transaction score when saving and restoring txpool [#8363](https://github.com/hyperledger/besu/pull/8363)
 - Upgrade to execution-spec-tests v4.1.0 including better EIP-2537 coverage for BLS [#8402](https://github.com/hyperledger/besu/pull/8402)
 - 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)
diff --git a/acceptance-tests/dsl/build.gradle b/acceptance-tests/dsl/build.gradle
@@ -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'
diff --git a/acceptance-tests/tests/build.gradle b/acceptance-tests/tests/build.gradle
@@ -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'
diff --git a/besu/build.gradle b/besu/build.gradle
@@ -72,10 +72,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'
@@ -98,8 +98,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'
diff --git a/build.gradle b/build.gradle
@@ -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'
   }
 
 
diff --git a/config/build.gradle b/config/build.gradle
@@ -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'
diff --git a/consensus/clique/build.gradle b/consensus/clique/build.gradle
@@ -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')
diff --git a/consensus/common/build.gradle b/consensus/common/build.gradle
@@ -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')
diff --git a/consensus/ibft/build.gradle b/consensus/ibft/build.gradle
@@ -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')
diff --git a/consensus/merge/build.gradle b/consensus/merge/build.gradle
@@ -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')
diff --git a/consensus/qbft-core/build.gradle b/consensus/qbft-core/build.gradle
@@ -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')
diff --git a/consensus/qbft/build.gradle b/consensus/qbft/build.gradle
@@ -46,8 +46,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')
diff --git a/crypto/algorithms/build.gradle b/crypto/algorithms/build.gradle
@@ -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'
diff --git a/datatypes/build.gradle b/datatypes/build.gradle
@@ -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'
diff --git a/enclave/build.gradle b/enclave/build.gradle
@@ -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')
 
diff --git a/ethereum/api/build.gradle b/ethereum/api/build.gradle
@@ -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'
 
diff --git a/ethereum/blockcreation/build.gradle b/ethereum/blockcreation/build.gradle
@@ -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')
diff --git a/ethereum/core/build.gradle b/ethereum/core/build.gradle
@@ -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'
 
@@ -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'
@@ -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'
 
diff --git a/ethereum/eth/build.gradle b/ethereum/eth/build.gradle
@@ -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'
diff --git a/ethereum/ethstats/build.gradle b/ethereum/ethstats/build.gradle
@@ -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')
diff --git a/ethereum/mock-p2p/build.gradle b/ethereum/mock-p2p/build.gradle
@@ -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'
diff --git a/ethereum/p2p/build.gradle b/ethereum/p2p/build.gradle
@@ -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'
@@ -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')
diff --git a/ethereum/permissioning/build.gradle b/ethereum/permissioning/build.gradle
@@ -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')
diff --git a/ethereum/referencetests/build.gradle b/ethereum/referencetests/build.gradle
@@ -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'
@@ -201,8 +201,8 @@ dependencies {
   referenceTestImplementation 'ethereum:execution-spec-tests:4.1.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'
diff --git a/ethereum/rlp/build.gradle b/ethereum/rlp/build.gradle
@@ -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')
diff --git a/ethereum/stratum/build.gradle b/ethereum/stratum/build.gradle
@@ -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')
diff --git a/ethereum/trie/build.gradle b/ethereum/trie/build.gradle
@@ -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'
@@ -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'
diff --git a/ethereum/verkletrie/build.gradle b/ethereum/verkletrie/build.gradle
diff --git a/evm/build.gradle b/evm/build.gradle
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
diff --git a/platform/build.gradle b/platform/build.gradle
diff --git a/plugin-api/build.gradle b/plugin-api/build.gradle
diff --git a/plugins/rocksdb/build.gradle b/plugins/rocksdb/build.gradle
diff --git a/privacy-contracts/build.gradle b/privacy-contracts/build.gradle
diff --git a/services/tasks/build.gradle b/services/tasks/build.gradle
diff --git a/testfuzz/build.gradle b/testfuzz/build.gradle
diff --git a/testutil/build.gradle b/testutil/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,12 @@ configure(allprojects - project(':platform')) {`
`203`	`203`	`resolutionStrategy.capabilitiesResolution.withCapability('org.bouncycastle:bcpkix-jdk18on') {`
`204`	`204`	`selectHighestVersion()`
`205`	`205`	`}`
	`206`	`+`
	`207`	`+ // transitive versions conflict with io.protocols.tuweni, prefer ours`
	`208`	`+ exclude group: 'io.tmio', module: 'tuweni-bytes'`
	`209`	`+ exclude group: 'io.tmio', module: 'tuweni-crypto'`
	`210`	`+ exclude group: 'io.tmio', module: 'tuweni-rlp'`
	`211`	`+ exclude group: 'io.tmio', module: 'tuweni-units'`
`206`	`212`	`}`
`207`	`213`
`208`	`214`