[ETCM-141] merge from develop

Author: lemastero

src/main/scala/io/iohk/ethereum/domain/Blockchain.scala

@@ -486,7 +486,7 @@ class BlockchainImpl(
       accountStartNonce,
       (number: BigInt) => getBlockHeaderByNumber(number).map(_.hash),
       stateRootHash,
-      noEmptyAccounts = false,
+      noEmptyAccounts = noEmptyAccounts,
       ethCompatibleStorage = ethCompatibleStorage
     )
 

src/main/scala/io/iohk/ethereum/ledger/BlockPreparator.scala

@@ -37,7 +37,6 @@ class BlockPreparator(
     blockchainConfig.constantinopleBlockNumber
   )
 
-  // scalastyle:off method.length
   /**
     * This function updates the state in order to pay rewards based on YP section 11.3 and with the required
     * modifications due to ECIP1097:
@@ -55,7 +54,7 @@ class BlockPreparator(
     *
     * @param block the block being processed
     * @param worldStateProxy the initial state
-    * @return the state after paying the apropiate reward to who corresponds
+    * @return the state after paying the appropriate reward to who corresponds
     */
   private[ledger] def payBlockReward(
       block: Block,
@@ -76,20 +75,17 @@ class BlockPreparator(
         val minerReward = minerRewardForOmmers + minerRewardForBlock
         val worldAfterMinerReward = increaseAccountBalance(minerAddress, UInt256(minerReward))(worldStateProxy)
         log.debug(s"Paying block $blockNumber reward of $minerReward to miner with address $minerAddress")
-
         worldAfterMinerReward
       } else if (block.header.treasuryOptOut.get) {
         val minerReward = minerRewardForOmmers + minerRewardForBlock * MinerRewardPercentageAfterECIP1098 / 100
         val worldAfterMinerReward = increaseAccountBalance(minerAddress, UInt256(minerReward))(worldStateProxy)
         log.debug(
           s"Paying block $blockNumber reward of $minerReward to miner with address $minerAddress, miner opted-out of treasury"
         )
-
         worldAfterMinerReward
       } else {
         val minerReward = minerRewardForOmmers + minerRewardForBlock * MinerRewardPercentageAfterECIP1098 / 100
         val worldAfterMinerReward = increaseAccountBalance(minerAddress, UInt256(minerReward))(worldStateProxy)
-
         val treasuryReward = minerRewardForBlock * TreasuryRewardPercentageAfterECIP1098 / 100
         val worldAfterTreasuryReward =
           increaseAccountBalance(treasuryAddress, UInt256(treasuryReward))(worldAfterMinerReward)
@@ -98,7 +94,6 @@ class BlockPreparator(
           s"Paying block $blockNumber reward of $minerReward to miner with address $minerAddress" +
             s"paying treasury reward of $treasuryReward to treasury with address $treasuryAddress"
         )
-
         worldAfterTreasuryReward
       }
 
@@ -387,7 +382,7 @@ class BlockPreparator(
       None,
       blockchainConfig.accountStartNonce,
       parentStateRoot,
-      noEmptyAccounts = false,
+      noEmptyAccounts = EvmConfig.forBlock(block.header.number, blockchainConfig).noEmptyAccounts,
       ethCompatibleStorage = blockchainConfig.ethCompatibleStorage
     )
     val prepared = executePreparedTransactions(block.body.transactionList, initialWorld, block.header)

src/main/scala/io/iohk/ethereum/ledger/StxLedger.scala

@@ -19,7 +19,7 @@ class StxLedger(blockchain: BlockchainImpl, blockchainConfig: BlockchainConfig,
         blockNumber = None,
         accountStartNonce = blockchainConfig.accountStartNonce,
         stateRootHash = Some(blockHeader.stateRoot),
-        noEmptyAccounts = false,
+        noEmptyAccounts = EvmConfig.forBlock(blockHeader.number, blockchainConfig).noEmptyAccounts,
         ethCompatibleStorage = blockchainConfig.ethCompatibleStorage
       )
     )

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

