consensus/ethash: move accumulation of coinbase witness before coinbase account is credited (#41)

jwasinger · web-flow · commit 5bac5b326200 · 2021-12-02T09:41:11.000+01:00
diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go
@@ -669,7 +669,7 @@ func accumulateRewards(config *params.ChainConfig, state *state.StateDB, header
 		r.Div(blockReward, big32)
 		reward.Add(reward, r)
 	}
-	state.AddBalance(header.Coinbase, reward)
 	coinbase := utils.GetTreeKeyBalance(header.Coinbase.Bytes())
 	state.Witness().TouchAddress(coinbase, state.GetBalance(header.Coinbase).Bytes())
+	state.AddBalance(header.Coinbase, reward)
 }

Original file line number	Diff line number	Diff line change
`@@ -669,7 +669,7 @@ func accumulateRewards(config params.ChainConfig, state state.StateDB, header`
`669`	`669`	`r.Div(blockReward, big32)`
`670`	`670`	`reward.Add(reward, r)`
`671`	`671`	`}`
`672`		`- state.AddBalance(header.Coinbase, reward)`
`673`	`672`	`coinbase := utils.GetTreeKeyBalance(header.Coinbase.Bytes())`
`674`	`673`	`state.Witness().TouchAddress(coinbase, state.GetBalance(header.Coinbase).Bytes())`
	`674`	`+ state.AddBalance(header.Coinbase, reward)`
`675`	`675`	`}`