Merge pull request #1761 from ergoplatform/v4.0.34

Candidate for version 4.0.34

README.md

@@ -82,7 +82,7 @@ To run specific Ergo version `<VERSION>` as a service with custom config `/path/
         -e MAX_HEAP=3G \
         ergoplatform/ergo:<VERSION> --<networkId> -c /etc/myergo.conf
 
-Available versions can be found on [Ergo Docker image page](https://hub.docker.com/r/ergoplatform/ergo/tags), for example, `v4.0.33`.
+Available versions can be found on [Ergo Docker image page](https://hub.docker.com/r/ergoplatform/ergo/tags), for example, `v4.0.34`.
 
 This will connect to the Ergo mainnet or testnet following your configuration passed in `myergo.conf` and network flag `--<networkId>`. Every default config value would be overwritten with corresponding value in `myergo.conf`. `MAX_HEAP` variable can be used to control how much memory can the node consume.
 

src/main/resources/api/openapi.yaml

@@ -1,7 +1,7 @@
 openapi: "3.0.2"
 
 info:
-  version: "4.0.33"
+  version: "4.0.34"
   title: Ergo Node API
   description: API docs for Ergo Node. Models are shared between all Ergo products
   contact:

src/main/resources/application.conf

@@ -375,9 +375,6 @@ scorex {
 
     # request processing timeout
     timeout = 5s
-
-    # node which exposes restApi in firewall should define publicly accessible URL of it
-    # publicUrl = "https://example.com:80"
   }
 
   # P2P Network settings
@@ -391,7 +388,7 @@ scorex {
     nodeName = "ergo-node"
 
     # Network protocol version to be sent in handshakes
-    appVersion = 4.0.33
+    appVersion = 4.0.34
 
     # Network agent name. May contain information about client code
     # stack, starting from core code-base up to the end graphical interface.

src/main/resources/mainnet.conf

@@ -65,7 +65,7 @@ scorex {
   network {
     magicBytes = [1, 0, 2, 4]
     bindAddress = "0.0.0.0:9030"
-    nodeName = "ergo-mainnet-4.0.33"
+    nodeName = "ergo-mainnet-4.0.34"
     nodeName = ${?NODENAME}
     knownPeers = [
       "213.239.193.208:9030",

src/main/resources/testnet.conf

@@ -77,7 +77,7 @@ scorex {
   network {
     magicBytes = [2, 0, 0, 2]
     bindAddress = "0.0.0.0:9020"
-    nodeName = "ergo-testnet-4.0.33"
+    nodeName = "ergo-testnet-4.0.34"
     nodeName = ${?NODENAME}
     knownPeers = [
       "213.239.193.208:9020",

src/main/scala/org/ergoplatform/http/api/ErgoPeersApiRoute.scala

@@ -59,8 +59,7 @@ class ErgoPeersApiRoute(peerManager: ActorRef,
             lastMessage = con.lastMessage,
             lastHandshake = peerInfo.lastHandshake,
             name = peerInfo.peerSpec.nodeName,
-            connectionType = peerInfo.connectionType.map(_.toString),
-            restApiUrl = peerInfo.peerSpec.restApiUrl.map(_.toString)
+            connectionType = peerInfo.connectionType.map(_.toString)
           )
         }
       }
@@ -117,17 +116,15 @@ object ErgoPeersApiRoute {
                               lastMessage: Long,
                               lastHandshake: Long,
                               name: String,
-                              connectionType: Option[String],
-                              restApiUrl: Option[String])
+                              connectionType: Option[String])
 
   object PeerInfoResponse {
     def fromAddressAndInfo(address: InetSocketAddress, peerInfo: PeerInfo): PeerInfoResponse = PeerInfoResponse(
       address.toString,
       0,
       peerInfo.lastHandshake,
       peerInfo.peerSpec.nodeName,
-      peerInfo.connectionType.map(_.toString),
-      peerInfo.peerSpec.restApiUrl.map(_.toString)
+      peerInfo.connectionType.map(_.toString)
     )
 
     @SuppressWarnings(Array("org.wartremover.warts.PublicInference"))

src/main/scala/org/ergoplatform/local/ErgoStatsCollector.scala

@@ -21,7 +21,6 @@ import scorex.core.utils.TimeProvider.Time
 import scorex.util.ScorexLogging
 import scorex.core.network.peer.PeersStatus
 
-import java.net.URL
 import scala.concurrent.ExecutionContextExecutor
 import scala.concurrent.duration._
 
@@ -39,9 +38,9 @@ class ErgoStatsCollector(readersHolder: ActorRef,
     val ec: ExecutionContextExecutor = context.dispatcher
 
     readersHolder ! GetReaders
-    context.system.eventStream.subscribe(self, classOf[ChangedHistory[_]])
+    context.system.eventStream.subscribe(self, classOf[ChangedHistory])
     context.system.eventStream.subscribe(self, classOf[ChangedState])
-    context.system.eventStream.subscribe(self, classOf[ChangedMempool[_]])
+    context.system.eventStream.subscribe(self, classOf[ChangedMempool])
     context.system.eventStream.subscribe(self, classOf[SemanticallySuccessfulModifier])
     context.system.scheduler.scheduleAtFixedRate(10.seconds, 20.seconds, networkController, GetConnectedPeers)(ec, self)
     context.system.scheduler.scheduleAtFixedRate(45.seconds, 30.seconds, networkController, GetPeersStatus)(ec, self)
@@ -68,8 +67,7 @@ class ErgoStatsCollector(readersHolder: ActorRef,
     lastIncomingMessageTime = networkTime(),
     None,
     LaunchParameters,
-    eip27Supported = true,
-    settings.scorexSettings.restApi.publicUrl)
+    eip27Supported = true)
 
   override def receive: Receive =
     onConnectedPeers orElse
@@ -195,16 +193,13 @@ object ErgoStatsCollector {
                       lastIncomingMessageTime: Long,
                       genesisBlockIdOpt: Option[String],
                       parameters: Parameters,
-                      eip27Supported: Boolean,
-                      restApiUrl: Option[URL])
+                      eip27Supported: Boolean)
 
   object NodeInfo extends ApiCodecs {
     implicit val paramsEncoder: Encoder[Parameters] = org.ergoplatform.settings.ParametersSerializer.jsonEncoder
 
     implicit val jsonEncoder: Encoder[NodeInfo] = (ni: NodeInfo) => {
-      val optionalFields =
-        ni.restApiUrl.map(_.toString).map(restApiUrl => Map("restApiUrl" -> restApiUrl.asJson)).getOrElse(Map.empty)
-      (Map(
+      Map(
         "name" -> ni.nodeName.asJson,
         "appVersion" -> Version.VersionString.asJson,
         "network" -> ni.network.asJson,
@@ -228,7 +223,7 @@ object ErgoStatsCollector {
         "genesisBlockId" -> ni.genesisBlockIdOpt.asJson,
         "parameters" -> ni.parameters.asJson,
         "eip27Supported" -> ni.eip27Supported.asJson
-      ) ++ optionalFields).asJson
+      ).asJson
     }
   }
 

src/main/scala/org/ergoplatform/network/ErgoNodeViewSynchronizer.scala

@@ -1,8 +1,8 @@
 package org.ergoplatform.network
 
 import akka.actor.SupervisorStrategy.{Restart, Stop}
-
 import java.net.InetSocketAddress
+
 import akka.actor.{Actor, ActorInitializationException, ActorKilledException, ActorRef, ActorRefFactory, DeathPactException, OneForOneStrategy, Props}
 import org.ergoplatform.modifiers.history.ADProofs
 import org.ergoplatform.modifiers.history.header.Header
@@ -17,28 +17,28 @@ import org.ergoplatform.nodeView.mempool.{ErgoMemPool, ErgoMemPoolReader}
 import org.ergoplatform.settings.{Constants, ErgoSettings}
 import org.ergoplatform.nodeView.ErgoNodeViewHolder.ReceivableMessages.{ChainIsHealthy, ChainIsStuck, GetNodeViewChanges, IsChainHealthy, ModifiersFromRemote, TransactionsFromRemote}
 import org.ergoplatform.nodeView.ErgoNodeViewHolder._
-import scorex.core.consensus.History.{Equal, Fork, Nonsense, Older, Unknown, Younger}
-import scorex.core.consensus.{HistoryReader, SyncInfo}
+import scorex.core.consensus.{Equal, Fork, Nonsense, Older, Unknown, Younger}
 import scorex.core.network.ModifiersStatus.Requested
 import scorex.core.{ModifierTypeId, NodeViewModifier, PersistentNodeViewModifier, idsToString}
 import scorex.core.network.NetworkController.ReceivableMessages.{PenalizePeer, RegisterMessageSpecs}
 import org.ergoplatform.network.ErgoNodeViewSynchronizer.ReceivableMessages._
 import org.ergoplatform.nodeView.state.{ErgoStateReader, StateType}
+import org.ergoplatform.nodeView.wallet.ErgoWalletReader
 import scorex.core.network.message.{InvSpec, MessageSpec, ModifiersSpec, RequestModifierSpec}
 import scorex.core.network._
 import scorex.core.network.NetworkController.ReceivableMessages.SendToNetwork
 import scorex.core.network.message.{InvData, Message, ModifiersData}
 import scorex.core.network.{ConnectedPeer, ModifiersStatus, SendToPeer, SendToPeers}
 import scorex.core.serialization.ScorexSerializer
 import scorex.core.settings.NetworkSettings
-import scorex.core.transaction.{MempoolReader, Transaction}
+import scorex.core.transaction.Transaction
 import scorex.core.utils.{NetworkTimeProvider, ScorexEncoding}
 import scorex.core.validation.MalformedModifierError
 import scorex.util.{ModifierId, ScorexLogging}
 import scorex.core.network.DeliveryTracker
 import scorex.core.network.peer.PenaltyType
 import scorex.core.transaction.state.TransactionValidation.TooHighCostError
-import scorex.core.transaction.wallet.VaultReader
+
 
 import scala.annotation.tailrec
 import scala.collection.mutable
@@ -114,8 +114,8 @@ class ErgoNodeViewSynchronizer(networkControllerRef: ActorRef,
     context.system.eventStream.subscribe(self, classOf[DisconnectedPeer])
 
     // subscribe for all the node view holder events involving modifiers and transactions
-    context.system.eventStream.subscribe(self, classOf[ChangedHistory[ErgoHistoryReader]])
-    context.system.eventStream.subscribe(self, classOf[ChangedMempool[ErgoMemPoolReader]])
+    context.system.eventStream.subscribe(self, classOf[ChangedHistory])
+    context.system.eventStream.subscribe(self, classOf[ChangedMempool])
     context.system.eventStream.subscribe(self, classOf[ModificationOutcome])
     context.system.eventStream.subscribe(self, classOf[DownloadRequest])
     context.system.eventStream.subscribe(self, classOf[BlockAppliedTransactions])
@@ -975,11 +975,11 @@ object ErgoNodeViewSynchronizer {
 
     trait NodeViewChange extends NodeViewHolderEvent
 
-    case class ChangedHistory[HR <: HistoryReader[_ <: PersistentNodeViewModifier, _ <: SyncInfo]](reader: HR) extends NodeViewChange
+    case class ChangedHistory(reader: ErgoHistoryReader) extends NodeViewChange
 
-    case class ChangedMempool[MR <: MempoolReader[_ <: Transaction]](mempool: MR) extends NodeViewChange
+    case class ChangedMempool(mempool: ErgoMemPoolReader) extends NodeViewChange
 
-    case class ChangedVault[VR <: VaultReader](reader: VR) extends NodeViewChange
+    case class ChangedVault(reader: ErgoWalletReader) extends NodeViewChange
 
     case class ChangedState(reader: ErgoStateReader) extends NodeViewChange
 

src/main/scala/org/ergoplatform/network/ErgoPeerStatus.scala

@@ -3,7 +3,7 @@ package org.ergoplatform.network
 import io.circe.{Encoder, Json}
 import org.ergoplatform.nodeView.history.ErgoHistory.Height
 import scorex.core.app.Version
-import scorex.core.consensus.History.HistoryComparisonResult
+import scorex.core.consensus.HistoryComparisonResult
 import scorex.core.network.ConnectedPeer
 import scorex.core.utils.TimeProvider.Time
 

src/main/scala/org/ergoplatform/network/ErgoSyncTracker.scala

@@ -5,7 +5,7 @@ import java.net.InetSocketAddress
 import akka.actor.ActorSystem
 import org.ergoplatform.nodeView.history.ErgoHistory
 import org.ergoplatform.nodeView.history.ErgoHistory.Height
-import scorex.core.consensus.History.{Fork, HistoryComparisonResult, Older, Unknown}
+import scorex.core.consensus.{Fork, HistoryComparisonResult, Older, Unknown}
 import org.ergoplatform.network.ErgoNodeViewSynchronizer.Events.{BetterNeighbourAppeared, NoBetterNeighbour}
 import scorex.core.network.ConnectedPeer
 import scorex.core.settings.NetworkSettings

src/main/scala/org/ergoplatform/nodeView/ErgoModifiersCache.scala

@@ -9,7 +9,7 @@ import scorex.core.validation.MalformedModifierError
 import scala.util.Failure
 
 class ErgoModifiersCache(override val maxSize: Int)
-  extends DefaultModifiersCache[ErgoPersistentModifier, ErgoHistory](maxSize) {
+  extends DefaultModifiersCache(maxSize) {
 
   override def findCandidateKey(history: ErgoHistory): Option[K] = {
     def tryToApply(k: K, v: ErgoPersistentModifier): Boolean = {

src/main/scala/org/ergoplatform/nodeView/ErgoNodeViewHolder.scala

@@ -19,7 +19,7 @@ import scorex.core._
 import org.ergoplatform.network.ErgoNodeViewSynchronizer.ReceivableMessages._
 import org.ergoplatform.nodeView.ErgoNodeViewHolder.{BlockAppliedTransactions, CurrentView, DownloadRequest}
 import org.ergoplatform.nodeView.ErgoNodeViewHolder.ReceivableMessages._
-import scorex.core.consensus.History.ProgressInfo
+import scorex.core.consensus.ProgressInfo
 import scorex.core.settings.ScorexSettings
 import scorex.core.utils.{NetworkTimeProvider, ScorexEncoding}
 import scorex.core.validation.RecoverableModifierError

src/main/scala/org/ergoplatform/nodeView/history/ErgoHistory.scala

@@ -13,15 +13,25 @@ import org.ergoplatform.nodeView.history.storage.modifierprocessors._
 import org.ergoplatform.nodeView.history.storage.modifierprocessors.popow.{EmptyPoPoWProofsProcessor, FullPoPoWProofsProcessor}
 import org.ergoplatform.settings._
 import org.ergoplatform.utils.LoggingUtil
-import scorex.core.consensus.History
-import scorex.core.consensus.History.ProgressInfo
+import scorex.core.consensus.ProgressInfo
 import scorex.core.utils.NetworkTimeProvider
 import scorex.core.validation.RecoverableModifierError
 import scorex.util.{ModifierId, ScorexLogging, idToBytes}
 
 import scala.util.{Failure, Success, Try}
 
 /**
+  *
+  * History of a blockchain system is some blocktree in fact
+  * (like this: http://image.slidesharecdn.com/sfbitcoindev-chepurnoy-2015-150322043044-conversion-gate01/95/proofofstake-its-improvements-san-francisco-bitcoin-devs-hackathon-12-638.jpg),
+  * where longest chain is being considered as canonical one, containing right kind of history.
+  *
+  * In cryptocurrencies of today blocktree view is usually implicit, means code supports only linear history,
+  * but other options are possible.
+  *
+  * To say "longest chain" is the canonical one is simplification, usually some kind of "cumulative difficulty"
+  * function has been used instead.
+  *
   * History implementation. It is processing persistent modifiers generated locally or coming from the network.
   * Depending on chosen node settings, it will process modifiers in a different way, different processors define how to
   * process different type of modifiers.
@@ -39,8 +49,7 @@ import scala.util.{Failure, Success, Try}
   *   2. Be ignored by history (verifyTransactions == false)
   */
 trait ErgoHistory
-  extends History[ErgoPersistentModifier, ErgoSyncInfo, ErgoHistory]
-    with ErgoHistoryReader {
+  extends ErgoHistoryReader {
 
   override protected lazy val requireProofs: Boolean = nodeSettings.stateType.requireProofs
 
@@ -62,7 +71,7 @@ trait ErgoHistory
   /**
     * Append ErgoPersistentModifier to History if valid
     */
-  override def append(modifier: ErgoPersistentModifier): Try[(ErgoHistory, ProgressInfo[ErgoPersistentModifier])] = synchronized {
+  def append(modifier: ErgoPersistentModifier): Try[(ErgoHistory, ProgressInfo[ErgoPersistentModifier])] = synchronized {
     log.debug(s"Trying to append modifier ${modifier.encodedId} of type ${modifier.modifierTypeId} to history")
     applicableTry(modifier).flatMap { _ =>
       modifier match {
@@ -87,7 +96,7 @@ trait ErgoHistory
   /**
     * Mark modifier as valid
     */
-  override def reportModifierIsValid(modifier: ErgoPersistentModifier): Try[ErgoHistory] = synchronized {
+  def reportModifierIsValid(modifier: ErgoPersistentModifier): Try[ErgoHistory] = synchronized {
     log.debug(s"Modifier ${modifier.encodedId} of type ${modifier.modifierTypeId} is marked as valid ")
     modifier match {
       case fb: ErgoFullBlock =>
@@ -115,7 +124,7 @@ trait ErgoHistory
     * @return ProgressInfo with next modifier to try to apply
     */
   @SuppressWarnings(Array("OptionGet", "TraversableHead"))
-  override def reportModifierIsInvalid(modifier: ErgoPersistentModifier,
+  def reportModifierIsInvalid(modifier: ErgoPersistentModifier,
                                        progressInfo: ProgressInfo[ErgoPersistentModifier]
                                       ): Try[(ErgoHistory, ProgressInfo[ErgoPersistentModifier])] = synchronized {
     log.warn(s"Modifier ${modifier.encodedId} of type ${modifier.modifierTypeId} is marked as invalid")
@@ -219,6 +228,12 @@ trait ErgoHistory
       }
     }
   }
+
+  /**
+    * @return read-only copy of this history
+    */
+  def getReader: ErgoHistoryReader = this
+
 }
 
 object ErgoHistory extends ScorexLogging {