Merge branch 'develop'

ethereum · Jan 15, 2019 · 6a6d284 · 6a6d284
2 parents 76f9f07 + 73acba3
commit 6a6d284
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ethereumj-core/src/main/java/org/ethereum/config/net/MainNetConfig.java b/ethereumj-core/src/main/java/org/ethereum/config/net/MainNetConfig.java
@@ -32,6 +32,7 @@ public MainNetConfig() {
         add(2_463_000, new Eip150HFConfig(new DaoHFConfig()));
         add(2_675_000, new Eip160HFConfig(new DaoHFConfig()));
         add(4_370_000, new ByzantiumConfig(new DaoHFConfig()));
-        add(7_080_000, new ConstantinopleConfig(new DaoHFConfig()));
+//        FIXME: Delayed until resolving of EIP-1283 bug
+//        add(7_080_000, new ConstantinopleConfig(new DaoHFConfig()));
     }
 }
diff --git a/ethereumj-core/src/main/resources/version.properties b/ethereumj-core/src/main/resources/version.properties
@@ -1,3 +1,3 @@
-versionNumber='1.10.0'
+versionNumber='1.11.0'
 // Remove org.ethereum.db.migrate.MigrateHeaderSourceTotalDiff with databaseVersion > 6
 databaseVersion=6