From 36625c38d4e53d22bfae8e3ab3e529a41f787aed Mon Sep 17 00:00:00 2001 From: Yohan Graterol Date: Mon, 11 Jun 2018 20:42:36 -0500 Subject: [PATCH] Remove Invoke Ethash rewards in Clique --- consensus/clique/clique.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index fae965814a..0190358f2e 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -39,8 +39,7 @@ import ( "github.com/EthereumCommonwealth/go-callisto/params" "github.com/EthereumCommonwealth/go-callisto/rlp" "github.com/EthereumCommonwealth/go-callisto/rpc" - lru "github.com/hashicorp/golang-lru" - "github.com/EthereumCommonwealth/go-callisto/consensus/ethash" + "github.com/hashicorp/golang-lru" ) const ( @@ -571,7 +570,7 @@ func (c *Clique) Prepare(chain consensus.ChainReader, header *types.Header) erro // Finalize implements consensus.Engine, ensuring no uncles are set, nor block // rewards given, and returns the final block. func (c *Clique) Finalize(chain consensus.ChainReader, header *types.Header, state *state.StateDB, txs []*types.Transaction, uncles []*types.Header, receipts []*types.Receipt) (*types.Block, error) { - ethash.InvokeAccumulateRewards(chain.Config(), state, header, uncles) + // ethash.InvokeAccumulateRewards(chain.Config(), state, header, uncles) Removed to Parity compatibility header.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number)) header.UncleHash = types.CalcUncleHash(nil)