forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove Invoke Ethash rewards in Clique

Browse source
This commit is contained in:
Yohan Graterol 2018-06-11 20:42:36 -05:00
parent 3a7292d521
commit 36625c38d4
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
consensus/clique/clique.go
View file

@ -39,8 +39,7 @@ import (
"github.com/EthereumCommonwealth/go-callisto/params" "github.com/EthereumCommonwealth/go-callisto/params"
"github.com/EthereumCommonwealth/go-callisto/rlp" "github.com/EthereumCommonwealth/go-callisto/rlp"
"github.com/EthereumCommonwealth/go-callisto/rpc" "github.com/EthereumCommonwealth/go-callisto/rpc"
lru "github.com/hashicorp/golang-lru" "github.com/hashicorp/golang-lru"
"github.com/EthereumCommonwealth/go-callisto/consensus/ethash"
) )
const ( 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 // Finalize implements consensus.Engine, ensuring no uncles are set, nor block
// rewards given, and returns the final 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) { 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.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
header.UncleHash = types.CalcUncleHash(nil) header.UncleHash = types.CalcUncleHash(nil)