Merge branch 'main' into refrests-12.4

shemnon · Sep 20, 2023 · 61967ee · 61967ee
2 parents 82925ce + cedcb5c
commit 61967ee
Show file tree

Hide file tree

Showing 11 changed files with 349 additions and 244 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,6 @@
 # Changelog
 
 ## 23.7.3
-### Additions and Improvements
-- Add access to an immutable world view to start/end transaction hooks in the tracing API[#5836](https://github.com/hyperledger/besu/pull/5836)
 
 ### Breaking Changes
 - Removed support for Kotti network (ETC) [#5816](https://github.com/hyperledger/besu/pull/5816)
@@ -11,7 +9,10 @@
     - `--Xlayered-tx-pool-layer-max-capacity`, `--Xlayered-tx-pool-max-prioritized` and `--Xlayered-tx-pool-max-future-by-sender` just drop the `X` and keep the same behavior
 
 ### Additions and Improvements
+- Add access to an immutable world view to start/end transaction hooks in the tracing API[#5836](https://github.com/hyperledger/besu/pull/5836)
 - Layered transaction pool implementation is now stable and enabled by default. If you want still to use the legacy implementation, use `--tx-pool=legacy` [#5772](https://github.com/hyperledger/besu)
+- Tune G1GC to reduce Besu memory footprint, and new `besu-untuned` start scripts to run without any specific G1GC flags [#5879](https://github.com/hyperledger/besu/pull/5879)
+- Update Holesky config for re-launch [#5890](https://github.com/hyperledger/besu/pull/5890)
 
 ### Bug Fixes
 - do not create ignorable storage on revert storage-variables subcommand [#5830](https://github.com/hyperledger/besu/pull/5830) 

diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
@@ -84,10 +84,9 @@ public static Collection<Object[]> parameters() {
           new Object[] {
             NetworkName.HOLESKY,
             List.of(
-                new ForkId(Bytes.ofUnsignedInt(0xa200f558L), 1694790240L),
-                new ForkId(Bytes.ofUnsignedInt(0x840a3b53L), 2000000000L),
-                new ForkId(Bytes.ofUnsignedInt(0x30771f90), 0L),
-                new ForkId(Bytes.ofUnsignedInt(0x30771f90), 0L))
+                new ForkId(Bytes.ofUnsignedInt(0xc61a6098L), 1696000704L),
+                new ForkId(Bytes.ofUnsignedInt(0xfd4f016bL), 0L),
+                new ForkId(Bytes.ofUnsignedInt(0xfd4f016bL), 0L))
           },
           new Object[] {
             NetworkName.GOERLI,

diff --git a/build.gradle b/build.gradle
@@ -551,6 +551,22 @@ def tweakStartScript(createScriptTask) {
 }
 
 startScripts {
+  defaultJvmOpts = applicationDefaultJvmArgs + [
+    "-XX:G1ConcRefinementThreads=2",
+    "-XX:G1HeapWastePercent=15",
+    "-XX:MaxGCPauseMillis=100"
+  ]
+  unixStartScriptGenerator.template = resources.text.fromFile("${projectDir}/besu/src/main/scripts/unixStartScript.txt")
+  windowsStartScriptGenerator.template = resources.text.fromFile("${projectDir}/besu/src/main/scripts/windowsStartScript.txt")
+  doLast { tweakStartScript(startScripts) }
+}
+
+task untunedStartScripts(type: CreateStartScripts) {
+  mainClass = 'org.hyperledger.besu.Besu'
+  classpath = startScripts.classpath
+  outputDir = startScripts.outputDir
+  applicationName = 'besu-untuned'
+  defaultJvmOpts = applicationDefaultJvmArgs
   unixStartScriptGenerator.template = resources.text.fromFile("${projectDir}/besu/src/main/scripts/unixStartScript.txt")
   windowsStartScriptGenerator.template = resources.text.fromFile("${projectDir}/besu/src/main/scripts/windowsStartScript.txt")
   doLast { tweakStartScript(startScripts) }
@@ -587,10 +603,10 @@ task autocomplete(type: JavaExec) {
   }
 }
 
-installDist { dependsOn checkLicenses, evmToolStartScripts }
+installDist { dependsOn checkLicenses, untunedStartScripts, evmToolStartScripts }
 
 distTar {
-  dependsOn checkLicenses, autocomplete, evmToolStartScripts
+  dependsOn checkLicenses, autocomplete, untunedStartScripts, evmToolStartScripts
   doFirst {
     delete fileTree(dir: 'build/distributions', include: '*.tar.gz')
   }
@@ -599,7 +615,7 @@ distTar {
 }
 
 distZip {
-  dependsOn checkLicenses, autocomplete, evmToolStartScripts
+  dependsOn checkLicenses, autocomplete, untunedStartScripts, evmToolStartScripts
   doFirst {
     delete fileTree(dir: 'build/distributions', include: '*.zip')
   }