rename premerge fork to paris, keep premerge as an alias (hyperledger…

…#3615) * rename premerge fork to paris, keep premerge as an alias Signed-off-by: garyschulte <garyschulte@gmail.com>
garyschulte · May 2, 2022 · 21cda64 · 21cda64
1 parent c5b9414
commit 21cda64
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 34 deletions.
diff --git a/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java
@@ -84,7 +84,7 @@ default boolean isConsensusMigration() {
 
   OptionalLong getArrowGlacierBlockNumber();
 
-  OptionalLong getPreMergeForkBlockNumber();
+  OptionalLong getParisBlockNumber();
 
   Optional<Wei> getBaseFeePerGas();
 

diff --git a/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java
@@ -34,6 +34,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Streams;
 import org.apache.tuweni.units.bigints.UInt256;
 
 public class JsonGenesisConfigOptions implements GenesisConfigOptions {
@@ -273,8 +274,14 @@ public OptionalLong getArrowGlacierBlockNumber() {
   }
 
   @Override
-  public OptionalLong getPreMergeForkBlockNumber() {
-    return getOptionalLong("premergeforkblock");
+  public OptionalLong getParisBlockNumber() {
+    var parisBlock = getOptionalLong("parisblock");
+    var preMergeAlias = getOptionalLong("premergeforkblock");
+    if (parisBlock.isPresent() && preMergeAlias.isPresent()) {
+      throw new RuntimeException(
+          "Found both paris and preMergeFork blocks.  Should have one or the other");
+    }
+    return Streams.concat(parisBlock.stream(), preMergeAlias.stream()).findFirst();
   }
 
   @Override
@@ -432,7 +439,7 @@ public Map<String, Object> asMap() {
     getBerlinBlockNumber().ifPresent(l -> builder.put("berlinBlock", l));
     getLondonBlockNumber().ifPresent(l -> builder.put("londonBlock", l));
     getArrowGlacierBlockNumber().ifPresent(l -> builder.put("arrowGlacierBlock", l));
-    getPreMergeForkBlockNumber().ifPresent(l -> builder.put("preMergeForkBlock", l));
+    getParisBlockNumber().ifPresent(l -> builder.put("parisBlock", l));
     getTerminalBlockNumber().ifPresent(l -> builder.put("terminalBlockNumber", l));
     getTerminalBlockHash().ifPresent(h -> builder.put("terminalBlockHash", h.toHexString()));
 
@@ -550,7 +557,7 @@ public List<Long> getForks() {
             getBerlinBlockNumber(),
             getLondonBlockNumber(),
             getArrowGlacierBlockNumber(),
-            getPreMergeForkBlockNumber(),
+            getParisBlockNumber(),
             getTerminalBlockNumber(),
             getEcip1015BlockNumber(),
             getDieHardBlockNumber(),

diff --git a/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java
@@ -42,7 +42,7 @@ public class StubGenesisConfigOptions implements GenesisConfigOptions {
   private OptionalLong berlinBlockNumber = OptionalLong.empty();
   private OptionalLong londonBlockNumber = OptionalLong.empty();
   private OptionalLong arrowGlacierBlockNumber = OptionalLong.empty();
-  private OptionalLong preMergeForkBlockNumber = OptionalLong.empty();
+  private OptionalLong parisBlockNumber = OptionalLong.empty();
   private OptionalLong terminalBlockNumber = OptionalLong.empty();
   private Optional<Hash> terminalBlockHash = Optional.empty();
   private Optional<UInt256> terminalTotalDifficulty = Optional.empty();
@@ -201,8 +201,8 @@ public OptionalLong getArrowGlacierBlockNumber() {
   }
 
   @Override
-  public OptionalLong getPreMergeForkBlockNumber() {
-    return preMergeForkBlockNumber;
+  public OptionalLong getParisBlockNumber() {
+    return parisBlockNumber;
   }
 
   @Override
@@ -331,7 +331,7 @@ public Map<String, Object> asMap() {
     getBerlinBlockNumber().ifPresent(l -> builder.put("berlinBlock", l));
     getLondonBlockNumber().ifPresent(l -> builder.put("londonBlock", l));
     getArrowGlacierBlockNumber().ifPresent(l -> builder.put("arrowGlacierBlock", l));
-    getPreMergeForkBlockNumber().ifPresent(l -> builder.put("preMergeForkBlock", l));
+    getParisBlockNumber().ifPresent(l -> builder.put("parisBlock", l));
     getTerminalBlockNumber().ifPresent(l -> builder.put("terminalBlockNumber", l));
     getTerminalBlockHash().ifPresent(h -> builder.put("terminalBlockHash", h));
     // classic fork blocks
@@ -460,8 +460,8 @@ public StubGenesisConfigOptions arrowGlacierBlock(final long blockNumber) {
     return this;
   }
 
-  public StubGenesisConfigOptions preMergeForkBlock(final long blockNumber) {
-    preMergeForkBlockNumber = OptionalLong.of(blockNumber);
+  public StubGenesisConfigOptions parisBlock(final long blockNumber) {
+    parisBlockNumber = OptionalLong.of(blockNumber);
     return this;
   }
 

diff --git a/config/src/main/resources/kiln.json b/config/src/main/resources/kiln.json
@@ -12,7 +12,7 @@
     "istanbulBlock": 0,
     "berlinBlock": 0,
     "londonBlock": 0,
-    "preMergeForkBlock": 1000,
+    "parisBlock": 1000,
     "terminalTotalDifficulty": 20000000000000,
     "discovery": {
       "bootnodes": [

diff --git a/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java
@@ -198,6 +198,37 @@ public void shouldGetEmptyTerminalTotalDifficultyAtGenesis() {
     assertThat(EMPTY_CONFIG.getConfigOptions().getTerminalTotalDifficulty()).isNotPresent();
   }
 
+  @Test
+  public void shouldFindParisForkAndAlias() {
+    GenesisConfigFile parisGenesis =
+        GenesisConfigFile.fromConfig("{\"config\":{\"parisBlock\":10},\"baseFeePerGas\":\"0xa\"}");
+    assertThat(parisGenesis.getForks()).hasSize(1);
+    assertThat(parisGenesis.getConfigOptions().getParisBlockNumber()).isPresent();
+    assertThat(parisGenesis.getConfigOptions().getParisBlockNumber().getAsLong()).isEqualTo(10L);
+
+    GenesisConfigFile premergeForkGenesis =
+        GenesisConfigFile.fromConfig(
+            "{\"config\":{\"preMergeForkBlock\":11},\"baseFeePerGas\":\"0xa\"}");
+    assertThat(premergeForkGenesis.getForks()).hasSize(1);
+    assertThat(premergeForkGenesis.getConfigOptions().getParisBlockNumber()).isPresent();
+    assertThat(premergeForkGenesis.getConfigOptions().getParisBlockNumber().getAsLong())
+        .isEqualTo(11L);
+
+    // assert fail if both paris and alias are present
+    var dupeOptions =
+        GenesisConfigFile.fromConfig(
+                "{\"config\":{\"parisBlock\":10,\"preMergeForkBlock\":11},\"baseFeePerGas\":\"0xa\"}")
+            .getConfigOptions();
+    assertThatThrownBy(() -> dupeOptions.getParisBlockNumber())
+        .isInstanceOf(RuntimeException.class);
+
+    // assert empty if neither are present:
+    GenesisConfigFile londonGenesis =
+        GenesisConfigFile.fromConfig("{\"config\":{\"londonBlock\":11},\"baseFeePerGas\":\"0xa\"}");
+    assertThat(londonGenesis.getForks()).hasSize(1);
+    assertThat(londonGenesis.getConfigOptions().getParisBlockNumber()).isEmpty();
+  }
+
   @Test
   public void shouldDefaultTimestampToZero() {
     assertThat(EMPTY_CONFIG.getTimestamp()).isZero();

diff --git a/config/src/test/resources/all_forks.json b/config/src/test/resources/all_forks.json
@@ -12,7 +12,7 @@
     "berlinBlock": 10,
     "londonBlock": 11,
     "arrowGlacierBlock": 12,
-    "preMergeForkBlock": 13,
+    "parisBlock": 13,
     "ecip1015Block": 102,
     "dieHardBlock": 103,
     "gothamBlock": 104,

diff --git a/config/src/test/resources/preMerge.json b/config/src/test/resources/preMerge.json
@@ -3,7 +3,7 @@
     "chainId": 1337,
     "londonBlock": 0,
     "phillyBlock": 5,
-    "preMergeForkBlock": 10,
+    "parisBlock": 10,
     "contractSizeLimit": 2147483647,
     "ethash": {
       "fixeddifficulty": 100

diff --git a/consensus/merge/src/test/resources/posAtGenesis.json b/consensus/merge/src/test/resources/posAtGenesis.json
@@ -2,7 +2,7 @@
   "config": {
     "chainId": 1337,
     "londonBlock": 0,
-    "preMergeForkBlock": 0,
+    "parisBlock": 0,
     "terminalTotalDifficulty": 1000,
     "contractSizeLimit": 2147483647,
     "ethash": {

diff --git a/consensus/merge/src/test/resources/powAtGenesis.json b/consensus/merge/src/test/resources/powAtGenesis.json
@@ -2,7 +2,7 @@
   "config": {
     "chainId": 1337,
     "londonBlock": 0,
-    "preMergeForkBlock": 0,
+    "parisBlock": 0,
     "terminalTotalDifficulty": 1001,
     "contractSizeLimit": 2147483647,
     "ethash": {

diff --git a/.../core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java b/.../core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java
@@ -162,9 +162,8 @@ public ProtocolSpecBuilder arrowGlacierDefinition(
         evmConfiguration);
   }
 
-  public ProtocolSpecBuilder preMergeForkDefinition(
-      final GenesisConfigOptions genesisConfigOptions) {
-    return MainnetProtocolSpecs.preMergeForkDefinition(
+  public ProtocolSpecBuilder parisDefinition(final GenesisConfigOptions genesisConfigOptions) {
+    return MainnetProtocolSpecs.parisDefinition(
         chainId,
         contractSizeLimit,
         evmStackSize,

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
@@ -589,7 +589,7 @@ static ProtocolSpecBuilder arrowGlacierDefinition(
         .name("ArrowGlacier");
   }
 
-  static ProtocolSpecBuilder preMergeForkDefinition(
+  static ProtocolSpecBuilder parisDefinition(
       final Optional<BigInteger> chainId,
       final OptionalInt configContractSizeLimit,
       final OptionalInt configStackSizeLimit,
@@ -608,9 +608,8 @@ static ProtocolSpecBuilder preMergeForkDefinition(
             evmConfiguration)
         .evmBuilder(
             (gasCalculator, jdCacheConfig) ->
-                MainnetEVMs.preMergeFork(
-                    gasCalculator, chainId.orElse(BigInteger.ZERO), evmConfiguration))
-        .name("PreMergeFork");
+                MainnetEVMs.paris(gasCalculator, chainId.orElse(BigInteger.ZERO), evmConfiguration))
+        .name("ParisFork");
   }
 
   private static TransactionReceipt frontierTransactionReceiptFactory(

diff --git a/...eum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java b/...eum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java
@@ -235,9 +235,7 @@ private TreeMap<Long, BuilderMapEntry> buildMilestoneMap(
                 create(
                     config.getArrowGlacierBlockNumber(),
                     specFactory.arrowGlacierDefinition(config)),
-                create(
-                    config.getPreMergeForkBlockNumber(),
-                    specFactory.preMergeForkDefinition(config)),
+                create(config.getParisBlockNumber(), specFactory.parisDefinition(config)),
                 // Classic Milestones
                 create(config.getEcip1015BlockNumber(), specFactory.tangerineWhistleDefinition()),
                 create(config.getDieHardBlockNumber(), specFactory.dieHardDefinition()),

diff --git a/evm/src/main/java/org/hyperledger/besu/evm/MainnetEVMs.java b/evm/src/main/java/org/hyperledger/besu/evm/MainnetEVMs.java
@@ -369,26 +369,25 @@ public static void registerLondonOperations(
     registry.put(new BaseFeeOperation(gasCalculator));
   }
 
-  public static EVM preMergeFork(
-      final BigInteger chainId, final EvmConfiguration evmConfiguration) {
-    return preMergeFork(new LondonGasCalculator(), chainId, evmConfiguration);
+  public static EVM paris(final BigInteger chainId, final EvmConfiguration evmConfiguration) {
+    return paris(new LondonGasCalculator(), chainId, evmConfiguration);
   }
 
-  public static EVM preMergeFork(
+  public static EVM paris(
       final GasCalculator gasCalculator,
       final BigInteger chainId,
       final EvmConfiguration evmConfiguration) {
-    return new EVM(preMergeForkOperations(gasCalculator, chainId), gasCalculator, evmConfiguration);
+    return new EVM(parisOperations(gasCalculator, chainId), gasCalculator, evmConfiguration);
   }
 
-  public static OperationRegistry preMergeForkOperations(
+  public static OperationRegistry parisOperations(
       final GasCalculator gasCalculator, final BigInteger chainId) {
     OperationRegistry operationRegistry = new OperationRegistry();
-    registerPreMergeForkOperations(operationRegistry, gasCalculator, chainId);
+    registerParisOperations(operationRegistry, gasCalculator, chainId);
     return operationRegistry;
   }
 
-  public static void registerPreMergeForkOperations(
+  public static void registerParisOperations(
       final OperationRegistry registry,
       final GasCalculator gasCalculator,
       final BigInteger chainID) {