OSDN Git Service

edit code while reviewing the code (#255)
[bytom/vapor.git] / protocol / bbft.go
index a34e703..70b1d81 100644 (file)
@@ -28,6 +28,44 @@ func signCacheKey(blockHash, pubkey string) string {
        return fmt.Sprintf("%s:%s", blockHash, pubkey)
 }
 
+func (c *Chain) checkDoubleSign(bh *types.BlockHeader, xPub string) error {
+       blockHashes, err := c.store.GetBlockHashesByHeight(bh.Height)
+       if err != nil {
+               return err
+       }
+
+       for _, blockHash := range blockHashes {
+               if *blockHash == bh.Hash() {
+                       continue
+               }
+
+               blockHeader, err := c.store.GetBlockHeader(blockHash)
+               if err != nil {
+                       return err
+               }
+
+               consensusNode, err := c.getConsensusNode(&blockHeader.PreviousBlockHash, xPub)
+               if err == errNotFoundConsensusNode {
+                       continue
+               } else if err != nil {
+                       return err
+               }
+
+               if blockHeader.BlockWitness.Get(consensusNode.Order) != nil {
+                       return errDoubleSignBlock
+               }
+       }
+       return nil
+}
+
+func (c *Chain) checkNodeSign(bh *types.BlockHeader, consensusNode *state.ConsensusNode, signature []byte) error {
+       if !consensusNode.XPub.Verify(bh.Hash().Bytes(), signature) {
+               return errInvalidSignature
+       }
+
+       return c.checkDoubleSign(bh, consensusNode.XPub.String())
+}
+
 func (c *Chain) isIrreversible(blockHeader *types.BlockHeader) bool {
        consensusNodes, err := c.getConsensusNodes(&blockHeader.PreviousBlockHash)
        if err != nil {
@@ -44,56 +82,33 @@ func (c *Chain) isIrreversible(blockHeader *types.BlockHeader) bool {
        return signCount > len(consensusNodes)*2/3
 }
 
-// GetConsensusResultByHash return vote result by block hash
-func (c *Chain) GetConsensusResultByHash(blockHash *bc.Hash) (*state.ConsensusResult, error) {
-       blockHeader, err := c.store.GetBlockHeader(blockHash)
-       if err != nil {
-               return nil, err
-       }
-       return c.getConsensusResult(state.CalcVoteSeq(blockHeader.Height), blockHeader)
-}
-
-// IsBlocker returns whether the consensus node is a blocker at the specified time
-func (c *Chain) IsBlocker(prevBlockHash *bc.Hash, pubKey string, timeStamp uint64) (bool, error) {
-       xPub, err := c.GetBlocker(prevBlockHash, timeStamp)
-       if err != nil {
-               return false, err
-       }
-       return xPub == pubKey, nil
-}
-
-// ProcessBlockSignature process the received block signature messages
-// return whether a block become irreversible, if so, the chain module must update status
-func (c *Chain) ProcessBlockSignature(signature, xPub []byte, blockHash *bc.Hash) error {
-       xpubStr := hex.EncodeToString(xPub[:])
-       blockHeader, _ := c.store.GetBlockHeader(blockHash)
-
-       // save the signature if the block is not exist
-       if blockHeader == nil {
-               cacheKey := signCacheKey(blockHash.String(), xpubStr)
-               c.signatureCache.Add(cacheKey, signature)
-               return nil
-       }
-
-       consensusNode, err := c.getConsensusNode(&blockHeader.PreviousBlockHash, xpubStr)
-       if err != nil {
+func (c *Chain) updateBlockSignature(blockHeader *types.BlockHeader, nodeOrder uint64, signature []byte) error {
+       blockHeader.Set(nodeOrder, signature)
+       if err := c.store.SaveBlockHeader(blockHeader); err != nil {
                return err
        }
 
-       if blockHeader.BlockWitness.Get(consensusNode.Order) != nil {
+       if !c.isIrreversible(blockHeader) || blockHeader.Height <= c.lastIrrBlockHeader.Height {
                return nil
        }
 
-       c.cond.L.Lock()
-       defer c.cond.L.Unlock()
-       if err := c.checkNodeSign(blockHeader, consensusNode, signature); err != nil {
-               return err
-       }
+       if c.InMainChain(blockHeader.Hash()) {
+               if err := c.store.SaveChainStatus(c.bestBlockHeader, blockHeader, []*types.BlockHeader{}, state.NewUtxoViewpoint(), []*state.ConsensusResult{}); err != nil {
+                       return err
+               }
 
-       if err := c.updateBlockSignature(blockHeader, consensusNode.Order, signature); err != nil {
-               return err
+               c.lastIrrBlockHeader = blockHeader
+       } else {
+               // block is on a forked chain
+               log.WithFields(log.Fields{"module": logModule}).Info("majority votes received on forked chain")
+               tail, err := c.traceLongestChainTail(blockHeader)
+               if err != nil {
+                       return err
+               }
+
+               return c.reorganizeChain(tail)
        }
-       return c.eventDispatcher.Post(event.BlockSignatureEvent{BlockHash: *blockHash, Signature: signature, XPub: xPub})
+       return nil
 }
 
 // validateSign verify the signatures of block, and return the number of correct signature
@@ -105,14 +120,15 @@ func (c *Chain) validateSign(block *types.Block) error {
                return err
        }
 
+       blocker, err := c.GetBlocker(&block.PreviousBlockHash, block.Timestamp)
+       if err != nil {
+               return err
+       }
+
        hasBlockerSign := false
        blockHash := block.Hash()
        for pubKey, node := range consensusNodeMap {
-               if len(block.Witness) <= int(node.Order) {
-                       continue
-               }
-
-               if block.Get(node.Order) == nil {
+               if block.BlockWitness.Get(node.Order) == nil {
                        cachekey := signCacheKey(blockHash.String(), pubKey)
                        if signature, ok := c.signatureCache.Get(cachekey); ok {
                                block.Set(node.Order, signature.([]byte))
@@ -123,21 +139,15 @@ func (c *Chain) validateSign(block *types.Block) error {
 
                if err := c.checkNodeSign(&block.BlockHeader, node, block.Get(node.Order)); err == errDoubleSignBlock {
                        log.WithFields(log.Fields{"module": logModule, "blockHash": blockHash.String(), "pubKey": pubKey}).Warn("the consensus node double sign the same height of different block")
-                       block.Delete(node.Order)
+                       block.BlockWitness.Delete(node.Order)
                        continue
                } else if err != nil {
                        return err
                }
 
-               isBlocker, err := c.IsBlocker(&block.PreviousBlockHash, pubKey, block.Timestamp)
-               if err != nil {
-                       return err
-               }
-
-               if isBlocker {
+               if blocker == pubKey {
                        hasBlockerSign = true
                }
-
        }
 
        if !hasBlockerSign {
@@ -146,40 +156,38 @@ func (c *Chain) validateSign(block *types.Block) error {
        return nil
 }
 
-func (c *Chain) checkNodeSign(bh *types.BlockHeader, consensusNode *state.ConsensusNode, signature []byte) error {
-       if !consensusNode.XPub.Verify(bh.Hash().Bytes(), signature) {
-               return errInvalidSignature
+// ProcessBlockSignature process the received block signature messages
+// return whether a block become irreversible, if so, the chain module must update status
+func (c *Chain) ProcessBlockSignature(signature, xPub []byte, blockHash *bc.Hash) error {
+       xpubStr := hex.EncodeToString(xPub[:])
+       blockHeader, _ := c.store.GetBlockHeader(blockHash)
+
+       // save the signature if the block is not exist
+       if blockHeader == nil {
+               cacheKey := signCacheKey(blockHash.String(), xpubStr)
+               c.signatureCache.Add(cacheKey, signature)
+               return nil
        }
 
-       blockHashes, err := c.store.GetBlockHashesByHeight(bh.Height)
+       consensusNode, err := c.getConsensusNode(&blockHeader.PreviousBlockHash, xpubStr)
        if err != nil {
                return err
        }
 
-       for _, blockHash := range blockHashes {
-               if *blockHash == bh.Hash() {
-                       continue
-               }
-
-               blockHeader, err := c.store.GetBlockHeader(blockHash)
-               if err != nil {
-                       return err
-               }
-
-               consensusNode, err := c.getConsensusNode(&blockHeader.PreviousBlockHash, consensusNode.XPub.String())
-               if err != nil && err != errNotFoundConsensusNode {
-                       return err
-               }
+       if blockHeader.BlockWitness.Get(consensusNode.Order) != nil {
+               return nil
+       }
 
-               if err == errNotFoundConsensusNode {
-                       continue
-               }
+       c.cond.L.Lock()
+       defer c.cond.L.Unlock()
+       if err := c.checkNodeSign(blockHeader, consensusNode, signature); err != nil {
+               return err
+       }
 
-               if blockHeader.BlockWitness.Get(consensusNode.Order) != nil {
-                       return errDoubleSignBlock
-               }
+       if err := c.updateBlockSignature(blockHeader, consensusNode.Order, signature); err != nil {
+               return err
        }
-       return nil
+       return c.eventDispatcher.Post(event.BlockSignatureEvent{BlockHash: *blockHash, Signature: signature, XPub: xPub})
 }
 
 // SignBlock signing the block if current node is consensus node
@@ -193,24 +201,12 @@ func (c *Chain) SignBlock(block *types.Block) ([]byte, error) {
                return nil, err
        }
 
-       //check double sign in same block height
-       blockHashes, err := c.store.GetBlockHashesByHeight(block.Height)
-       if err != nil {
+       if err := c.checkDoubleSign(&block.BlockHeader, node.XPub.String()); err == errDoubleSignBlock {
+               return nil, nil
+       } else if err != nil {
                return nil, err
        }
 
-       for _, hash := range blockHashes {
-               blockHeader, err := c.store.GetBlockHeader(hash)
-               if err != nil {
-                       return nil, err
-               }
-
-               // Has already signed the same height block
-               if blockHeader.BlockWitness.Get(node.Order) != nil {
-                       return nil, nil
-               }
-       }
-
        signature := block.Get(node.Order)
        if len(signature) == 0 {
                signature = xprv.Sign(block.Hash().Bytes())
@@ -218,32 +214,3 @@ func (c *Chain) SignBlock(block *types.Block) ([]byte, error) {
        }
        return signature, nil
 }
-
-func (c *Chain) updateBlockSignature(blockHeader *types.BlockHeader, nodeOrder uint64, signature []byte) error {
-       blockHeader.Set(nodeOrder, signature)
-       if err := c.store.SaveBlockHeader(blockHeader); err != nil {
-               return err
-       }
-
-       if !c.isIrreversible(blockHeader) || blockHeader.Height <= c.lastIrrBlockHeader.Height {
-               return nil
-       }
-
-       if c.InMainChain(blockHeader.Hash()) {
-               if err := c.store.SaveChainStatus(c.bestBlockHeader, blockHeader, []*types.BlockHeader{}, state.NewUtxoViewpoint(), []*state.ConsensusResult{}); err != nil {
-                       return err
-               }
-
-               c.lastIrrBlockHeader = blockHeader
-       } else {
-               // block is on a forked chain
-               log.WithFields(log.Fields{"module": logModule}).Info("majority votes received on forked chain")
-               tail, err := c.traceLongestChainTail(blockHeader)
-               if err != nil {
-                       return err
-               }
-
-               return c.reorganizeChain(tail)
-       }
-       return nil
-}