From 52db07216c50ef188054b95505d11eccca2a85a2 Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Wed, 3 Jan 2024 14:32:40 +0100 Subject: [PATCH 1/4] Bump com.google.guava:guava to 33.0.0 Signed-off-by: Fabio Di Fabio --- gradle/verification-metadata.xml | 37 ++++++++++++++++++++++++++++++++ gradle/versions.gradle | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 30d55eb6840..b3f146669b4 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -792,6 +792,14 @@ + + + + + + + + @@ -920,6 +928,14 @@ + + + + + + + + @@ -944,6 +960,14 @@ + + + + + + + + @@ -964,6 +988,11 @@ + + + + + @@ -3527,6 +3556,14 @@ + + + + + + + + diff --git a/gradle/versions.gradle b/gradle/versions.gradle index b497109d782..c27af91f09b 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -46,7 +46,7 @@ dependencyManagement { entry 'error_prone_test_helpers' } - dependency 'com.google.guava:guava:31.1-jre' + dependency 'com.google.guava:guava:33.0.0-jre' dependency 'com.graphql-java:graphql-java:21.3' From a18a3673f16d9e847c57d469140660c6575ab8a3 Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Wed, 3 Jan 2024 18:42:34 +0100 Subject: [PATCH 2/4] Update pending tx estimated memory size after Guava update Signed-off-by: Fabio Di Fabio --- .../transactions/PendingTransactionEstimatedMemorySizeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionEstimatedMemorySizeTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionEstimatedMemorySizeTest.java index c9c81543a63..20b94f5bf8c 100644 --- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionEstimatedMemorySizeTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionEstimatedMemorySizeTest.java @@ -58,7 +58,7 @@ public class PendingTransactionEstimatedMemorySizeTest extends BaseTransactionPo private static final Set> SHARED_CLASSES = Set.of(SignatureAlgorithm.class, TransactionType.class); private static final Set COMMON_CONSTANT_FIELD_PATHS = - Set.of(".value.ctor", ".hashNoSignature"); + Set.of(".value.ctor", ".hashNoSignature", ".signature.encoded.delegate"); private static final Set EIP1559_EIP4844_CONSTANT_FIELD_PATHS = Sets.union(COMMON_CONSTANT_FIELD_PATHS, Set.of(".gasPrice")); private static final Set FRONTIER_ACCESS_LIST_CONSTANT_FIELD_PATHS = From d4fb2ce47ad68d32bea420725a907286950584fe Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Tue, 9 Jan 2024 19:29:31 +0100 Subject: [PATCH 3/4] Rebuilt Gradle validation metadata Signed-off-by: Fabio Di Fabio --- gradle/verification-metadata.xml | 67 ++++++-------------------------- 1 file changed, 11 insertions(+), 56 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index b3f146669b4..58a562fff88 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -760,14 +760,6 @@ - - - - - - - - @@ -777,9 +769,6 @@ - - - @@ -816,11 +805,6 @@ - - - - - @@ -836,6 +820,11 @@ + + + + + @@ -936,14 +925,6 @@ - - - - - - - - @@ -967,17 +948,15 @@ + + + - - - - - @@ -1027,14 +1006,6 @@ - - - - - - - - @@ -3521,22 +3492,6 @@ - - - - - - - - - - - - - - - - @@ -3552,9 +3507,6 @@ - - - @@ -3563,6 +3515,9 @@ + + + From 0619848b214c99ee22f8a03c102857227f39b695 Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Fri, 12 Jan 2024 12:18:09 +0100 Subject: [PATCH 4/4] Update CHANGELOG Signed-off-by: Fabio Di Fabio --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index abcc2ab3c85..bb8d3cb9bff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Introduce TransactionEvaluationContext to pass data between transaction selectors and plugin, during block creation [#6381](https://github.com/hyperledger/besu/pull/6381) - Upgrade dependencies [#6377](https://github.com/hyperledger/besu/pull/6377) - Upgrade `com.fasterxml.jackson` dependencies [#6378](https://github.com/hyperledger/besu/pull/6378) +- Upgrade Guava dependency [#6396](https://github.com/hyperledger/besu/pull/6396) ### Bug fixes - INTERNAL_ERROR from `eth_estimateGas` JSON/RPC calls [#6344](https://github.com/hyperledger/besu/issues/6344)