Permalink
Browse files

Merge pull request #643 from ethereumproject/fix/rpc-block-mixhash

Fix/rpc block mixhash
  • Loading branch information...
whilei committed Jul 10, 2018
2 parents 5291a28 + 356afc0 commit 01ce9b3956468df1910dfbeb75021934b2e0fbd5
Showing with 3 additions and 2 deletions.
  1. +1 −0 eth/api.go
  2. +2 −2 eth/downloader/downloader.go
View
@@ -849,6 +849,7 @@ func (s *PublicBlockChainAPI) rpcOutputBlock(b *types.Block, inclTx bool, fullTx
"hash": b.Hash(),
"parentHash": b.ParentHash(),
"nonce": b.Header().Nonce,
"mixHash": b.Header().MixDigest,
"sha3Uncles": b.UncleHash(),
"logsBloom": b.Bloom(),
"stateRoot": b.Root(),
@@ -1581,8 +1581,8 @@ func (d *Downloader) commitFastSyncData(results []*fetchResult, stateSync *state
// Retrieve the a batch of results to import
first, last := results[0].Header, results[len(results)-1].Header
glog.V(logger.Debug).Infoln("Inserting fast-sync blocks", "items", len(results),
"firstnum", first.Number, "firsthash", first.Hash(),
"lastnumn", last.Number, "lasthash", last.Hash(),
"firstnum", first.Number, "firsthash", first.Hash().Hex(),
"lastnumn", last.Number, "lasthash", last.Hash().Hex(),
)
blocks := make([]*types.Block, len(results))
receipts := make([]types.Receipts, len(results))

0 comments on commit 01ce9b3

Please sign in to comment.