Remove EOF (#9559)

* Remove EOF

Signed-off-by: daniellehrner <daniel.lehrner@consensys.net>

Author: daniellehrner

CHANGELOG.md

@@ -48,6 +48,7 @@
 - Add Linea named networks for `linea_mainnet` and `linea_sepolia` [#9436](https://github.com/hyperledger/besu/pull/9436), [#9518](https://github.com/hyperledger/besu/pull/9518)
 - Add `eth_subscribe` and `eth_unsubscribe` support to IPC service [#9504](https://github.com/hyperledger/besu/pull/9504)
 - Add experimental `callTracer` tracer option to `debug_trace*` methods. Enabled using `--Xenable-extra-debug-tracers=true` option. Issue [#8326][issue_8326] implemented via PR [#8960][PR_8960] and [#9072][PR_9072].
+- Remove EOF [#9559](https://github.com/hyperledger/besu/pull/9559)
 
 ### Bug fixes
 - Fix non-deterministic sub-protocol registration during IBFT2 to QBFT consensus migration [#9516](https://github.com/hyperledger/besu/pull/9516)

app/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

@@ -1795,7 +1795,6 @@ private void transformGethToBesu(final ObjectNode genesisRoot) {
    */
   private boolean hasKzgFork(final GenesisConfigOptions genesisConfigOptions) {
     return genesisConfigOptions.getCancunTime().isPresent()
-        || genesisConfigOptions.getCancunEOFTime().isPresent()
         || genesisConfigOptions.getPragueTime().isPresent()
         || genesisConfigOptions.getOsakaTime().isPresent()
         || genesisConfigOptions.getBpo1Time().isPresent()

config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java

@@ -258,13 +258,6 @@ default boolean isConsensusMigration() {
    */
   OptionalLong getCancunTime();
 
-  /**
-   * Gets cancun EOF time.
-   *
-   * @return the cancun EOF time
-   */
-  OptionalLong getCancunEOFTime();
-
   /**
    * Gets prague time.
    *

config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java

@@ -313,11 +313,6 @@ public OptionalLong getShanghaiTime() {
     return getOptionalLong("shanghaitime");
   }
 
-  @Override
-  public OptionalLong getCancunEOFTime() {
-    return getOptionalLong("cancuneoftime");
-  }
-
   @Override
   public OptionalLong getCancunTime() {
     return getOptionalLong("cancuntime");
@@ -535,7 +530,6 @@ public Map<String, Object> asMap() {
     getMergeNetSplitBlockNumber().ifPresent(l -> builder.put("mergeNetSplitBlock", l));
     getShanghaiTime().ifPresent(l -> builder.put("shanghaiTime", l));
     getCancunTime().ifPresent(l -> builder.put("cancunTime", l));
-    getCancunEOFTime().ifPresent(l -> builder.put("cancunEOFTime", l));
     getPragueTime().ifPresent(l -> builder.put("pragueTime", l));
     getOsakaTime().ifPresent(l -> builder.put("osakaTime", l));
     getBpo1Time().ifPresent(l -> builder.put("bpo1Time", l));
@@ -702,7 +696,6 @@ public List<Long> getForkBlockTimestamps() {
         Stream.of(
             getShanghaiTime(),
             getCancunTime(),
-            getCancunEOFTime(),
             getPragueTime(),
             getOsakaTime(),
             getBpo1Time(),

config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java

@@ -48,7 +48,6 @@ public class StubGenesisConfigOptions implements GenesisConfigOptions, Cloneable
   private OptionalLong mergeNetSplitBlockNumber = OptionalLong.empty();
   private OptionalLong shanghaiTime = OptionalLong.empty();
   private OptionalLong cancunTime = OptionalLong.empty();
-  private OptionalLong cancunEOFTime = OptionalLong.empty();
   private OptionalLong pragueTime = OptionalLong.empty();
   private OptionalLong osakaTime = OptionalLong.empty();
   private OptionalLong bpo1Time = OptionalLong.empty();
@@ -258,11 +257,6 @@ public OptionalLong getCancunTime() {
     return cancunTime;
   }
 
-  @Override
-  public OptionalLong getCancunEOFTime() {
-    return cancunEOFTime;
-  }
-
   @Override
   public OptionalLong getPragueTime() {
     return pragueTime;
@@ -710,17 +704,6 @@ public StubGenesisConfigOptions cancunTime(final long timestamp) {
     return this;
   }
 
-  /**
-   * Cancun EOF time.
-   *
-   * @param timestamp the timestamp
-   * @return the stub genesis config options
-   */
-  public StubGenesisConfigOptions cancunEOFTime(final long timestamp) {
-    cancunEOFTime = OptionalLong.of(timestamp);
-    return this;
-  }
-
   /**
    * Prague time.
    *

config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java

@@ -193,13 +193,6 @@ void shouldGetCancunTime() {
     assertThat(config.getCancunTime()).hasValue(1670470142);
   }
 
-  @Test
-  void shouldGetCancunEOFTime() {
-    final GenesisConfigOptions config =
-        fromConfigOptions(singletonMap("cancunEOFTime", 1670470142));
-    assertThat(config.getCancunEOFTime()).hasValue(1670470142);
-  }
-
   @Test
   void shouldGetPragueTime() {
     final GenesisConfigOptions config = fromConfigOptions(singletonMap("pragueTime", 1670470143));
@@ -281,7 +274,6 @@ void shouldNotReturnEmptyOptionalWhenBlockNumberNotSpecified() {
     assertThat(config.getMergeNetSplitBlockNumber()).isEmpty();
     assertThat(config.getShanghaiTime()).isEmpty();
     assertThat(config.getCancunTime()).isEmpty();
-    assertThat(config.getCancunEOFTime()).isEmpty();
     assertThat(config.getPragueTime()).isEmpty();
     assertThat(config.getOsakaTime()).isEmpty();
     assertThat(config.getBpo1Time()).isEmpty();

datatypes/src/main/java/org/hyperledger/besu/datatypes/HardforkId.java

@@ -79,8 +79,6 @@ enum MainnetHardforkId implements HardforkId {
     SHANGHAI(true, "Shanghai"),
     /** Cancun fork. */
     CANCUN(true, "Cancun"),
-    /** Cancun + EOF fork. */
-    CANCUN_EOF(false, "Cancun + EOF"),
     /** Prague fork. */
     PRAGUE(true, "Prague"),
     /** Osaka fork. */

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/vm/VmTraceGenerator.java

@@ -18,7 +18,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.Trace;
 import org.hyperledger.besu.evm.Code;
-import org.hyperledger.besu.evm.code.CodeV0;
 import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
 import org.hyperledger.besu.evm.tracing.TraceFrame;
 
@@ -288,7 +287,7 @@ private void initStep(final TraceFrame frame) {
     // set smart contract code
     if (currentTrace != null && "0x".equals(currentTrace.getCode())) {
       currentTrace.setCode(
-          currentTraceFrame.getMaybeCode().orElse(CodeV0.EMPTY_CODE).getBytes().toHexString());
+          currentTraceFrame.getMaybeCode().orElse(Code.EMPTY_CODE).getBytes().toHexString());
     }
   }
 

ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/BenchmarkHelper.java

@@ -19,7 +19,7 @@
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
-import org.hyperledger.besu.evm.code.CodeV0;
+import org.hyperledger.besu.evm.Code;
 import org.hyperledger.besu.evm.frame.BlockValues;
 import org.hyperledger.besu.evm.frame.MessageFrame;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
@@ -51,7 +51,7 @@ public static MessageFrame createMessageCallFrame() {
         .sender(Address.ZERO)
         .value(Wei.ZERO)
         .apparentValue(Wei.ZERO)
-        .code(CodeV0.EMPTY_CODE)
+        .code(Code.EMPTY_CODE)
         .completer(__ -> {})
         .build();
   }
@@ -73,7 +73,7 @@ public static MessageFrame createMessageCallFrameWithCallData(final Bytes callDa
         .sender(Address.ZERO)
         .value(Wei.ZERO)
         .apparentValue(Wei.ZERO)
-        .code(CodeV0.EMPTY_CODE)
+        .code(Code.EMPTY_CODE)
         .completer(__ -> {})
         .build();
   }

ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/CountLeadingZerosOperationBenchmark.java

@@ -19,7 +19,7 @@
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
-import org.hyperledger.besu.evm.code.CodeV0;
+import org.hyperledger.besu.evm.Code;
 import org.hyperledger.besu.evm.frame.BlockValues;
 import org.hyperledger.besu.evm.frame.MessageFrame;
 import org.hyperledger.besu.evm.operation.CountLeadingZerosOperation;
@@ -86,7 +86,7 @@ public void setUp() {
             .sender(Address.ZERO)
             .value(Wei.ZERO)
             .apparentValue(Wei.ZERO)
-            .code(CodeV0.EMPTY_CODE)
+            .code(Code.EMPTY_CODE)
             .completer(messageFrame -> {})
             .build();
     bytes = Bytes.fromHexString(bytesHex);