Merge pull request #644 from input-output-hk/etcm-28-petersbug-changes

[ETCM-28] petersburg changes

Author: Michał Mrożek

src/ets/scala/io/iohk/ethereum/ets/blockchain/BlockchainTestConfig.scala

@@ -39,6 +39,7 @@ trait BlockchainTestConfig extends BlockchainConfig {
   override val atlantisBlockNumber: BigInt = Long.MaxValue
   override val aghartaBlockNumber: BigInt = Long.MaxValue
   override val phoenixBlockNumber: BigInt = Long.MaxValue
+  override val petersburgBlockNumber: BigInt = Long.MaxValue
 }
 
 object FrontierConfig extends BlockchainTestConfig {

src/it/scala/io/iohk/ethereum/txExecTest/ECIP1017Test.scala

@@ -45,6 +45,7 @@ class ECIP1017Test extends FlatSpec with Matchers {
       override val atlantisBlockNumber: BigInt = Long.MaxValue
       override val aghartaBlockNumber: BigInt = Long.MaxValue
       override val phoenixBlockNumber: BigInt = Long.MaxValue
+      override val petersburgBlockNumber: BigInt = Long.MaxValue
     }
     val ec = ExecutionContext.fromExecutor(Executors.newFixedThreadPool(4))
 

src/it/scala/io/iohk/ethereum/txExecTest/ForksTest.scala

@@ -42,6 +42,7 @@ class ForksTest extends FlatSpec with Matchers {
       override val atlantisBlockNumber: BigInt = Long.MaxValue
       override val aghartaBlockNumber: BigInt = Long.MaxValue
       override val phoenixBlockNumber: BigInt = Long.MaxValue
+      override val petersburgBlockNumber: BigInt = Long.MaxValue
     }
 
     val noErrors = a[Right[_, Seq[Receipt]]]

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

@@ -12,7 +12,7 @@
 
   # Constantinople fork block number (ETH only)
   # https://github.com/ethereum/pm/issues/53
-  constantinople-block-number = "7080000"
+  constantinople-block-number = "7280000"
 
   # EIP-170 max code size (Enabled from eip161-block-number)
   max-code-size = "24576"
@@ -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,6 +188,7 @@ 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
       chainId = 0x3d.toByte   //TODO include chainId 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,6 +20,7 @@ case class BlockchainConfigForEvm(
   accountStartNonce: UInt256,
   atlantisBlockNumber: BigInt,
   aghartaBlockNumber: BigInt,
+  petersburgBlockNumber: BigInt,
   phoenixBlockNumber: BigInt,
   chainId: Byte
 )
@@ -39,6 +40,7 @@ object BlockchainConfigForEvm {
       accountStartNonce = accountStartNonce,
       atlantisBlockNumber = atlantisBlockNumber,
       aghartaBlockNumber = aghartaBlockNumber,
+      petersburgBlockNumber = petersburgBlockNumber,
       phoenixBlockNumber = phoenixBlockNumber,
       chainId = chainId
     )

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

@@ -38,6 +38,7 @@ object EvmConfig {
       blockchainConfig.constantinopleBlockNumber -> ConstantinopleConfigBuilder,
       blockchainConfig.atlantisBlockNumber -> AtlantisConfigBuilder,
       blockchainConfig.aghartaBlockNumber -> AghartaConfigBuilder,
+      blockchainConfig.petersburgBlockNumber -> PetersburgConfigBuilder,
       blockchainConfig.phoenixBlockNumber -> PhoenixConfigBuilder
     )
 
@@ -96,6 +97,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

@@ -594,7 +594,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
@@ -636,7 +636,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
@@ -662,8 +662,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/consensus/BlockGeneratorSpec.scala

@@ -169,6 +169,7 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with PropertyChecks with
       override val atlantisBlockNumber: BigInt = Long.MaxValue
       override val aghartaBlockNumber: BigInt = Long.MaxValue
       override val phoenixBlockNumber: BigInt = Long.MaxValue
+      override val petersburgBlockNumber: BigInt = Long.MaxValue
     }
 
     override lazy val blockExecution = new BlockExecution(blockchain, blockchainConfig, consensus.blockPreparator, blockValidation)
@@ -339,6 +340,8 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with PropertyChecks with
       override val atlantisBlockNumber: BigInt = Long.MaxValue
       override val aghartaBlockNumber: BigInt = Long.MaxValue
       override val phoenixBlockNumber: BigInt = Long.MaxValue
+      override val petersburgBlockNumber: BigInt = Long.MaxValue
+
     }
 
     val genesisDataLoader = new GenesisDataLoader(blockchain, blockchainConfig)

src/test/scala/io/iohk/ethereum/consensus/validators/BlockHeaderValidatorSpec.scala

@@ -387,6 +387,7 @@ class BlockHeaderValidatorSpec
       override val atlantisBlockNumber: BigInt = Long.MaxValue
       override val aghartaBlockNumber: BigInt = Long.MaxValue
       override val phoenixBlockNumber: BigInt = Long.MaxValue
+      override val petersburgBlockNumber: BigInt = Long.MaxValue
     }
 
   val ProDaoBlock1920008Header = BlockHeader(

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

@@ -177,6 +177,7 @@ class VMClientSpec extends FlatSpec with Matchers with MockFactory {
       accountStartNonce = 0,
       atlantisBlockNumber = 0,
       aghartaBlockNumber = 0,
+      petersburgBlockNumber = 0,
       phoenixBlockNumber = 0,
       chainId = 0x3d.toByte
     )

src/test/scala/io/iohk/ethereum/jsonrpc/EthServiceSpec.scala

@@ -896,6 +896,7 @@ class EthServiceSpec extends FlatSpec with Matchers with ScalaFutures with MockF
       override val atlantisBlockNumber: BigInt = 0
       override val aghartaBlockNumber: BigInt = 0
       override val phoenixBlockNumber: BigInt = 0
+      override val petersburgBlockNumber: BigInt = 0
     }
 
     override lazy val consensus: TestConsensus = buildTestConsensus().withBlockGenerator(blockGenerator)

