remove engine api validate for optimism

Author: thinkAfCod

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV2.java

@@ -68,6 +68,9 @@ protected JsonRpcResponse createResponse(
 
   @Override
   protected ValidationResult<RpcErrorType> validateForkSupported(final long blockTimestamp) {
+    if (this.mergeContext.get().isOptimism()) {
+      return ValidationResult.valid();
+    }
     if (cancunMilestone.isPresent() && blockTimestamp >= cancunMilestone.get()) {
       return ValidationResult.invalid(RpcErrorType.UNSUPPORTED_FORK);
     }

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV3.java

@@ -68,6 +68,9 @@ protected JsonRpcResponse createResponse(
 
   @Override
   protected ValidationResult<RpcErrorType> validateForkSupported(final long blockTimestamp) {
+    if (this.mergeContext.get().isOptimism()) {
+      return ValidationResult.valid();
+    }
     return ForkSupportHelper.validateForkSupported(CANCUN, cancunMilestone, blockTimestamp);
   }
 }

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV2.java

@@ -35,7 +35,6 @@
 import io.vertx.core.Vertx;
 
 public class EngineNewPayloadV2 extends AbstractEngineNewPayload {
-  private final Optional<Long> cancunMilestone;
 
   public EngineNewPayloadV2(
       final Vertx vertx,
@@ -45,7 +44,6 @@ public EngineNewPayloadV2(
       final EthPeers ethPeers,
       final EngineCallListener engineCallListener) {
     super(vertx, protocolSchedule, protocolContext, mergeCoordinator, ethPeers, engineCallListener);
-    cancunMilestone = protocolSchedule.milestoneFor(CANCUN);
   }
 
   @Override
@@ -81,10 +79,6 @@ protected ValidationResult<RpcErrorType> validateBlobs(
 
   @Override
   protected ValidationResult<RpcErrorType> validateForkSupported(final long blockTimestamp) {
-    if (cancunMilestone.isPresent() && blockTimestamp >= cancunMilestone.get()) {
-      return ValidationResult.invalid(RpcErrorType.UNSUPPORTED_FORK);
-    }
-
     return ValidationResult.valid();
   }
 }

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV3.java

@@ -76,6 +76,9 @@ protected ValidationResult<RpcErrorType> validateParameters(
 
   @Override
   protected ValidationResult<RpcErrorType> validateForkSupported(final long blockTimestamp) {
+    if (this.mergeContext.get().isOptimism()) {
+      return ValidationResult.valid();
+    }
     return ForkSupportHelper.validateForkSupported(CANCUN, cancunMilestone, blockTimestamp);
   }
 }

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/ExecutionEngineJsonRpcMethods.java

@@ -147,18 +147,10 @@ protected Map<String, JsonRpcMethod> create() {
               new EngineExchangeCapabilities(
                   consensusEngineServer, protocolContext, engineQosTimer),
               new EnginePreparePayloadDebug(
-                  consensusEngineServer, protocolContext, engineQosTimer, mergeCoordinator.get())));
-
-      if (protocolSchedule.anyMatch(p -> p.spec().getName().equalsIgnoreCase("cancun"))) {
-        executionEngineApisSupported.add(
-            new EngineGetPayloadV3(
-                consensusEngineServer,
-                protocolContext,
-                mergeCoordinator.get(),
-                blockResultFactory,
-                engineQosTimer,
-                protocolSchedule));
-      }
+                  consensusEngineServer, protocolContext, engineQosTimer, mergeCoordinator.get()),
+              new EngineGetPayloadV3(
+                  consensusEngineServer, protocolContext, mergeCoordinator.get(), blockResultFactory, engineQosTimer,
+                  protocolSchedule)));
 
       if (protocolSchedule.anyMatch(p -> p.spec().getName().equalsIgnoreCase("prague"))) {
         executionEngineApisSupported.add(

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java

@@ -1102,6 +1102,7 @@ static ProtocolSpecBuilder canyonDefinition(
         .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::cancun)
         .blockHeaderValidatorBuilder(MainnetBlockHeaderValidator::cancunBlockHeaderValidator)
         .blockHashProcessor(new CancunBlockHashProcessor())
+        .genesisConfigOptions(Optional.of(genesisConfigOptions))
         .name("Canyon");
   }
 
@@ -1179,6 +1180,7 @@ static ProtocolSpecBuilder fjordDefinition(
         .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::fjord)
         .blockHeaderValidatorBuilder(MainnetBlockHeaderValidator::cancunBlockHeaderValidator)
         .blockHashProcessor(new CancunBlockHashProcessor())
+        .genesisConfigOptions(Optional.of(genesisConfigOptions))
         .name("Fjord");
   }
 
@@ -1256,6 +1258,7 @@ static ProtocolSpecBuilder graniteDefinition(
         .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::granite)
         .blockHeaderValidatorBuilder(MainnetBlockHeaderValidator::cancunBlockHeaderValidator)
         .blockHashProcessor(new CancunBlockHashProcessor())
+        .genesisConfigOptions(Optional.of(genesisConfigOptions))
         .name("Granite");
   }