From 671de397ab83387e0553e846aab274f9dfc6878c Mon Sep 17 00:00:00 2001
From: Jason Frame <jason.frame@consensys.net>
Date: Wed, 10 Jan 2024 12:59:48 +1000
Subject: [PATCH] Update for 24.1.0 (#961)

* update besu version to 23.10.3
* add goerli notice to changelog
* in ATs using Besu remove --tx-pool-limit-by-account-percentage and use default layered tx pool
---
 CHANGELOG.md                                                | 2 ++
 .../web3signer/tests/eth1rpc/Eth1RpcAcceptanceTestBase.java | 6 +-----
 gradle.properties                                           | 2 +-
 gradle/versions.gradle                                      | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83559346e..cb2c37a51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 24.1.0
 
+This is an optional release for mainnet Ethereum and it includes the updated network configuration for the Goerli Deneb fork.
+
 ### Upcoming Breaking Changes
 - `--Xworker-pool-size` cli option will be removed in a future release. This option has been replaced with `--vertx-worker-pool-size`.
 
diff --git a/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/eth1rpc/Eth1RpcAcceptanceTestBase.java b/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/eth1rpc/Eth1RpcAcceptanceTestBase.java
index 2ad1b914f..10eac5a6c 100644
--- a/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/eth1rpc/Eth1RpcAcceptanceTestBase.java
+++ b/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/eth1rpc/Eth1RpcAcceptanceTestBase.java
@@ -25,7 +25,6 @@
 import java.math.BigInteger;
 import java.net.URISyntaxException;
 import java.nio.file.Path;
-import java.util.List;
 
 import com.google.common.io.Resources;
 import org.junit.jupiter.api.AfterEach;
@@ -44,10 +43,7 @@ public class Eth1RpcAcceptanceTestBase extends AcceptanceTestBase {
   protected Path keyFileTempDir;
 
   protected void startBesu() {
-    final BesuNodeConfig besuNodeConfig =
-        BesuNodeConfigBuilder.aBesuNodeConfig()
-            .withAdditionalCommandLineArgs(List.of("--tx-pool-limit-by-account-percentage=1"))
-            .build();
+    final BesuNodeConfig besuNodeConfig = BesuNodeConfigBuilder.aBesuNodeConfig().build();
 
     besu = BesuNodeFactory.create(besuNodeConfig);
     besu.start();
diff --git a/gradle.properties b/gradle.properties
index 2d8d2edeb..b0acbeb78 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-besuVersion=23.7.2
+besuVersion=23.10.3
 besuDistroUrl=https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/${besuVersion}/besu-${besuVersion}.tar.gz
 
 hashicorpVaultVersion=1.9.2
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index c36dd089e..2a13dff83 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -85,8 +85,8 @@ dependencyManagement {
       entry 'mockito-junit-jupiter'
     }
 
-    dependency 'org.hyperledger.besu:plugin-api:23.10.2'
-    dependency 'org.hyperledger.besu.internal:metrics-core:23.10.2'
+    dependency 'org.hyperledger.besu:plugin-api:23.10.3'
+    dependency 'org.hyperledger.besu.internal:metrics-core:23.10.3'
 
     dependency 'org.xipki.iaik:sunpkcs11-wrapper:1.4.10'