status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix block 1.487.668 problem: getScore int overflow

This commit is contained in:
andri lim 2019-04-05 16:29:05 +07:00
parent 4d29677f5a
commit f2f92f5608
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nimbus/db/db_chain.nim
View File

@ -79,8 +79,8 @@ proc getBlockHeader*(self: BaseChainDB; n: BlockNumber): BlockHeader =
## Raises BlockNotFound error if the block is not in the DB. ## Raises BlockNotFound error if the block is not in the DB.
self.getBlockHeader(self.getBlockHash(n)) self.getBlockHeader(self.getBlockHash(n))
proc getScore*(self: BaseChainDB; blockHash: Hash256): uint64 = proc getScore*(self: BaseChainDB; blockHash: Hash256): Uint256 =
rlp.decode(self.db.get(blockHashToScoreKey(blockHash).toOpenArray).toRange, uint64) rlp.decode(self.db.get(blockHashToScoreKey(blockHash).toOpenArray).toRange, Uint256)
iterator findNewAncestors(self: BaseChainDB; header: BlockHeader): BlockHeader = iterator findNewAncestors(self: BaseChainDB; header: BlockHeader): BlockHeader =
## Returns the chain leading up from the given header until the first ancestor it has in ## Returns the chain leading up from the given header until the first ancestor it has in
@ -224,18 +224,18 @@ proc persistHeaderToDb*(self: BaseChainDB; header: BlockHeader): seq[BlockHeader
self.db.put(genericHashKey(headerHash).toOpenArray, rlp.encode(header)) self.db.put(genericHashKey(headerHash).toOpenArray, rlp.encode(header))
let score = if isGenesis: header.difficulty let score = if isGenesis: header.difficulty
else: self.getScore(header.parentHash).u256 + header.difficulty else: self.getScore(header.parentHash) + header.difficulty
self.db.put(blockHashToScoreKey(headerHash).toOpenArray, rlp.encode(score)) self.db.put(blockHashToScoreKey(headerHash).toOpenArray, rlp.encode(score))
self.addBlockNumberToHashLookup(header) self.addBlockNumberToHashLookup(header)
var headScore: uint64 var headScore: Uint256
try: try:
headScore = self.getScore(self.getCanonicalHead().hash) headScore = self.getScore(self.getCanonicalHead().hash)
except CanonicalHeadNotFound: except CanonicalHeadNotFound:
return self.setAsCanonicalChainHead(headerHash) return self.setAsCanonicalChainHead(headerHash)
if score > headScore.u256: if score > headScore:
result = self.setAsCanonicalChainHead(headerHash) result = self.setAsCanonicalChainHead(headerHash)
proc addTransactionToCanonicalChain(self: BaseChainDB, txHash: Hash256, proc addTransactionToCanonicalChain(self: BaseChainDB, txHash: Hash256,