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 org.scalacheck.Gen
 import org.bouncycastle.util.encoders.Hex

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

@@ -7,15 +7,14 @@ 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
@@ -24,17 +23,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,
-  ServerActor
-}
+import io.iohk.ethereum.network.{EtcPeerManagerActor, ForkResolver, KnownNodesManager, PeerEventBusActor, PeerManagerActor, 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
@@ -160,10 +155,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)
 
@@ -177,7 +174,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

@@ -21,6 +21,8 @@ import io.iohk.ethereum.network.PeerManagerActor.PeerConfiguration
 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}
@@ -84,10 +86,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)
 
@@ -101,7 +105,7 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
       authHandshaker = authHandshaker,
       messageDecoder = EthereumMessageDecoder,
       discoveryConfig,
-      Config.Network.protocolVersion
+      protocolNegotiator
     ),
     "peer-manager"
   )

src/main/resources/application.conf

@@ -37,11 +37,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