src/test/scala/io/iohk/ethereum/jsonrpc/PersonalServiceSpec.scala

@@ -444,6 +444,7 @@ class PersonalServiceSpec extends FlatSpec with Matchers with MockFactory with S
       override val atlantisBlockNumber: BigInt = 0
       override val aghartaBlockNumber: BigInt = 0
       override val phoenixBlockNumber: BigInt = 0
+      override val petersburgBlockNumber: BigInt = 0
     }
 
     val wallet = Wallet(address, prvKey)

src/test/scala/io/iohk/ethereum/ledger/LedgerTestSetup.scala

@@ -214,6 +214,7 @@ trait DaoForkTestSetup extends TestSetup with MockFactory {
     override val atlantisBlockNumber: BigInt = Long.MaxValue
     override val aghartaBlockNumber: BigInt = Long.MaxValue
     override val phoenixBlockNumber: BigInt = Long.MaxValue
+    override val petersburgBlockNumber: BigInt = Long.MaxValue
   }
 
   (testBlockchain.getBlockHeaderByHash _).expects(proDaoBlock.header.parentHash).returning(Some(Fixtures.Blocks.DaoParentBlock.header))

src/test/scala/io/iohk/ethereum/ledger/StxLedgerSpec.scala

@@ -127,6 +127,7 @@ trait ScenarioSetup extends EphemBlockchainTestSetup {
     override val atlantisBlockNumber: BigInt = 0
     override val aghartaBlockNumber: BigInt = 0
     override val phoenixBlockNumber: BigInt = 0
+    override val petersburgBlockNumber: BigInt = 0
   }
 
   override lazy val stxLedger = new StxLedger(blockchain, blockchainConfig, consensus.blockPreparator)

src/test/scala/io/iohk/ethereum/network/handshaker/EtcHandshakerSpec.scala

@@ -206,6 +206,7 @@ class EtcHandshakerSpec extends FlatSpec with Matchers  {
       override val atlantisBlockNumber: BigInt = 0
       override val aghartaBlockNumber: BigInt = 0
       override val phoenixBlockNumber: BigInt = 0
+      override val petersburgBlockNumber: BigInt = 0
     }
 
     val etcHandshakerConfigurationWithResolver = new MockEtcHandshakerConfiguration {

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

@@ -3,6 +3,7 @@ package io.iohk.ethereum.vm
 object Fixtures {
 
   val ConstantinopleBlockNumber = 200
+  val PetersburgBlockNumber = 400
 
   val blockchainConfig = BlockchainConfigForEvm(
     // block numbers are irrelevant
@@ -17,6 +18,7 @@ object Fixtures {
     accountStartNonce = 0,
     atlantisBlockNumber = 0,
     aghartaBlockNumber = 0,
+    petersburgBlockNumber = PetersburgBlockNumber,
     phoenixBlockNumber = 0,
     chainId = 0x3d.toByte
   )

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

@@ -6,6 +6,7 @@ import io.iohk.ethereum.vm.Generators._
 import org.scalatest.prop.PropertyChecks
 import org.scalatest.{FunSuite, Matchers}
 import Fixtures.blockchainConfig
+import org.scalacheck.Gen
 
 class OpCodeGasSpec extends FunSuite with OpCodeTesting with Matchers with PropertyChecks {
 
@@ -421,15 +422,20 @@ class OpCodeGasSpec extends FunSuite with OpCodeTesting with Matchers with Prope
 
     forAll(table) { (offset, value, expectedGas, _) =>
       val stackIn = Stack.empty().push(value).push(offset)
-      val stateIn = getProgramStateGen(blockNumberGen = getUInt256Gen(0, Fixtures.ConstantinopleBlockNumber - 1))
-        .sample.get.withStack(stackIn).withStorage(storage).copy(gas = expectedGas)
+      val stateIn = getProgramStateGen(blockNumberGen = Gen.frequency(
+        (1, getUInt256Gen(0, Fixtures.ConstantinopleBlockNumber - 1)),
+        (1, getUInt256Gen(Fixtures.PetersburgBlockNumber + 1, UInt256.MaxValue))
+      )).sample.get.withStack(stackIn).withStorage(storage).copy(gas = expectedGas)
       val stateOut = op.execute(stateIn)
       verifyGas(expectedGas, stateIn, stateOut, allowOOG = false)
     }
 
     val maxGasUsage = G_sset + G_sreset
     val stateGen = getProgramStateGen(
-      blockNumberGen = getUInt256Gen(0, Fixtures.ConstantinopleBlockNumber - 1),
+      blockNumberGen = Gen.frequency(
+        (1, getUInt256Gen(0, Fixtures.ConstantinopleBlockNumber - 1)),
+        (1, getUInt256Gen(Fixtures.PetersburgBlockNumber + 1, UInt256.MaxValue))
+      ),
       stackGen = getStackGen(elems = 2, maxUInt = Two),
       gasGen = getBigIntGen(max = maxGasUsage),
       storageGen = getStorageGen(3, getUInt256Gen(max = One))

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

@@ -157,6 +157,7 @@ class VMSpec extends WordSpec with PropertyChecks with Matchers {
       accountStartNonce = 0,
       atlantisBlockNumber = Long.MaxValue,
       aghartaBlockNumber = Long.MaxValue,
+      petersburgBlockNumber = Long.MaxValue,
       phoenixBlockNumber = Long.MaxValue,
       chainId = 0x3d.toByte
     )