Merge branches 'etcm-28-petersbug-changes' and 'phase/etc_forks' of https://github.com/input-output-hk/mantis into etcm-28-petersbug-changes

� Conflicts:
�	src/main/scala/io/iohk/ethereum/extvm/VMServer.scala
�	src/main/scala/io/iohk/ethereum/vm/BlockchainConfigForEvm.scala
�	src/main/scala/io/iohk/ethereum/vm/EvmConfig.scala
�	src/test/scala/io/iohk/ethereum/extvm/VMClientSpec.scala
�	src/test/scala/io/iohk/ethereum/vm/Fixtures.scala
�	src/test/scala/io/iohk/ethereum/vm/VMSpec.scala

Author: mmrozek

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

@@ -188,8 +188,9 @@ class VMServer(messageHandler: MessageHandler)
       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
       phoenixBlockNumber = BigInt(10500839),   //TODO include phoenix block number in protobuf
-      petersburgBlockNumber = BigInt(10000000)   //TODO include petersburg block number in protobuf
+      chainId = 0x3d.toByte   //TODO include chainId in protobuf
     )
   }
 }

src/main/scala/io/iohk/ethereum/vm/BlockchainConfigForEvm.scala

@@ -20,8 +20,9 @@ case class BlockchainConfigForEvm(
   accountStartNonce: UInt256,
   atlantisBlockNumber: BigInt,
   aghartaBlockNumber: BigInt,
+  petersburgBlockNumber: BigInt,
   phoenixBlockNumber: BigInt,
-  petersburgBlockNumber: BigInt
+  chainId: Byte
 )
 
 object BlockchainConfigForEvm {
@@ -39,8 +40,9 @@ object BlockchainConfigForEvm {
       accountStartNonce = accountStartNonce,
       atlantisBlockNumber = atlantisBlockNumber,
       aghartaBlockNumber = aghartaBlockNumber,
+      petersburgBlockNumber = petersburgBlockNumber,
       phoenixBlockNumber = phoenixBlockNumber,
-      petersburgBlockNumber = petersburgBlockNumber
+      chainId = chainId
     )
   }
 

src/main/scala/io/iohk/ethereum/vm/EvmConfig.scala

@@ -4,6 +4,7 @@ import akka.util.ByteString
 import io.iohk.ethereum.domain.UInt256
 import io.iohk.ethereum.utils.BlockchainConfig
 import EvmConfig._
+import io.iohk.ethereum
 import io.iohk.ethereum.vm
 
 // scalastyle:off number.of.methods
@@ -37,7 +38,8 @@ object EvmConfig {
       blockchainConfig.constantinopleBlockNumber -> ConstantinopleConfigBuilder,
       blockchainConfig.atlantisBlockNumber -> AtlantisConfigBuilder,
       blockchainConfig.aghartaBlockNumber -> AghartaConfigBuilder,
-      blockchainConfig.petersburgBlockNumber -> PetersburgConfigBuilder
+      blockchainConfig.petersburgBlockNumber -> PetersburgConfigBuilder,
+      blockchainConfig.phoenixBlockNumber -> PhoenixConfigBuilder
     )
 
     // highest transition block that is less/equal to `blockNumber`
