From 77c6b3ac0be36ab3f8bf3c33a4829fb3baa57a15 Mon Sep 17 00:00:00 2001
From: shemnon <danno.ferrin@gmail.com>
Date: Tue, 13 Aug 2019 23:05:43 -0600
Subject: [PATCH] [PAN-3065] Disable Istanbul block

Istanbul is not ready.  Disable the genesis configuration so it doesn't
accidentially get configured.
---
 .../pantheon/config/JsonGenesisConfigOptions.java  | 14 ++++++++++++--
 .../pantheon/config/GenesisConfigOptionsTest.java  |  3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java b/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java
index 65c2023697..979ae6fd7b 100644
--- a/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java
+++ b/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java
@@ -22,8 +22,13 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableMap;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class JsonGenesisConfigOptions implements GenesisConfigOptions {
+
+  private final Logger LOG = LogManager.getLogger();
+
   private static final String ETHASH_CONFIG_KEY = "ethash";
   private static final String IBFT_LEGACY_CONFIG_KEY = "ibft";
   private static final String IBFT2_CONFIG_KEY = "ibft2";
@@ -140,9 +145,13 @@ public OptionalLong getConstantinopleFixBlockNumber() {
     return getOptionalLong("constantinoplefixblock");
   }
 
+  // Disabled until Istanbul is settled
   @Override
   public OptionalLong getIstanbulBlockNumber() {
-    return getOptionalLong("istanbulblock");
+    if (configRoot.has("istanbulblock")) {
+      LOG.warn("IstanbulBlock was requested but configuration is not enabled");
+    }
+    return OptionalLong.empty();
   }
 
   @Override
@@ -188,7 +197,8 @@ public Map<String, Object> asMap() {
     getByzantiumBlockNumber().ifPresent(l -> builder.put("byzantiumBlock", l));
     getConstantinopleBlockNumber().ifPresent(l -> builder.put("constantinopleBlock", l));
     getConstantinopleFixBlockNumber().ifPresent(l -> builder.put("constantinopleFixBlock", l));
-    getIstanbulBlockNumber().ifPresent(l -> builder.put("istanbulBlock", l));
+    // Disabled until Istanbul is settled
+    // getIstanbulBlockNumber().ifPresent(l -> builder.put("istanbulBlock", l));
     getContractSizeLimit().ifPresent(l -> builder.put("contractSizeLimit", l));
     getEvmStackSize().ifPresent(l -> builder.put("evmstacksize", l));
     if (isClique()) {
diff --git a/config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigOptionsTest.java b/config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigOptionsTest.java
index cddb330a6a..9dde97164d 100644
--- a/config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigOptionsTest.java
+++ b/config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigOptionsTest.java
@@ -128,7 +128,8 @@ public void shouldGetConstantinopleFixBlockNumber() {
   @Test
   public void shouldGetIstanbulBlockNumber() {
     final GenesisConfigOptions config = fromConfigOptions(singletonMap("istanbulBlock", 1000));
-    assertThat(config.getIstanbulBlockNumber()).hasValue(1000);
+    // Disabled until Istanbul is settled
+    assertThat(config.getIstanbulBlockNumber()).isEmpty();
   }
 
   @Test