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

Fix/rpc block mixhash
ethereumproject · Jul 10, 2018 · 01ce9b3 · 01ce9b3
2 parents 5291a28 + 356afc0
commit 01ce9b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/eth/api.go b/eth/api.go
@@ -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(),

diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
@@ -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))