etcm-402 added negotiating protocol version in message codec

Author: rtkaczyk

src/benchmark/scala/io/iohk/ethereum/rlp/RLPSpeedSuite.scala

@@ -4,7 +4,7 @@ import akka.util.ByteString
 import io.iohk.ethereum.ObjectGenerators
 import io.iohk.ethereum.domain.Block._
 import io.iohk.ethereum.domain._
-import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
+import io.iohk.ethereum.network.p2p.messages.PV60.SignedTransactions._
 import io.iohk.ethereum.utils.Logger
 import io.iohk.ethereum.utils.Hex
 import org.scalacheck.Gen

src/ets/scala/io/iohk/ethereum/ets/blockchain/BlockchainTestConfig.scala

@@ -30,6 +30,7 @@ object BlockchainTestConfig {
     difficultyBombRemovalBlockNumber = 5900000,
     chainId = 0x1.toByte,
     networkId = 1,
+    protocolVersion = 63,
     customGenesisFileOpt = Some("test-genesis.json"),
     monetaryPolicyConfig =
       MonetaryPolicyConfig(5000000, 0.2, BigInt("5000000000000000000"), BigInt("3000000000000000000")),

src/it/scala/io/iohk/ethereum/sync/util/CommonFakePeer.scala

@@ -1,22 +1,17 @@
 package io.iohk.ethereum.sync.util
 
-import java.nio.file.Files
-import java.time.Clock
-import java.util.concurrent.atomic.AtomicReference
-
 import akka.actor.{ActorRef, ActorSystem}
 import akka.testkit.TestProbe
 import akka.util.{ByteString, Timeout}
 import io.iohk.ethereum.blockchain.sync.regular.BlockBroadcast.BlockToBroadcast
-import io.iohk.ethereum.blockchain.sync.regular.{BlockBroadcast, BlockBroadcasterActor}
 import io.iohk.ethereum.blockchain.sync.regular.BlockBroadcasterActor.BroadcastBlock
+import io.iohk.ethereum.blockchain.sync.regular.{BlockBroadcast, BlockBroadcasterActor}
 import io.iohk.ethereum.blockchain.sync.{BlockchainHostActor, TestSyncConfig}
 import io.iohk.ethereum.db.components.{RocksDbDataSourceComponent, Storages}
 import io.iohk.ethereum.db.dataSource.{RocksDbConfig, RocksDbDataSource}
 import io.iohk.ethereum.db.storage.pruning.{ArchivePruning, PruningMode}
 import io.iohk.ethereum.db.storage.{AppStateStorage, Namespaces}
 import io.iohk.ethereum.domain.{Block, Blockchain, BlockchainImpl, ChainWeight}
-import io.iohk.ethereum.security.SecureRandomBuilder
 import io.iohk.ethereum.ledger.InMemoryWorldStateProxy
 import io.iohk.ethereum.mpt.MerklePatriciaTrie
 import io.iohk.ethereum.network.EtcPeerManagerActor.PeerInfo
@@ -25,18 +20,13 @@ import io.iohk.ethereum.network.discovery.PeerDiscoveryManager.DiscoveredNodesIn
 import io.iohk.ethereum.network.discovery.{DiscoveryConfig, Node}
 import io.iohk.ethereum.network.handshaker.{EtcHandshaker, EtcHandshakerConfiguration, Handshaker}
 import io.iohk.ethereum.network.p2p.EthereumMessageDecoder
+import io.iohk.ethereum.network.p2p.Message.Version
+import io.iohk.ethereum.network.p2p.messages.ProtocolNegotiator
 import io.iohk.ethereum.network.rlpx.AuthHandshaker
 import io.iohk.ethereum.network.rlpx.RLPxConnectionHandler.RLPxConfiguration
-import io.iohk.ethereum.network.{
-  EtcPeerManagerActor,
-  ForkResolver,
-  KnownNodesManager,
-  PeerEventBusActor,
-  PeerManagerActor,
-  PeerStatisticsActor,
-  ServerActor
-}
+import io.iohk.ethereum.network.{EtcPeerManagerActor, ForkResolver, KnownNodesManager, PeerEventBusActor, PeerManagerActor, PeerStatisticsActor, ServerActor}
 import io.iohk.ethereum.nodebuilder.PruningConfigBuilder
+import io.iohk.ethereum.security.SecureRandomBuilder
 import io.iohk.ethereum.sync.util.SyncCommonItSpec._
 import io.iohk.ethereum.sync.util.SyncCommonItSpecUtils._
 import io.iohk.ethereum.utils.ServerStatus.Listening
@@ -45,6 +35,9 @@ import io.iohk.ethereum.vm.EvmConfig
 import io.iohk.ethereum.{Fixtures, Timeouts}
 import monix.eval.Task
 
+import java.nio.file.Files
+import java.time.Clock
+import java.util.concurrent.atomic.AtomicReference
 import scala.concurrent.duration.{FiniteDuration, _}
 
 abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCustomConfig)
