BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: handle multiple forks at same checkpoint

This commit is contained in:
ThomasV 2017-07-24 08:46:49 +02:00
parent 732679aa3d
commit d5d5e8af5c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/network.py
View File

@ -835,13 +835,19 @@ class Network(util.DaemonThread):
if branch is not None:
if branch.check_header(interface.bad_header):
interface.print_error('joining chain', interface.bad)
next_height = None
elif branch.parent().check_header(header):
interface.print_error('reorg', interface.bad, interface.tip)
interface.blockchain = branch.parent()
next_height = None
else:
# should not happen
raise BaseException('error')
next_height = None
interface.print_error('checkpoint conflicts with existing fork', branch.path())
open(branch.path(), 'w+').close()
branch.save_header(interface.bad_header)
interface.mode = 'catch_up'
interface.blockchain = branch
next_height = interface.bad + 1
interface.blockchain.catch_up = interface.server
else:
bh = interface.blockchain.height()
next_height = None