Merge branch 'develop'
This commit is contained in:
commit
6c7e58643c
|
@ -221,9 +221,16 @@ func (bc *BlockChain) GetChainFromHash(hash []byte, max uint64) []interface{} {
|
||||||
startNumber := parentNumber + count
|
startNumber := parentNumber + count
|
||||||
|
|
||||||
num := lastNumber
|
num := lastNumber
|
||||||
for ; num > startNumber; currentHash = bc.GetBlock(currentHash).PrevHash {
|
for num > startNumber {
|
||||||
num--
|
num--
|
||||||
|
|
||||||
|
block := bc.GetBlock(currentHash)
|
||||||
|
if block == nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
currentHash = block.PrevHash
|
||||||
}
|
}
|
||||||
|
|
||||||
for i := uint64(0); bytes.Compare(currentHash, hash) != 0 && num >= parentNumber && i < count; i++ {
|
for i := uint64(0); bytes.Compare(currentHash, hash) != 0 && num >= parentNumber && i < count; i++ {
|
||||||
// Get the block of the chain
|
// Get the block of the chain
|
||||||
block := bc.GetBlock(currentHash)
|
block := bc.GetBlock(currentHash)
|
||||||
|
|
Loading…
Reference in New Issue