Merge branch 'main' of github.com:hyperledger/besu into fix-eth-simulate-error-codes

Author: macfarla

.github/workflows/bft-soak-test.yml

@@ -0,0 +1,49 @@
+name: bft-soak-test
+on:
+  workflow_dispatch:
+    inputs:
+      soak-time-mins:
+        description: 'Duration of soak test in minutes (minimum 60)'
+        required: false
+        default: '60'
+        type: string
+
+env:
+  GRADLE_OPTS: "-Xmx6g -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true"
+
+jobs:
+  bft-soak-test:
+    name: "BFT Soak Test"
+    runs-on: ubuntu-22.04
+    timeout-minutes: 180
+    permissions:
+      statuses: write
+      checks: write
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        with:
+          ref: ${{ github.ref }}
+      - name: Set up Java
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
+        with:
+          distribution: temurin
+          java-version: 21
+      - name: setup gradle
+        uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1
+        with:
+          cache-disabled: true
+      - name: run BFT soak test
+        run: ./gradlew :acceptance-tests:tests:acceptanceTestBftSoak -Dacctests.soakTimeMins=${{ inputs['soak-time-mins'] }}
+      - name: Upload BFT Soak Test HTML Reports
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
+        if: always()
+        with:
+          name: bft-soak-test-html-reports
+          path: 'acceptance-tests/tests/build/reports/tests/**'
+      - name: Upload BFT Soak Test Results
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
+        if: always()
+        with:
+          name: bft-soak-test-results
+          path: 'acceptance-tests/tests/build/test-results/**/TEST-*.xml'

CHANGELOG.md

