[ETCM-1049] Berlin config (#1111)

* [ETCM-1049] Add Berlin block height to config

* [ETCM-1049] Handle Berlin fork in the EVM

* [ETCM-1049] Add Berlin gas specs

Author: lukasz-golebiewski

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

@@ -109,6 +109,9 @@
   # https://ecips.ethereumclassic.org/ECIPs/ecip-1103
   magneto-block-number = "13189133"
 
+  # Berlin fork block number (ETH only)
+  berlin-block-number = "1000000000000000000"
+
   # ECIP-1049 soft fork block number
   # https://ecips.ethereumclassic.org/ECIPs/ecip-1049
   # https://github.com/ethereumclassic/ECIPs/issues/394

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

@@ -106,6 +106,9 @@
   # https://ecips.ethereumclassic.org/ECIPs/ecip-1103
   magneto-block-number = "1000000000000000000"
 
+  # Berlin fork block number (ETH only)
+  berlin-block-number = "12244000"
+
   # DAO fork configuration (Ethereum HF/Classic split)
   # https://blog.ethereum.org/2016/07/20/hard-fork-completed/
   dao {

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

@@ -107,6 +107,9 @@
   # https://ecips.ethereumclassic.org/ECIPs/ecip-1103
   magneto-block-number = "3985893"
 
+  # Berlin fork block number (ETH only)
+  berlin-block-number = "1000000000000000000"
+
   # DAO fork configuration (Ethereum HF/Classic split)
   # https://blog.ethereum.org/2016/07/20/hard-fork-completed/
   dao = null

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

@@ -110,6 +110,9 @@
   # https://ecips.ethereumclassic.org/ECIPs/ecip-1103
   magneto-block-number = "1000000000000000000"
 
+  # Berlin fork block number (ETH only)
+  berlin-block-number = "9812189"
+
   # DAO fork configuration (Ethereum HF/Classic split)
   # https://blog.ethereum.org/2016/07/20/hard-fork-completed/
   dao {

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

@@ -107,6 +107,9 @@
   # https://ecips.ethereumclassic.org/ECIPs/ecip-1103
   magneto-block-number = "1000000000000000000"
 
+  # Berlin fork block number (ETH only)
+  berlin-block-number = "1000000000000000000"
+
   # DAO fork configuration (Ethereum HF/Classic split)
   # https://blog.ethereum.org/2016/07/20/hard-fork-completed/
   dao {

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

@@ -106,6 +106,9 @@
     # https://ecips.ethereumclassic.org/ECIPs/ecip-1103
     magneto-block-number = "1000000000000000000"
 
+    # Berlin fork block number (ETH only)
+    berlin-block-number = "1000000000000000000"
+
     # DAO fork configuration (Ethereum HF/Classic split)
     # https://blog.ethereum.org/2016/07/20/hard-fork-completed/
     dao = null

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

@@ -208,6 +208,7 @@ class VMServer(messageHandler: MessageHandler) extends Logger {
       petersburgBlockNumber = BigInt(10000000), //TODO include petersburg block number in protobuf
       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
     )
 }

src/main/scala/io/iohk/ethereum/utils/BlockchainConfig.scala

@@ -61,7 +61,8 @@ case class ForkBlockNumbers(
     ecip1049BlockNumber: Option[BigInt],
     ecip1099BlockNumber: BigInt,
     muirGlacierBlockNumber: BigInt,
-    magnetoBlockNumber: BigInt
+    magnetoBlockNumber: BigInt,
+    berlinBlockNumber: BigInt
 ) {
   def all: List[BigInt] = this.productIterator.toList.flatMap {
     case i: BigInt => Some(i)
@@ -98,7 +99,8 @@ object ForkBlockNumbers {
     ecip1099BlockNumber = Long.MaxValue,
     ecip1049BlockNumber = None,
     muirGlacierBlockNumber = Long.MaxValue,
-    magnetoBlockNumber = Long.MaxValue
+    magnetoBlockNumber = Long.MaxValue,
+    berlinBlockNumber = Long.MaxValue
   )
 }
 
@@ -171,6 +173,7 @@ object BlockchainConfig {
     val ecip1099BlockNumber: BigInt = BigInt(blockchainConfig.getString("ecip1099-block-number"))
     val muirGlacierBlockNumber: BigInt = BigInt(blockchainConfig.getString("muir-glacier-block-number"))
     val magnetoBlockNumber: BigInt = BigInt(blockchainConfig.getString("magneto-block-number"))
+    val berlinBlockNumber: BigInt = BigInt(blockchainConfig.getString("berlin-block-number"))
 
     val capabilities: List[Capability] =
       blockchainConfig.getStringList("capabilities").asScala.toList.map(Capability.parseUnsafe)
@@ -200,7 +203,8 @@ object BlockchainConfig {
         ecip1049BlockNumber = ecip1049BlockNumber,
         ecip1099BlockNumber = ecip1099BlockNumber,
         muirGlacierBlockNumber = muirGlacierBlockNumber,
-        magnetoBlockNumber = magnetoBlockNumber
+        magnetoBlockNumber = magnetoBlockNumber,
+        berlinBlockNumber = berlinBlockNumber
       ),
       treasuryAddress = treasuryAddress,
       maxCodeSize = maxCodeSize,

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

@@ -9,6 +9,7 @@ import io.iohk.ethereum.vm.BlockchainConfigForEvm.EtcForks.EtcFork
 import io.iohk.ethereum.vm.BlockchainConfigForEvm.EtcForks.Magneto
 import io.iohk.ethereum.vm.BlockchainConfigForEvm.EtcForks.Phoenix
 import io.iohk.ethereum.vm.BlockchainConfigForEvm.EthForks.BeforeByzantium
+import io.iohk.ethereum.vm.BlockchainConfigForEvm.EthForks.Berlin
 import io.iohk.ethereum.vm.BlockchainConfigForEvm.EthForks.Byzantium
 import io.iohk.ethereum.vm.BlockchainConfigForEvm.EthForks.Constantinople
 import io.iohk.ethereum.vm.BlockchainConfigForEvm.EthForks.Istanbul
@@ -37,6 +38,7 @@ case class BlockchainConfigForEvm(
     petersburgBlockNumber: BigInt,
     phoenixBlockNumber: BigInt,
     magnetoBlockNumber: BigInt,
+    berlinBlockNumber: BigInt,
     chainId: Byte
 ) {
   def etcForkForBlockNumber(blockNumber: BigInt): EtcFork = blockNumber match {
@@ -52,7 +54,8 @@ case class BlockchainConfigForEvm(
     case _ if blockNumber < constantinopleBlockNumber => Byzantium
     case _ if blockNumber < petersburgBlockNumber     => Constantinople
     case _ if blockNumber < istanbulBlockNumber       => Petersburg
-    case _ if blockNumber >= istanbulBlockNumber      => Istanbul
+    case _ if blockNumber < berlinBlockNumber         => Istanbul
+    case _ if blockNumber >= berlinBlockNumber        => Berlin
   }
 }
 
@@ -68,7 +71,8 @@ object BlockchainConfigForEvm {
     val BeforeByzantium, Byzantium, Constantinople, Petersburg, Istanbul, Berlin = Value
   }
 
-  def isEip2929Enabled(etcFork: EtcFork): Boolean = etcFork >= EtcForks.Magneto
+  def isEip2929Enabled(etcFork: EtcFork, ethFork: BlockchainConfigForEvm.EthForks.Value): Boolean =
+    etcFork >= EtcForks.Magneto || ethFork >= EthForks.Berlin
 
   def apply(blockchainConfig: BlockchainConfig): BlockchainConfigForEvm = {
     import blockchainConfig._
@@ -88,6 +92,7 @@ object BlockchainConfigForEvm {
       petersburgBlockNumber = forkBlockNumbers.petersburgBlockNumber,
       phoenixBlockNumber = forkBlockNumbers.phoenixBlockNumber,
       magnetoBlockNumber = forkBlockNumbers.magnetoBlockNumber,
+      berlinBlockNumber = forkBlockNumbers.berlinBlockNumber,
       chainId = chainId
     )
   }

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

@@ -43,7 +43,8 @@ object EvmConfig {
       (blockchainConfig.petersburgBlockNumber, 8, PetersburgConfigBuilder),
       (blockchainConfig.istanbulBlockNumber, 9, IstanbulConfigBuilder),
       (blockchainConfig.phoenixBlockNumber, 9, PhoenixConfigBuilder),
-      (blockchainConfig.magnetoBlockNumber, 10, MagnetoConfigBuilder)
+      (blockchainConfig.magnetoBlockNumber, 10, MagnetoConfigBuilder),
+      (blockchainConfig.berlinBlockNumber, 10, BerlinConfigBuilder)
     )
 
     // highest transition block that is less/equal to `blockNumber`
@@ -140,6 +141,8 @@ object EvmConfig {
       opCodeList = MagnetoOpCodes
     )
 
+  val BerlinConfigBuilder: EvmConfigBuilder = MagnetoConfigBuilder
+
   case class OpCodeList(opCodes: List[OpCode]) {
     val byteToOpCode: Map[Byte, OpCode] =
       opCodes.map(op => op.code -> op).toMap

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

@@ -189,9 +189,9 @@ object OpCode {
       postWarmGasFn: FeeSchedule => BigInt
   ): BigInt = {
     val currentBlockNumber = state.env.blockHeader.number
-    // FIXME: handle ETH Berlin here as well
     val etcFork = state.config.blockchainConfig.etcForkForBlockNumber(currentBlockNumber)
-    val eip2929Enabled = isEip2929Enabled(etcFork)
+    val ethFork = state.config.blockchainConfig.ethForkForBlockNumber(currentBlockNumber)
+    val eip2929Enabled = isEip2929Enabled(etcFork, ethFork)
     if (eip2929Enabled) {
       if (isWarm)
         postWarmGasFn(state.config.feeSchedule)

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

@@ -196,6 +196,7 @@ class VMClientSpec extends AnyFlatSpec with Matchers with MockFactory {
       petersburgBlockNumber = 0,
       phoenixBlockNumber = 0,
       magnetoBlockNumber = 0,
+      berlinBlockNumber = 0,
       chainId = 0x3d.toByte
     )
     val evmConfig: EvmConfig = EvmConfig.FrontierConfigBuilder(blockchainConfigForEvm)

src/test/scala/io/iohk/ethereum/forkid/ForkIdSpec.scala

@@ -26,7 +26,7 @@ class ForkIdSpec extends AnyWordSpec with Matchers {
 
     "gatherForks for the eth chain correctly" in {
       val res = config.blockchains.map { case (name, conf) => (name, gatherForks(conf)) }
-      res("eth") shouldBe List(1150000, 1920000, 2463000, 2675000, 4370000, 7280000, 9069000, 9200000)
+      res("eth") shouldBe List(1150000, 1920000, 2463000, 2675000, 4370000, 7280000, 9069000, 9200000, 12244000)
     }
 
     "create correct ForkId for ETH mainnet blocks" in {
@@ -53,9 +53,11 @@ class ForkIdSpec extends AnyWordSpec with Matchers {
       create(9068999) shouldBe ForkId(0x668db0afL, Some(9069000)) // Last Petersburg block
       create(9069000) shouldBe ForkId(0x879d6e30L, Some(9200000)) // First Istanbul block
       create(9200000 - 1) shouldBe ForkId(0x879d6e30L, Some(9200000)) // Last Istanbul block
-      create(9200000) shouldBe ForkId(0xe029e991L, None) // First Muir Glacier block
-      create(12644529) shouldBe ForkId(0xe029e991L, None) // Today Muir Glacier block
-      // TODO: Add Berlin
+      create(9200000) shouldBe ForkId(0xe029e991L, Some(12244000)) // First Muir Glacier block
+      create(12243999) shouldBe ForkId(0xe029e991L, Some(12244000)) // Last Muir Glacier block
+      create(12244000) shouldBe ForkId(0x0eb440f6L, None) // First Berlin block
+      create(12644529) shouldBe ForkId(0x0eb440f6L, None) // Today Berlin block
+      // TODO: Add London
     }
 
     "create correct ForkId for ETC mainnet blocks" in {

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

@@ -7,40 +7,33 @@ import org.scalatest.wordspec.AnyWordSpec
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 
 import io.iohk.ethereum.Fixtures.{Blocks => BlockFixtures}
-import io.iohk.ethereum.crypto._
 import io.iohk.ethereum.domain.Account
 import io.iohk.ethereum.domain.Address
 import io.iohk.ethereum.domain.BlockHeader
 import io.iohk.ethereum.domain.UInt256
-import io.iohk.ethereum.utils.ByteUtils
 import io.iohk.ethereum.vm.MockWorldState._
 
 import Fixtures.blockchainConfig
 
-class MagnetoCallOpFixture(config: EvmConfig)
-    extends CallOpFixture(config, MockWorldState(touchedAccounts = Set.empty)) {
-
-  override val fakeHeader: BlockHeader =
-    BlockFixtures.ValidBlock.header.copy(number = Fixtures.MagnetoBlockNumber, unixTimestamp = 0)
-
-  override val requiredGas: BigInt = {
-    val storageCost = 3 * (config.feeSchedule.G_sset + config.feeSchedule.G_cold_sload)
-    val memCost = config.calcMemCost(0, 0, 32)
-    val copyCost = config.feeSchedule.G_copy * wordsForBytes(32)
+class CallOpcodesPostBerlin(val config: EvmConfig = EvmConfig.BerlinConfigBuilder(blockchainConfig))
+    extends CallOpcodesPostEip2929Spec(config) {
+  override val fxt = new Eip2929CallOpFixture(config, Fixtures.BerlinBlockNumber)
+}
 
-    extCode.linearConstGas(config) + storageCost + memCost + copyCost
-  }
+class CallOpcodesPostMagneto(val config: EvmConfig = EvmConfig.MagnetoConfigBuilder(blockchainConfig))
+    extends CallOpcodesPostEip2929Spec(config) {
+  override val fxt = new Eip2929CallOpFixture(config, Fixtures.MagnetoBlockNumber)
 }
 
-class CallOpcodesPostEip2929Spec
+abstract class CallOpcodesPostEip2929Spec(config: EvmConfig)
     extends AnyWordSpec
     with CallOpCodesBehaviors
     with Matchers
     with ScalaCheckPropertyChecks {
 
-  val config: EvmConfig = EvmConfig.MagnetoConfigBuilder(blockchainConfig)
   import config.feeSchedule._
-  val fxt = new MagnetoCallOpFixture(config)
+
+  protected[this] val fxt: CallOpFixture
 
   "CALL" when {
 
@@ -555,3 +548,18 @@ class CallOpcodesPostEip2929Spec
     }
   }
 }
+
+class Eip2929CallOpFixture(config: EvmConfig, forkBlockHeight: Int)
+    extends CallOpFixture(config, MockWorldState(touchedAccounts = Set.empty)) {
+
+  override val fakeHeader: BlockHeader =
+    BlockFixtures.ValidBlock.header.copy(number = forkBlockHeight, unixTimestamp = 0)
+
+  override val requiredGas: BigInt = {
+    val storageCost = 3 * (config.feeSchedule.G_sset + config.feeSchedule.G_cold_sload)
+    val memCost = config.calcMemCost(0, 0, 32)
+    val copyCost = config.feeSchedule.G_copy * wordsForBytes(32)
+
+    extCode.linearConstGas(config) + storageCost + memCost + copyCost
+  }
+}

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

@@ -7,6 +7,7 @@ object Fixtures {
   val PhoenixBlockNumber = 600
   val IstanbulBlockNumber = 600
   val MagnetoBlockNumber = 700
+  val BerlinBlockNumber = 700
 
   val blockchainConfig: BlockchainConfigForEvm = BlockchainConfigForEvm(
     // block numbers are irrelevant
@@ -25,6 +26,7 @@ object Fixtures {
     petersburgBlockNumber = PetersburgBlockNumber,
     phoenixBlockNumber = PhoenixBlockNumber,
     magnetoBlockNumber = MagnetoBlockNumber,
+    berlinBlockNumber = BerlinBlockNumber,
     chainId = 0x3d.toByte
   )