best chain test (#1959)

[bytom/bytom.git] / protocol / casper.go

diff --git a/protocol/casper.go b/protocol/casper.go
index 5123f95..9d2cc95 100644 (file)
--- a/protocol/casper.go
+++ b/protocol/casper.go
@@ -160,7 +160,9 @@ func chainOfMaxJustifiedHeight(node *treeNode, justifiedHeight uint64) (uint64,
 
        bestHeight, bestHash, maxJustifiedHeight := checkpoint.Height, checkpoint.Hash, justifiedHeight
        for _, child := range node.children {
-               if height, hash, justified := chainOfMaxJustifiedHeight(child, justifiedHeight); justified > maxJustifiedHeight || height > bestHeight {
+               height, hash, justified := chainOfMaxJustifiedHeight(child, justifiedHeight)
+               if justified > maxJustifiedHeight || (justified == maxJustifiedHeight && height > bestHeight) ||
+                       (justified == maxJustifiedHeight && height == bestHeight && hash.String() > bestHash.String()) {
                        bestHeight, bestHash, maxJustifiedHeight = height, hash, justified
                }
        }