diff options
author | obscuren <geffobscura@gmail.com> | 2015-04-20 18:01:20 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-04-20 18:01:20 +0800 |
commit | 97b0c4b6978d7fd972f3b0991acca1227e4e83dc (patch) | |
tree | 8c6f35d6e82fa809a06694635c331bb8103b8907 /core/chain_manager.go | |
parent | fa729a0c55aa4b00c2ac33d0fcee8acabed2f737 (diff) | |
download | go-tangerine-97b0c4b6978d7fd972f3b0991acca1227e4e83dc.tar go-tangerine-97b0c4b6978d7fd972f3b0991acca1227e4e83dc.tar.gz go-tangerine-97b0c4b6978d7fd972f3b0991acca1227e4e83dc.tar.bz2 go-tangerine-97b0c4b6978d7fd972f3b0991acca1227e4e83dc.tar.lz go-tangerine-97b0c4b6978d7fd972f3b0991acca1227e4e83dc.tar.xz go-tangerine-97b0c4b6978d7fd972f3b0991acca1227e4e83dc.tar.zst go-tangerine-97b0c4b6978d7fd972f3b0991acca1227e4e83dc.zip |
core: moved TD calculation from proc to chain
Diffstat (limited to 'core/chain_manager.go')
-rw-r--r-- | core/chain_manager.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go index 4f1e1e68a..76fa3e1ea 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -461,7 +461,7 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error { } // Call in to the block processor and check for errors. It's likely that if one block fails // all others will fail too (unless a known block is returned). - td, logs, err := self.processor.Process(block) + logs, err := self.processor.Process(block) if err != nil { if IsKnownBlockErr(err) { continue @@ -492,7 +492,8 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error { return err } - block.Td = td + + block.Td = new(big.Int).Set(CalculateTD(block, self.GetBlock(block.ParentHash()))) self.mu.Lock() { @@ -502,14 +503,14 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error { self.write(block) // Compare the TD of the last known block in the canonical chain to make sure it's greater. // At this point it's possible that a different chain (fork) becomes the new canonical chain. - if td.Cmp(self.td) > 0 { + if block.Td.Cmp(self.td) > 0 { //if block.Header().Number.Cmp(new(big.Int).Add(cblock.Header().Number, common.Big1)) < 0 { if block.Number().Cmp(cblock.Number()) <= 0 { chash := cblock.Hash() hash := block.Hash() if glog.V(logger.Info) { - glog.Infof("Split detected. New head #%v (%x) TD=%v, was #%v (%x) TD=%v\n", block.Header().Number, hash[:4], td, cblock.Header().Number, chash[:4], self.td) + glog.Infof("Split detected. New head #%v (%x) TD=%v, was #%v (%x) TD=%v\n", block.Header().Number, hash[:4], block.Td, cblock.Header().Number, chash[:4], self.td) } // during split we merge two different chains and create the new canonical chain self.merge(self.getBlockByNumber(block.NumberU64()), block) @@ -518,7 +519,7 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error { queueEvent.splitCount++ } - self.setTotalDifficulty(td) + self.setTotalDifficulty(block.Td) self.insert(block) jsonlogger.LogJson(&logger.EthChainNewHead{ |