status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

EIP-3675: disable reward for coinbase and uncles miner

This commit is contained in:
jangko 2022-02-08 16:27:04 +07:00
parent 28cdfcaf6b
commit ec59c691aa
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nimbus/p2p/executor/process_block.nim
View File

@ -139,7 +139,8 @@ proc processBlockNotPoA*(
if not vmState.procBlkPreamble(header, body):
return ValidationResult.Error
vmState.calculateReward(header, body)
if not vmState.ttdReached: # EIP-3675: no reward for miner
vmState.calculateReward(header, body)
if not vmState.procBlkEpilogue(header, body):
return ValidationResult.Error
@ -183,7 +184,10 @@ proc processBlock*(
if not vmState.procBlkPreamble(header, body):
return ValidationResult.Error
if not vmState.chainDB.config.poaEngine:
let disableReward = vmState.chainDB.config.poaEngine or
vmState.ttdReached # EIP-3675: no reward for miner
if not disableReward:
vmState.calculateReward(header, body)
if not vmState.procBlkEpilogue(header, body):

4
nimbus/utils/tx_pool/tx_tasks/tx_packer.nim
View File

@ -220,8 +220,10 @@ proc vmExecCommit(pst: TxPackerStateRef)
let
xp = pst.xp
vmState = xp.chain.vmState
disableReward = vmState.chainDB.config.poaEngine or
vmState.ttdReached # EIP-3675: no reward for miner
if not vmState.chainDB.config.poaEngine:
if not disableReward:
let
number = xp.chain.head.blockNumber + 1
uncles: seq[BlockHeader] = @[] # no uncles yet