Genesis config cleanup (#1812)

* Finish internal ConstantinopleFix->Petersburg transition, including class names. Only backwards compatibility and retesteth use of the name will remain. * Remove four unused config fields from json configs. These are fields with no code uses of any sort. All are implied by other fields. eip150Hash, eip155Block, eip160Block, and daoForkSupport. * Remove redundant fork block fields where their value is implied Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
hyperledger · Jan 19, 2021 · 2d83e13 · 2d83e13
1 parent e69e1f5
commit 2d83e13
Show file tree

Hide file tree

Showing 60 changed files with 89 additions and 264 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## 21.2.0-RC1
+
+### 21.2 Breaking Changes
+There are currently no breaking changes in 21.2
+
+### Additions and Improvements
+* Removed unused flags in default genesis configs [\#1812](https://github.com/hyperledger/besu/pull/1812)
+
+### Bug Fixes
+
+### Early Access Features
+
+#### Previously identified known issues
+
+- [Fast sync when running Besu on cloud providers](KNOWN_ISSUES.md#fast-sync-when-running-besu-on-cloud-providers)
+- [Privacy users with private transactions created using v1.3.4 or earlier](KNOWN_ISSUES.md#privacy-users-with-private-transactions-created-using-v134-or-earlier)
+
 ## 20.10.4
 
 ### Additions and Improvements

diff --git a/acceptance-tests/tests/src/test/resources/clique/clique.json b/acceptance-tests/tests/src/test/resources/clique/clique.json
@@ -3,12 +3,10 @@
     "chainId": 4,
     "homesteadBlock": 1,
     "eip150Block": 2,
-    "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "eip155Block": 3,
     "eip158Block": 4,
     "byzantiumBlock": 5,
     "constantinopleBlock": 6,
-    "constantinopleFixBlock": 7,
+    "petersburgBlock": 7,
     "clique": {
       "blockperiodseconds": 10,
       "epochlength": 30000

diff --git a/acceptance-tests/tests/src/test/resources/ibft/ibft.json b/acceptance-tests/tests/src/test/resources/ibft/ibft.json
@@ -3,8 +3,6 @@
     "chainId": 4,
     "homesteadBlock": 1,
     "eip150Block": 2,
-    "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "eip155Block": 3,
     "eip158Block": 3,
     "byzantiumBlock": 1035301,
     "ibft2": {

diff --git a/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_genesis.json b/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_genesis.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 999,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "ethash": {
       "fixeddifficulty": 100
     }

diff --git a/...tance-tests/tests/src/test/resources/permissioning/simple_permissioning_ibft_genesis.json b/...tance-tests/tests/src/test/resources/permissioning/simple_permissioning_ibft_genesis.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 999,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "ibft2": {
       "blockperiodseconds": 5,
       "epochlength": 30000,

diff --git a/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_v2_genesis.json b/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_v2_genesis.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 999,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "ethash": {
       "fixeddifficulty": 100
     }

diff --git a/besu/src/test/java/org/hyperledger/besu/RunnerTest.java b/besu/src/test/java/org/hyperledger/besu/RunnerTest.java
@@ -377,7 +377,6 @@ private GenesisConfigFile getFastSyncGenesis() {
         (node) -> {
           // Clear DAO block so that inability to validate DAO block won't interfere with fast sync
           node.remove("daoForkBlock");
-          node.put("daoForkSupport", false);
         });
     return GenesisConfigFile.fromConfig(jsonNode);
   }

diff --git a/besu/src/test/resources/ibftlegacy_genesis.json b/besu/src/test/resources/ibftlegacy_genesis.json
@@ -3,8 +3,6 @@
         "chainId": 2017,
         "homesteadBlock": 0,
         "eip150Block": 0,
-        "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "eip155Block": 0,
         "eip158Block": 0,
 
         "ibft": {

diff --git a/besu/src/test/resources/operator/config_generate_keys.json b/besu/src/test/resources/operator/config_generate_keys.json
@@ -2,10 +2,7 @@
   "genesis": {
     "config": {
       "chainId": 2017,
-      "constantinoplefixblock": 0,
-      "homesteadBlock": 0,
       "eip150Block": 0,
-      "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
       "ibft2": {
 
       }

diff --git a/besu/src/test/resources/operator/config_import_keys.json b/besu/src/test/resources/operator/config_import_keys.json
@@ -2,10 +2,7 @@
   "genesis": {
     "config": {
       "chainId": 2017,
-      "constantinoplefixblock": 0,
-      "homesteadBlock": 0,
-      "eip150Block": 0,
-      "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "petersburgBlock": 0,
       "ibft2": {
 
       }

diff --git a/besu/src/test/resources/operator/config_import_keys_invalid_keys.json b/besu/src/test/resources/operator/config_import_keys_invalid_keys.json
@@ -2,10 +2,7 @@
   "genesis": {
     "config": {
       "chainId": 2017,
-      "constantinoplefixblock": 0,
-      "homesteadBlock": 0,
-      "eip150Block": 0,
-      "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "petersburgBlock": 0,
       "ibft2": {
 
       }

diff --git a/besu/src/test/resources/org/hyperledger/besu/chainimport/clique/genesis.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/clique/genesis.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "contractSizeLimit": 2147483647,
     "clique": {
       "blockperiodseconds": 15,

diff --git a/besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/genesis.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/genesis.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "contractSizeLimit": 2147483647,
     "ethash": {
       "fixeddifficulty": 100

diff --git a/besu/src/test/resources/org/hyperledger/besu/chainimport/unsupported/genesis.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/unsupported/genesis.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "contractSizeLimit": 2147483647,
     "ibft2": {
       "blockperiodseconds": 1,

diff --git a/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java
@@ -55,7 +55,7 @@ public interface GenesisConfigOptions {
 
   OptionalLong getConstantinopleBlockNumber();
 
-  OptionalLong getConstantinopleFixBlockNumber();
+  OptionalLong getPetersburgBlockNumber();
 
   OptionalLong getIstanbulBlockNumber();
 

diff --git a/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java
@@ -201,7 +201,7 @@ public OptionalLong getConstantinopleBlockNumber() {
   }
 
   @Override
-  public OptionalLong getConstantinopleFixBlockNumber() {
+  public OptionalLong getPetersburgBlockNumber() {
     final OptionalLong petersburgBlock = getOptionalLong("petersburgblock");
     final OptionalLong constantinopleFixBlock = getOptionalLong("constantinoplefixblock");
     if (constantinopleFixBlock.isPresent()) {
@@ -331,24 +331,20 @@ public Map<String, Object> asMap() {
         .ifPresent(
             l -> {
               builder.put("daoForkBlock", l);
-              builder.put("daoForkSupport", Boolean.TRUE);
             });
     getTangerineWhistleBlockNumber()
         .ifPresent(
             l -> {
               builder.put("eip150Block", l);
-              getOptionalString("eip150hash")
-                  .ifPresent(eip150hash -> builder.put("eip150Hash", eip150hash));
             });
     getSpuriousDragonBlockNumber()
         .ifPresent(
             l -> {
-              builder.put("eip155Block", l);
               builder.put("eip158Block", l);
             });
     getByzantiumBlockNumber().ifPresent(l -> builder.put("byzantiumBlock", l));
     getConstantinopleBlockNumber().ifPresent(l -> builder.put("constantinopleBlock", l));
-    getConstantinopleFixBlockNumber().ifPresent(l -> builder.put("petersburgBlock", l));
+    getPetersburgBlockNumber().ifPresent(l -> builder.put("petersburgBlock", l));
     getIstanbulBlockNumber().ifPresent(l -> builder.put("istanbulBlock", l));
     getMuirGlacierBlockNumber().ifPresent(l -> builder.put("muirGlacierBlock", l));
     getBerlinBlockNumber().ifPresent(l -> builder.put("berlinBlock", l));
@@ -379,15 +375,6 @@ public Map<String, Object> asMap() {
     return builder.build();
   }
 
-  private Optional<String> getOptionalString(final String key) {
-    if (configOverrides.containsKey(key)) {
-      final String value = configOverrides.get(key);
-      return value == null || value.isEmpty() ? Optional.empty() : Optional.of(value);
-    } else {
-      return JsonUtil.getString(configRoot, key);
-    }
-  }
-
   private OptionalLong getOptionalLong(final String key) {
     if (configOverrides.containsKey(key)) {
       final String value = configOverrides.get(key);
@@ -442,7 +429,7 @@ public List<Long> getForks() {
             getSpuriousDragonBlockNumber(),
             getByzantiumBlockNumber(),
             getConstantinopleBlockNumber(),
-            getConstantinopleFixBlockNumber(),
+            getPetersburgBlockNumber(),
             getIstanbulBlockNumber(),
             getMuirGlacierBlockNumber(),
             getEIP1559BlockNumber(),

diff --git a/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java
@@ -34,7 +34,7 @@ public class StubGenesisConfigOptions implements GenesisConfigOptions {
   private OptionalLong spuriousDragonBlockNumber = OptionalLong.empty();
   private OptionalLong byzantiumBlockNumber = OptionalLong.empty();
   private OptionalLong constantinopleBlockNumber = OptionalLong.empty();
-  private OptionalLong constantinopleFixBlockNumber = OptionalLong.empty();
+  private OptionalLong petersburgBlockNumber = OptionalLong.empty();
   private OptionalLong istanbulBlockNumber = OptionalLong.empty();
   private OptionalLong muirGlacierBlockNumber = OptionalLong.empty();
   private OptionalLong berlinBlockNumber = OptionalLong.empty();
@@ -135,8 +135,8 @@ public OptionalLong getConstantinopleBlockNumber() {
   }
 
   @Override
-  public OptionalLong getConstantinopleFixBlockNumber() {
-    return constantinopleFixBlockNumber;
+  public OptionalLong getPetersburgBlockNumber() {
+    return petersburgBlockNumber;
   }
 
   @Override
@@ -234,18 +234,16 @@ public Map<String, Object> asMap() {
         .ifPresent(
             l -> {
               builder.put("daoForkBlock", l);
-              builder.put("daoForkSupport", Boolean.TRUE);
             });
     getTangerineWhistleBlockNumber().ifPresent(l -> builder.put("eip150Block", l));
     getSpuriousDragonBlockNumber()
         .ifPresent(
             l -> {
-              builder.put("eip155Block", l);
               builder.put("eip158Block", l);
             });
     getByzantiumBlockNumber().ifPresent(l -> builder.put("byzantiumBlock", l));
     getConstantinopleBlockNumber().ifPresent(l -> builder.put("constantinopleBlock", l));
-    getConstantinopleFixBlockNumber().ifPresent(l -> builder.put("petersburgBlock", l));
+    getPetersburgBlockNumber().ifPresent(l -> builder.put("petersburgBlock", l));
     getIstanbulBlockNumber().ifPresent(l -> builder.put("istanbulBlock", l));
     getMuirGlacierBlockNumber().ifPresent(l -> builder.put("muirGlacierBlock", l));
     getBerlinBlockNumber().ifPresent(l -> builder.put("berlinBlock", l));
@@ -318,8 +316,8 @@ public StubGenesisConfigOptions constantinopleBlock(final long blockNumber) {
     return this;
   }
 
-  public StubGenesisConfigOptions constantinopleFixBlock(final long blockNumber) {
-    constantinopleFixBlockNumber = OptionalLong.of(blockNumber);
+  public StubGenesisConfigOptions petersburgBlock(final long blockNumber) {
+    petersburgBlockNumber = OptionalLong.of(blockNumber);
     return this;
   }
 

diff --git a/config/src/main/resources/dev.json b/config/src/main/resources/dev.json
@@ -1,13 +1,6 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
     "petersburgBlock": 0,
     "contractSizeLimit": 2147483647,
     "ethash": {

diff --git a/config/src/main/resources/goerli.json b/config/src/main/resources/goerli.json
@@ -1,14 +1,6 @@
 {
   "config":{
     "chainId":5,
-    "homesteadBlock":0,
-    "eip150Block":0,
-    "eip150Hash": "0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a",
-    "eip155Block":0,
-    "eip158Block":0,
-    "eip160Block":0,
-    "byzantiumBlock":0,
-    "constantinopleBlock":0,
     "petersburgBlock":0,
     "istanbulBlock":1561651,
     "clique":{

diff --git a/config/src/main/resources/mainnet.json b/config/src/main/resources/mainnet.json
@@ -1,15 +1,11 @@
 {
   "config": {
     "chainId": 1,
-    "daoForkBlock": 1920000,
     "homesteadBlock": 1150000,
-    "daoForkSupport": true,
+    "daoForkBlock": 1920000,
     "eip150Block": 2463000,
-    "eip150Hash": "0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0",
-    "eip155Block": 2675000,
     "eip158Block": 2675000,
     "byzantiumBlock": 4370000,
-    "constantinopleBlock": 7280000,
     "petersburgBlock": 7280000,
     "istanbulBlock": 9069000,
     "muirGlacierBlock": 9200000,

diff --git a/config/src/main/resources/rinkeby.json b/config/src/main/resources/rinkeby.json
@@ -3,8 +3,6 @@
     "chainId": 4,
     "homesteadBlock": 1,
     "eip150Block": 2,
-    "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "eip155Block": 3,
     "eip158Block": 3,
     "byzantiumBlock": 1035301,
     "constantinopleBlock": 3660663,

diff --git a/config/src/main/resources/ropsten.json b/config/src/main/resources/ropsten.json
@@ -1,8 +1,6 @@
 {
   "config": {
     "chainId": 3,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
     "eip150Block": 0,
     "eip158Block": 10,
     "byzantiumBlock": 1700000,

diff --git a/config/src/main/resources/yolo.json b/config/src/main/resources/yolo.json
@@ -1,15 +1,6 @@
 {
   "config":{
     "chainId":133519467574834,
-    "homesteadBlock":0,
-    "eip150Block":0,
-    "eip150Hash":"0x0000000000000000000000000000000000000000000000000000000000000000",
-    "eip155Block":0,
-    "eip158Block":0,
-    "byzantiumBlock":0,
-    "constantinopleBlock":0,
-    "petersburgBlock":0,
-    "istanbulBlock":0,
     "yoloV2Block":0,
     "clique":{
       "period":15,