Merge pull request #13 from rootstock/networkUpgrade

joaquinlpereyra-iov · web-flow · commit edfac0db2c37 · 2019-12-20T10:45:21.000-03:00
Block number activation for twoToThree (rskip150)
diff --git a/rskj-core/src/main/resources/config/main.conf b/rskj-core/src/main/resources/config/main.conf
@@ -6,7 +6,7 @@ blockchain.config {
         orchid = 729000,
         orchid060 = 1052700,
         wasabi100 = 1591000,
-        twoToThree = 187200
+        twoToThree = 2018000
     }
 }
 
diff --git a/rskj-core/src/main/resources/config/testnet.conf b/rskj-core/src/main/resources/config/testnet.conf
@@ -6,7 +6,7 @@ blockchain.config {
         orchid = 0,
         orchid060 = 0,
         wasabi100 = 0,
-        twoToThree = 370000
+        twoToThree = 504000
     },
     consensusRules = {
         rskip97 = -1, # disable orchid difficulty drop
