Merge branch 'develop' into tweak/tweak-fast-sync-config-params

Author: Nicolás Tallar

README.md

@@ -17,9 +17,12 @@ The latest release can be downloaded from [here](https://github.com/input-output
 
 ### Command line version
 
-Depending on network you want to join you can use appropriate launcher, all can be found in `bin` directory:
-  - `mantis-etc` - for joining Ethereum Classic network
-  - `mantis-eth` - for joining Ethereum
+You can use generic launcher with appropriate parameter to connect with pre-configured network, it can be found in `bin` directory.
+
+Example:
+  - `./bin/mantis-launcher etc` - for joining Ethereum Classic network
+
+Possible networks: `etc`, `eth`, `mordor`, `testnet-internal`
 
 ### Building the client
 

src/main/resources/application.conf

@@ -242,6 +242,7 @@ mantis {
     # If false then that 20% gets burned
     # Doesn't have any effect is ecip1098 is not yet activated
     treasury-opt-out = false
+
   }
 
   # This is the section dedicated to Ethash mining.
@@ -387,8 +388,6 @@ mantis {
     # Sets max number of blocks that can be stored in queue to import on fetcher side
     # Warning! This setting affects ability to go back in case of branch resolution so it should not be too low
     max-fetcher-queue-size = 1000
-
-    use-new-regular-sync = true
   }
 
   pruning {

src/main/resources/chains/etc-chain.conf

@@ -154,4 +154,7 @@
     "enode://715171f50508aba88aecd1250af392a45a330af91d7b90701c436b618c86aaa1589c9184561907bebbb56439b8f8787bc01f49a7c77276c58c1b09822d75e8e8@52.231.165.108:30303",  // bootnode-azure-koreasouth-001
     "enode://5d6d7cd20d6da4bb83a1d28cadb5d409b64edf314c0335df658c1a54e32c7c4a7ab7823d57c39b6a757556e68ff1df17c748b698544a55cb488b52479a92b60f@104.42.217.25:30303"   // bootnode-azure-westus-001
   ]
+
+  # List of hex encoded public keys of Checkpoint Authorities
+  checkpoint-public-keys = []
 }

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

@@ -127,4 +127,7 @@
 
     # Set of initial nodes
     bootstrap-nodes = []
+
+    # List of hex encoded public keys of Checkpoint Authorities
+    checkpoint-public-keys = []
 }

src/main/scala/io/iohk/ethereum/blockchain/sync/SyncController.scala

@@ -1,7 +1,7 @@
 package io.iohk.ethereum.blockchain.sync
 
 import akka.actor.{Actor, ActorLogging, ActorRef, PoisonPill, Props, Scheduler}
-import io.iohk.ethereum.blockchain.sync.regular.{OldRegularSync, RegularSync}
+import io.iohk.ethereum.blockchain.sync.regular.RegularSync
 import io.iohk.ethereum.consensus.validators.Validators
 import io.iohk.ethereum.db.storage.{AppStateStorage, FastSyncStateStorage}
 import io.iohk.ethereum.domain.Blockchain
@@ -85,9 +85,7 @@ class SyncController(
     context become runningFastSync(fastSync)
   }
 
-  def startRegularSync(): Unit = if (syncConfig.useNewRegularSync) startNewRegularSync() else startOldRegularSync()
-
-  def startNewRegularSync(): Unit = {
+  def startRegularSync(): Unit = {
     val peersClient = context.actorOf(PeersClient.props(etcPeerManager, peerEventBus, syncConfig, scheduler), "peers-client")
     val regularSync = context.actorOf(
       RegularSync.props(
@@ -100,29 +98,12 @@ class SyncController(
         ommersPool,
         pendingTransactionsManager,
         scheduler),
-      "new-regular-sync"
+      "regular-sync"
     )
     regularSync ! RegularSync.Start
     context become runningRegularSync(regularSync)
   }
 
-  def startOldRegularSync(): Unit = {
-    val regularSync = context.actorOf(OldRegularSync.props(
-      appStateStorage = appStateStorage,
-      etcPeerManager = etcPeerManager,
-      peerEventBus = peerEventBus,
-      ommersPool = ommersPool,
-      pendingTransactionsManager = pendingTransactionsManager,
-      broadcaster = new BlockBroadcast(etcPeerManager, syncConfig),
-      ledger = ledger,
-      blockchain = blockchain,
-      syncConfig = syncConfig,
-      scheduler = scheduler
-    ), "old-regular-sync")
-
-    regularSync ! OldRegularSync.Start
-    context become runningRegularSync(regularSync)
-  }
 }
 
 object SyncController {