From f98337ea6b0065672cebc9d998b442517d6a3fa5 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 6 Jul 2023 23:24:33 -0700 Subject: [PATCH] update Tuweni to 2.4.2 Signed-off-by: Antoine Toulme --- CHANGELOG.md | 2 +- .../p2p/network/DefaultP2PNetworkTest.java | 3 + gradle/verification-metadata.xml | 120 ++++++++++++++++++ gradle/versions.gradle | 2 +- 4 files changed, 125 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a77d25084fe..f7b2f2f425e 100644 --- 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/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetworkTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetworkTest.java index 5b61d4946a4..00cbccb126a 100644 --- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetworkTest.java +++ b/ethereum/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 index 39142d19df4..c9a2105d52d 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2579,6 +2579,14 @@ + + + + + + + + @@ -2587,6 +2595,14 @@ + + + + + + + + @@ -2595,6 +2611,14 @@ + + + + + + + + @@ -2603,6 +2627,14 @@ + + + + + + + + @@ -2611,6 +2643,14 @@ + + + + + + + + @@ -2619,6 +2659,14 @@ + + + + + + + + @@ -2627,6 +2675,14 @@ + + + + + + + + @@ -2635,6 +2691,14 @@ + + + + + + + + @@ -2643,6 +2707,14 @@ + + + + + + + + @@ -2651,6 +2723,14 @@ + + + + + + + + @@ -2659,6 +2739,14 @@ + + + + + + + + @@ -2667,6 +2755,14 @@ + + + + + + + + @@ -2675,6 +2771,14 @@ + + + + + + + + @@ -2683,6 +2787,14 @@ + + + + + + + + @@ -2691,6 +2803,14 @@ + + + + + + + + diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 1d56fb72ff0..4089bbb3014 100644 --- 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'