[ETCM-44] Treasury block reward distribution

Nicolas Tallar · Nicolas Tallar · commit 38cbba76be5d · 2020-09-24T14:20:29.000-03:00
diff --git a/src/ets/scala/io/iohk/ethereum/ets/blockchain/BlockchainTestConfig.scala b/src/ets/scala/io/iohk/ethereum/ets/blockchain/BlockchainTestConfig.scala
@@ -43,7 +43,8 @@ object BlockchainTestConfig {
     atlantisBlockNumber = Long.MaxValue,
     aghartaBlockNumber = Long.MaxValue,
     phoenixBlockNumber = Long.MaxValue,
-    ecip1098BlockNumber = Long.MaxValue
+    ecip1098BlockNumber = Long.MaxValue,
+    treasuryAddress = Address(0)
   )
 
   val FrontierConfig = BaseBlockchainConfig.copy(
diff --git a/src/it/scala/io/iohk/ethereum/txExecTest/ECIP1017Test.scala b/src/it/scala/io/iohk/ethereum/txExecTest/ECIP1017Test.scala
@@ -2,11 +2,11 @@ package io.iohk.ethereum.txExecTest
 
 import java.util.concurrent.Executors
 
-import io.iohk.ethereum.domain.{ BlockchainImpl, Receipt, UInt256 }
+import io.iohk.ethereum.domain.{Address, BlockchainImpl, Receipt, UInt256}
 import io.iohk.ethereum.ledger._
 import io.iohk.ethereum.txExecTest.util.FixtureProvider
-import io.iohk.ethereum.utils.{ BlockchainConfig, MonetaryPolicyConfig }
-import org.scalatest.{ FlatSpec, Matchers }
+import io.iohk.ethereum.utils.{BlockchainConfig, MonetaryPolicyConfig}
+import org.scalatest.{FlatSpec, Matchers}
 
 import scala.concurrent.ExecutionContext
 
@@ -47,7 +47,8 @@ class ECIP1017Test extends FlatSpec with Matchers {
       aghartaBlockNumber = Long.MaxValue,
       phoenixBlockNumber = Long.MaxValue,
       petersburgBlockNumber = Long.MaxValue,
-      ecip1098BlockNumber = Long.MaxValue
+      ecip1098BlockNumber = Long.MaxValue,
+      treasuryAddress = Address(0)
     )
     val ec = ExecutionContext.fromExecutor(Executors.newFixedThreadPool(4))
 
diff --git a/src/it/scala/io/iohk/ethereum/txExecTest/ForksTest.scala b/src/it/scala/io/iohk/ethereum/txExecTest/ForksTest.scala
@@ -2,11 +2,11 @@ package io.iohk.ethereum.txExecTest
 
 import java.util.concurrent.Executors
 
-import io.iohk.ethereum.domain.{ BlockchainImpl, Receipt, UInt256 }
-import io.iohk.ethereum.ledger.{ BlockExecution, BlockQueue, BlockValidation }
+import io.iohk.ethereum.domain.{Address, BlockchainImpl, Receipt, UInt256}
+import io.iohk.ethereum.ledger.{BlockExecution, BlockQueue, BlockValidation}
 import io.iohk.ethereum.txExecTest.util.FixtureProvider
-import io.iohk.ethereum.utils.{ BlockchainConfig, MonetaryPolicyConfig }
-import org.scalatest.{ FlatSpec, Matchers }
+import io.iohk.ethereum.utils.{BlockchainConfig, MonetaryPolicyConfig}
+import org.scalatest.{FlatSpec, Matchers}
 
 import scala.concurrent.ExecutionContext
 
@@ -44,7 +44,8 @@ class ForksTest extends FlatSpec with Matchers {
       aghartaBlockNumber = Long.MaxValue,
       phoenixBlockNumber = Long.MaxValue,
       petersburgBlockNumber = Long.MaxValue,
-      ecip1098BlockNumber = Long.MaxValue
+      ecip1098BlockNumber = Long.MaxValue,
+      treasuryAddress = Address(0)
     )
 
     val noErrors = a[Right[_, Seq[Receipt]]]
diff --git a/src/main/resources/chains/etc-chain.conf b/src/main/resources/chains/etc-chain.conf
@@ -80,6 +80,7 @@
 
   # Proto-treasury fork block number (ETC only, but deactivated for now)
   # https://ecips.ethereumclassic.org/ECIPs/ecip-1098
+  treasury-address = "0011223344556677889900112233445566778899"
   ecip1098-block-number = "1000000000000000000"
 
   # DAO fork configuration (Ethereum HF/Classic split)
diff --git a/src/main/resources/chains/eth-chain.conf b/src/main/resources/chains/eth-chain.conf
@@ -80,6 +80,7 @@
 
   # Proto-treasury fork block number (ETC only, but deactivated for now)
   # https://ecips.ethereumclassic.org/ECIPs/ecip-1098
+  treasury-address = "0011223344556677889900112233445566778899"
   ecip1098-block-number = "1000000000000000000"
 
   # DAO fork configuration (Ethereum HF/Classic split)
diff --git a/src/main/resources/chains/mordor-chain.conf b/src/main/resources/chains/mordor-chain.conf
@@ -80,6 +80,7 @@
 
   # Proto-treasury fork block number (ETC only, but deactivated for now)
   # https://ecips.ethereumclassic.org/ECIPs/ecip-1098
+  treasury-address = "0011223344556677889900112233445566778899"
   ecip1098-block-number = "1000000000000000000"
 
   # DAO fork configuration (Ethereum HF/Classic split)
diff --git a/src/main/resources/chains/ropsten-chain.conf b/src/main/resources/chains/ropsten-chain.conf
@@ -83,6 +83,7 @@
 
   # Proto-treasury fork block number (ETC only, but deactivated for now)
   # https://ecips.ethereumclassic.org/ECIPs/ecip-1098
+  treasury-address = "0011223344556677889900112233445566778899"
   ecip1098-block-number = "1000000000000000000"
 
   # DAO fork configuration (Ethereum HF/Classic split)
diff --git a/src/main/resources/chains/test-chain.conf b/src/main/resources/chains/test-chain.conf
@@ -80,6 +80,7 @@
 
   # Proto-treasury fork block number (ETC only, but deactivated for now)
   # https://ecips.ethereumclassic.org/ECIPs/ecip-1098
+  treasury-address = "0011223344556677889900112233445566778899"
   ecip1098-block-number = "1000000000000000000"
 
   # DAO fork configuration (Ethereum HF/Classic split)
diff --git a/src/main/resources/chains/testnet-internal-chain.conf b/src/main/resources/chains/testnet-internal-chain.conf
@@ -80,6 +80,7 @@
 
     # Proto-treasury fork block number (ETC only, but deactivated for now)
     # https://ecips.ethereumclassic.org/ECIPs/ecip-1098
+    treasury-address = "0011223344556677889900112233445566778899"
     ecip1098-block-number = "1000000000000000000"
 
     # DAO fork configuration (Ethereum HF/Classic split)
diff --git a/src/main/scala/io/iohk/ethereum/ledger/BlockPreparator.scala b/src/main/scala/io/iohk/ethereum/ledger/BlockPreparator.scala
@@ -6,6 +6,7 @@ import io.iohk.ethereum.domain.UInt256._
 import io.iohk.ethereum.domain._
 import io.iohk.ethereum.ledger.BlockExecutionError.{StateBeforeFailure, TxsExecutionError}
 import io.iohk.ethereum.ledger.Ledger._
+import io.iohk.ethereum.ledger.BlockPreparator._
 import io.iohk.ethereum.utils.{BlockchainConfig, Logger}
 import io.iohk.ethereum.vm.{PC => _, _}
 
@@ -45,26 +46,47 @@ class BlockPreparator(
    * @return
    */
   private[ledger] def payBlockReward(block: Block, worldStateProxy: InMemoryWorldStateProxy): InMemoryWorldStateProxy = {
-    def getAccountToPay(address: Address, ws: InMemoryWorldStateProxy): Account =
-      ws.getAccount(address).getOrElse(Account.empty(blockchainConfig.accountStartNonce))
-
     val blockNumber = block.header.number
 
+    val rewardForBlock = blockRewardCalculator.calculateMiningRewardForBlock(blockNumber)
+    val minerRewardForOmmers = blockRewardCalculator.calculateMiningRewardForOmmers(blockNumber, block.body.uncleNodesList.size)
+
     val minerAddress = Address(block.header.beneficiary)
-    val minerAccount = getAccountToPay(minerAddress, worldStateProxy)
-    val minerReward = blockRewardCalculator.calcBlockMinerReward(blockNumber, block.body.uncleNodesList.size)
+    val treasuryAddress = blockchainConfig.treasuryAddress
+    val existsTreasuryContract = worldStateProxy.getAccount(treasuryAddress).isDefined
 
-    val afterMinerReward = worldStateProxy.saveAccount(minerAddress, minerAccount.increaseBalance(UInt256(minerReward)))
-    log.debug(s"Paying block $blockNumber reward of $minerReward to miner with account address $minerAddress")
+    val worldAfterPayingBlockReward =
+      if (block.header.treasuryOptOut.isEmpty || !existsTreasuryContract) {
+        val minerReward = minerRewardForOmmers + rewardForBlock
+        val worldAfterMinerReward = pay(minerAddress, UInt256(minerReward), withTouch = false)(worldStateProxy)
+        log.debug(s"Paying block $blockNumber reward of $minerReward to miner with address $minerAddress")
 
-    block.body.uncleNodesList.foldLeft(afterMinerReward) { (ws, ommer) =>
-      val ommerAddress = Address(ommer.beneficiary)
-      val account = getAccountToPay(ommerAddress, ws)
+        worldAfterMinerReward
+      } else if (block.header.treasuryOptOut.get) {
+        val minerReward = minerRewardForOmmers + rewardForBlock * 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 + rewardForBlock * MinerRewardPercentageAfterECIP1098 / 100
+        val worldAfterMinerReward = increaseAccountBalance(minerAddress, UInt256(minerReward))(worldStateProxy)
 
-      val ommerReward = blockRewardCalculator.calcOmmerMinerReward(blockNumber, ommer.number)
+        val treasuryReward = rewardForBlock * TreasuryRewardPercentageAfterECIP1098 / 100
+        val worldAfterTreasuryReward = increaseAccountBalance(treasuryAddress, UInt256(treasuryReward))(worldAfterMinerReward)
+
+        log.debug(s"Paying block $blockNumber reward of $minerReward to miner with address $minerAddress" +
+          s"paying treasury reward of $treasuryReward to treasury with address $treasuryAddress")
+
+        worldAfterTreasuryReward
+      }
+
+    block.body.uncleNodesList.foldLeft(worldAfterPayingBlockReward) { (ws, ommer) =>
+      val ommerAddress = Address(ommer.beneficiary)
+      val ommerReward = blockRewardCalculator.calculateOmmerRewardForInclusion(blockNumber, ommer.number)
 
       log.debug(s"Paying block $blockNumber reward of $ommerReward to ommer with account address $ommerAddress")
-      ws.saveAccount(ommerAddress, account.increaseBalance(UInt256(ommerReward)))
+      increaseAccountBalance(ommerAddress, UInt256(ommerReward))(ws)
     }
   }
 
@@ -120,13 +142,16 @@ class BlockPreparator(
     }
   }
 
+  private[ledger] def increaseAccountBalance(address: Address, value: UInt256)(world: InMemoryWorldStateProxy): InMemoryWorldStateProxy = {
+    val account = world.getAccount(address).getOrElse(Account.empty(blockchainConfig.accountStartNonce)).increaseBalance(value)
+    world.saveAccount(address, account)
+  }
+
   private[ledger] def pay(address: Address, value: UInt256, withTouch: Boolean)(world: InMemoryWorldStateProxy): InMemoryWorldStateProxy = {
     if (world.isZeroValueTransferToNonExistentAccount(address, value)) {
       world
     } else {
-      val account = world.getAccount(address).getOrElse(Account.empty(blockchainConfig.accountStartNonce)).increaseBalance(value)
-      val savedWorld = world.saveAccount(address, account)
-
+      val savedWorld = increaseAccountBalance(address, value)(world)
       if (withTouch) savedWorld.touchAccounts(address) else savedWorld
     }
   }
@@ -320,3 +345,8 @@ class BlockPreparator(
     }
   }
 }