@@ -16,7 +16,7 @@ import io.iohk.ethereum.vm.BlockchainConfigForEvm.EthForks.{
   * Note that `accountStartNonce` is required for a [[WorldStateProxy]] implementation that is used
   * by a given VM
   */
-// FIXME manage etc/eth forks in a more sophisticated way
+// FIXME manage etc/eth forks in a more sophisticated way [ETCM-249]
 case class BlockchainConfigForEvm(
     // ETH forks
     frontierBlockNumber: BigInt,

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

@@ -7,8 +7,6 @@ import EvmConfig._
 import io.iohk.ethereum
 import io.iohk.ethereum.vm
 
-// scalastyle:off number.of.methods
-// scalastyle:off number.of.types
 // scalastyle:off magic.number
 object EvmConfig {
 
@@ -30,26 +28,28 @@ object EvmConfig {
     * returns the evm config that should be used for given block
     */
   def forBlock(blockNumber: BigInt, blockchainConfig: BlockchainConfigForEvm): EvmConfig = {
-    val transitionBlockToConfigMapping: Map[BigInt, EvmConfigBuilder] = Map(
-      blockchainConfig.frontierBlockNumber -> FrontierConfigBuilder,
-      blockchainConfig.homesteadBlockNumber -> HomesteadConfigBuilder,
-      blockchainConfig.eip150BlockNumber -> PostEIP150ConfigBuilder,
-      blockchainConfig.eip160BlockNumber -> PostEIP160ConfigBuilder,
-      blockchainConfig.eip161BlockNumber -> PostEIP161ConfigBuilder,
-      blockchainConfig.byzantiumBlockNumber -> ByzantiumConfigBuilder,
-      blockchainConfig.constantinopleBlockNumber -> ConstantinopleConfigBuilder,
-      blockchainConfig.istanbulBlockNumber -> IstanbulConfigBuilder,
-      blockchainConfig.atlantisBlockNumber -> AtlantisConfigBuilder,
-      blockchainConfig.aghartaBlockNumber -> AghartaConfigBuilder,
-      blockchainConfig.petersburgBlockNumber -> PetersburgConfigBuilder,
-      blockchainConfig.phoenixBlockNumber -> PhoenixConfigBuilder
+    // FIXME manage etc/eth forks in a more sophisticated way [ETCM-249]
+    val transitionBlockToConfigWithPriorityMapping: List[(BigInt, Int, EvmConfigBuilder)] = List(
+      (blockchainConfig.frontierBlockNumber, 1, FrontierConfigBuilder),
+      (blockchainConfig.homesteadBlockNumber, 2, HomesteadConfigBuilder),
+      (blockchainConfig.eip150BlockNumber, 3, PostEIP150ConfigBuilder),
+      (blockchainConfig.eip160BlockNumber, 4, PostEIP160ConfigBuilder),
+      (blockchainConfig.eip161BlockNumber, 5, PostEIP161ConfigBuilder),
+      (blockchainConfig.byzantiumBlockNumber, 6, ByzantiumConfigBuilder),
+      (blockchainConfig.atlantisBlockNumber, 6, AtlantisConfigBuilder),
+      (blockchainConfig.constantinopleBlockNumber, 7, ConstantinopleConfigBuilder),
+      (blockchainConfig.aghartaBlockNumber, 7, AghartaConfigBuilder),
+      (blockchainConfig.petersburgBlockNumber, 8, PetersburgConfigBuilder),
+      (blockchainConfig.istanbulBlockNumber, 9, IstanbulConfigBuilder),
+      (blockchainConfig.phoenixBlockNumber, 9, PhoenixConfigBuilder)
     )
 
     // highest transition block that is less/equal to `blockNumber`
-    val evmConfigBuilder = transitionBlockToConfigMapping
-      .filterKeys(_ <= blockNumber)
-      .maxBy(_._1)
-      ._2
+    val evmConfigBuilder = transitionBlockToConfigWithPriorityMapping
+      .filterNot { case (number, _, _) => number > blockNumber }
+      .maxBy { case (number, priority, _) => (number, priority) }
+      ._3
+
     evmConfigBuilder(blockchainConfig)
   }
 

src/test/scala/io/iohk/ethereum/consensus/BlockGeneratorSpec.scala

@@ -258,6 +258,62 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
     fullBlock.right.foreach(b => b.header.extraData shouldBe headerExtraData)
   }
 
+  it should "generate correct block with (without empty accounts) after EIP-161" in new TestSetup {
+    override lazy val blockchainConfig = BlockchainConfig(
+      frontierBlockNumber = 0,
+      homesteadBlockNumber = 1150000,
+      difficultyBombPauseBlockNumber = 3000000,
+      difficultyBombContinueBlockNumber = 5000000,
+      difficultyBombRemovalBlockNumber = 5900000,
+      eip155BlockNumber = Long.MaxValue,
+      eip106BlockNumber = Long.MaxValue,
+      byzantiumBlockNumber = Long.MaxValue,
+      constantinopleBlockNumber = Long.MaxValue,
+      istanbulBlockNumber = Long.MaxValue,
+      chainId = 0x3d.toByte,
+      networkId = 1,
+      customGenesisFileOpt = Some("test-genesis.json"),
+      monetaryPolicyConfig =
+        MonetaryPolicyConfig(5000000, 0.2, 5000000000000000000L, 3000000000000000000L, 2000000000000000000L),
+      // unused
+      maxCodeSize = None,
+      eip160BlockNumber = Long.MaxValue,
+      eip150BlockNumber = Long.MaxValue,
+      eip161BlockNumber = 0,
+      accountStartNonce = UInt256.Zero,
+      daoForkConfig = None,
+      bootstrapNodes = Set(),
+      gasTieBreaker = false,
+      ethCompatibleStorage = true,
+      atlantisBlockNumber = Long.MaxValue,
+      aghartaBlockNumber = Long.MaxValue,
+      phoenixBlockNumber = Long.MaxValue,
+      petersburgBlockNumber = Long.MaxValue,
+      ecip1098BlockNumber = Long.MaxValue,
+      treasuryAddress = Address(0),
+      ecip1097BlockNumber = Long.MaxValue
+    )
+
+    override lazy val blockExecution =
+      new BlockExecution(blockchain, blockchainConfig, consensus.blockPreparator, blockValidation)
+
+    val transaction1 = Transaction(
+      nonce = 0,
+      gasPrice = 1,
+      gasLimit = 1000000,
+      receivingAddress = None,
+      value = 0,
+      payload = ByteString.empty
+    )
+    val generalTx = SignedTransaction.sign(transaction1, keyPair, None).tx
+
+    val generatedBlock: Either[BlockPreparationError, PendingBlock] =
+      blockGenerator.generateBlock(bestBlock, Seq(generalTx), Address(testAddress), blockGenerator.emptyX)
+
+    generatedBlock shouldBe a[Right[_, Block]]
+    generatedBlock.right.foreach(pb => blockExecution.executeBlock(pb.block, true) shouldBe a[Right[_, Seq[Receipt]]])
+  }
+
   it should "generate block after eip155 and allow both chain specific and general transactions" in new TestSetup {
     val generalTx = SignedTransaction.sign(transaction.copy(nonce = transaction.nonce + 1), keyPair, None).tx