@@ -54,6 +56,7 @@ object EvmConfig {
   val AtlantisOpCodes = ByzantiumOpCodes
   val ConstantinopleOpCodes = OpCodeList(OpCodes.ConstantinopleOpCodes)
   val AghartaOpCodes = ConstantinopleOpCodes
+  val PhoenixOpCodes = OpCodeList(OpCodes.PhoenixOpCodes)
 
   val FrontierConfigBuilder: EvmConfigBuilder = config => EvmConfig(
     blockchainConfig = config,
@@ -108,6 +111,11 @@ object EvmConfig {
     opCodeList = AghartaOpCodes
   )
 
+  val PhoenixConfigBuilder: EvmConfigBuilder = config => AghartaConfigBuilder(config).copy(
+    feeSchedule = new ethereum.vm.FeeSchedule.PhoenixFeeSchedule,
+    opCodeList = PhoenixOpCodes
+  )
+
   case class OpCodeList(opCodes: List[OpCode]) {
     val byteToOpCode: Map[Byte, OpCode] =
       opCodes.map(op => op.code -> op).toMap
@@ -256,6 +264,8 @@ object FeeSchedule {
 
   class AghartaFeeSchedule extends ByzantiumFeeSchedule
 
+  class PhoenixFeeSchedule extends AghartaFeeSchedule
+
 }
 
 trait FeeSchedule {

src/main/scala/io/iohk/ethereum/vm/OpCode.scala

@@ -166,6 +166,9 @@ object OpCodes {
 
   val ConstantinopleOpCodes: List[OpCode] =
     List(EXTCODEHASH, CREATE2, SHL, SHR, SAR) ++ ByzantiumOpCodes
+
+  val PhoenixOpCodes: List[OpCode] =
+    List(CHAINID) ++ ConstantinopleOpCodes
 }
 
 object OpCode {
@@ -1151,3 +1154,5 @@ case object SELFDESTRUCT extends OpCode(0xff, 1, 0, _.G_selfdestruct) {
 
   override protected def availableInContext[W <: WorldStateProxy[W, S], S <: Storage[S]]: ProgramState[W, S] => Boolean = !_.staticCtx
 }
+
+case object CHAINID extends ConstOp(0x46)(state => UInt256(state.env.evmConfig.blockchainConfig.chainId))

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

@@ -177,8 +177,9 @@ class VMClientSpec extends FlatSpec with Matchers with MockFactory {
       accountStartNonce = 0,
       atlantisBlockNumber = 0,
       aghartaBlockNumber = 0,
+      petersburgBlockNumber = 0,
       phoenixBlockNumber = 0,
-      petersburgBlockNumber = 0
+      chainId = 0x3d.toByte
     )
     val evmConfig = EvmConfig.FrontierConfigBuilder(blockchainConfigForEvm)
 

src/test/scala/io/iohk/ethereum/vm/Fixtures.scala

@@ -18,8 +18,9 @@ object Fixtures {
     accountStartNonce = 0,
     atlantisBlockNumber = 0,
     aghartaBlockNumber = 0,
+    petersburgBlockNumber = PetersburgBlockNumber,
     phoenixBlockNumber = 0,
-    petersburgBlockNumber = PetersburgBlockNumber
+    chainId = 0x3d.toByte
   )
 
 }

src/test/scala/io/iohk/ethereum/vm/OpCodeFunSpec.scala

@@ -14,7 +14,7 @@ class OpCodeFunSpec extends FunSuite with OpCodeTesting with Matchers with Prope
 
   import MockWorldState.PS
 
-  override val config = EvmConfig.ByzantiumConfigBuilder(blockchainConfig)
+  override val config = EvmConfig.PhoenixConfigBuilder(blockchainConfig)
 
   def executeOp(op: OpCode, stateIn: PS): PS = {
     // gas is not tested in this spec
@@ -819,7 +819,7 @@ class OpCodeFunSpec extends FunSuite with OpCodeTesting with Matchers with Prope
     }
   }
 
-  verifyAllOpCodesRegistered(except = CREATE, CREATE2, CALL, CALLCODE, DELEGATECALL, STATICCALL)
+  verifyAllOpCodesRegistered(except = CREATE, CREATE2, CALL, CALLCODE, DELEGATECALL, STATICCALL, SHL, SHR, SAR)
 
   test("sliceBytes helper") {
     def zeroes(i: Int): ByteString =

src/test/scala/io/iohk/ethereum/vm/VMSpec.scala

@@ -157,8 +157,9 @@ class VMSpec extends WordSpec with PropertyChecks with Matchers {
       accountStartNonce = 0,
       atlantisBlockNumber = Long.MaxValue,
       aghartaBlockNumber = Long.MaxValue,
+      petersburgBlockNumber = Long.MaxValue,
       phoenixBlockNumber = Long.MaxValue,
-      petersburgBlockNumber = Long.MaxValue
+      chainId = 0x3d.toByte
     )
 
     val homesteadConfig = EvmConfig.forBlock(0, evmBlockchainConfig.copy(homesteadBlockNumber = 0))