diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-20 18:19:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-20 18:19:25 +0800 |
| commit | faa57ecaefe545e88c5f7528186ca99c7f4c5333 (patch) | |
| tree | a5929b368b3af94c2916bb13c291a4b9223414a5 /ethchain | |
| parent | 2450398862e8ac55b39dd88a3af169985e1727f3 (diff) | |
| parent | 36c9c93720c41be260f4574dd9feb71306ae4a0e (diff) | |
| download | go-tangerine-faa57ecaefe545e88c5f7528186ca99c7f4c5333.tar go-tangerine-faa57ecaefe545e88c5f7528186ca99c7f4c5333.tar.gz go-tangerine-faa57ecaefe545e88c5f7528186ca99c7f4c5333.tar.bz2 go-tangerine-faa57ecaefe545e88c5f7528186ca99c7f4c5333.tar.lz go-tangerine-faa57ecaefe545e88c5f7528186ca99c7f4c5333.tar.xz go-tangerine-faa57ecaefe545e88c5f7528186ca99c7f4c5333.tar.zst go-tangerine-faa57ecaefe545e88c5f7528186ca99c7f4c5333.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
Diffstat (limited to 'ethchain')
| -rw-r--r-- | ethchain/block_chain.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ethchain/block_chain.go b/ethchain/block_chain.go index 9926354bd..457aed714 100644 --- a/ethchain/block_chain.go +++ b/ethchain/block_chain.go @@ -127,7 +127,6 @@ func (bc *BlockChain) FindCanonicalChain(blocks []*Block, commonBlockHash []byte log.Println("[CHAIN] We have found the common parent block, breaking") break } - log.Println("Checking incoming blocks:") chainDifficulty.Add(chainDifficulty, bc.CalculateBlockTD(block)) } @@ -182,6 +181,7 @@ func (bc *BlockChain) ResetTillBlockHash(hash []byte) error { // XXX Why are we resetting? This is the block chain, it has nothing to do with states //bc.Ethereum.StateManager().PrepareDefault(returnTo) + // Manually reset the last sync block err := ethutil.Config.Db.Delete(lastBlock.Hash()) if err != nil { return err |