@@ -169,10 +162,12 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
       override val peerConfiguration: PeerConfiguration = peerConf
       override val blockchain: Blockchain = bl
       override val appStateStorage: AppStateStorage = storagesInstance.storages.appStateStorage
-      override val protocolVersion: Int = Config.Network.protocolVersion
+      override val protocolVersion: Version = blockchainConfig.protocolVersion
     }
 
-  lazy val handshaker: Handshaker[PeerInfo] = EtcHandshaker(handshakerConfiguration)
+  val protocolNegotiator = new ProtocolNegotiator(handshakerConfiguration.protocolVersion)
+
+  lazy val handshaker: Handshaker[PeerInfo] = EtcHandshaker(handshakerConfiguration, protocolNegotiator)
 
   lazy val authHandshaker: AuthHandshaker = AuthHandshaker(nodeKey, secureRandom)
 
@@ -190,7 +185,7 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
       authHandshaker,
       EthereumMessageDecoder,
       discoveryConfig,
-      Config.Network.protocolVersion
+      protocolNegotiator
     ),
     "peer-manager"
   )

src/it/scala/io/iohk/ethereum/txExecTest/ECIP1017Test.scala

@@ -22,6 +22,7 @@ class ECIP1017Test extends AnyFlatSpec with Matchers {
       maxCodeSize = None,
       chainId = 0x3d.toByte,
       networkId = 1,
+      protocolVersion = 63,
       frontierBlockNumber = 0,
       homesteadBlockNumber = 1150000,
       eip106BlockNumber = Long.MaxValue,

src/it/scala/io/iohk/ethereum/txExecTest/ForksTest.scala

@@ -27,6 +27,7 @@ class ForksTest extends AnyFlatSpec with Matchers {
       // unused
       bootstrapNodes = Set(),
       networkId = 1,
+      protocolVersion = 63,
       maxCodeSize = None,
       eip161BlockNumber = Long.MaxValue,
       customGenesisFileOpt = None,

src/it/scala/io/iohk/ethereum/txExecTest/util/DumpChainApp.scala

@@ -23,6 +23,8 @@ import io.iohk.ethereum.network.PeerStatisticsActor
 import io.iohk.ethereum.network.discovery.DiscoveryConfig
 import io.iohk.ethereum.network.handshaker.{EtcHandshaker, EtcHandshakerConfiguration, Handshaker}
 import io.iohk.ethereum.network.p2p.EthereumMessageDecoder
+import io.iohk.ethereum.network.p2p.Message.Version
+import io.iohk.ethereum.network.p2p.messages.ProtocolNegotiator
 import io.iohk.ethereum.network.rlpx.RLPxConnectionHandler.RLPxConfiguration
 import io.iohk.ethereum.network.{ForkResolver, PeerEventBusActor, PeerManagerActor}
 import io.iohk.ethereum.nodebuilder.{AuthHandshakerBuilder, NodeKeyBuilder}
@@ -91,10 +93,12 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
       override val peerConfiguration: PeerConfiguration = peerConfig
       override val blockchain: Blockchain = DumpChainApp.blockchain
       override val appStateStorage: AppStateStorage = storagesInstance.storages.appStateStorage
-      override val protocolVersion: Int = Config.Network.protocolVersion
+      override val protocolVersion: Version = blockchainConfig.protocolVersion
     }
 
-  lazy val handshaker: Handshaker[PeerInfo] = EtcHandshaker(handshakerConfiguration)
+  val protocolNegotiator = new ProtocolNegotiator(handshakerConfiguration.protocolVersion)
+
+  lazy val handshaker: Handshaker[PeerInfo] = EtcHandshaker(handshakerConfiguration, protocolNegotiator)
 
   val peerMessageBus = actorSystem.actorOf(PeerEventBusActor.props)
 
@@ -111,7 +115,7 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
       authHandshaker = authHandshaker,
       messageDecoder = EthereumMessageDecoder,
       discoveryConfig = discoveryConfig,
-      bestProtocolVersion = Config.Network.protocolVersion
+      protocolNegotiator = protocolNegotiator
     ),
     "peer-manager"
   )

src/main/resources/application.conf

