diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-20 13:45:44 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-20 13:45:44 +0800 |
| commit | eb452115018e7686dc94ce1e92d2e9f85d76ab09 (patch) | |
| tree | bfd809ec89295d1b60c2eabf0d8841406a5c4bcd /core | |
| parent | c3a3d387352cf9cf626dc67e0aeaaa68c4bc651a (diff) | |
| parent | b4a51de6020ce0fdee47eb6c7d63a13647b7e3c4 (diff) | |
| download | dexon-eb452115018e7686dc94ce1e92d2e9f85d76ab09.tar dexon-eb452115018e7686dc94ce1e92d2e9f85d76ab09.tar.gz dexon-eb452115018e7686dc94ce1e92d2e9f85d76ab09.tar.bz2 dexon-eb452115018e7686dc94ce1e92d2e9f85d76ab09.tar.lz dexon-eb452115018e7686dc94ce1e92d2e9f85d76ab09.tar.xz dexon-eb452115018e7686dc94ce1e92d2e9f85d76ab09.tar.zst dexon-eb452115018e7686dc94ce1e92d2e9f85d76ab09.zip | |
Merge branch 'rpcfrontier' of github.com:ethereum/go-ethereum into rpcfrontier
Diffstat (limited to 'core')
| -rw-r--r-- | core/chain_manager.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go index 88518e62b..64ea8957d 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -444,14 +444,12 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error { self.setTotalDifficulty(td) self.insert(block) - /* XXX crashes jsonlogger.LogJson(&logger.EthChainNewHead{ BlockHash: common.Bytes2Hex(block.Hash()), BlockNumber: block.Number(), ChainHeadHash: common.Bytes2Hex(cblock.Hash()), BlockPrevHash: common.Bytes2Hex(block.ParentHash()), }) - */ self.setTransState(state.New(block.Root(), self.stateDb)) self.setTxState(state.New(block.Root(), self.stateDb)) |