RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A couple of tweaks to the prior commit.

Browse Source
This commit is contained in:
Neil Booth 2017-03-14 20:42:01 +09:00
parent ed7d8a319d
commit 37602d4eae
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/coins.py
View File

@ -665,7 +665,7 @@ class FairCoin(Coin):
block and its height.''' block and its height.'''
if height > 0: if height > 0:
return cls.block_full(block, height) return super().block_full(block, height)
else: else:
return Block(cls.block_header(block, height), []) return Block(cls.block_header(block, height), [])

10
server/block_processor.py
View File

@ -485,7 +485,6 @@ class BlockProcessor(server.db.DB):
It is already verified they correctly connect onto our tip. It is already verified they correctly connect onto our tip.
''' '''
headers = [block.header for block in blocks]
min_height = self.min_undo_height(self.daemon.cached_height()) min_height = self.min_undo_height(self.daemon.cached_height())
height = self.height height = self.height
@ -495,6 +494,7 @@ class BlockProcessor(server.db.DB):
if height >= min_height: if height >= min_height:
self.undo_infos.append((undo_info, height)) self.undo_infos.append((undo_info, height))
headers = [block.header for block in blocks]
self.height = height self.height = height
self.headers.extend(headers) self.headers.extend(headers)
self.tip = self.coin.header_hash(headers[-1]) self.tip = self.coin.header_hash(headers[-1])
@ -569,14 +569,14 @@ class BlockProcessor(server.db.DB):
coin = self.coin coin = self.coin
for block in blocks: for block in blocks:
# Check and update self.tip # Check and update self.tip
header, txs = coin.block_full(block, self.height) block_full = coin.block_full(block, self.height)
header_hash = coin.header_hash(header) header_hash = coin.header_hash(block_full.header)
if header_hash != self.tip: if header_hash != self.tip:
raise ChainError('backup block {} not tip {} at height {:,d}' raise ChainError('backup block {} not tip {} at height {:,d}'
.format(hash_to_str(header_hash), .format(hash_to_str(header_hash),
hash_to_str(self.tip), self.height)) hash_to_str(self.tip), self.height))
self.tip = coin.header_prevhash(header) self.tip = coin.header_prevhash(block_full.header)
self.backup_txs(txs) self.backup_txs(block_full.transactions)
self.height -= 1 self.height -= 1
self.tx_counts.pop() self.tx_counts.pop()