@@ -34,11 +34,6 @@ mantis {
   }
 
   network {
-    # Ethereum protocol version
-    # Supported versions:
-    # 63, 64 (experimental version which enables usage of messages with checkpointing information. In the future after ETCM-355, ETCM-356, it will be 66 probably)
-    protocol-version = 63
-
     server-address {
       # Listening interface for Ethereum protocol connections
       interface = "0.0.0.0"

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

@@ -3,6 +3,11 @@
   # 1 - mainnet, 3 - ropsten, 7 - mordor
   network-id = 1
 
+  # Ethereum protocol version
+  # Supported versions:
+  # 63, 64 (experimental version which enables usage of messages with checkpointing information. In the future after ETCM-355, ETCM-356, it will be 66 probably)
+  network.protocol-version = 63
+
   # Possibility to set Proof of Work target time for testing purposes.
   # null means that the standard difficulty calculation rules are used
   pow-target-time = null

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

@@ -3,6 +3,11 @@
   # 1 - mainnet, 3 - ropsten, 7 - mordor
   network-id = 1
 
+  # Ethereum protocol version
+  # Supported versions:
+  # 63, 64 (experimental version which enables usage of messages with checkpointing information. In the future after ETCM-355, ETCM-356, it will be 66 probably)
+  network.protocol-version = 63
+
   # Possibility to set Proof of Work target time for testing purposes.
   # null means that the standard difficulty calculation rules are used
   pow-target-time = null

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

@@ -3,6 +3,11 @@
   # 1 - mainnet, 3 - ropsten, 7 - mordor
   network-id = 7
 
+  # Ethereum protocol version
+  # Supported versions:
+  # 63, 64 (experimental version which enables usage of messages with checkpointing information. In the future after ETCM-355, ETCM-356, it will be 66 probably)
+  network.protocol-version = 63
+
   # Possibility to set Proof of Work target time for testing purposes.
   # null means that the standard difficulty calculation rules are used
   pow-target-time = null

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

@@ -3,6 +3,11 @@
   # 1 - mainnet, 3 - ropsten, 7 - mordor
   network-id = 3
 
+  # Ethereum protocol version
+  # Supported versions:
+  # 63, 64 (experimental version which enables usage of messages with checkpointing information. In the future after ETCM-355, ETCM-356, it will be 66 probably)
+  network.protocol-version = 63
+
   # Possibility to set Proof of Work target time for testing purposes.
   # null means that the standard difficulty calculation rules are used
   pow-target-time = null

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

@@ -3,6 +3,11 @@
   # 1 - mainnet, 7 - mordor
   network-id = 1
 
+  # Ethereum protocol version
+  # Supported versions:
+  # 63, 64 (experimental version which enables usage of messages with checkpointing information. In the future after ETCM-355, ETCM-356, it will be 66 probably)
+  network.protocol-version = 63
+
   # Possibility to set Proof of Work target time for testing purposes.
   # null means that the standard difficulty calculation rules are used
   pow-target-time = null

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

@@ -3,6 +3,11 @@
     # 1 - mainnet, 3 - ropsten, 7 - mordor
     network-id = 42
 
+    # Ethereum protocol version
+    # Supported versions:
+    # 63, 64 (experimental version which enables usage of messages with checkpointing information. In the future after ETCM-355, ETCM-356, it will be 66 probably)
+    network.protocol-version = 63
+
     # Possibility to set Proof of Work target time for testing purposes.
     # null means that the standard difficulty calculation rules are used
     pow-target-time = null

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

@@ -3,6 +3,11 @@
     # 1 - mainnet, 3 - ropsten, 7 - mordor
     network-id = 42
 
+    # Ethereum protocol version
+    # Supported versions:
+    # 63, 64 (experimental version which enables usage of messages with checkpointing information. In the future after ETCM-355, ETCM-356, it will be 66 probably)
+    network.protocol-version = 63
+
     # Possibility to set Proof of Work target time for testing purposes.
     # null means that the standard difficulty calculation rules are used
     pow-target-time = 30 seconds

src/main/scala/io/iohk/ethereum/blockchain/sync/regular/BlockBroadcast.scala

@@ -6,7 +6,7 @@ import io.iohk.ethereum.domain.{Block, ChainWeight}
 import io.iohk.ethereum.network.EtcPeerManagerActor.PeerInfo
 import io.iohk.ethereum.network.p2p.MessageSerializable
 import io.iohk.ethereum.network.p2p.messages.PV62.BlockHash
-import io.iohk.ethereum.network.p2p.messages.{CommonMessages, PV62, PV64, ProtocolVersions}
+import io.iohk.ethereum.network.p2p.messages.{PV60, PV62, PV64, ProtocolVersions}
 import io.iohk.ethereum.network.{EtcPeerManagerActor, Peer}
 
 import scala.util.Random
@@ -71,7 +71,7 @@ object BlockBroadcast {
     * (they are different versions of NewBlock msg)
     */
   case class BlockToBroadcast(block: Block, chainWeight: ChainWeight) {
-    def as63: CommonMessages.NewBlock = CommonMessages.NewBlock(block, chainWeight.totalDifficulty)
+    def as63: PV60.NewBlock = PV60.NewBlock(block, chainWeight.totalDifficulty)
     def as64: PV64.NewBlock = PV64.NewBlock(block, chainWeight)
   }
 }

src/main/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcher.scala

@@ -21,7 +21,7 @@ import io.iohk.ethereum.network.PeerEventBusActor.PeerEvent.MessageFromPeer
 import io.iohk.ethereum.network.PeerEventBusActor.SubscriptionClassifier.MessageClassifier
 import io.iohk.ethereum.network.PeerEventBusActor.{PeerSelector, Subscribe, Unsubscribe}
 import io.iohk.ethereum.network.PeerId
-import io.iohk.ethereum.network.p2p.messages.{Codes, CommonMessages, PV64}
+import io.iohk.ethereum.network.p2p.messages.{Codes, PV60, PV64}
 import io.iohk.ethereum.network.p2p.messages.PV62._
 import io.iohk.ethereum.network.p2p.messages.PV63.{GetNodeData, NodeData}
 import io.iohk.ethereum.utils.ByteStringUtils
@@ -197,7 +197,8 @@ class BlockFetcher(
       }
       supervisor ! ProgressProtocol.GotNewBlock(newState.knownTop)
       fetchBlocks(newState)
-    case MessageFromPeer(CommonMessages.NewBlock(block, _), peerId) =>
+    // Remember to always add match for every new version of NewBlock message
+    case MessageFromPeer(PV60.NewBlock(block, _), peerId) =>
       handleNewBlock(block, peerId, state)
     case MessageFromPeer(PV64.NewBlock(block, _), peerId) =>
       handleNewBlock(block, peerId, state)

src/main/scala/io/iohk/ethereum/domain/Block.scala

@@ -29,7 +29,7 @@ case class Block(header: BlockHeader, body: BlockBody) {
 object Block {
 
   implicit class BlockEnc(val obj: Block) extends RLPSerializable {
-    import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
+    import io.iohk.ethereum.network.p2p.messages.PV60.SignedTransactions._
 
     override def toRLPEncodable: RLPEncodeable = RLPList(
       obj.header.toRLPEncodable,
@@ -39,7 +39,7 @@ object Block {
   }
 
   implicit class BlockDec(val bytes: Array[Byte]) extends AnyVal {
-    import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
+    import io.iohk.ethereum.network.p2p.messages.PV60.SignedTransactions._
     def toBlock: Block = rawDecode(bytes) match {
       case RLPList(header: RLPList, stx: RLPList, uncles: RLPList) =>
         Block(

src/main/scala/io/iohk/ethereum/domain/BlockBody.scala

@@ -31,7 +31,7 @@ object BlockBody {
 
   implicit class BlockBodyEnc(msg: BlockBody) extends RLPSerializable {
     override def toRLPEncodable: RLPEncodeable = {
-      import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
+      import io.iohk.ethereum.network.p2p.messages.PV60.SignedTransactions._
 
       blockBodyToRlpEncodable(
         msg,
@@ -61,7 +61,7 @@ object BlockBody {
 
   implicit class BlockBodyRLPEncodableDec(val rlpEncodeable: RLPEncodeable) {
     def toBlockBody: BlockBody = {
-      import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
+      import io.iohk.ethereum.network.p2p.messages.PV60.SignedTransactions._
 
       rlpEncodableToBlockBody(
         rlpEncodeable,

src/main/scala/io/iohk/ethereum/domain/SignedTransaction.scala

@@ -5,16 +5,17 @@ import com.google.common.cache.{Cache, CacheBuilder}
 import io.iohk.ethereum.crypto
 import io.iohk.ethereum.crypto.{ECDSASignature, kec256}
 import io.iohk.ethereum.mpt.ByteArraySerializable
-import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
+import io.iohk.ethereum.network.p2p.messages.PV60.SignedTransactions._
 import io.iohk.ethereum.rlp.RLPImplicitConversions._
 import io.iohk.ethereum.rlp.RLPImplicits._
 import io.iohk.ethereum.rlp.{encode => rlpEncode, _}
-import java.math.BigInteger
-import java.util.concurrent.Executors
 import monix.eval.Task
 import monix.execution.Scheduler
 import org.bouncycastle.crypto.AsymmetricCipherKeyPair
 import org.bouncycastle.util.encoders.Hex
+
+import java.math.BigInteger
+import java.util.concurrent.Executors
 import scala.util.Try
 
 object SignedTransaction {

src/main/scala/io/iohk/ethereum/faucet/jsonrpc/WalletService.scala

@@ -7,7 +7,7 @@ import io.iohk.ethereum.faucet.FaucetConfig
 import io.iohk.ethereum.jsonrpc.client.RpcClient.RpcError
 import io.iohk.ethereum.keystore.KeyStore.KeyStoreError
 import io.iohk.ethereum.keystore.{KeyStore, Wallet}
-import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions.SignedTransactionEnc
+import io.iohk.ethereum.network.p2p.messages.PV60.SignedTransactions.SignedTransactionEnc
 import io.iohk.ethereum.rlp
 import io.iohk.ethereum.utils.{ByteStringUtils, Logger}
 import monix.eval.Task

src/main/scala/io/iohk/ethereum/jsonrpc/EthTxService.scala

@@ -168,7 +168,7 @@ class EthTxService(
   }
 
   def sendRawTransaction(req: SendRawTransactionRequest): ServiceResponse[SendRawTransactionResponse] = {
-    import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions.SignedTransactionDec
+    import io.iohk.ethereum.network.p2p.messages.PV60.SignedTransactions.SignedTransactionDec
 
     Try(req.data.toArray.toSignedTransaction) match {
       case Success(signedTransaction) =>

src/main/scala/io/iohk/ethereum/jsonrpc/RawTransactionCodec.scala

@@ -2,7 +2,7 @@ package io.iohk.ethereum.jsonrpc
 
 import akka.util.ByteString
 import io.iohk.ethereum.domain.SignedTransaction
-import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions.SignedTransactionEnc
+import io.iohk.ethereum.network.p2p.messages.PV60.SignedTransactions.SignedTransactionEnc
 import io.iohk.ethereum.rlp
 
 object RawTransactionCodec {

src/main/scala/io/iohk/ethereum/network/EtcPeerManagerActor.scala

@@ -13,7 +13,7 @@ import io.iohk.ethereum.network.handshaker.Handshaker.HandshakeResult
 import io.iohk.ethereum.network.p2p.messages.PV62.{BlockHeaders, GetBlockHeaders, NewBlockHashes}
 import io.iohk.ethereum.network.p2p.messages.PV64.NewBlock
 import io.iohk.ethereum.network.p2p.messages.WireProtocol.Disconnect
-import io.iohk.ethereum.network.p2p.messages.{Codes, CommonMessages, PV64}
+import io.iohk.ethereum.network.p2p.messages.{Codes, PV60, PV64}
 import io.iohk.ethereum.network.p2p.{Message, MessageSerializable}
 import io.iohk.ethereum.utils.ByteStringUtils
 
@@ -159,7 +159,7 @@ class EtcPeerManagerActor(
     */
   private def updateChainWeight(message: Message)(initialPeerInfo: PeerInfo): PeerInfo =
     message match {
-      case newBlock: CommonMessages.NewBlock =>
+      case newBlock: PV60.NewBlock =>
         initialPeerInfo.copy(chainWeight = ChainWeight.totalDifficultyOnly(newBlock.totalDifficulty))
       case newBlock: PV64.NewBlock => initialPeerInfo.copy(chainWeight = newBlock.chainWeight)
       case _ => initialPeerInfo
@@ -220,7 +220,7 @@ class EtcPeerManagerActor(
     message match {
       case m: BlockHeaders =>
         update(m.headers.map(header => (header.number, header.hash)))
-      case m: CommonMessages.NewBlock =>
+      case m: PV60.NewBlock =>
         update(Seq((m.block.header.number, m.block.header.hash)))
       case m: NewBlock =>
         update(Seq((m.block.header.number, m.block.header.hash)))
@@ -263,7 +263,7 @@ object EtcPeerManagerActor {
       RemoteStatus(status.protocolVersion, status.networkId, status.chainWeight, status.bestHash, status.genesisHash)
     }
 
-    def apply(status: CommonMessages.Status): RemoteStatus = {
+    def apply(status: PV60.Status): RemoteStatus = {
       RemoteStatus(
         status.protocolVersion,
         status.networkId,