Merge branch 'main' into protoSchedNotIgnoringDiff

.circleci/config.yml

@@ -4,14 +4,6 @@ orbs:
   win: circleci/[email protected]
 
 executors:
-  besu_executor_small:
-    docker:
-      - image: cimg/openjdk:17.0
-    resource_class: small
-    working_directory: ~/project
-    environment:
-      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2
-
   besu_executor_med: # 2cpu, 4G ram
     docker:
       - image: cimg/openjdk:17.0
@@ -189,7 +181,7 @@ jobs:
       - capture_test_results
 
   integrationTests:
-    executor: xl_machine_executor
+    executor: xl_machine_executor # needs the machine executor since privacy test uses container tests (docker)
     steps:
       - prepare
       - attach_workspace:
@@ -219,8 +211,8 @@ jobs:
       - capture_test_results
 
   acceptanceTests:
-    parallelism: 4
-    executor: xl_machine_executor
+    parallelism: 2
+    executor: xl_machine_executor # needs the machine executor since privacy test uses container tests (docker)
     steps:
       - prepare
       - attach_workspace:
@@ -241,8 +233,7 @@ jobs:
       - capture_test_logs
 
   acceptanceTestsCliqueBft:
-    parallelism: 6
-    executor: xl_machine_executor
+    executor: besu_executor_xl
     steps:
       - prepare
       - attach_workspace:
@@ -251,20 +242,13 @@ jobs:
           name: AcceptanceTests (Non-Mainnet)
           no_output_timeout: 20m
           command: |
-            CLASSNAMES=$(circleci tests glob "acceptance-tests/tests/src/test/java/**/*.java" \
-              | sed 's@.*/src/test/java/@@' \
-              | sed 's@/@.@g' \
-              | sed 's/.\{5\}$//' \
-              | circleci tests split --split-by=timings --timings-type=classname)
-            # Format the arguments to "./gradlew test"
-            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}')
-            ./gradlew --no-daemon acceptanceTestCliqueBft $GRADLE_ARGS
+            ./gradlew --no-daemon acceptanceTestCliqueBft
       - capture_test_results
       - capture_test_logs
 
   acceptanceTestsPrivacy:
-    parallelism: 6
-    executor: xl_machine_executor
+    parallelism: 4
+    executor: xl_machine_executor # needs the machine executor since it uses container tests (docker)
     steps:
       - prepare
       - attach_workspace:
@@ -285,8 +269,7 @@ jobs:
       - capture_test_logs
 
   acceptanceTestsPermissioning:
-    parallelism: 6
-    executor: xl_machine_executor
+    executor: besu_executor_xl
     steps:
       - prepare
       - attach_workspace:
@@ -295,14 +278,7 @@ jobs:
           name: AcceptanceTests (Non-Mainnet)
           no_output_timeout: 20m
           command: |
-            CLASSNAMES=$(circleci tests glob "acceptance-tests/tests/src/test/java/**/*.java" \
-              | sed 's@.*/src/test/java/@@' \
-              | sed 's@/@.@g' \
-              | sed 's/.\{5\}$//' \
-              | circleci tests split --split-by=timings --timings-type=classname)
-            # Format the arguments to "./gradlew test"
-            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}')
-            ./gradlew --no-daemon acceptanceTestPermissioning $GRADLE_ARGS
+            ./gradlew --no-daemon acceptanceTestPermissioning
       - capture_test_results
       - capture_test_logs
 
@@ -448,9 +424,6 @@ workflows:
       - acceptanceTestsCliqueBft:
           requires:
             - assemble
-      - acceptanceTestsPrivacy:
-          requires:
-            - assemble
       - acceptanceTestsPermissioning:
           requires:
             - assemble
@@ -525,3 +498,6 @@ workflows:
     jobs:
       - assemble
       - dockerScan
+      - acceptanceTestsPrivacy:
+          requires:
+            - assemble

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEngineCancunBlockBuildingAcceptanceTest.java

@@ -83,10 +83,10 @@ protected void evaluateResponse(
       assertThat(blobsBundle.get("blobs").getNodeType()).isEqualTo(JsonNodeType.ARRAY);
       final ArrayNode blobs = (ArrayNode) blobsBundle.get("blobs");
       final ArrayNode proofs = (ArrayNode) blobsBundle.get("proofs");
-      assertThat(2).isEqualTo(transactions.size());
-      assertThat(6).isEqualTo(commitments.size());
-      assertThat(6).isEqualTo(blobs.size());
-      assertThat(6).isEqualTo(proofs.size());
+      assertThat(3).isEqualTo(transactions.size());
+      assertThat(3).isEqualTo(commitments.size());
+      assertThat(3).isEqualTo(blobs.size());
+      assertThat(3).isEqualTo(proofs.size());
     }
   }
 

acceptance-tests/tests/src/test/resources/jsonrpc/engine/cancun/test-cases/block-production/10_cancun_build_on_genesis.json

