[ETCM-28] Petersburg fork

Author: mmrozek

src/main/resources/chains/base.conf

@@ -70,6 +70,10 @@
   # https://github.com/ethereum/pm/issues/53
   constantinople-block-number = "1000000000000000000"
 
+  # Petersburg fork block number (ETH only)
+  # https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1716.md
+  petersburg-block-number = "1000000000000000000"
+
   # DAO fork configuration (Ethereum HF/Classic split)
   # https://blog.ethereum.org/2016/07/20/hard-fork-completed/
   dao {

src/main/resources/chains/eth.conf

@@ -37,6 +37,10 @@
   # https://ecips.ethereumclassic.org/ECIPs/ecip-1088
   phoenix-block-number = "1000000000000000000"
 
+  # Petersburg fork block number (ETH only)
+  # https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1716.md
+  petersburg-block-number = "7280000"
+
   monetary-policy {
 
     # Setting era-duration for eth and ropsten chain to big number is necessery to ensure

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

@@ -188,7 +188,8 @@ 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
-      phoenixBlockNumber = BigInt(10500839)   //TODO include phoenix block number in protobuf
+      phoenixBlockNumber = BigInt(10500839),   //TODO include phoenix block number in protobuf
+      petersburgBlockNumber = BigInt(10000000)   //TODO include petersburg block number in protobuf
     )
   }
 }

src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala

@@ -61,6 +61,7 @@ class TestService(
 
   private var etherbase: Address = consensusConfig.coinbase
 
+  // scalastyle:off method.length
   def setChainParams(request: SetChainParamsRequest): ServiceResponse[SetChainParamsResponse] = {
     val newBlockchainConfig = new BlockchainConfig {
       override val frontierBlockNumber: BigInt = testLedgerWrapper.blockchainConfig.frontierBlockNumber
@@ -88,7 +89,9 @@ class TestService(
       override val atlantisBlockNumber: BigInt = testLedgerWrapper.blockchainConfig.atlantisBlockNumber
       override val aghartaBlockNumber: BigInt = testLedgerWrapper.blockchainConfig.aghartaBlockNumber
       override val phoenixBlockNumber: BigInt = testLedgerWrapper.blockchainConfig.phoenixBlockNumber
+      override val petersburgBlockNumber: BigInt = testLedgerWrapper.blockchainConfig.petersburgBlockNumber
     }
+    // scalastyle:on method.length
 
     val genesisData = GenesisData(
       nonce = ByteString(Hex.decode("00")),

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

@@ -373,6 +373,7 @@ trait BlockchainConfig {
   val atlantisBlockNumber: BigInt
   val aghartaBlockNumber: BigInt
   val phoenixBlockNumber: BigInt
+  val petersburgBlockNumber: BigInt
 }
 
 object BlockchainConfig {
@@ -419,6 +420,8 @@ object BlockchainConfig {
       override val aghartaBlockNumber: BigInt = BigInt(blockchainConfig.getString("agharta-block-number"))
 
       override val phoenixBlockNumber: BigInt = BigInt(blockchainConfig.getString("phoenix-block-number"))
+
+      override val petersburgBlockNumber: BigInt = BigInt(blockchainConfig.getString("petersburg-block-number"))
     }
   }
 }

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

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

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

@@ -36,7 +36,8 @@ object EvmConfig {
       blockchainConfig.byzantiumBlockNumber -> ByzantiumConfigBuilder,
       blockchainConfig.constantinopleBlockNumber -> ConstantinopleConfigBuilder,
       blockchainConfig.atlantisBlockNumber -> AtlantisConfigBuilder,
-      blockchainConfig.aghartaBlockNumber -> AghartaConfigBuilder
+      blockchainConfig.aghartaBlockNumber -> AghartaConfigBuilder,
+      blockchainConfig.petersburgBlockNumber -> PetersburgConfigBuilder
     )
 
     // highest transition block that is less/equal to `blockNumber`
@@ -93,6 +94,8 @@ object EvmConfig {
     opCodeList = ConstantinopleOpCodes
   )
 
+  val PetersburgConfigBuilder: EvmConfigBuilder = config => ConstantinopleConfigBuilder(config)
+
   // Ethereum classic forks only
   val AtlantisConfigBuilder: EvmConfigBuilder = config => PostEIP160ConfigBuilder(config).copy(
     feeSchedule = new FeeSchedule.AtlantisFeeSchedule,

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

@@ -591,7 +591,7 @@ case object SSTORE extends OpCode(0x55, 2, 0, _.G_zero) {
   protected def exec[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S]): ProgramState[W, S] = {
     val (Seq(offset, newValue), stack1) = state.stack.pop(2)
     val currentValue = state.storage.load(offset)
-    val refund: BigInt = if (isAfterConstantinopleFork(state)) {
+    val refund: BigInt = if (isEip1283Enabled(state)) {
       val originalValue = state.originalWorld.getStorage(state.ownAddress).load(offset)
       if (currentValue != newValue.toBigInt) {
         if (originalValue == currentValue) { // fresh slot
@@ -633,7 +633,7 @@ case object SSTORE extends OpCode(0x55, 2, 0, _.G_zero) {
   protected def varGas[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S]): BigInt = {
     val (Seq(offset, newValue), _) = state.stack.pop(2)
     val currentValue = state.storage.load(offset)
-    if (isAfterConstantinopleFork(state)) {
+    if (isEip1283Enabled(state)) {
       // https://eips.ethereum.org/EIPS/eip-1283
       if (currentValue == newValue.toBigInt) { // no-op
         state.config.feeSchedule.G_sload
@@ -659,8 +659,10 @@ case object SSTORE extends OpCode(0x55, 2, 0, _.G_zero) {
 
   override protected def availableInContext[W <: WorldStateProxy[W, S], S <: Storage[S]]: ProgramState[W, S] => Boolean = !_.staticCtx
 
-  private def isAfterConstantinopleFork[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S]): Boolean =
-    state.env.blockHeader.number >= state.config.blockchainConfig.constantinopleBlockNumber
+  private def isEip1283Enabled[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S]): Boolean = {
+    val blockNumber = state.env.blockHeader.number
+    blockNumber >= state.config.blockchainConfig.constantinopleBlockNumber && blockNumber < state.config.blockchainConfig.petersburgBlockNumber
+  }
 }
 
 case object JUMP extends OpCode(0x56, 1, 0, _.G_mid) with ConstGas {

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

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