@@ -7,6 +7,7 @@
 - eth_simulateV1 returns BLOCK_NOT_FOUND instead of null success response when called with a future block [#9837](https://github.com/hyperledger/besu/pull/9837)
 - eth_simulateV1: when validation is enabled, map UPFRONT_COST_EXCEEDS_BALANCE (-38014) error code to -32602 [#9837](https://github.com/hyperledger/besu/pull/9837)
 - Forest db subcommands `x-backup-state` and `x-restore-state` are removed [#9821](https://github.com/hyperledger/besu/pull/9821)
+- Omit totalDifficulty from post-merge blockResults [#9836](https://github.com/hyperledger/besu/pull/9836)
 - **Chain pruning CLI options have been redesigned with new behavior:** [#9637](https://github.com/hyperledger/besu/pull/9637)
   - `--Xchain-pruning-enabled` now accepts three strategy values instead of boolean:
     - `ALL` - prunes both blocks and BALs (replaces the old `--Xchain-pruning-enabled=true`)
@@ -47,6 +48,7 @@
 
 #### Performance
 - EVM optimisations - Improves 70% of EEST benchmarks [#9775](https://github.com/hyperledger/besu/pull/9775)
+- EVM optimisations - Improve SAR, SHR and SHL opcodes performance [#9796](https://github.com/hyperledger/besu/pull/9796)
 
 ### Bug fixes
 - Fix QBFT Shanghai support by reintroducing NotApplicableWithdrawals withdrawals validator [#9830](https://github.com/hyperledger/besu/pull/9830)

acceptance-tests/tests/build.gradle

@@ -112,15 +112,30 @@ testing {
 
         acceptanceTestBftSoak {
           testTask.configure {
+            // Clear the exclude inherited from the 'all' block
+            excludes.clear()
             include '**/bftsoak/**'
 
+            dependsOn(rootProject.installDist)
+            setSystemProperties(getSystemProperties())
+            systemProperty 'acctests.runBesuAsProcess', 'true'
+            systemProperty 'java.security.properties', "${buildDir}/resources/acceptanceTest/acceptanceTesting.security"
             // Set to any time > 60 minutes to run the soak test for longer
             // systemProperty 'acctests.soakTimeMins', '120'
             description = 'Runs BFT soak test.'
+            group = 'verification'
+
+            jvmArgs "-XX:ErrorFile=${buildDir}/jvmErrorLogs/java_err_pid%p.log"
 
             testLogging {
+              exceptionFormat = 'full'
+              showStackTraces = true
               showStandardStreams = true
+              showExceptions = true
+              showCauses = true
             }
+
+            doFirst { mkdir "${buildDir}/jvmErrorLogs" }
           }
         }
       }

acceptance-tests/tests/src/acceptanceTest/java/org/hyperledger/besu/tests/acceptance/bft/BftSyncAcceptanceTest.java

@@ -80,6 +80,6 @@ public void shouldSyncValidatorNode(
     // Add validator4 to cluster and start
     cluster.addNode(validator4);
 
-    validator4.verify(blockchain.minimumHeight(TARGET_BLOCK_HEIGHT, 120));
+    validator4.verify(blockchain.minimumHeight(TARGET_BLOCK_HEIGHT, 140));
   }
 }

acceptance-tests/tests/src/acceptanceTest/java/org/hyperledger/besu/tests/acceptance/ethereum/EIP7708TransferLogAcceptanceTest.java

@@ -57,7 +57,7 @@
  *
  * <ul>
  *   <li>SELFDESTRUCT to different address: Transfer log (LOG3) with 3 topics
- *   <li>SELFDESTRUCT to self: Selfdestruct log (LOG2) with 2 topics
+ *   <li>SELFDESTRUCT to self: Burn log (LOG2) with 2 topics
  * </ul>
  */
 public class EIP7708TransferLogAcceptanceTest extends AcceptanceTestBase {
@@ -67,8 +67,8 @@ public class EIP7708TransferLogAcceptanceTest extends AcceptanceTestBase {
   private static final String EIP7708_SYSTEM_ADDRESS = "0xfffffffffffffffffffffffffffffffffffffffe";
   private static final String TRANSFER_TOPIC =
       "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef";
-  private static final String SELFDESTRUCT_TOPIC =
-      "0x4bfaba3443c1a1836cd362418edc679fc96cae8449cbefccb6457cdf2c943083";
+  private static final String BURN_TOPIC =
+      "0xcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5";
 
   private final Account sender =
       accounts.createAccount(
@@ -344,7 +344,7 @@ public void shouldEmitTransferLogForSelfDestructToDifferentAddress() throws IOEx
    *
    * <p>Per EIP-7708, since no actual destruction or value transfer occurs, no log should be
    * emitted. This is different from pre-Cancun behavior where the contract would be destroyed and a
-   * Selfdestruct log would be emitted.
+   * Burn log would be emitted.
    */
   @Test
   public void shouldNotEmitLogForPreExistingContractSelfDestructToSelf() throws IOException {
@@ -497,7 +497,7 @@ public void shouldNotEmitTransferLogForRevertedTransaction() throws IOException
   }
 
   /**
-   * Test that SELFDESTRUCT to SELF for a same-tx-created contract DOES emit a Selfdestruct log.
+   * Test that SELFDESTRUCT to SELF for a same-tx-created contract DOES emit a Burn log.
    *
    * <p>This test calls a factory contract (0x7710) that:
    *
@@ -508,8 +508,8 @@ public void shouldNotEmitTransferLogForRevertedTransaction() throws IOException
    * </ol>
    *
    * <p>Under EIP-6780, contracts created in the same transaction CAN be destroyed by SELFDESTRUCT.
-   * Per EIP-7708, when a same-tx-created contract selfdestructs to itself, a Selfdestruct log
-   * (LOG2) should be emitted with the destroyed balance.
+   * Per EIP-7708, when a same-tx-created contract selfdestructs to itself, a Burn log (LOG2) should
+   * be emitted with the destroyed balance.
    */
   @Test
   public void shouldEmitSelfdestructLogForSameTxCreatedContractSelfDestructToSelf()
@@ -552,18 +552,18 @@ public void shouldEmitSelfdestructLogForSameTxCreatedContractSelfDestructToSelf(
 
     final List<Log> logs = receipt.getLogs();
 
-    // Should have at least one Selfdestruct log (LOG2 with 2 topics)
+    // Should have at least one Burn log (LOG2 with 2 topics)
     final List<Log> selfdestructLogs =
         logs.stream()
             .filter(log -> log.getTopics().size() == 2)
-            .filter(log -> log.getTopics().get(0).equalsIgnoreCase(SELFDESTRUCT_TOPIC))
+            .filter(log -> log.getTopics().get(0).equalsIgnoreCase(BURN_TOPIC))
             .toList();
 
     assertThat(selfdestructLogs)
-        .as("Same-tx-created contract SELFDESTRUCT to self SHOULD emit a Selfdestruct log")
+        .as("Same-tx-created contract SELFDESTRUCT to self SHOULD emit a Burn log")
         .isNotEmpty();
 
-    // Verify the Selfdestruct log has the correct balance
+    // Verify the Burn log has the correct balance
     final Log selfdestructLog = selfdestructLogs.getFirst();
     assertThat(selfdestructLog.getAddress()).isEqualToIgnoringCase(EIP7708_SYSTEM_ADDRESS);
     assertThat(selfdestructLog.getData())

acceptance-tests/tests/src/acceptanceTest/resources/jsonrpc/debug/replayBlock/test-cases/05_get_latest_block.json

@@ -18,7 +18,6 @@
       "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
       "miner": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
       "difficulty": "0x0",
-      "totalDifficulty": "0x400000000",
       "extraData": "0x",
       "baseFeePerGas": "0x7",
       "size": "0x1fa",

acceptance-tests/tests/src/acceptanceTest/resources/jsonrpc/debug/replayBlock/test-cases/07_get_latest_block_after_replay_block.json

@@ -18,7 +18,6 @@
       "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
       "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
       "difficulty" : "0x0",
-      "totalDifficulty" : "0x400000000",
       "extraData" : "0x",
       "baseFeePerGas" : "0x7",
       "size" : "0x1fa",

acceptance-tests/tests/src/acceptanceTest/resources/jsonrpc/debug/setHead/test-cases/05_get_latest_block.json

@@ -18,7 +18,6 @@
       "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
       "miner": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
       "difficulty": "0x0",
-      "totalDifficulty": "0x400000000",
       "extraData": "0x",
       "baseFeePerGas": "0x7",
       "size": "0x1fa",

acceptance-tests/tests/src/acceptanceTest/resources/jsonrpc/debug/setHead/test-cases/07_get_latest_block_after_set_head.json

@@ -18,7 +18,6 @@
       "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
       "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
       "difficulty" : "0x0",
-      "totalDifficulty" : "0x400000000",
       "extraData" : "0x",
       "baseFeePerGas" : "0x7",
       "size" : "0x1fa",

acceptance-tests/tests/src/acceptanceTest/resources/jsonrpc/engine/cancun/test-cases/block-production/09_cancun_get_chainhead.json

@@ -24,7 +24,6 @@
       "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
       "miner": "0x0000000000000000000000000000000000000000",
       "difficulty": "0x0",
-      "totalDifficulty": "0x0",
       "extraData": "0x",
       "baseFeePerGas": "0x3b9aca00",
       "size": "0x244",