Merge branch '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/main/scala/io/iohk/ethereum/vm/VM.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/vm/VM.scala

@@ -133,12 +133,11 @@ class VM[W <: WorldStateProxy[W, S], S <: Storage[S]] extends Logger {
 
 
   private def exceedsMaxContractSize(context: PC, config: EvmConfig, contractCode: ByteString): Boolean = {
-    val maxCodeSizeExceeded = config.maxCodeSize.exists(codeSizeLimit => contractCode.size > codeSizeLimit)
+    lazy val maxCodeSizeExceeded = config.maxCodeSize.exists(codeSizeLimit => contractCode.size > codeSizeLimit)
     val currentBlock = context.blockHeader.number
     // Max code size was enabled on eip161 block number on eth network, and on atlantis block number on etc
-    maxCodeSizeExceeded &&
-      (currentBlock >= config.blockchainConfig.eip161BlockNumber ||
-        currentBlock >= config.blockchainConfig.atlantisBlockNumber)
+    (currentBlock >= config.blockchainConfig.eip161BlockNumber || currentBlock >= config.blockchainConfig.atlantisBlockNumber) &&
+      maxCodeSizeExceeded
   }
 
   private def saveNewContract(context: PC, address: Address, result: PR, config: EvmConfig): PR = {

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

@@ -152,7 +152,7 @@ class VMClientSpec extends FlatSpec with Matchers with MockFactory {
       eip150BlockNumber = blockchainConfig.eip150BlockNumber,
       eip160BlockNumber = blockchainConfig.eip160BlockNumber,
       eip161BlockNumber = blockchainConfig.eip161BlockNumber,
-      maxCodeSize = ByteString(),
+      maxCodeSize = blockchainConfig.maxCodeSize.get,
       accountStartNonce = blockchainConfig.accountStartNonce)
     val expectedHelloConfigMsg = msg.Hello.Config.EthereumConfig(expectedEthereumConfig)
     val expectedHelloMsg = msg.Hello(version = "testVersion", config = expectedHelloConfigMsg)

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

@@ -59,14 +59,21 @@ class VMSpec extends WordSpec with PropertyChecks with Matchers {
         result2.world.getStorage(expectedNewAddress).load(storageOffset) shouldEqual secondStoredValue
       }
 
-      "go OOG if new contract's code size exceeds limit" in new ContractCreation {
+      "go OOG if new contract's code size exceeds limit and block is after atlantis or eip161" in new ContractCreation {
         val codeSize = evmBlockchainConfig.maxCodeSize.get.toInt + 1
         val contractCode = ByteString(Array.fill(codeSize)(-1.toByte))
 
-        val context = getContext(inputData = initCode(contractCode))
+        val context = getContext(inputData = initCode(contractCode),
+          evmConfig = homesteadConfig.copy(blockchainConfig = homesteadConfig.blockchainConfig.copy(eip161BlockNumber = 1)))
         val result = vm.run(context)
 
         result.error shouldBe Some(OutOfGas)
+
+        val context1 = getContext(inputData = initCode(contractCode),
+          evmConfig = homesteadConfig.copy(blockchainConfig = homesteadConfig.blockchainConfig.copy(atlantisBlockNumber = 1)))
+        val result1 = vm.run(context1)
+
+        result1.error shouldBe Some(OutOfGas)
       }
 
       "fail to create contract in case of address conflict (non-empty code)" in new ContractCreation {