slparser/blkmaker ETH: Because the delay of Ethereum's Constantinople…

… hard fork, its fork height was changed to configurable.

src/blkmaker/BlkMakerMain.cc

@@ -38,6 +38,7 @@
 #include "Utils.h"
 
 #include "bitcoin/BlockMakerBitcoin.h"
+#include "eth/EthConsensus.h"
 #include "eth/BlockMakerEth.h"
 #include "bytom/BlockMakerBytom.h"
 #include "sia/BlockMakerSia.h"
@@ -99,6 +100,16 @@ shared_ptr<BlockMakerDefinition> createDefinition(const Setting &setting)
   shared_ptr<BlockMakerDefinition> def;
 
   readFromSetting(setting, "chain_type",  chainType);
+
+  // The hard fork Constantinople of Ethereum mainnet has been delayed.
+  // So set a default height that won't arrive (9999999).
+  // The user can change the height in the configuration file
+  // after the fork height is determined.
+  if (chainType == "ETH") {
+    int constantinopleHeight = 9999999;
+    setting.lookupValue("constantinople_height", constantinopleHeight);
+    EthConsensus::setHardForkConstantinopleHeight(constantinopleHeight);
+  }
 
 #if defined(CHAIN_TYPE_STR)
   if (CHAIN_TYPE_STR == chainType)

src/blkmaker/blkmaker.cfg

@@ -45,6 +45,12 @@ blk_makers = (
     );
     #solved share topic
     solved_share_topic = "EthSolvedShare";
+
+    # The hard fork Constantinople of Ethereum mainnet has been delayed.
+    # So set a default height that won't arrive (9999999).
+    # The user can change the height in the configuration file
+    # after the fork height is determined.
+    constantinople_height = 9999999;
   },
   {
     chain_type = "SIA"; //blockchain short name

src/eth/EthConsensus.cc

@@ -24,7 +24,18 @@
 #include "EthConsensus.h"
 
 #include <algorithm>
+#include <glog/logging.h>
 
+// The hard fork Constantinople of Ethereum mainnet has been delayed.
+// So set a default height that won't arrive (9999999).
+// The user can change the height in the configuration file
+// after the fork height is determined.
+int EthConsensus::kHardForkConstantinopleHeight_ = 9999999;
+
+void EthConsensus::setHardForkConstantinopleHeight(int height) {
+    kHardForkConstantinopleHeight_ = height;
+    LOG(INFO) << "Height of Ethereum Constantinople Hard Fork: " << kHardForkConstantinopleHeight_;
+}
 
 EthConsensus::Chain EthConsensus::getChain(std::string chainStr) {
     // toupper
@@ -95,7 +106,7 @@ int64_t EthConsensus::getStaticBlockRewardClassic(int nHeight) {
 // static block rewards of Ethereum Main Network
 int64_t EthConsensus::getStaticBlockRewardFoundation(int nHeight) {
  // Constantinople fork at block 7080000 on Mainnet.
-  if (nHeight >= 7080000) {
+  if (nHeight >= kHardForkConstantinopleHeight_) {
     return 2e+18;
   }
   // Ethereum Main Network has a static block reward (3 Ether) before height 7080000.

src/eth/EthConsensus.h

@@ -54,6 +54,8 @@ class EthConsensus {
     // the 0.875 will be returned.
     static double getUncleBlockRewardRatio(int nHeight, Chain chain);
 
+    static void setHardForkConstantinopleHeight(int height);
+
 protected:
     // static block rewards of Ethereum Classic Main Network
     static int64_t getStaticBlockRewardClassic(int nHeight);
@@ -62,6 +64,12 @@ class EthConsensus {
 
     static double getUncleBlockRewardRatioClassic(int nHeight);
     static double getUncleBlockRewardRatioFoundation(int nHeight);
+
+    // The hard fork Constantinople of Ethereum mainnet has been delayed.
+    // So set a default height that won't arrive (9999999).
+    // The user can change the height in the configuration file
+    // after the fork height is determined.
+    static int kHardForkConstantinopleHeight_;
 };
 
 #endif // ETH_CONSENSUS_H_

src/slparser/ShareLogParserMain.cc

@@ -43,6 +43,7 @@
 #include "bitcoin/StatisticsBitcoin.h"
 #include "bitcoin/ShareLogParserBitcoin.h"
 
+#include "eth/EthConsensus.h"
 #include "eth/StatisticsEth.h"
 #include "eth/ShareLogParserEth.h"
 
@@ -254,6 +255,16 @@ int main(int argc, char **argv) {
     // Track duplicate shares within N blocks.
     int32_t dupShareTrackingHeight = 3;
     cfg.lookupValue("dup_share_checker.tracking_height_number", dupShareTrackingHeight);
+
+    // The hard fork Constantinople of Ethereum mainnet has been delayed.
+    // So set a default height that won't arrive (9999999).
+    // The user can change the height in the configuration file
+    // after the fork height is determined.
+    if (chainType == "ETH") {
+      int constantinopleHeight = 9999999;
+      cfg.lookupValue("sharelog.constantinople_height", constantinopleHeight);
+      EthConsensus::setHardForkConstantinopleHeight(constantinopleHeight);
+    }
 
     //////////////////////////////////////////////////////////////////////////////
     //  dump shares to stdout

src/slparser/slparser.cfg

@@ -21,6 +21,12 @@ slparserhttpd = {
 sharelog = {
   chain_type = "ETH";
   data_dir = "/work/btcpool/data/sharelog";
+
+  # The hard fork Constantinople of Ethereum mainnet has been delayed.
+  # So set a default height that won't arrive (9999999).
+  # The user can change the height in the configuration file
+  # after the fork height is determined.
+  constantinople_height = 9999999;
 };
 
 # Used to detect duplicate share attacks on ETH mining.