update Tuweni to 2.4.2

Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>
hyperledger · Jul 8, 2023 · a0189b9 · a0189b9
1 parent 08edefd
commit a0189b9
Show file tree

Hide file tree

Showing 5 changed files with 128 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - EvmTool now executes the `execution-spec-tests` via the `t8n` and `b11r`. See the [README](ethereum/evmtool/README.md) in EvmTool for more instructions.
 - Improve lifecycle management of the transaction pool [#5634](https://github.com/hyperledger/besu/pull/5634)
 - Add extension points in AbstractCreateOperation for EVM libraries to react to contract creations [#5656](https://github.com/hyperledger/besu/pull/5656)
+- Update to Tuweni 2.4.2. [#5684](https://github.com/hyperledger/besu/pull/5684)
 
 ### Bug Fixes
 - Use the node's configuration to determine if DNS enode URLs are allowed in calls to `admin_addPeer` and `admin_removePeer` [#5584](https://github.com/hyperledger/besu/pull/5584)
@@ -35,7 +36,6 @@ and in case a rollback is needed, before installing a previous version, the migr
 - Use BlobDB for blockchain storage to reduce initial sync time and write amplification [#5475](https://github.com/hyperledger/besu/pull/5475)
 - Add healing flat db mechanism with early access CLI options `--Xsnapsync-synchronizer-flat-db-healing-enabled=true` [#5319](https://github.com/hyperledger/besu/pull/5319)
 - Add debug_getRawTransaction method to the DEBUG suite [#5635](https://github.com/hyperledger/besu/pull/5635)
-- Update to Tuweni 2.4.1. [#5513](https://github.com/hyperledger/besu/pull/5513)
 
 ### Bug Fixes
 - Fix backwards sync bug where chain is rolled back too far, especially when restarting Nimbus [#5497](https://github.com/hyperledger/besu/pull/5497)

diff --git a/...m/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RangeManagerTest.java b/...m/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RangeManagerTest.java
@@ -16,6 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.base.Strings;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.TrieGenerator;
 import org.hyperledger.besu.ethereum.proof.WorldStateProofProvider;
@@ -41,7 +42,7 @@ public final class RangeManagerTest {
   @Test
   public void testRemainingRangesEqualToOneWhenFirstRangeContainsMoreThanHalf() {
     TreeMap<Bytes32, Bytes> items = new TreeMap<>();
-    items.put(Bytes32.repeat((byte) 0xbb), Bytes.wrap(new byte[] {0x03}));
+    items.put(Bytes32.fromHexString("bb".repeat(32)), Bytes.wrap(new byte[] {0x03}));
     int nbRanges =
         RangeManager.getRangeCount(RangeManager.MIN_RANGE, RangeManager.MAX_RANGE, items);
     assertThat(nbRanges).isEqualTo(1);
@@ -50,7 +51,7 @@ public void testRemainingRangesEqualToOneWhenFirstRangeContainsMoreThanHalf() {
   @Test
   public void testRemainingRangesEqualToOneWhenFirstRangeContainsLessThanHalf() {
     TreeMap<Bytes32, Bytes> items = new TreeMap<>();
-    items.put(Bytes32.repeat((byte) 0x77), Bytes.wrap(new byte[] {0x03}));
+    items.put(Bytes32.fromHexString("77".repeat(32)), Bytes.wrap(new byte[] {0x03}));
     int nbRanges =
         RangeManager.getRangeCount(RangeManager.MIN_RANGE, RangeManager.MAX_RANGE, items);
     assertThat(nbRanges).isEqualTo(2);

diff --git a/...um/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetworkTest.java b/...um/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetworkTest.java
@@ -58,6 +58,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import io.vertx.core.Context;
 import io.vertx.core.Vertx;
 import io.vertx.core.dns.DnsClient;
 import org.apache.tuweni.bytes.Bytes32;
@@ -352,6 +353,7 @@ public void shouldStartDnsDiscoveryWhenDnsURLIsConfigured() {
 
     Vertx vertx = mock(Vertx.class);
     when(vertx.createDnsClient(any())).thenReturn(mock(DnsClient.class));
+    when(vertx.getOrCreateContext()).thenReturn(mock(Context.class));
 
     // spy on DefaultP2PNetwork
     final DefaultP2PNetwork testClass =
@@ -374,6 +376,7 @@ public void shouldUseDnsServerOverrideIfPresent() {
 
     Vertx vertx = mock(Vertx.class);
     when(vertx.createDnsClient(any())).thenReturn(mock(DnsClient.class));
+    when(vertx.getOrCreateContext()).thenReturn(mock(Context.class));
 
     final DefaultP2PNetwork testClass =
         (DefaultP2PNetwork) builder().config(dnsConfig).vertx(vertx).build();

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -2579,6 +2579,14 @@
             <sha256 value="7d8622bfcfa6ddd3295514315a4574fe3e76e90f2e801b8daf2bb93fc9441b08" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-bytes" version="2.4.2">
+         <artifact name="tuweni-bytes-2.4.2.jar">
+            <sha256 value="f12627fd4e7f2fe1a1e6baab93970f3b3b900112d8411868f75a83534958e77e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-bytes-2.4.2.pom">
+            <sha256 value="5fd911bdabe5fb4f9bc265095883e26e8ac4ca6ac926f6c8c4ce5c21e8429ee1" 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"/>
@@ -2587,6 +2595,14 @@
             <sha256 value="27f13e0cb1ef191cd80c6112418eb2daca5611617f98d4bcabe97fcfc8974fe3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-concurrent" version="2.4.2">
+         <artifact name="tuweni-concurrent-2.4.2.jar">
+            <sha256 value="ab5d7835d304811dc4e4b18b18d0ae2d6d04c1da3378825455ec0ab58bf4bdf2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-concurrent-2.4.2.pom">
+            <sha256 value="b2e55457a23b78bf6f7f698a68428d6eef29312de2891599f360044d369b45c8" 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"/>
@@ -2595,6 +2611,14 @@
             <sha256 value="d1dcc63128d3d99a8b57bc62b6ea85433e0883d72e9c8559003e58e52447ee86" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-concurrent-coroutines" version="2.4.2">
+         <artifact name="tuweni-concurrent-coroutines-2.4.2.jar">
+            <sha256 value="068eac479c3ab40ed76220e0c7bcd389a9a9e53f66db82ef15a6782719100749" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-concurrent-coroutines-2.4.2.pom">
+            <sha256 value="4cf7b317ac639886f2dcd336e6d51cf9075f1191313b1311dd02de5656050e31" 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"/>
@@ -2603,6 +2627,14 @@
             <sha256 value="22915297c706813e165764d7708a03fec4129bf3bcb5325d8a0fdeb1935bcefa" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-config" version="2.4.2">
+         <artifact name="tuweni-config-2.4.2.jar">
+            <sha256 value="8b100d84c4831bf4c2d825091e8a4af810ebb131ed4c9e5b0b2ef8860b6ecb4d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-config-2.4.2.pom">
+            <sha256 value="9474f243024c9c889ef91b34258360d90ccff3c062668a0477366126d3040c1f" 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"/>
@@ -2611,6 +2643,14 @@
             <sha256 value="d4d023824b5bab91dcf5fe101890890d2e23f61840875ba9901ecc573bd09d5b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-crypto" version="2.4.2">
+         <artifact name="tuweni-crypto-2.4.2.jar">
+            <sha256 value="e52413605d5ca130266eefb23935148b02d783a73333852d5eecbda3d229fa1f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-crypto-2.4.2.pom">
+            <sha256 value="a08b5eecfb91563c9d1844d062e544a27eda111b327dc8bd887527dee1235cd0" 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"/>
@@ -2619,6 +2659,14 @@
             <sha256 value="09a067423e9a47c8cab7b6ece4573009bdd0a50c98c20d4156972e25f94b672c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-devp2p" version="2.4.2">
+         <artifact name="tuweni-devp2p-2.4.2.jar">
+            <sha256 value="1430eb4456aefae120265a31cf2312dfaaecc74b4457ad7cd808de4d14069bf6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-devp2p-2.4.2.pom">
+            <sha256 value="681d98c3b6c5e740d96a1779d1589201a7c7e48553dcaa2192d4d00ee973b9f3" 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"/>
@@ -2627,6 +2675,14 @@
             <sha256 value="ff7b47a7ab787e0587a7ba10eb6871559bf17e5cb5c2b04ade60d11eb6da1d95" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-dns-discovery" version="2.4.2">
+         <artifact name="tuweni-dns-discovery-2.4.2.jar">
+            <sha256 value="f50eace57c5f9a56b2f22ea8cf50da379856a3bbdb4abdfb2b3729fa5b11e11d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-dns-discovery-2.4.2.pom">
+            <sha256 value="f9838e6d8dcaa69e2b61641650afb94b5ef7e478ec2e98efa403dcc509ed2d4d" 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"/>
@@ -2635,6 +2691,14 @@
             <sha256 value="5759cef4a9f11161c68c3f71959efe25affe7844c006c344c44c1e783c30f00b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-io" version="2.4.2">
+         <artifact name="tuweni-io-2.4.2.jar">
+            <sha256 value="67effc78467927c6790ca519bd941d55fbee517eb5a1059961d54d0dc3ab626e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-io-2.4.2.pom">
+            <sha256 value="8090c3518e987c2e50f5a2b3c8ffa7e75d895fdf9885ac4d657e20d06e81e654" 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"/>
@@ -2643,6 +2707,14 @@
             <sha256 value="5a005c2e1ffb82953bac7c1886ddc6f37a0d3e23a4c69aca9024dce237e35e10" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-kademlia" version="2.4.2">
+         <artifact name="tuweni-kademlia-2.4.2.jar">
+            <sha256 value="44a4f0e7721688ce0fc8b8d797acab22416eb9036f62398ba2fb7916f2a20cc9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-kademlia-2.4.2.pom">
+            <sha256 value="aad9ddfa094f337e979fbb5d844d43bab47a79079e921c41d11cb9b3820902b6" 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"/>
@@ -2651,6 +2723,14 @@
             <sha256 value="9f749969cc9876276cd6ce0340b4c5f11696ffafc82f11fd0de24ced65513367" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-kv" version="2.4.2">
+         <artifact name="tuweni-kv-2.4.2.jar">
+            <sha256 value="00ce9049989cd351acb796633301560589d6952222974ec05c5760a31d864fd3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-kv-2.4.2.pom">
+            <sha256 value="91497b2a0846fd00dd23f1c6fda8733cb06c37dde1fa07b0c00e334c61971c41" 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"/>
@@ -2659,6 +2739,14 @@
             <sha256 value="d77671ba499d365266ef3143c1685a69af25f1faf6519e00ee18b3f3ac06b410" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-merkle-trie" version="2.4.2">
+         <artifact name="tuweni-merkle-trie-2.4.2.jar">
+            <sha256 value="ea199aaaf46f6702708af42174af8b7b0d82cbb7d96540b9849b6797a209bfa2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-merkle-trie-2.4.2.pom">
+            <sha256 value="212b776892d9e3f72015ea89b72e911da480c1f0e8a4727920c901b9f5f92f20" 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"/>
@@ -2667,6 +2755,14 @@
             <sha256 value="e87fd4a814df8616bd0ad2775888ff8d8499b822bd08fa3bfcfb4c058b92dd59" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-net" version="2.4.2">
+         <artifact name="tuweni-net-2.4.2.jar">
+            <sha256 value="258366b0d8028141f9a8441727e77e31e1204cf955f57e597a40c1ea94365c3e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-net-2.4.2.pom">
+            <sha256 value="e32560d4d37222e424c9333638a080d6e545b829934b85cbedbf9c1d40814ae6" 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"/>
@@ -2675,6 +2771,14 @@
             <sha256 value="e60cbf6a436e1252c9d1739dd3432ce903356f0af35120d05979623bb830f2a3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-rlp" version="2.4.2">
+         <artifact name="tuweni-rlp-2.4.2.jar">
+            <sha256 value="8a2b457d2c77c11d31864bf0f223e381b8fe9b0972a66062db785c80c7a95a40" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-rlp-2.4.2.pom">
+            <sha256 value="939651379f9090f32d9b97636b69b212e4c70db30741dc4eea2c7ee02015f912" 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"/>
@@ -2683,6 +2787,14 @@
             <sha256 value="f4d6fb11a6121a668e4b86c6948a859e8c910ba609ab4216c86497e989a09ef5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-toml" version="2.4.2">
+         <artifact name="tuweni-toml-2.4.2.jar">
+            <sha256 value="aab23065d44abdd399f39562be80a54343496e29133a14d70a678a565bc86604" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-toml-2.4.2.pom">
+            <sha256 value="2f6464b314e62708ae0aff56a16659d1b197fe7ac5e0527b358f54192429306c" 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"/>
@@ -2691,6 +2803,14 @@
             <sha256 value="1b6f11842e1a9ada07a14e9bb47d844d94a73c68b6bba74ffd0cf663117f8088" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.tmio" name="tuweni-units" version="2.4.2">
+         <artifact name="tuweni-units-2.4.2.jar">
+            <sha256 value="b21adeb945adcfe3008df17c72a371a7db98237e8dcedbda0cdd9528469f45fd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-units-2.4.2.pom">
+            <sha256 value="2cd99dcfcc8753ee6cdd2946a60c129ddfa82ef989ba213131322f2b4d7177b5" 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"/>

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -133,7 +133,7 @@ dependencyManagement {
       entry 'log4j-slf4j2-impl'
     }
 
-    dependencySet(group: 'io.tmio', version: '2.4.1') {
+    dependencySet(group: 'io.tmio', version: '2.4.2') {
       entry 'tuweni-bytes'
       entry 'tuweni-config'
       entry 'tuweni-concurrent'