MessageSpecInitial / MessageSpecSubBlock

ergo-core/src/main/scala/org/ergoplatform/SubBlockAlgos.scala

@@ -4,7 +4,7 @@ import org.ergoplatform.SubBlockAlgos.SubBlockInfo
 import org.ergoplatform.mining.AutolykosPowScheme
 import org.ergoplatform.modifiers.history.header.{Header, HeaderSerializer}
 import org.ergoplatform.network.message.MessageConstants.MessageCode
-import org.ergoplatform.network.message.MessageSpecV1
+import org.ergoplatform.network.message.MessageSpecInitial
 import org.ergoplatform.serialization.ErgoSerializer
 import org.ergoplatform.settings.{Constants, Parameters}
 import scorex.crypto.hash.Digest32
@@ -122,7 +122,7 @@ object SubBlockAlgos {
     * Message that is informing about sub block produced.
     * Contains header and link to previous sub block ().
     */
-  object SubBlockMessageSpec extends MessageSpecV1[SubBlockInfo] {
+  object SubBlockMessageSpec extends MessageSpecInitial[SubBlockInfo] {
 
     val MaxMessageSize = 10000
 
@@ -142,7 +142,7 @@ object SubBlockAlgos {
     * On receiving sub block or block, the node is sending last sub block or block id it has to get short transaction
     * ids since then
     */
-  object GetDataSpec extends MessageSpecV1[ModifierId] {
+  object GetDataSpec extends MessageSpecInitial[ModifierId] {
 
     import scorex.util.{bytesToId, idToBytes}
 
@@ -160,7 +160,7 @@ object SubBlockAlgos {
 
   case class TransactionsSince(transactionsWithBlockIds: Array[(ModifierId, Array[Array[Byte]])])
 
-  class DataSpec extends MessageSpecV1[TransactionsSince] {
+  class DataSpec extends MessageSpecInitial[TransactionsSince] {
 
     override val messageCode: MessageCode = 92: Byte
     override val messageName: String = "GetData"

ergo-core/src/main/scala/org/ergoplatform/network/HandshakeSerializer.scala

@@ -1,15 +1,15 @@
 package org.ergoplatform.network
 
 import org.ergoplatform.network.message.MessageConstants.MessageCode
-import org.ergoplatform.network.message.MessageSpecV1
+import org.ergoplatform.network.message.MessageSpecInitial
 import scorex.util.serialization.{Reader, Writer}
 
 /**
  * The `Handshake` message provides information about the transmitting node
  * to the receiving node at the beginning of a connection. Until both peers
  * have exchanged `Handshake` messages, no other messages will be accepted.
  */
-object HandshakeSerializer extends MessageSpecV1[Handshake] {
+object HandshakeSerializer extends MessageSpecInitial[Handshake] {
   override val messageCode: MessageCode = 75: Byte
   override val messageName: String = "Handshake"
 

ergo-core/src/main/scala/org/ergoplatform/network/Version.scala

@@ -37,6 +37,8 @@ object Version {
   val Eip37ForkVersion: Version = Version(4, 0, 100)
   val JitSoftForkVersion: Version = Version(5, 0, 0)
 
+  val SubblocksVersion: Version = Version(6, 0, 0)  // todo: check before activation
+
   val UtxoSnapsnotActivationVersion: Version = Version(5, 0, 12)
 
   val NipopowActivationVersion: Version = Version(5, 0, 13)

ergo-core/src/main/scala/org/ergoplatform/network/message/GetNipopowProofSpec.scala

@@ -9,7 +9,7 @@ import scorex.util.serialization.{Reader, Writer}
 /**
  * The `GetNipopowProof` message requests a `NipopowProof` message from the receiving node
  */
-object GetNipopowProofSpec extends MessageSpecV1[NipopowProofData] {
+object GetNipopowProofSpec extends MessageSpecInitial[NipopowProofData] {
 
   val SizeLimit = 1000
 

ergo-core/src/main/scala/org/ergoplatform/network/message/InvSpec.scala

@@ -14,7 +14,7 @@ import scorex.util.serialization.{Reader, Writer}
  * or it can be sent in reply to a `SyncInfo` message (or application-specific messages like `GetMempool`).
  *
  */
-object InvSpec extends MessageSpecV1[InvData] {
+object InvSpec extends MessageSpecInitial[InvData] {
 
   val maxInvObjects: Int = 400
 

ergo-core/src/main/scala/org/ergoplatform/network/message/MessageSpec.scala

@@ -29,10 +29,20 @@ trait MessageSpec[Content] extends ErgoSerializer[Content] {
 }
 
 /**
-  * P2p messages, that where implemented since the beginning.
+  * P2p messages, that where implemented before sub-blocks
   */
-trait MessageSpecV1[Content] extends MessageSpec[Content] {
+trait MessageSpecInitial[Content] extends MessageSpec[Content] {
 
   override val protocolVersion: Version = Version.initial
 
 }
+
+
+/**
+  * Sub-blocks related messages, V2 of the protocol
+  */
+trait MessageSpecSubblocks[Content] extends MessageSpec[Content] {
+
+  override val protocolVersion: Version = Version.SubblocksVersion
+
+}

ergo-core/src/main/scala/org/ergoplatform/network/message/ModifiersSpec.scala

@@ -10,7 +10,7 @@ import scala.collection.immutable
 /**
  * The `Modifier` message is a reply to a `RequestModifier` message which requested these modifiers.
  */
-object ModifiersSpec extends MessageSpecV1[ModifiersData] with ScorexLogging {
+object ModifiersSpec extends MessageSpecInitial[ModifiersData] with ScorexLogging {
 
   val maxMessageSize: Int = 2048576
 

ergo-core/src/main/scala/org/ergoplatform/network/message/NipopowProofSpec.scala

@@ -6,7 +6,7 @@ import scorex.util.serialization.{Reader, Writer}
 /**
  * The `NipopowProof` message is a reply to a `GetNipopowProof` message.
  */
-object NipopowProofSpec extends MessageSpecV1[Array[Byte]] {
+object NipopowProofSpec extends MessageSpecInitial[Array[Byte]] {
 
   val SizeLimit = 2000000
   override val messageCode: Byte = 91

ergo-core/src/main/scala/org/ergoplatform/network/message/RequestModifierSpec.scala

@@ -15,7 +15,7 @@ import scorex.util.serialization.{Reader, Writer}
   * data from a node which previously advertised it had that data by sending an `Inv` message.
   *
   */
-object RequestModifierSpec extends MessageSpecV1[InvData] {
+object RequestModifierSpec extends MessageSpecInitial[InvData] {
   override val messageCode: MessageCode = 22: Byte
   override val messageName: String      = "RequestModifier"
 

ergo-core/src/main/scala/org/ergoplatform/network/message/SyncInfoMessageSpec.scala

@@ -13,7 +13,7 @@ import scorex.util.serialization.{Reader, Writer}
  *
  * Payload of this message should be determined in underlying applications.
  */
-class SyncInfoMessageSpec[SI <: SyncInfo](serializer: ErgoSerializer[SI]) extends MessageSpecV1[SI] {
+class SyncInfoMessageSpec[SI <: SyncInfo](serializer: ErgoSerializer[SI]) extends MessageSpecInitial[SI] {
 
   override val messageCode: MessageCode = 65: Byte
   override val messageName: String = "Sync"

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

@@ -40,7 +40,7 @@ trait VersionBasedPeerFilteringRule extends PeerFilteringRule {
     * @return - whether the peer should be selected
     */
   override def condition(peer: ConnectedPeer): Boolean = {
-    val version = peer.peerInfo.map(_.peerSpec.protocolVersion).getOrElse(Version.initial)
+    val version = peer.peerInfo.map(_.peerSpec.protocolVersion).getOrElse(Version.Eip37ForkVersion)
     condition(version)
   }
 
@@ -83,7 +83,7 @@ object NipopowSupportFilter extends PeerFilteringRule {
     * @return - whether the peer should be selected
     */
   override def condition(peer: ConnectedPeer): Boolean = {
-    val version = peer.peerInfo.map(_.peerSpec.protocolVersion).getOrElse(Version.initial)
+    val version = peer.peerInfo.map(_.peerSpec.protocolVersion).getOrElse(Version.Eip37ForkVersion)
 
     peer.mode.flatMap(_.nipopowBootstrapped).isEmpty &&
       version.compare(Version.NipopowActivationVersion) >= 0

src/main/scala/org/ergoplatform/network/message/BasicMessagesRepo.scala

@@ -16,7 +16,7 @@ import org.ergoplatform.sdk.wallet.Constants.ModifierIdLength
   * its database of available nodes rather than waiting for unsolicited `Peers`
   * messages to arrive over time.
   */
-object GetPeersSpec extends MessageSpecV1[Unit] {
+object GetPeersSpec extends MessageSpecInitial[Unit] {
   override val messageCode: MessageCode = 1: Byte
 
   override val messageName: String = "GetPeers message"
@@ -41,7 +41,7 @@ object PeersSpec {
   * The `Peers` message is a reply to a `GetPeer` message and relays connection information about peers
   * on the network.
   */
-class PeersSpec(peersLimit: Int) extends MessageSpecV1[Seq[PeerSpec]] {
+class PeersSpec(peersLimit: Int) extends MessageSpecInitial[Seq[PeerSpec]] {
 
   override val messageCode: MessageCode = PeersSpec.messageCode
 
@@ -64,7 +64,7 @@ class PeersSpec(peersLimit: Int) extends MessageSpecV1[Seq[PeerSpec]] {
 /**
   * The `GetSnapshotsInfo` message requests an `SnapshotsInfo` message from the receiving node
   */
-object GetSnapshotsInfoSpec extends MessageSpecV1[Unit] {
+object GetSnapshotsInfoSpec extends MessageSpecInitial[Unit] {
   private val SizeLimit = 100
 
   override val messageCode: MessageCode = 76: Byte
@@ -83,7 +83,7 @@ object GetSnapshotsInfoSpec extends MessageSpecV1[Unit] {
   * The `SnapshotsInfo` message is a reply to a `GetSnapshotsInfo` message.
   * It contains information about UTXO set snapshots stored locally.
   */
-object SnapshotsInfoSpec extends MessageSpecV1[SnapshotsInfo] {
+object SnapshotsInfoSpec extends MessageSpecInitial[SnapshotsInfo] {
   private val SizeLimit = 20000
 
   override val messageCode: MessageCode = 77: Byte
@@ -115,7 +115,7 @@ object SnapshotsInfoSpec extends MessageSpecV1[SnapshotsInfo] {
 /**
   * The `GetManifest` sends manifest (BatchAVLProverManifest) identifier
   */
-object GetManifestSpec extends MessageSpecV1[ManifestId] {
+object GetManifestSpec extends MessageSpecInitial[ManifestId] {
   private val SizeLimit = 100
 
   override val messageCode: MessageCode = 78: Byte
@@ -136,7 +136,7 @@ object GetManifestSpec extends MessageSpecV1[ManifestId] {
   * The `Manifest` message is a reply to a `GetManifest` message.
   * It contains serialized manifest, top subtree of a tree authenticating UTXO set snapshot
   */
-object ManifestSpec extends MessageSpecV1[Array[Byte]] {
+object ManifestSpec extends MessageSpecInitial[Array[Byte]] {
   private val SizeLimit = 4000000
 
   override val messageCode: MessageCode = 79: Byte
@@ -160,7 +160,7 @@ object ManifestSpec extends MessageSpecV1[Array[Byte]] {
 /**
   * The `GetUtxoSnapshotChunk` sends send utxo subtree (BatchAVLProverSubtree) identifier
   */
-object GetUtxoSnapshotChunkSpec extends MessageSpecV1[SubtreeId] {
+object GetUtxoSnapshotChunkSpec extends MessageSpecInitial[SubtreeId] {
   private val SizeLimit = 100
 
   override val messageCode: MessageCode = 80: Byte
@@ -181,7 +181,7 @@ object GetUtxoSnapshotChunkSpec extends MessageSpecV1[SubtreeId] {
 /**
   * The `UtxoSnapshotChunk` message is a reply to a `GetUtxoSnapshotChunk` message.
   */
-object UtxoSnapshotChunkSpec extends MessageSpecV1[Array[Byte]] {
+object UtxoSnapshotChunkSpec extends MessageSpecInitial[Array[Byte]] {
   private val SizeLimit = 4000000
 
   override val messageCode: MessageCode = 81: Byte