Revert "Update Tuweni to 2.4.1 (#5513)" (#5585)

This reverts commit b96418143c.

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

CHANGELOG.md

@@ -14,7 +14,6 @@ and in case a rollback is needed, before installing a previous version, the migr
 - Tidy DEBUG logs by moving engine API full logging to TRACE [#5529](https://github.com/hyperledger/besu/pull/5529)
 - remove PoW validation if merge is enabled as it is not needed anymore [#5538](https://github.com/hyperledger/besu/pull/5538)
 - Use BlobDB for blockchain storage to reduce initial sync time and write amplification [#5475](https://github.com/hyperledger/besu/pull/5475)
-- Update to Tuweni 2.4.1. [#5513](https://github.com/hyperledger/besu/pull/5513)
 
 ### Bug Fixes
 - check to ensure storage and transactions are not closed prior to reading/writing [#5527](https://github.com/hyperledger/besu/pull/5527) 

acceptance-tests/dsl/build.gradle

@@ -36,9 +36,9 @@ dependencies {
   implementation 'io.vertx:vertx-core'
   implementation 'junit:junit'
   implementation 'io.opentelemetry:opentelemetry-api'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-io'
+  implementation 'org.apache.tuweni:tuweni-io'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.assertj:assertj-core'
   implementation 'org.awaitility:awaitility'
   implementation 'org.java-websocket:Java-WebSocket'

acceptance-tests/tests/build.gradle

@@ -76,7 +76,7 @@ dependencies {
   testImplementation 'junit:junit'
   testImplementation 'org.apache.commons:commons-compress'
   testImplementation 'org.apache.logging.log4j:log4j-core'
-  testImplementation 'io.tmio:tuweni-crypto'
+  testImplementation 'org.apache.tuweni:tuweni-crypto'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.awaitility:awaitility'
   testImplementation 'org.junit.jupiter:junit-jupiter'

besu/build.gradle

@@ -70,10 +70,10 @@ dependencies {
   implementation 'io.vertx:vertx-web'
   implementation 'org.apache.commons:commons-lang3'
   implementation 'org.apache.logging.log4j:log4j-core'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-config'
+  implementation 'org.apache.tuweni:tuweni-config'
-  implementation 'io.tmio:tuweni-toml'
+  implementation 'org.apache.tuweni:tuweni-toml'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.springframework.security:spring-security-crypto'
   implementation 'org.xerial.snappy:snappy-java'
   implementation 'tech.pegasys:jc-kzg-4844'
@@ -92,8 +92,8 @@ dependencies {
   testImplementation 'io.opentelemetry:opentelemetry-api'
   testImplementation 'junit:junit'
   testImplementation 'org.apache.commons:commons-text'
-  testImplementation 'io.tmio:tuweni-bytes'
+  testImplementation 'org.apache.tuweni:tuweni-bytes'
-  testImplementation 'io.tmio:tuweni-units'
+  testImplementation 'org.apache.tuweni:tuweni-units'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.awaitility:awaitility'
   testImplementation 'org.junit.jupiter:junit-jupiter'

config/build.gradle

@@ -36,8 +36,8 @@ dependencies {
   implementation 'com.fasterxml.jackson.core:jackson-databind'
   implementation 'com.google.guava:guava'
   implementation 'info.picocli:picocli'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
 
   testImplementation project(':testutil')
 

consensus/clique/build.gradle

@@ -47,8 +47,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 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
 
   testImplementation project(path: ':consensus:common', configuration: 'testArtifacts')
   testImplementation project(path: ':crypto:services', configuration: 'testSupportArtifacts')

consensus/common/build.gradle

@@ -44,7 +44,7 @@ dependencies {
 
   implementation 'com.fasterxml.jackson.core:jackson-databind'
   implementation 'com.google.guava:guava'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
 
   testImplementation project(':config')
   testImplementation project(':crypto:algorithms')

consensus/ibft/build.gradle

@@ -44,8 +44,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 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
 
   integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts')
   integrationTestImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')

consensus/merge/build.gradle

@@ -46,8 +46,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 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
 
   testImplementation project(path: ':consensus:common', configuration: 'testArtifacts')
   testImplementation project(':crypto:algorithms')

consensus/qbft/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 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.web3j:abi'
 
   integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts')

crypto/algorithms/build.gradle

@@ -33,8 +33,8 @@ dependencies {
   api 'org.slf4j:slf4j-api'
 
   implementation 'net.java.dev.jna:jna'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.hyperledger.besu:secp256k1'
   implementation 'org.hyperledger.besu:secp256r1'
   implementation 'org.hyperledger.besu:blake2bf'

datatypes/build.gradle

@@ -34,8 +34,8 @@ dependencies {
   implementation project(':crypto:algorithms')
   implementation project(':ethereum:rlp')
   implementation 'com.google.guava:guava'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
 
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'

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 'org.apache.tuweni:tuweni-net'
 
   runtimeOnly('org.bouncycastle:bcpkix-jdk15on')
 

ethereum/api/build.gradle

@@ -64,10 +64,10 @@ dependencies {
   implementation 'io.vertx:vertx-web'
   implementation 'io.vertx:vertx-codegen'
   implementation 'com.fasterxml.jackson.core:jackson-databind'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-net'
+  implementation 'org.apache.tuweni:tuweni-net'
-  implementation 'io.tmio:tuweni-toml'
+  implementation 'org.apache.tuweni:tuweni-toml'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.antlr:antlr4-runtime'
   implementation 'org.bouncycastle:bcprov-jdk15on'
   implementation 'org.springframework.security:spring-security-crypto'

ethereum/blockcreation/build.gradle

@@ -24,8 +24,8 @@ dependencies {
 
   implementation 'com.google.guava:guava'
   implementation 'io.vertx:vertx-core'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
 
   testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
   testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')

ethereum/core/build.gradle

@@ -53,10 +53,10 @@ dependencies {
 
   implementation 'net.java.dev.jna:jna'
   implementation 'org.apache.commons:commons-lang3'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-concurrent'
+  implementation 'org.apache.tuweni:tuweni-concurrent'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
-  implementation 'io.tmio:tuweni-rlp'
+  implementation 'org.apache.tuweni:tuweni-rlp'
   implementation 'org.hyperledger.besu:bls12-381'
   implementation 'org.immutables:value-annotations'
 
@@ -77,9 +77,9 @@ dependencies {
 
   testImplementation 'junit:junit'
   testImplementation 'org.apache.logging.log4j:log4j-core'
-  testImplementation 'io.tmio:tuweni-bytes'
+  testImplementation 'org.apache.tuweni:tuweni-bytes'
-  testImplementation 'io.tmio:tuweni-io'
+  testImplementation 'org.apache.tuweni:tuweni-io'
-  testImplementation 'io.tmio:tuweni-units'
+  testImplementation 'org.apache.tuweni:tuweni-units'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.junit.jupiter:junit-jupiter-params'

ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java

@@ -32,8 +32,7 @@ public class TransactionTestFixture {
   private static final Hash DEFAULT_VERSIONED_HASH =
       Hash.wrap(
           Bytes32.wrap(
-              Bytes.concatenate(
+              Bytes.concatenate(Bytes.fromHexString("0x01"), Bytes.repeat((byte) 42, 31))));
-                  Bytes.fromHexString("0x01"), Bytes.fromHexString("2a".repeat(31)))));
 
   private TransactionType transactionType = TransactionType.FRONTIER;
 

ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalEncoderTest.java

@@ -29,7 +29,8 @@ class WithdrawalEncoderTest {
       "0xd8808094000000000000000000000000000000000000000080";
   public static final String WITHDRAWAL_MAX_VALUE =
       "0xf088ffffffffffffffff88ffffffffffffffff94ffffffffffffffffffffffffffffffffffffffff88ffffffffffffffff";
-  public static final Address MAX_ADDRESS = Address.fromHexString("ff".repeat(20));
+  public static final Address MAX_ADDRESS =
+      Address.fromHexString(Bytes.repeat((byte) 0xff, 20).toHexString());
 
   @Test
   void shouldEncodeWithdrawalForZeroCase() {

ethereum/eth/build.gradle

@@ -55,9 +55,9 @@ dependencies {
   implementation 'com.google.guava:guava'
   implementation 'io.vertx:vertx-core'
   implementation 'org.apache.commons:commons-lang3'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
-  implementation 'io.tmio:tuweni-rlp'
+  implementation 'org.apache.tuweni:tuweni-rlp'
 
   annotationProcessor "org.immutables:value"
   implementation "org.immutables:value-annotations"

ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/BaseTransactionPoolTest.java

@@ -110,7 +110,7 @@ public class BaseTransactionPoolTest {
             .nonce(nonce)
             .type(type);
     if (payloadSize > 0) {
-      var payloadBytes = Bytes.fromHexString("01".repeat(payloadSize));
+      var payloadBytes = Bytes.repeat((byte) 1, payloadSize);
       tx.payload(payloadBytes);
     }
     if (type.supports1559FeeMarket()) {

ethereum/ethstats/build.gradle

@@ -34,7 +34,7 @@ dependencies {
   implementation 'com.google.guava:guava'
   implementation 'com.squareup.okhttp3:okhttp'
   implementation 'io.vertx:vertx-core'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
 
   implementation project(':consensus:clique')
   implementation project(':config')

ethereum/mock-p2p/build.gradle

@@ -35,7 +35,7 @@ dependencies {
   implementation project(':util')
 
   implementation 'io.vertx:vertx-core'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
 
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'

ethereum/p2p/build.gradle

@@ -45,17 +45,17 @@ dependencies {
   implementation 'io.prometheus:simpleclient'
   implementation 'io.vertx:vertx-core'
 
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-crypto'
+  implementation 'org.apache.tuweni:tuweni-crypto'
-  implementation('io.tmio:tuweni-devp2p') {
+  implementation('org.apache.tuweni:tuweni-devp2p') {
     exclude group:'ch.qos.logback', module:'logback-classic'
   }
-  implementation('io.tmio:tuweni-dns-discovery'){
+  implementation('org.apache.tuweni:tuweni-dns-discovery'){
     exclude group:'ch.qos.logback', module:'logback-classic'
   }
-  implementation 'io.tmio:tuweni-io'
+  implementation 'org.apache.tuweni:tuweni-io'
-  implementation 'io.tmio:tuweni-rlp'
+  implementation 'org.apache.tuweni:tuweni-rlp'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.jetbrains.kotlin:kotlin-stdlib'
   implementation 'org.owasp.encoder:encoder'
   implementation 'org.xerial.snappy:snappy-java'

ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetwork.java

@@ -145,7 +145,6 @@ public class DefaultP2PNetwork implements P2PNetwork {
   private final AtomicBoolean stopped = new AtomicBoolean(false);
   private final CountDownLatch shutdownLatch = new CountDownLatch(2);
   private final Duration shutdownTimeout = Duration.ofSeconds(15);
-  private final Vertx vertx;
   private DNSDaemon dnsDaemon;
 
   /**
@@ -164,7 +163,6 @@ public class DefaultP2PNetwork implements P2PNetwork {
    * @param maintainedPeers A collection of peers for which we are expected to maintain connections
    * @param reputationManager An object that inspect disconnections for misbehaving peers that can
    *     then be blacklisted.
-   * @param vertx the Vert.x instance managing network resources
    */
   DefaultP2PNetwork(
       final MutableLocalNode localNode,
@@ -175,8 +173,7 @@ public class DefaultP2PNetwork implements P2PNetwork {
       final PeerPermissions peerPermissions,
       final NatService natService,
       final MaintainedPeers maintainedPeers,
-      final PeerDenylistManager reputationManager,
+      final PeerDenylistManager reputationManager) {
-      final Vertx vertx) {
     this.localNode = localNode;
     this.peerDiscoveryAgent = peerDiscoveryAgent;
     this.rlpxAgent = rlpxAgent;
@@ -186,7 +183,6 @@ public class DefaultP2PNetwork implements P2PNetwork {
 
     this.nodeId = nodeKey.getPublicKey().getEncodedBytes();
     this.peerPermissions = peerPermissions;
-    this.vertx = vertx;
 
     // set the requirement here that the number of peers be greater than the lower bound
     final int peerLowerBound = rlpxAgent.getPeerLowerBound();
@@ -233,8 +229,7 @@ public class DefaultP2PNetwork implements P2PNetwork {
                       createDaemonListener(),
                       0L,
                       600000L,
-                      config.getDnsDiscoveryServerOverride().orElse(null),
+                      config.getDnsDiscoveryServerOverride().orElse(null));
-                      vertx);
               dnsDaemon.start();
             });
 
@@ -540,8 +535,7 @@ public class DefaultP2PNetwork implements P2PNetwork {
           peerPermissions,
           natService,
           maintainedPeers,
-          reputationManager,
+          reputationManager);
-          vertx);
     }
 
     private void validate() {

ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetworkTest.java

@@ -58,8 +58,6 @@ import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import io.vertx.core.Vertx;
-import io.vertx.core.dns.DnsClient;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.crypto.SECP256K1;
 import org.assertj.core.api.Assertions;
@@ -350,12 +348,8 @@ public final class DefaultP2PNetworkTest {
     final NetworkingConfiguration dnsConfig =
         when(spy(config).getDiscovery()).thenReturn(disco).getMock();
 
-    Vertx vertx = mock(Vertx.class);
-    when(vertx.createDnsClient(any())).thenReturn(mock(DnsClient.class));
-
     // spy on DefaultP2PNetwork
-    final DefaultP2PNetwork testClass =
+    final DefaultP2PNetwork testClass = (DefaultP2PNetwork) builder().config(dnsConfig).build();
-        (DefaultP2PNetwork) builder().vertx(vertx).config(dnsConfig).build();
 
     testClass.start();
     assertThat(testClass.getDnsDaemon()).isPresent();
@@ -372,11 +366,7 @@ public final class DefaultP2PNetworkTest {
     doReturn(disco).when(dnsConfig).getDiscovery();
     doReturn(Optional.of("localhost")).when(dnsConfig).getDnsDiscoveryServerOverride();
 
-    Vertx vertx = mock(Vertx.class);
+    final DefaultP2PNetwork testClass = (DefaultP2PNetwork) builder().config(dnsConfig).build();
-    when(vertx.createDnsClient(any())).thenReturn(mock(DnsClient.class));
-
-    final DefaultP2PNetwork testClass =
-        (DefaultP2PNetwork) builder().config(dnsConfig).vertx(vertx).build();
     testClass.start();
 
     // ensure we used the dns server override config when building DNSDaemon:

ethereum/permissioning/build.gradle

@@ -41,9 +41,9 @@ dependencies {
 
   implementation 'com.fasterxml.jackson.core:jackson-databind'
   implementation 'com.google.guava:guava'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-toml'
+  implementation 'org.apache.tuweni:tuweni-toml'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.web3j:abi'
 
   testImplementation project(':config')

ethereum/referencetests/build.gradle

@@ -138,8 +138,8 @@ dependencies {
   referenceTestImplementation 'ethereum:execution-spec-tests:0.2.3:fixtures@tar.gz'
   referenceTestImplementation 'com.fasterxml.jackson.core:jackson-databind'
   referenceTestImplementation 'com.google.guava:guava'
-  referenceTestImplementation 'io.tmio:tuweni-bytes'
+  referenceTestImplementation 'org.apache.tuweni:tuweni-bytes'
-  referenceTestImplementation 'io.tmio:tuweni-units'
+  referenceTestImplementation 'org.apache.tuweni:tuweni-units'
   referenceTestImplementation 'org.assertj:assertj-core'
   referenceTestImplementation 'org.junit.jupiter:junit-jupiter-api'
   referenceTestImplementation 'org.junit.jupiter:junit-jupiter-params'

ethereum/retesteth/build.gradle

@@ -47,8 +47,8 @@ dependencies {
   implementation 'io.vertx:vertx-core'
   implementation 'io.vertx:vertx-web'
   implementation 'com.fasterxml.jackson.core:jackson-databind'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
 
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'

ethereum/rlp/build.gradle

@@ -31,8 +31,8 @@ jar {
 dependencies {
   annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess'
 
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'com.google.guava:guava'
 
 

ethereum/stratum/build.gradle

@@ -41,8 +41,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 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
 
   testImplementation project(path: ':metrics:core', configuration: 'testSupportArtifacts')
   testImplementation project(':testutil')

ethereum/trie/build.gradle

@@ -36,7 +36,7 @@ dependencies {
   implementation 'org.immutables:value-annotations'
   implementation 'com.google.guava:guava'
   implementation 'io.opentelemetry:opentelemetry-api'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
   implementation 'org.bouncycastle:bcprov-jdk15on'
 
   annotationProcessor 'org.immutables:value'
@@ -46,7 +46,7 @@ dependencies {
 
   testImplementation 'com.fasterxml.jackson.core:jackson-databind'
   testImplementation 'junit:junit'
-  testImplementation 'io.tmio:tuweni-units'
+  testImplementation 'org.apache.tuweni:tuweni-units'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'

ethereum/verkletrie/build.gradle

@@ -35,8 +35,8 @@ dependencies {
   implementation "org.immutables:value-annotations"
   implementation 'com.google.guava:guava'
   implementation 'io.opentelemetry:opentelemetry-api'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.bouncycastle:bcprov-jdk15on'
   implementation 'org.hyperledger.besu:ipa-multipoint'
 
@@ -48,7 +48,7 @@ dependencies {
   testImplementation 'com.fasterxml.jackson.core:jackson-databind'
   testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
   testImplementation 'junit:junit'
-  testImplementation 'io.tmio:tuweni-units'
+  testImplementation 'org.apache.tuweni:tuweni-units'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'

evm/build.gradle

@@ -40,8 +40,8 @@ dependencies {
   implementation 'com.github.ben-manes.caffeine:caffeine'
   implementation 'com.google.guava:guava'
   implementation 'net.java.dev.jna:jna'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.hyperledger.besu:arithmetic'
   implementation 'org.hyperledger.besu:bls12-381'
   implementation 'tech.pegasys:jc-kzg-4844'

gradle/verification-metadata.xml

@@ -467,17 +467,6 @@
             <sha256 value="1ab06a6de419150682954064a188e8ecfbfcf3219013adf20de127f00c0a2a78" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.jnr" name="jffi" version="1.3.10">
-         <artifact name="jffi-1.3.10-native.jar">
-            <sha256 value="df4682f7d48b23298b89f257d76b6233335047d7a3c6e49e7f0b7332365a7bac" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="jffi-1.3.10.jar">
-            <sha256 value="8f4e9fe793db1c79c12d8247a3785a30b949ecd126c346e04969b831ae48bcd3" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="jffi-1.3.10.pom">
-            <sha256 value="3e53aba32eaccc85caa23071ffc1a9475f18def722689148a2970e10156411b8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.github.jnr" name="jffi" version="1.3.9">
          <artifact name="jffi-1.3.9-native.jar">
             <sha256 value="bddfe460d528c68a71d0d4c9d30122f28f6f182f9ebb4be8f65e7090c4ca881c" origin="Generated by Gradle"/>
@@ -529,14 +518,6 @@
             <sha256 value="8be242591cacccb6cae9da700f4373ddad00760e8da679697a98128bb42a5f7b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.jnr" name="jnr-ffi" version="2.2.13">
-         <artifact name="jnr-ffi-2.2.13.jar">
-            <sha256 value="d309575e8d080785988dc51b6636ae67738561c3d1453e8b24f9501301e00296" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="jnr-ffi-2.2.13.pom">
-            <sha256 value="d8b8107bd75b2e6a7f220a3f87ecc85802ed4963d30dabc6dcbc0a741f79c7ad" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.github.jnr" name="jnr-posix" version="3.1.15">
          <artifact name="jnr-posix-3.1.15.jar">
             <sha256 value="c38ecfccd24e5f21f17a62e45d5bd454842c5db17ed42b01b868f9206d0e99e7" origin="Generated by Gradle"/>
@@ -827,9 +808,6 @@
          </artifact>
       </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.14.0">
-         <artifact name="error_prone_annotations-2.14.0.jar">
-            <sha256 value="1494e24e7bd5496e7d6f705169dddd46081cefb882ea4fc60b4a58ca50767f34" origin="Generated by Gradle"/>
-         </artifact>
          <artifact name="error_prone_annotations-2.14.0.pom">
             <sha256 value="9dfffc8c883991086f424b94e383dd777cb27e52e9709b2e8ef45e480d30886d" origin="Generated by Gradle"/>
          </artifact>
@@ -2571,126 +2549,6 @@
             <sha256 value="6d2ab119502ad06f80a5ff0d741cf0b213c56170b51761fc5911aecd8f512441" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.tmio" name="tuweni-bytes" version="2.4.1">
-         <artifact name="tuweni-bytes-2.4.1.jar">
-            <sha256 value="e1552abf17c06d3daf725ebed20c1e8234b50744274e48fcf220931e980385c4" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-bytes-2.4.1.pom">
-            <sha256 value="7d8622bfcfa6ddd3295514315a4574fe3e76e90f2e801b8daf2bb93fc9441b08" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-concurrent" version="2.4.1">
-         <artifact name="tuweni-concurrent-2.4.1.jar">
-            <sha256 value="f184244bf73f1598c8ae1e44fb4d6c90057269e8dd1b207eea302557cde67398" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-concurrent-2.4.1.pom">
-            <sha256 value="27f13e0cb1ef191cd80c6112418eb2daca5611617f98d4bcabe97fcfc8974fe3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-concurrent-coroutines" version="2.4.1">
-         <artifact name="tuweni-concurrent-coroutines-2.4.1.jar">
-            <sha256 value="dcd7652d12d10fbaf048144768faba710787606abe32db96f002e3b07f7e12ee" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-concurrent-coroutines-2.4.1.pom">
-            <sha256 value="d1dcc63128d3d99a8b57bc62b6ea85433e0883d72e9c8559003e58e52447ee86" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-config" version="2.4.1">
-         <artifact name="tuweni-config-2.4.1.jar">
-            <sha256 value="5da541cefaeef16e1e6cba6badb46abf5aa0e4535a75e51fd2c70e94bbfab77b" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-config-2.4.1.pom">
-            <sha256 value="22915297c706813e165764d7708a03fec4129bf3bcb5325d8a0fdeb1935bcefa" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-crypto" version="2.4.1">
-         <artifact name="tuweni-crypto-2.4.1.jar">
-            <sha256 value="97aee06a3d755bd2f7d54670e5738fad6fdee62f96bbf3a8ddbe6aedb64fa59d" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-crypto-2.4.1.pom">
-            <sha256 value="d4d023824b5bab91dcf5fe101890890d2e23f61840875ba9901ecc573bd09d5b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-devp2p" version="2.4.1">
-         <artifact name="tuweni-devp2p-2.4.1.jar">
-            <sha256 value="332850028d7b1c18aef3dee7e47a34057a61ea89518e9ac22e4f365c45a7b538" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-devp2p-2.4.1.pom">
-            <sha256 value="09a067423e9a47c8cab7b6ece4573009bdd0a50c98c20d4156972e25f94b672c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-dns-discovery" version="2.4.1">
-         <artifact name="tuweni-dns-discovery-2.4.1.jar">
-            <sha256 value="681cb728aec3fdb9c6a902470d745cd43a2ea42db2dbf8309361d28083abcb7d" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-dns-discovery-2.4.1.pom">
-            <sha256 value="ff7b47a7ab787e0587a7ba10eb6871559bf17e5cb5c2b04ade60d11eb6da1d95" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-io" version="2.4.1">
-         <artifact name="tuweni-io-2.4.1.jar">
-            <sha256 value="9dcef9e82384a2e322f15437d81b120394959245ca1fc187d2bbcca5d6dbc601" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-io-2.4.1.pom">
-            <sha256 value="5759cef4a9f11161c68c3f71959efe25affe7844c006c344c44c1e783c30f00b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-kademlia" version="2.4.1">
-         <artifact name="tuweni-kademlia-2.4.1.jar">
-            <sha256 value="e1a47856f349bd66d297f416c9124cb179ae6778816a8146a0e0954a81263f32" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-kademlia-2.4.1.pom">
-            <sha256 value="5a005c2e1ffb82953bac7c1886ddc6f37a0d3e23a4c69aca9024dce237e35e10" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-kv" version="2.4.1">
-         <artifact name="tuweni-kv-2.4.1.jar">
-            <sha256 value="1ac4639c74fea8f58e99fd7c218995eb15e5166135c1622f0afb47bfbf535dd7" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-kv-2.4.1.pom">
-            <sha256 value="9f749969cc9876276cd6ce0340b4c5f11696ffafc82f11fd0de24ced65513367" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-merkle-trie" version="2.4.1">
-         <artifact name="tuweni-merkle-trie-2.4.1.jar">
-            <sha256 value="9f328e83ca69c0c25f7a5570f1733d218fe1d87088a68e9ed1b2736547322f40" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-merkle-trie-2.4.1.pom">
-            <sha256 value="d77671ba499d365266ef3143c1685a69af25f1faf6519e00ee18b3f3ac06b410" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-net" version="2.4.1">
-         <artifact name="tuweni-net-2.4.1.jar">
-            <sha256 value="74cc6eaa1ffeeae8ee3b84423e498751c5a5c75033afc47f87690e8594695ab1" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-net-2.4.1.pom">
-            <sha256 value="e87fd4a814df8616bd0ad2775888ff8d8499b822bd08fa3bfcfb4c058b92dd59" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-rlp" version="2.4.1">
-         <artifact name="tuweni-rlp-2.4.1.jar">
-            <sha256 value="7e1f9855c86cd12150e24ec398d896d066569f1dc3a5afcbc02867f51a90e8a1" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-rlp-2.4.1.pom">
-            <sha256 value="e60cbf6a436e1252c9d1739dd3432ce903356f0af35120d05979623bb830f2a3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-toml" version="2.4.1">
-         <artifact name="tuweni-toml-2.4.1.jar">
-            <sha256 value="9c6df55186a469b990d72a853cfa340e30e9a7842727e0593d34a9425613003c" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-toml-2.4.1.pom">
-            <sha256 value="f4d6fb11a6121a668e4b86c6948a859e8c910ba609ab4216c86497e989a09ef5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.tmio" name="tuweni-units" version="2.4.1">
-         <artifact name="tuweni-units-2.4.1.jar">
-            <sha256 value="64a85f8129f4ec690fd80b8f10840090651ea38d386b32faa5be5f3ab10ee4e1" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-units-2.4.1.pom">
-            <sha256 value="1b6f11842e1a9ada07a14e9bb47d844d94a73c68b6bba74ffd0cf663117f8088" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="io.vertx" name="vertx-auth" version="4.3.5">
          <artifact name="vertx-auth-4.3.5.pom">
             <sha256 value="610c389160ae7a31cde5f60f105f87c300753a36908ef6fca8c859f6ea52fd95" origin="Generated by Gradle"/>
@@ -2746,11 +2604,6 @@
             <sha256 value="c2f2df4e57060796d577b379e3f1f79d58959eba7269b583b40205bbc2ce04a4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.vertx" name="vertx-dependencies" version="4.3.7">
-         <artifact name="vertx-dependencies-4.3.7.pom">
-            <sha256 value="353cc4d6761e519c7210b82b5b62bb57b09b8eabae7246234d0586d441a0feaf" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="io.vertx" name="vertx-ext" version="38">
          <artifact name="vertx-ext-38.pom">
             <sha256 value="9e00c39a0f0d832fde9f383c1e3ec7eb27d2bec15aa4c57d6bb1c639ab76a94c" origin="Generated by Gradle"/>
@@ -2777,14 +2630,6 @@
             <sha256 value="81fc9aa43e007a28855d1375cdf451e40fa977cfe6a7b97ffe990287f268281d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.vertx" name="vertx-lang-kotlin" version="4.3.7">
-         <artifact name="vertx-lang-kotlin-4.3.7.jar">
-            <sha256 value="298866e66dddcec8a99817c15d9f858668fd75a0c070cbc3961a116aa0f9aa2d" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="vertx-lang-kotlin-4.3.7.pom">
-            <sha256 value="7dfc3fe4a854338379ae1534110d9748a6bc0952abbc4e9e50b2ad0ae294e04b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="io.vertx" name="vertx-lang-kotlin-coroutines" version="4.1.2">
          <artifact name="vertx-lang-kotlin-coroutines-4.1.2.jar">
             <sha256 value="dfa191f72162774554f00a3a50d606e8872f5be3b41da9502a6fe51b922e3997" origin="Generated by Gradle"/>
@@ -2793,24 +2638,11 @@
             <sha256 value="208902b75918bebadf3e5e9581ab8aab872a4345a19b502c4f8d675fc8b45645" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.vertx" name="vertx-lang-kotlin-coroutines" version="4.3.7">
-         <artifact name="vertx-lang-kotlin-coroutines-4.3.7.jar">
-            <sha256 value="abae054c304fc46de7b536504c27cd8cfb723757dfb718c95a27591ef66be93b" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="vertx-lang-kotlin-coroutines-4.3.7.pom">
-            <sha256 value="ea9476022398ff9970b47c1d501b2a2f02098a0831cb2b13bb1aa7664370a68f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="io.vertx" name="vertx-lang-kotlin-parent" version="4.1.2">
          <artifact name="vertx-lang-kotlin-parent-4.1.2.pom">
             <sha256 value="992cf9dcc1564ab3c5bcac0b72608d99436b91098184af3df5d70d6e79bc4ff7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.vertx" name="vertx-lang-kotlin-parent" version="4.3.7">
-         <artifact name="vertx-lang-kotlin-parent-4.3.7.pom">
-            <sha256 value="59ea1680d478ae6cbc8dd070edb77df0be1388c555db309a31ca5ce799ac53ec" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="io.vertx" name="vertx-parent" version="19">
          <artifact name="vertx-parent-19.pom">
             <sha256 value="219614cfbb9c31b6287672d3f615575eaa86c4cc26e402cfc87c8a753c16693e" origin="Generated by Gradle"/>
@@ -3148,14 +2980,6 @@
             <sha256 value="dc6ac6baeadd576ef8f8b0c8ae9cd5b83982d7488be76a57d9edaa151ed9de6d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.antlr" name="antlr4" version="4.11.1">
-         <artifact name="antlr4-4.11.1.jar">
-            <sha256 value="e9686e8a663ca512afe3a2eeb6f6ad3f303abb46188991f19ebc6a0fd9c1c14f" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="antlr4-4.11.1.pom">
-            <sha256 value="6b0b88e3e0b5641d81946031c1be9ae30fd6a004637db4854b1fe2447c0a2605" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.antlr" name="antlr4-master" version="4.10.1">
          <artifact name="antlr4-master-4.10.1.pom">
             <sha256 value="77ed2165c379d27e18a03929e1adfb414d5d52ef042984901a5e7232073f50d3" origin="Generated by Gradle"/>
@@ -3166,11 +2990,6 @@
             <sha256 value="f081f97a88602f59f0f820a62332807e2ad01c1cf4fe82678669635b4cfc969e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.antlr" name="antlr4-master" version="4.11.1">
-         <artifact name="antlr4-master-4.11.1.pom">
-            <sha256 value="72ea5de8dabb6615785fd0feaaababd53dcdae70fe16bcd7c7b9686c0a6e00ad" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.antlr" name="antlr4-runtime" version="4.10.1">
          <artifact name="antlr4-runtime-4.10.1.jar">
             <sha256 value="da66be0c98acfb29bc708300d05f1a3269c40f9984a4cb9251cf2ba1898d1334" origin="Generated by Gradle"/>
@@ -3187,14 +3006,6 @@
             <sha256 value="5c834b3641429ee0f9bfab04ce918db5ab0ec9eb2407baeb3c08b42b670dbaad" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.antlr" name="antlr4-runtime" version="4.11.1">
-         <artifact name="antlr4-runtime-4.11.1.jar">
-            <sha256 value="e06c6553c1ccc14d36052ec4b0fc6f13b808cf957b5b1dc3f61bf401996ada59" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="antlr4-runtime-4.11.1.pom">
-            <sha256 value="c456ec2959078c591fbd7ef69ad9400a727920068d746989c74ab804ed681b34" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.apache" name="apache" version="10">
          <artifact name="apache-10.pom">
             <sha256 value="802feece72852dafcbd0a425a60367c72c5cb9b6ea5aae59481128569189daf9" origin="Generated by Gradle"/>
@@ -3543,14 +3354,6 @@
             <sha256 value="3e0b3f60267b6070a741b15db5b40fbd824c61db12a1f4f166ed658b9f62ece0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tuweni" name="tuweni-bytes" version="2.1.0">
-         <artifact name="tuweni-bytes-2.1.0.jar">
-            <sha256 value="283dff752302953b33296a3192774613c8a042c3c68a3c8c3442ea0eda2a6211" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-bytes-2.1.0.pom">
-            <sha256 value="1234ac03d16b7521543c07281d71c5638d531bc196a2fa28ad963cb4caafbfc8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.apache.tuweni" name="tuweni-bytes" version="2.3.1">
          <artifact name="tuweni-bytes-2.3.1.jar">
             <sha256 value="2249d635c819cd620a10d5991ef409f95fa5d8c83200658fc7d52699ebea4984" origin="Generated by Gradle"/>
@@ -3583,14 +3386,6 @@
             <sha256 value="c2fbdf1b04520659806df0abc75aa17f00e678b2d445c6e5180cd4a4f0107c93" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tuweni" name="tuweni-crypto" version="2.1.0">
-         <artifact name="tuweni-crypto-2.1.0.jar">
-            <sha256 value="183e434622392a52619b3727f219a42063fd5ef254cdcf9e9930671ff07f62e7" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-crypto-2.1.0.pom">
-            <sha256 value="0f7c00fe30d58c5701d28c8b084b5fd084d50f5791d4b0ad8d787f92ea9cd3a6" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.apache.tuweni" name="tuweni-crypto" version="2.3.1">
          <artifact name="tuweni-crypto-2.3.1.jar">
             <sha256 value="f87561527c3b20f4714f5d5a9ba12b3e8e20261ab9cf26e6205b841063e3668b" origin="Generated by Gradle"/>
@@ -3615,14 +3410,6 @@
             <sha256 value="83dd61c27c3597b979daa4e2ec7ad0a1fae68f61d88c202844751007b8ef582a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tuweni" name="tuweni-io" version="2.1.0">
-         <artifact name="tuweni-io-2.1.0.jar">
-            <sha256 value="476fb1cfb4a9f55ca7be0eeb0c376dc92f19e2dd443df25dd3dfa6ea9696873c" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-io-2.1.0.pom">
-            <sha256 value="202d101312d5b41bce0450e3b2e434a202fc0421a9149e8474db030f09bb3ba2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.apache.tuweni" name="tuweni-io" version="2.3.1">
          <artifact name="tuweni-io-2.3.1.jar">
             <sha256 value="08ad1ab991f5679ad0b8e8c8af5c1c27856095111424df08a1a5511b617ab5be" origin="Generated by Gradle"/>
@@ -3663,14 +3450,6 @@
             <sha256 value="a21ff5ba443fb723f71b9618e912522377ac4f97d73c49fb0f7ef3f4cd43e900" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tuweni" name="tuweni-rlp" version="2.1.0">
-         <artifact name="tuweni-rlp-2.1.0.jar">
-            <sha256 value="7999c06f97cfb023886c15b2e3584f13f8777e32b5bcc857afb85b7e26121cb4" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-rlp-2.1.0.pom">
-            <sha256 value="be8a49e9f1ab98f49e419819db0e92e63bff9d53e61be9777566c8a7108b80e2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.apache.tuweni" name="tuweni-rlp" version="2.3.1">
          <artifact name="tuweni-rlp-2.3.1.jar">
             <sha256 value="062f004dbd7e4281ee21d1c197f4602a9d809b13dd12781468815d3860862b73" origin="Generated by Gradle"/>
@@ -3687,14 +3466,6 @@
             <sha256 value="55f158e98a6ee4e38e7b674aa84bf573b4753262d871b2f27cd8f02f736581c6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.tuweni" name="tuweni-units" version="2.1.0">
-         <artifact name="tuweni-units-2.1.0.jar">
-            <sha256 value="6a792f7d6160ac25053ab45d24de9ab2428e1cad1531c92476f1569d853f4954" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tuweni-units-2.1.0.pom">
-            <sha256 value="e2854383a866cf2715b2adeb3353b13d318fcdb5eb8b673c980ce2e1276a7ade" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.apache.tuweni" name="tuweni-units" version="2.3.1">
          <artifact name="tuweni-units-2.3.1.jar">
             <sha256 value="59703a35883555ec944149aca53c81c26b2b9200520ffde059d57326d2ec7ca4" origin="Generated by Gradle"/>
@@ -4721,14 +4492,6 @@
             <sha256 value="ae23a4c6a2bdfc0cd5a7bbae87d998a11e0356be49fefa0a9af6c3ff6da2a02b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.21">
-         <artifact name="kotlin-stdlib-jdk7-1.8.21.jar">
-            <sha256 value="33d148db0e11debd0d90677d28242bced907f9c77730000fd597867089039d86" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-jdk7-1.8.21.pom">
-            <sha256 value="9bb107d5d5e3930bc5977f007a43cd20b7d24d91b1c1e528ea6ee0f248f14d36" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.3.61">
          <artifact name="kotlin-stdlib-jdk8-1.3.61.pom">
             <sha256 value="e30187e5720ca640b8e68686f20dd0250dcef0193d56e5569c3c4a61277312b6" origin="Generated by Gradle"/>
@@ -4766,24 +4529,11 @@
             <sha256 value="97e1b53abe45f138b587953f5043e399c380f555a6233d55795e7aee03d0a731" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.8.21">
-         <artifact name="kotlin-stdlib-jdk8-1.8.21.jar">
-            <sha256 value="3db752a30074f06ee6c57984aa6f27da44f4d2bbc7f5442651f6988f1cb2b7d7" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-jdk8-1.8.21.pom">
-            <sha256 value="3839d728d7c309a5c368b0270b44b4f1c7878ff5ca5d32a9a204faa3491459d8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-bom" version="1.6.0">
          <artifact name="kotlinx-coroutines-bom-1.6.0.pom">
             <sha256 value="da2327250eabf2adeb5ba4d015a437f34475102d15ba3d7448da71dfcfd196de" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-bom" version="1.6.4">
-         <artifact name="kotlinx-coroutines-bom-1.6.4.pom">
-            <sha256 value="ab2614855fba66aa8a42514dbe3d5a884315ffe1ed63f5932e710a8006245ce1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core" version="1.6.0">
          <artifact name="kotlinx-coroutines-core-1.6.0.module">
             <sha256 value="512cfab68f00d7363461b5dd02637dd19048b364a89e1960f99784c705a27a7c" origin="Generated by Gradle"/>
@@ -4792,14 +4542,6 @@
             <sha256 value="225504eb87207013296dfd69e21acc60f56240546e6ea8d4252783bdcfb324d9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core" version="1.6.4">
-         <artifact name="kotlinx-coroutines-core-1.6.4.module">
-            <sha256 value="a6eed4a1835588e7c84fcd7b0475fce9a7b3444c870ebc797b88ba64ccf4576b" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlinx-coroutines-core-1.6.4.pom">
-            <sha256 value="136b4edb87a47e15251f0842f3189fa31979eb4ab51acfb4239b4bf8d16d4588" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.6.0">
          <artifact name="kotlinx-coroutines-core-jvm-1.6.0.jar">
             <sha256 value="acc8c74b1fb88121c51221bfa7b6f5e920201bc20183ebf74165dcf5d45a8003" origin="Generated by Gradle"/>
@@ -4811,17 +4553,6 @@
             <sha256 value="d11fdf1c07d83682dc6f73a16a6fa010c2de5f45d7049cf2bf6ff09ceeda3001" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.6.4">
-         <artifact name="kotlinx-coroutines-core-jvm-1.6.4.jar">
-            <sha256 value="c24c8bb27bb320c4a93871501a7e5e0c61607638907b197aef675513d4c820be" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlinx-coroutines-core-jvm-1.6.4.module">
-            <sha256 value="0d94c8a41483e7c2707ebd693e1b1357a84152998ce85550ebbc54ca4321a3a7" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlinx-coroutines-core-jvm-1.6.4.pom">
-            <sha256 value="09d960f85922903c2e52e126b17e9fa5020b425c469ec61944b3c01835547224" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-jdk8" version="1.6.0">
          <artifact name="kotlinx-coroutines-jdk8-1.6.0.jar">
             <sha256 value="cf93f59cafabea454b0bb03c4c3ea055f6ea17f7ff06770a765eca94dd5de867" origin="Generated by Gradle"/>
@@ -4833,17 +4564,6 @@
             <sha256 value="0b2070e123c7cdc262b506ce2ad7e7d09d7bea6dab4acbfd58d27e7131684b00" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-jdk8" version="1.6.4">
-         <artifact name="kotlinx-coroutines-jdk8-1.6.4.jar">
-            <sha256 value="88c64b8eea3eb90597d2fb0fd30f3cf782fbcdad06312e5665a618f070f02119" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlinx-coroutines-jdk8-1.6.4.module">
-            <sha256 value="bdc4b3683b5af45d0894f56ffdb1f81d6bbde9d54a2e14abf1d9487e9e144e07" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlinx-coroutines-jdk8-1.6.4.pom">
-            <sha256 value="70e90954fefa9522e90edab9ea0e882b3727087b72c0193de3326af8c221ccb8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-metadata-jvm" version="0.5.0">
          <artifact name="kotlinx-metadata-jvm-0.5.0.jar">
             <sha256 value="ca063a96639b08b9eaa0de4d65e899480740a6efbe28ab9a8681a2ced03055a4" origin="Generated by Gradle"/>

gradle/versions.gradle

@@ -16,7 +16,7 @@
 dependencyManagement {
   dependencies {
 
-    dependencySet(group: 'org.antlr', version: '4.11.1') {
+    dependencySet(group: 'org.antlr', version: '4.10.1') {
       entry 'antlr4'
       entry 'antlr4-runtime'
     }
@@ -133,7 +133,7 @@ dependencyManagement {
       entry 'log4j-slf4j2-impl'
     }
 
-    dependencySet(group: 'io.tmio', version: '2.4.1') {
+    dependencySet(group: 'org.apache.tuweni', version: '2.3.1') {
       entry 'tuweni-bytes'
       entry 'tuweni-config'
       entry 'tuweni-concurrent'
@@ -147,6 +147,11 @@ dependencyManagement {
       entry 'tuweni-units'
     }
 
+    // commons-net is a transitive dependency of tuweni.
+    // Tuweni 2.3.1 has commons-net:3.8.0 which we force here to 3.9.0
+    // Once tuweni is updated, can remove this line
+    dependency 'commons-net:commons-net:3.9.0'
+
     dependency 'org.assertj:assertj-core:3.24.2'
 
     dependency 'org.awaitility:awaitility:4.2.0'

pki/build.gradle

@@ -31,7 +31,7 @@ dependencies {
   api 'org.slf4j:slf4j-api'
 
   implementation 'com.google.guava:guava'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
   implementation 'org.bouncycastle:bcpkix-jdk15on'
 
   testImplementation 'junit:junit'

plugin-api/build.gradle

@@ -30,8 +30,8 @@ jar {
 dependencies {
   api project(':datatypes')
   api 'org.apache.commons:commons-lang3'
-  api 'io.tmio:tuweni-bytes'
+  api 'org.apache.tuweni:tuweni-bytes'
-  api 'io.tmio:tuweni-units'
+  api 'org.apache.tuweni:tuweni-units'
   implementation 'com.google.guava:guava'
   implementation project(':evm')
 }

plugins/rocksdb/build.gradle

@@ -45,7 +45,7 @@ dependencies {
   implementation 'info.picocli:picocli'
   implementation 'io.opentelemetry:opentelemetry-api'
   implementation 'io.prometheus:simpleclient'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
   implementation 'org.rocksdb:rocksdbjni'
   implementation project(path: ':ethereum:core')
 

privacy-contracts/build.gradle

@@ -15,9 +15,9 @@
 
 jar { enabled = true }
 dependencies {
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-io'
+  implementation 'org.apache.tuweni:tuweni-io'
-  implementation 'io.tmio:tuweni-toml'
+  implementation 'org.apache.tuweni:tuweni-toml'
   implementation 'org.web3j:abi'
   implementation 'org.web3j:besu'
 }

services/tasks/build.gradle

@@ -38,7 +38,7 @@ dependencies {
 
   implementation 'com.google.guava:guava'
   implementation 'io.vertx:vertx-core'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
 
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'

testutil/build.gradle

@@ -37,9 +37,9 @@ dependencies {
   implementation 'com.squareup.okhttp3:okhttp'
   implementation 'io.vertx:vertx-core'
   implementation 'junit:junit'
-  implementation 'io.tmio:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
-  implementation 'io.tmio:tuweni-io'
+  implementation 'org.apache.tuweni:tuweni-io'
-  implementation 'io.tmio:tuweni-toml'
+  implementation 'org.apache.tuweni:tuweni-toml'
   implementation 'org.assertj:assertj-core'
   implementation 'org.mockito:mockito-core'
   implementation 'org.web3j:core'