+
+object BlockPreparator {
+  val TreasuryRewardPercentageAfterECIP1098 = 20
+  val MinerRewardPercentageAfterECIP1098 = 100 - TreasuryRewardPercentageAfterECIP1098
+}
diff --git a/src/main/scala/io/iohk/ethereum/ledger/BlockRewardCalculator.scala b/src/main/scala/io/iohk/ethereum/ledger/BlockRewardCalculator.scala
@@ -44,20 +44,17 @@ class BlockRewardCalculator(config: MonetaryPolicyConfig, byzantiumBlockNumber:
   val firstEraOmmerMiningRewardDenom: BigInt = 8
 
 
-  def calcBlockMinerReward(blockNumber: BigInt, ommersCount: Int): BigInt = {
-    val baseReward = calcMinerBaseReward(blockNumber)
-    val ommersReward = calcMinerRewardPerOmmer(blockNumber) * ommersCount
-    baseReward + ommersReward
-  }
+  def calculateMiningRewardForOmmers(blockNumber: BigInt, ommersCount: Int): BigInt =
+    calculateMiningRewardPerOmmer(blockNumber) * ommersCount
 
-  def calcOmmerMinerReward(blockNumber: BigInt, ommerNumber: BigInt): BigInt = {
+  def calculateOmmerRewardForInclusion(blockNumber: BigInt, ommerNumber: BigInt): BigInt = {
     val era = eraNumber(blockNumber)
 
     if (era == 0) {
       val number = firstEraOmmerMiningRewardMaxNumer - (blockNumber - ommerNumber - 1)
       (newBlockReward(blockNumber) * number) / firstEraOmmerMiningRewardDenom
     } else
-      calcMinerBaseReward(blockNumber) * ommerMiningRewardNumer / ommerMiningRewardDenom
+      calculateMiningRewardForBlock(blockNumber) * ommerMiningRewardNumer / ommerMiningRewardDenom
   }
 
   /**
@@ -66,7 +63,7 @@ class BlockRewardCalculator(config: MonetaryPolicyConfig, byzantiumBlockNumber:
     * @param blockNumber mined block
     * @return miner base reward
     */
-  private def calcMinerBaseReward(blockNumber: BigInt): BigInt = {
+  def calculateMiningRewardForBlock(blockNumber: BigInt): BigInt = {
     val era = eraNumber(blockNumber)
     val eraMultiplier = rewardReductionRateNumer.pow(era)
     val eraDivisor = rewardReductionRateDenom.pow(era)
@@ -79,8 +76,8 @@ class BlockRewardCalculator(config: MonetaryPolicyConfig, byzantiumBlockNumber:
     * @param blockNumber mined block
     * @return reward given to the miner for each ommer included
     */
-  private def calcMinerRewardPerOmmer(blockNumber: BigInt): BigInt = {
-    calcMinerBaseReward(blockNumber) * ommerInclusionRewardNumer / ommerInclusionRewardDenom
+  private def calculateMiningRewardPerOmmer(blockNumber: BigInt): BigInt = {
+    calculateMiningRewardForBlock(blockNumber) * ommerInclusionRewardNumer / ommerInclusionRewardDenom
   }
 
   /** era number counting from 0 */
diff --git a/src/main/scala/io/iohk/ethereum/utils/BlockchainConfig.scala b/src/main/scala/io/iohk/ethereum/utils/BlockchainConfig.scala
@@ -1,10 +1,9 @@
 package io.iohk.ethereum.utils
 
-import io.iohk.ethereum.domain.UInt256
+import io.iohk.ethereum.domain.{Address, UInt256}
 import io.iohk.ethereum.utils.NumericUtils._
 
 import scala.collection.JavaConverters._
-
 import com.typesafe.config.{Config => TypesafeConfig}
 
 import scala.util.Try
@@ -25,6 +24,7 @@ case class BlockchainConfig(
   aghartaBlockNumber: BigInt,
   phoenixBlockNumber: BigInt,
   petersburgBlockNumber: BigInt,
+  treasuryAddress: Address,
   ecip1098BlockNumber: BigInt,
 
   maxCodeSize: Option[BigInt],
@@ -69,6 +69,7 @@ object BlockchainConfig {
     val aghartaBlockNumber: BigInt = BigInt(blockchainConfig.getString("agharta-block-number"))
     val phoenixBlockNumber: BigInt = BigInt(blockchainConfig.getString("phoenix-block-number"))
     val petersburgBlockNumber: BigInt = BigInt(blockchainConfig.getString("petersburg-block-number"))
+    val treasuryAddress = Address(blockchainConfig.getString("treasury-address"))
     val ecip1098BlockNumber: BigInt = BigInt(blockchainConfig.getString("ecip1098-block-number"))
 
     val maxCodeSize: Option[BigInt] = Try(BigInt(blockchainConfig.getString("max-code-size"))).toOption
@@ -113,6 +114,7 @@ object BlockchainConfig {
       aghartaBlockNumber = aghartaBlockNumber,
       phoenixBlockNumber = phoenixBlockNumber,
       petersburgBlockNumber = petersburgBlockNumber,
+      treasuryAddress = treasuryAddress,
       ecip1098BlockNumber = ecip1098BlockNumber,
 
       maxCodeSize = maxCodeSize,
diff --git a/src/test/scala/io/iohk/ethereum/consensus/BlockGeneratorSpec.scala b/src/test/scala/io/iohk/ethereum/consensus/BlockGeneratorSpec.scala
@@ -220,7 +220,8 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with ScalaCheckPropertyC
       aghartaBlockNumber = Long.MaxValue,
       phoenixBlockNumber = Long.MaxValue,
       petersburgBlockNumber = Long.MaxValue,
-      ecip1098BlockNumber = Long.MaxValue
+      ecip1098BlockNumber = Long.MaxValue,
+      treasuryAddress = Address(0)
     )
 
     override lazy val blockExecution =
@@ -489,7 +490,8 @@ class BlockGeneratorSpec extends FlatSpec with Matchers with ScalaCheckPropertyC
       aghartaBlockNumber = Long.MaxValue,
       phoenixBlockNumber = Long.MaxValue,
       petersburgBlockNumber = Long.MaxValue,
-      ecip1098BlockNumber = Long.MaxValue
+      ecip1098BlockNumber = Long.MaxValue,
+      treasuryAddress = Address(0)
     )
     override lazy val blockchainConfig = baseBlockchainConfig
 
diff --git a/src/test/scala/io/iohk/ethereum/consensus/validators/BlockHeaderValidatorSpec.scala b/src/test/scala/io/iohk/ethereum/consensus/validators/BlockHeaderValidatorSpec.scala
@@ -430,7 +430,8 @@ class BlockHeaderValidatorSpec
       aghartaBlockNumber = Long.MaxValue,
       phoenixBlockNumber = Long.MaxValue,
       petersburgBlockNumber = Long.MaxValue,
-      ecip1098BlockNumber = Long.MaxValue
+      ecip1098BlockNumber = Long.MaxValue,
+      treasuryAddress = Address(0)
     )
   }
 
diff --git a/src/test/scala/io/iohk/ethereum/jsonrpc/EthServiceSpec.scala b/src/test/scala/io/iohk/ethereum/jsonrpc/EthServiceSpec.scala
@@ -975,38 +975,6 @@ class EthServiceSpec
     override lazy val ledger = mock[Ledger]
     override lazy val stxLedger = mock[StxLedger]
 
-    override lazy val blockchainConfig = BlockchainConfig(
-      ethCompatibleStorage = true,
-      //unused
-      eip155BlockNumber = 0,
-      chainId = 0x03.toByte,
-      networkId = 1,
-      maxCodeSize = None,
-      eip161BlockNumber = 0,
-      frontierBlockNumber = 0,
-      homesteadBlockNumber = 0,
-      eip150BlockNumber = 0,
-      eip160BlockNumber = 0,
-      eip106BlockNumber = 0,
-      byzantiumBlockNumber = 0,
-      constantinopleBlockNumber = 0,
-      istanbulBlockNumber = 0,
-      difficultyBombPauseBlockNumber = 0,
-      difficultyBombContinueBlockNumber = 0,
-      difficultyBombRemovalBlockNumber = 0,
-      customGenesisFileOpt = None,
-      accountStartNonce = UInt256.Zero,
-      monetaryPolicyConfig = MonetaryPolicyConfig(0, 0, 0, 0),
-      daoForkConfig = None,
-      bootstrapNodes = Set(),
-      gasTieBreaker = false,
-      atlantisBlockNumber = 0,
-      aghartaBlockNumber = 0,
-      phoenixBlockNumber = 0,
-      petersburgBlockNumber = 0,
-      ecip1098BlockNumber = 0
-    )
-
     override lazy val consensus: TestConsensus = buildTestConsensus().withBlockGenerator(blockGenerator)
 
     override implicit lazy val system = ActorSystem("EthServiceSpec_System")
diff --git a/src/test/scala/io/iohk/ethereum/jsonrpc/PersonalServiceSpec.scala b/src/test/scala/io/iohk/ethereum/jsonrpc/PersonalServiceSpec.scala
@@ -466,7 +466,8 @@ class PersonalServiceSpec
       aghartaBlockNumber = 0,
       phoenixBlockNumber = 0,
       petersburgBlockNumber = 0,
-      ecip1098BlockNumber = 0
+      ecip1098BlockNumber = 0,
+      treasuryAddress = Address(0)
     )
 
     val wallet = Wallet(address, prvKey)
diff --git a/src/test/scala/io/iohk/ethereum/ledger/BlockRewardCalculatorSpec.scala b/src/test/scala/io/iohk/ethereum/ledger/BlockRewardCalculatorSpec.scala
diff --git a/src/test/scala/io/iohk/ethereum/ledger/BlockRewardSpec.scala b/src/test/scala/io/iohk/ethereum/ledger/BlockRewardSpec.scala
diff --git a/src/test/scala/io/iohk/ethereum/ledger/LedgerSpec.scala b/src/test/scala/io/iohk/ethereum/ledger/LedgerSpec.scala
diff --git a/src/test/scala/io/iohk/ethereum/ledger/LedgerTestSetup.scala b/src/test/scala/io/iohk/ethereum/ledger/LedgerTestSetup.scala
diff --git a/src/test/scala/io/iohk/ethereum/ledger/StxLedgerSpec.scala b/src/test/scala/io/iohk/ethereum/ledger/StxLedgerSpec.scala

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ object BlockchainTestConfig {`
`43`	`43`	`atlantisBlockNumber = Long.MaxValue,`
`44`	`44`	`aghartaBlockNumber = Long.MaxValue,`
`45`	`45`	`phoenixBlockNumber = Long.MaxValue,`
`46`		`- ecip1098BlockNumber = Long.MaxValue`
	`46`	`+ ecip1098BlockNumber = Long.MaxValue,`
	`47`	`+ treasuryAddress = Address(0)`
`47`	`48`	`)`
`48`	`49`
`49`	`50`	`val FrontierConfig = BaseBlockchainConfig.copy(`