Bump external vm protobuf definition

Author: dzajkowski

src/main/protobuf/extvm

@@ -171,8 +171,13 @@ class VMClient(externalVmConfig: VmConfig.ExternalConfig, messageHandler: Messag
       eip150BlockNumber = blockchainConfig.eip150BlockNumber,
       eip160BlockNumber = blockchainConfig.eip160BlockNumber,
       eip161BlockNumber = blockchainConfig.eip161BlockNumber,
+      byzantiumBlockNumber = blockchainConfig.byzantiumBlockNumber,
+      constantinopleBlockNumber = blockchainConfig.constantinopleBlockNumber,
+      petersburgBlockNumber = blockchainConfig.petersburgBlockNumber,
+      istanbulBlockNumber = blockchainConfig.istanbulBlockNumber,
       maxCodeSize = blockchainConfig.maxCodeSize.map(bigintToGByteString).getOrElse(ByteString()),
-      accountStartNonce = blockchainConfig.accountStartNonce
+      accountStartNonce = blockchainConfig.accountStartNonce,
+      chainId = ByteString(blockchainConfig.chainId)
     )
 
   private def buildIeleConfigMsg(): msg.IeleConfig =

src/main/scala/io/iohk/ethereum/extvm/VMClient.scala

@@ -198,17 +198,17 @@ class VMServer(messageHandler: MessageHandler) extends Logger {
       eip150BlockNumber = conf.eip150BlockNumber,
       eip160BlockNumber = conf.eip160BlockNumber,
       eip161BlockNumber = conf.eip161BlockNumber,
-      byzantiumBlockNumber = BigInt(4370000), //TODO include byzantium block number in protobuf
-      constantinopleBlockNumber = BigInt(10000000), //TODO include constantinople block number in protobuf
-      istanbulBlockNumber = BigInt(10000000), //TODO include istanbul block number in protobuf
+      byzantiumBlockNumber = conf.byzantiumBlockNumber,
+      constantinopleBlockNumber = conf.constantinopleBlockNumber,
+      istanbulBlockNumber = conf.istanbulBlockNumber,
       maxCodeSize = if (conf.maxCodeSize.isEmpty) None else Some(bigintFromGByteString(conf.maxCodeSize)),
       accountStartNonce = conf.accountStartNonce,
       atlantisBlockNumber = BigInt(8772000), //TODO include atlantis block number in protobuf
       aghartaBlockNumber = BigInt(9573000), //TODO include agharta block number in protobuf
-      petersburgBlockNumber = BigInt(10000000), //TODO include petersburg block number in protobuf
+      petersburgBlockNumber = conf.petersburgBlockNumber,
       phoenixBlockNumber = BigInt(10500839), //TODO include phoenix block number in protobuf
       magnetoBlockNumber = BigInt(13189133), //TODO include magneto block number in protobuf
       berlinBlockNumber = BigInt("1000000000000000000"), //TODO include berlin block number in protobuf
-      chainId = 0x3d.toByte //TODO include chainId in protobuf
+      chainId = conf.chainId.byteAt(0)
     )
 }

src/main/scala/io/iohk/ethereum/extvm/VMServer.scala

@@ -166,8 +166,13 @@ class VMClientSpec extends AnyFlatSpec with Matchers with MockFactory {
       eip150BlockNumber = forkBlockNumbers.eip150BlockNumber,
       eip160BlockNumber = forkBlockNumbers.eip160BlockNumber,
       eip161BlockNumber = forkBlockNumbers.eip161BlockNumber,
+      byzantiumBlockNumber = forkBlockNumbers.byzantiumBlockNumber,
+      constantinopleBlockNumber = forkBlockNumbers.constantinopleBlockNumber,
+      petersburgBlockNumber = forkBlockNumbers.petersburgBlockNumber,
+      istanbulBlockNumber = forkBlockNumbers.istanbulBlockNumber,
       maxCodeSize = blockchainConfig.maxCodeSize.get,
-      accountStartNonce = blockchainConfig.accountStartNonce
+      accountStartNonce = blockchainConfig.accountStartNonce,
+      chainId = ByteString(blockchainConfig.chainId)
     )
     val expectedHelloConfigMsg = msg.Hello.Config.EthereumConfig(expectedEthereumConfig)
     val expectedHelloMsg = msg.Hello(version = "testVersion", config = expectedHelloConfigMsg)

src/test/scala/io/iohk/ethereum/extvm/VMClientSpec.scala

@@ -113,11 +113,16 @@ class VMServerSpec extends AnyFlatSpec with Matchers with MockFactory {
       eip150BlockNumber = forkBlockNumbers.eip150BlockNumber,
       eip160BlockNumber = forkBlockNumbers.eip160BlockNumber,
       eip161BlockNumber = forkBlockNumbers.eip161BlockNumber,
+      byzantiumBlockNumber = forkBlockNumbers.byzantiumBlockNumber,
+      constantinopleBlockNumber = forkBlockNumbers.constantinopleBlockNumber,
+      petersburgBlockNumber = forkBlockNumbers.petersburgBlockNumber,
+      istanbulBlockNumber = forkBlockNumbers.istanbulBlockNumber,
       maxCodeSize = ByteString(),
-      accountStartNonce = blockchainConfig.accountStartNonce
+      accountStartNonce = blockchainConfig.accountStartNonce,
+      chainId = ByteString(blockchainConfig.chainId)
     )
     val ethereumConfigMsg: Hello.Config.EthereumConfig = msg.Hello.Config.EthereumConfig(ethereumConfig)
-    val helloMsg: Hello = msg.Hello(version = "2.0", config = ethereumConfigMsg)
+    val helloMsg: Hello = msg.Hello(version = "2.1", config = ethereumConfigMsg)
 
     val messageHandler: MessageHandler = mock[MessageHandler]
     val vmServer = new VMServer(messageHandler)