Merge remote-tracking branch 'origin/develop' into etcm-197/move-fast-sync-to-separate-package

Author: KonradStaniec

src/main/resources/chains/testnet-internal-nomad-chain.conf

@@ -85,12 +85,12 @@
     # Proto-treasury fork block number (ETC only, but deactivated for now)
     # https://ecips.ethereumclassic.org/ECIPs/ecip-1098
     treasury-address = "0011223344556677889900112233445566778899"
-    ecip1098-block-number = "1000000000000000000"
+    ecip1098-block-number = "0"
 
     # Checkpointing fork block number
     # https://ecips.ethereumclassic.org/ECIPs/ecip-1097
     # Has to be equal or greater than ecip1098-block-number
-    ecip1097-block-number = "1000000000000000000"
+    ecip1097-block-number = "0"
 
     # Epoch calibration block number
     # https://ecips.ethereumclassic.org/ECIPs/ecip-1099

src/main/resources/chains/testnet-internal-nomad-genesis.json

@@ -10,35 +10,20 @@
   "coinbase": "0x0000000000000000000000000000000000000000",
   "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "alloc": {
-    "075b073eaa848fc14de2fd9c2a18d97a4783d84c": {
-      "balance": "1606938044258990275541962092341162602522202993782792835301376"
-    },
-    "18f496690eb3fabb794a653be8097af5331c07b1": {
-      "balance": "1606938044258990275541962092341162602522202993782792835301376"
-    },
-    "1ff7fc39f7f4dc79c5867b9514d0e42607741384": {
-      "balance": "1606938044258990275541962092341162602522202993782792835301376"
-    },
-    "2a0a5393adef8f8df2aa948c01c0500dfd786c83": {
-      "balance": "1606938044258990275541962092341162602522202993782792835301376"
-    },
-    "2ce0782496a68b614e53a0428e5a18fc3ca2f139": {
-      "balance": "1606938044258990275541962092341162602522202993782792835301376"
-    },
-    "421c8cd4f16ac4b36b9c125bc4a8cac1fbcb403e": {
-      "balance": "1606938044258990275541962092341162602522202993782792835301376"
-    },
-    "75b0f1c605223de2a013bf7f26d4cd93c63a5eb8": {
-      "balance": "1606938044258990275541962092341162602522202993782792835301376"
-    },
-    "7e3166074d45c3311908315da1af5f5a965b7ece": {
-      "balance": "1606938044258990275541962092341162602522202993782792835301376"
-    },
-    "8716c138878d158470dbc15727854375f5cb7ef5": {
-      "balance": "1606938044258990275541962092341162602522202993782792835301376"
-    },
-    "886b335e37ee91aa5ce8daca7c65bfbaa3fe41d2": {
-      "balance": "1606938044258990275541962092341162602522202993782792835301376"
-    }
+  "075b073eaa848fc14de2fd9c2a18d97a4783d84c": {
+    "balance": "1606938044258990275541962092341162602522202993782792835301376"
+  },
+  "18f496690eb3fabb794a653be8097af5331c07b1": {
+    "balance": "1606938044258990275541962092341162602522202993782792835301376"
+  },
+  "1ff7fc39f7f4dc79c5867b9514d0e42607741384": {
+    "balance": "1606938044258990275541962092341162602522202993782792835301376"
+  },
+  "75b0f1c605223de2a013bf7f26d4cd93c63a5eb8": {
+    "balance": "1606938044258990275541962092341162602522202993782792835301376"
+  },
+  "7e3166074d45c3311908315da1af5f5a965b7ece": {
+    "balance": "1606938044258990275541962092341162602522202993782792835301376"
   }
 }
+}