Add Electra milestone in few tests (Consensys#8173)

Author: StefanBratanov

Diff for: ethereum/executionclient/src/integration-test/java/tech/pegasys/teku/ethereum/executionclient/web3j/Web3JExecutionEngineClientTest.java

@@ -23,6 +23,7 @@
 import static org.mockito.Mockito.mock;
 import static tech.pegasys.teku.spec.SpecMilestone.CAPELLA;
 import static tech.pegasys.teku.spec.SpecMilestone.DENEB;
+import static tech.pegasys.teku.spec.SpecMilestone.ELECTRA;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonFactory;
@@ -43,12 +44,14 @@
 import okhttp3.mockwebserver.RecordedRequest;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestTemplate;
 import tech.pegasys.teku.ethereum.events.ExecutionClientEventsChannel;
 import tech.pegasys.teku.ethereum.executionclient.schema.ClientVersionV1;
 import tech.pegasys.teku.ethereum.executionclient.schema.ExecutionPayloadV3;
+import tech.pegasys.teku.ethereum.executionclient.schema.ExecutionPayloadV4;
 import tech.pegasys.teku.ethereum.executionclient.schema.ForkChoiceStateV1;
 import tech.pegasys.teku.ethereum.executionclient.schema.ForkChoiceUpdatedResult;
 import tech.pegasys.teku.ethereum.executionclient.schema.PayloadAttributesV1;
@@ -69,7 +72,7 @@
 import tech.pegasys.teku.spec.logic.versions.deneb.types.VersionedHash;
 import tech.pegasys.teku.spec.util.DataStructureUtil;
 
-@TestSpecContext(milestone = {CAPELLA, DENEB})
+@TestSpecContext(milestone = {CAPELLA, DENEB, ELECTRA})
 public class Web3JExecutionEngineClientTest {
 
   private static final Duration DEFAULT_TIMEOUT = Duration.ofMinutes(1);
@@ -298,6 +301,66 @@ public void newPayloadV3_shouldBuildRequestAndResponseSuccessfully() {
         .isEqualTo(parentBeaconBlockRoot.toHexString());
   }
 
+  @TestTemplate
+  @SuppressWarnings("unchecked")
+  public void newPayloadV4_shouldBuildRequestAndResponseSuccessfully() {
+    assumeThat(specMilestone).isGreaterThanOrEqualTo(ELECTRA);
+    final Bytes32 latestValidHash = dataStructureUtil.randomBytes32();
+    final PayloadStatus payloadStatusResponse =
+        PayloadStatus.valid(Optional.of(latestValidHash), Optional.empty());
+
+    final String bodyResponse =
+        "{\"jsonrpc\": \"2.0\", \"id\": 0, \"result\":"
+            + "{ \"status\": \"VALID\", \"latestValidHash\": \""
+            + latestValidHash
+            + "\", \"validationError\": null}}";
+
+    mockSuccessfulResponse(bodyResponse);
+
+    final ExecutionPayload executionPayload = dataStructureUtil.randomExecutionPayload();
+    final ExecutionPayloadV4 executionPayloadV4 =
+        ExecutionPayloadV4.fromInternalExecutionPayload(executionPayload);
+
+    final List<VersionedHash> blobVersionedHashes = dataStructureUtil.randomVersionedHashes(3);
+    final Bytes32 parentBeaconBlockRoot = dataStructureUtil.randomBytes32();
+
+    final SafeFuture<Response<PayloadStatusV1>> futureResponse =
+        eeClient.newPayloadV4(executionPayloadV4, blobVersionedHashes, parentBeaconBlockRoot);
+
+    assertThat(futureResponse)
+        .succeedsWithin(1, TimeUnit.SECONDS)
+        .matches(
+            response ->
+                response.getPayload().asInternalExecutionPayload().equals(payloadStatusResponse));
+
+    final Map<String, Object> requestData = takeRequest();
+    verifyJsonRpcMethodCall(requestData, "engine_newPayloadV4");
+
+    final Map<String, Object> executionPayloadV4Parameter =
+        (Map<String, Object>) ((List<Object>) requestData.get("params")).get(0);
+    // 19 fields in ExecutionPayloadV4
+    assertThat(executionPayloadV4Parameter).hasSize(19);
+    // sanity check
+    assertThat(executionPayloadV4Parameter.get("parentHash"))
+        .isEqualTo(executionPayloadV4.parentHash.toHexString());
+
+    assertThat(executionPayloadV4Parameter.get("depositReceipts"))
+        .asInstanceOf(InstanceOfAssertFactories.LIST)
+        .hasSameSizeAs(executionPayloadV4.depositReceipts);
+    assertThat(executionPayloadV4Parameter.get("exits"))
+        .asInstanceOf(InstanceOfAssertFactories.LIST)
+        .hasSameSizeAs(executionPayloadV4.exits);
+    assertThat(((List<Object>) requestData.get("params")).get(1))
+        .asInstanceOf(LIST)
+        .containsExactlyElementsOf(
+            blobVersionedHashes.stream()
+                .map(VersionedHash::toHexString)
+                .collect(Collectors.toList()));
+    assertThat(((List<Object>) requestData.get("params")).get(2))
+        .asString()
+        .isEqualTo(parentBeaconBlockRoot.toHexString());
+  }
+
   private void mockSuccessfulResponse(final String responseBody) {
     mockWebServer.enqueue(
         new MockResponse()

Diff for: ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/electra/block/BlockProcessorElectra.java

@@ -85,12 +85,12 @@ protected void processOperationsNoValidation(
       final BeaconBlockBody body,
       final IndexedAttestationCache indexedAttestationCache)
       throws BlockProcessingException {
-    final MutableBeaconStateElectra electraState = MutableBeaconStateElectra.required(state);
     super.processOperationsNoValidation(state, body, indexedAttestationCache);
+
     safelyProcess(
         () ->
             processDepositReceipts(
-                electraState,
+                MutableBeaconStateElectra.required(state),
                 body.getOptionalExecutionPayload()
                     .flatMap(ExecutionPayload::toVersionElectra)
                     .map(ExecutionPayloadElectra::getDepositReceipts)
@@ -136,7 +136,7 @@ protected void processExecutionLayerExits(
   }
 
   /*
-    Implements process_execution_layer_exit from consensus-spec (EIP-7002)
+    Implements process_execution_layer_exit from consensus-specs (EIP-7002)
   */
   @Override
   public void processExecutionLayerExits(
@@ -208,7 +208,7 @@ private SszList<ExecutionLayerExit> getExecutionLayerExitsFromBlock(
   }
 
   /*
-   Implements process_deposit_receipt from consensus-spec (EIP-6110)
+   Implements process_deposit_receipt from consensus-specs (EIP-6110)
   */
   public void processDepositReceipts(
       final MutableBeaconStateElectra state, final SszList<DepositReceipt> depositReceipts) {

Diff for: ethereum/spec/src/test/java/tech/pegasys/teku/spec/logic/common/util/BlindBlockUtilTest.java

@@ -26,7 +26,13 @@
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.util.DataStructureUtil;
 
-@TestSpecContext(milestone = {SpecMilestone.BELLATRIX, SpecMilestone.CAPELLA, SpecMilestone.DENEB})
+@TestSpecContext(
+    milestone = {
+      SpecMilestone.BELLATRIX,
+      SpecMilestone.CAPELLA,
+      SpecMilestone.DENEB,
+      SpecMilestone.ELECTRA
+    })
 class BlindBlockUtilTest {
 
   private DataStructureUtil dataStructureUtil;

Diff for: ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/validation/BlobSidecarGossipValidatorTest.java

@@ -44,7 +44,7 @@
 import tech.pegasys.teku.spec.logic.versions.deneb.helpers.MiscHelpersDeneb;
 import tech.pegasys.teku.spec.util.DataStructureUtil;
 
-@TestSpecContext(milestone = {SpecMilestone.DENEB})
+@TestSpecContext(milestone = {SpecMilestone.DENEB, SpecMilestone.ELECTRA})
 public class BlobSidecarGossipValidatorTest {
   private final Map<Bytes32, BlockImportResult> invalidBlocks = new HashMap<>();
   private final GossipValidationHelper gossipValidationHelper = mock(GossipValidationHelper.class);

Diff for: ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/validation/BlockGossipValidatorTest.java

@@ -48,7 +48,13 @@
 import tech.pegasys.teku.storage.storageSystem.InMemoryStorageSystemBuilder;
 import tech.pegasys.teku.storage.storageSystem.StorageSystem;
 
-@TestSpecContext(milestone = {SpecMilestone.ALTAIR, SpecMilestone.BELLATRIX, SpecMilestone.DENEB})
+@TestSpecContext(
+    milestone = {
+      SpecMilestone.ALTAIR,
+      SpecMilestone.BELLATRIX,
+      SpecMilestone.DENEB,
+      SpecMilestone.ELECTRA
+    })
 public class BlockGossipValidatorTest {
   private Spec spec;
   private RecentChainData recentChainData;