Revert "Wire up EIP-3855 PUSH0 to shanghaiTime and disable EOF (maxEo…

…fVersion) in EvmSpecVersion.SHANGHAI" This reverts commit a47cce6. Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
siladu · Dec 21, 2022 · 5543413 · 5543413
1 parent 2a52a78
commit 5543413
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 32 deletions.
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java
@@ -658,10 +658,6 @@ static ProtocolSpecBuilder shanghaiDefinition(
             genesisConfigOptions,
             quorumCompatibilityMode,
             evmConfiguration)
-        .evmBuilder(
-            (gasCalculator, jdCacheConfig) ->
-                MainnetEVMs.shanghai(
-                    gasCalculator, chainId.orElse(BigInteger.ZERO), evmConfiguration))
         .transactionProcessorBuilder(
             (gasCalculator,
                 transactionValidator,

diff --git a/evm/src/main/java/org/hyperledger/besu/evm/EvmSpecVersion.java b/evm/src/main/java/org/hyperledger/besu/evm/EvmSpecVersion.java
@@ -26,7 +26,7 @@ public enum EvmSpecVersion {
   ISTANBUL(0, true),
   LONDON(0, true),
   PARIS(0, true),
-  SHANGHAI(0, false),
+  SHANGHAI(1, false),
 
   /** Transient fork, will be removed */
   SHANDONG(1, false);

diff --git a/evm/src/main/java/org/hyperledger/besu/evm/MainnetEVMs.java b/evm/src/main/java/org/hyperledger/besu/evm/MainnetEVMs.java
@@ -427,33 +427,6 @@ public static void registerParisOperations(
     registry.put(new PrevRanDaoOperation(gasCalculator));
   }
 
-  public static EVM shanghai(
-      final GasCalculator gasCalculator,
-      final BigInteger chainId,
-      final EvmConfiguration evmConfiguration) {
-    return new EVM(
-        shanghaiOperations(gasCalculator, chainId),
-        gasCalculator,
-        evmConfiguration,
-        EvmSpecVersion.SHANGHAI);
-  }
-
-  public static OperationRegistry shanghaiOperations(
-      final GasCalculator gasCalculator, final BigInteger chainId) {
-    OperationRegistry operationRegistry = new OperationRegistry();
-    registerShanghaiOperations(operationRegistry, gasCalculator, chainId);
-    return operationRegistry;
-  }
-
-  public static void registerShanghaiOperations(
-      final OperationRegistry registry,
-      final GasCalculator gasCalculator,
-      final BigInteger chainID) {
-    registerParisOperations(registry, gasCalculator, chainID);
-    // Register the PUSH0 operation.
-    registry.put(new Push0Operation(gasCalculator));
-  }
-
   public static EVM shandong(final BigInteger chainId, final EvmConfiguration evmConfiguration) {
     return shandong(new LondonGasCalculator(), chainId, evmConfiguration);
   }