@@ -1,95 +1,5 @@
 {
-  "request": {
-    "jsonrpc": "2.0",
-    "id": 1,
-    "method": "engine_forkchoiceUpdatedV3",
-    "params": [
-      {
-        "headBlockHash": "0x33235e7b7a78302cdb54e5ddba66c7ae49b01c1f5498bb00cd0c8ed5206784bf",
-        "safeBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-      },
-      {
-        "timestamp": "0x1235",
-        "prevRandao": "0x31a3b9b03c64172b39b7fa7d35d86eaa0f9cbac30e2abbf9895a32b80ae1cd76",
-        "suggestedFeeRecipient": "0x0000000000000000000000000000000000000000",
-        "withdrawals": [
-          {
-            "index": "0x1",
-            "validatorIndex": "0x0",
-            "address": "0x0000000000000000000000000000000000000000",
-            "amount": "0x64"
-          },
-          {
-            "index": "0x2",
-            "validatorIndex": "0x1",
-            "address": "0x0100000000000000000000000000000000000000",
-            "amount": "0x64"
-          },
-          {
-            "index": "0x3",
-            "validatorIndex": "0x2",
-            "address": "0x0200000000000000000000000000000000000000",
-            "amount": "0x64"
-          },
-          {
-            "index": "0x4",
-            "validatorIndex": "0x3",
-            "address": "0x0300000000000000000000000000000000000000",
-            "amount": "0x64"
-          },
-          {
-            "index": "0x5",
-            "validatorIndex": "0x4",
-            "address": "0x0400000000000000000000000000000000000000",
-            "amount": "0x64"
-          },
-          {
-            "index": "0x6",
-            "validatorIndex": "0x5",
-            "address": "0x0500000000000000000000000000000000000000",
-            "amount": "0x64"
-          },
-          {
-            "index": "0x7",
-            "validatorIndex": "0x6",
-            "address": "0x0600000000000000000000000000000000000000",
-            "amount": "0x64"
-          },
-          {
-            "index": "0x8",
-            "validatorIndex": "0x7",
-            "address": "0x0700000000000000000000000000000000000000",
-            "amount": "0x64"
-          },
-          {
-            "index": "0x9",
-            "validatorIndex": "0x8",
-            "address": "0x0800000000000000000000000000000000000000",
-            "amount": "0x64"
-          },
-          {
-            "index": "0xa",
-            "validatorIndex": "0x9",
-            "address": "0x0900000000000000000000000000000000000000",
-            "amount": "0x64"
-          }
-        ],
-        "parentBeaconBlockRoot": "0x169630f535b4a41330164c6e5c92b1224c0c407f582d407d0ac3d206cd32fd52"
-      }
-    ]
-  },
-  "response": {
-    "jsonrpc": "2.0",
-    "id": 1,
-    "result": {
-      "payloadStatus": {
-        "status": "VALID",
-        "latestValidHash": "0x33235e7b7a78302cdb54e5ddba66c7ae49b01c1f5498bb00cd0c8ed5206784bf",
-        "validationError": null
-      },
-      "payloadId": "0x78d3b312ed5adeb5"
-    }
-  },
-  "statusCode": 200
+  "request" : {"jsonrpc":"2.0","id":5,"method":"engine_forkchoiceUpdatedV3","params":[{"headBlockHash":"0x33235e7b7a78302cdb54e5ddba66c7ae49b01c1f5498bb00cd0c8ed5206784bf","safeBlockHash":"0x0000000000000000000000000000000000000000000000000000000000000000","finalizedBlockHash":"0x0000000000000000000000000000000000000000000000000000000000000000"},{"timestamp":"0x1236","prevRandao":"0xc13da06dc53836ca0766057413b9683eb9a8773bbb8fcc5691e41c25b56dda1d","suggestedFeeRecipient":"0x0000000000000000000000000000000000000000","withdrawals":[{"index":"0xb","validatorIndex":"0x0","address":"0x0000000000000000000000000000000000000000","amount":"0x64"},{"index":"0xc","validatorIndex":"0x1","address":"0x0100000000000000000000000000000000000000","amount":"0x64"},{"index":"0xd","validatorIndex":"0x2","address":"0x0200000000000000000000000000000000000000","amount":"0x64"},{"index":"0xe","validatorIndex":"0x3","address":"0x0300000000000000000000000000000000000000","amount":"0x64"},{"index":"0xf","validatorIndex":"0x4","address":"0x0400000000000000000000000000000000000000","amount":"0x64"},{"index":"0x10","validatorIndex":"0x5","address":"0x0500000000000000000000000000000000000000","amount":"0x64"},{"index":"0x11","validatorIndex":"0x6","address":"0x0600000000000000000000000000000000000000","amount":"0x64"},{"index":"0x12","validatorIndex":"0x7","address":"0x0700000000000000000000000000000000000000","amount":"0x64"},{"index":"0x13","validatorIndex":"0x8","address":"0x0800000000000000000000000000000000000000","amount":"0x64"},{"index":"0x14","validatorIndex":"0x9","address":"0x0900000000000000000000000000000000000000","amount":"0x64"}],"parentBeaconBlockRoot":"0x062367f0b23e2d49ad5e770d9ad17b83c0c1c625c3f9a290cd9572b3fc6cfc9e"}]},
+  "response" : {"jsonrpc":"2.0","id":5,"result":{"payloadStatus":{"status":"VALID","latestValidHash":"0x33235e7b7a78302cdb54e5ddba66c7ae49b01c1f5498bb00cd0c8ed5206784bf","validationError":null},"payloadId":"0x29e12df730769ab6"}},
+  "statusCode" : 200
 }