X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=protocol%2Fbbft.go;h=d62b3ed6612855a641815e695cb2ffe3ecc6902c;hb=1337be95f74a1d2a1a7316737efde413f29bcb2f;hp=e7498f97001fa32d8d4a65e592a4585bcba93633;hpb=eea317c609eee0bb184a6cdfdda39d9f336f92c4;p=bytom%2Fvapor.git

diff --git a/protocol/bbft.go b/protocol/bbft.go
index e7498f97..d62b3ed6 100644
--- a/protocol/bbft.go
+++ b/protocol/bbft.go
@@ -6,12 +6,13 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/vapor/config"
-	"github.com/vapor/errors"
-	"github.com/vapor/event"
-	"github.com/vapor/protocol/bc"
-	"github.com/vapor/protocol/bc/types"
-	"github.com/vapor/protocol/state"
+	"github.com/bytom/vapor/config"
+	"github.com/bytom/vapor/crypto/ed25519/chainkd"
+	"github.com/bytom/vapor/errors"
+	"github.com/bytom/vapor/event"
+	"github.com/bytom/vapor/protocol/bc"
+	"github.com/bytom/vapor/protocol/bc/types"
+	"github.com/bytom/vapor/protocol/state"
 )
 
 const (
@@ -19,25 +20,62 @@ const (
 )
 
 var (
-	errVotingOperationOverFlow = errors.New("voting operation result overflow")
-	errDoubleSignBlock         = errors.New("the consensus is double sign in same height of different block")
-	errInvalidSignature        = errors.New("the signature of block is invalid")
-	errSignForkChain           = errors.New("can not sign fork before the irreversible block")
+	errDoubleSignBlock  = errors.New("the consensus is double sign in same height of different block")
+	errInvalidSignature = errors.New("the signature of block is invalid")
+	errSignForkChain    = errors.New("can not sign fork before the irreversible block")
 )
 
 func signCacheKey(blockHash, pubkey string) string {
 	return fmt.Sprintf("%s:%s", blockHash, pubkey)
 }
 
-func (c *Chain) isIrreversible(blockNode *state.BlockNode) bool {
-	consensusNodes, err := c.consensusNodeManager.getConsensusNodes(&blockNode.Parent.Hash)
+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 {
 		return false
 	}
 
 	signCount := 0
 	for i := 0; i < len(consensusNodes); i++ {
-		if ok, _ := blockNode.BlockWitness.Test(uint32(i)); ok {
+		if blockHeader.BlockWitness.Get(uint64(i)) != nil {
 			signCount++
 		}
 	}
@@ -45,47 +83,45 @@ func (c *Chain) isIrreversible(blockNode *state.BlockNode) bool {
 	return signCount > len(consensusNodes)*2/3
 }
 
-// NextLeaderTime returns the start time of the specified public key as the next leader node
-func (c *Chain) IsBlocker(prevBlockHash *bc.Hash, pubkey string, timeStamp uint64) (bool, error) {
-	return c.consensusNodeManager.isBlocker(prevBlockHash, pubkey, timeStamp)
-}
-
-// 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[:])
-	blockNode := c.index.GetNode(blockHash)
-	// save the signature if the block is not exist
-	if blockNode == nil {
-		cacheKey := signCacheKey(blockHash.String(), xpubStr)
-		c.signatureCache.Add(cacheKey, signature)
-		return nil
-	}
-
-	consensusNode, err := c.consensusNodeManager.getConsensusNode(&blockNode.Parent.Hash, 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 exist, _ := blockNode.BlockWitness.Test(uint32(consensusNode.Order)); exist {
+	if !c.isIrreversible(blockHeader) || blockHeader.Height <= c.lastIrrBlockHeader.Height {
 		return nil
 	}
 
-	if err := c.checkNodeSign(blockNode.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(blockNode, 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
 // if some signature is invalid, they will be reset to nil
-// if the block has not the signature of blocker, it will return error
+// if the block does not have the signature of blocker, it will return error
 func (c *Chain) validateSign(block *types.Block) error {
-	consensusNodeMap, err := c.consensusNodeManager.getConsensusNodes(&block.PreviousBlockHash)
+	consensusNodeMap, err := c.getConsensusNodes(&block.PreviousBlockHash)
+	if err != nil {
+		return err
+	}
+
+	blocker, err := c.GetBlocker(&block.PreviousBlockHash, block.Timestamp)
 	if err != nil {
 		return err
 	}
@@ -93,36 +129,28 @@ func (c *Chain) validateSign(block *types.Block) error {
 	hasBlockerSign := false
 	blockHash := block.Hash()
 	for pubKey, node := range consensusNodeMap {
-		if len(block.Witness) <= int(node.Order) {
-			continue
-		}
-
-		if block.Witness[node.Order] == nil {
+		if block.BlockWitness.Get(node.Order) == nil {
 			cachekey := signCacheKey(blockHash.String(), pubKey)
 			if signature, ok := c.signatureCache.Get(cachekey); ok {
-				block.Witness[node.Order] = signature.([]byte)
+				block.Set(node.Order, signature.([]byte))
+				c.eventDispatcher.Post(event.BlockSignatureEvent{BlockHash: blockHash, Signature: signature.([]byte), XPub: node.XPub[:]})
+				c.signatureCache.Remove(cachekey)
 			} else {
 				continue
 			}
 		}
 
-		if err := c.checkNodeSign(&block.BlockHeader, node, block.Witness[node.Order]); err == errDoubleSignBlock {
+		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.Witness[node.Order] = nil
+			block.BlockWitness.Delete(node.Order)
 			continue
 		} else if err != nil {
 			return err
 		}
 
-		isBlocker, err := c.consensusNodeManager.isBlocker(&block.PreviousBlockHash, pubKey, block.Timestamp)
-		if err != nil {
-			return err
-		}
-
-		if isBlocker {
+		if blocker == pubKey {
 			hasBlockerSign = true
 		}
-
 	}
 
 	if !hasBlockerSign {
@@ -131,97 +159,67 @@ 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)
 
-	blockNodes := c.consensusNodeManager.blockIndex.NodesByHeight(bh.Height)
-	for _, blockNode := range blockNodes {
-		if blockNode.Hash == bh.Hash() {
-			continue
+	// save the signature if the block is not exist
+	if blockHeader == nil {
+		var xPubKey chainkd.XPub
+		copy(xPubKey[:], xPub[:])
+		if !xPubKey.Verify(blockHash.Bytes(), signature) {
+			return errInvalidSignature
 		}
 
-		consensusNode, err := c.consensusNodeManager.getConsensusNode(&blockNode.Parent.Hash, consensusNode.XPub.String())
-		if err != nil && err != errNotFoundConsensusNode {
-			return err
-		}
+		cacheKey := signCacheKey(blockHash.String(), xpubStr)
+		c.signatureCache.Add(cacheKey, signature)
+		return nil
+	}
 
-		if err == errNotFoundConsensusNode {
-			continue
-		}
+	consensusNode, err := c.getConsensusNode(&blockHeader.PreviousBlockHash, xpubStr)
+	if err != nil {
+		return err
+	}
 
-		if ok, err := blockNode.BlockWitness.Test(uint32(consensusNode.Order)); err == nil && ok {
-			return errDoubleSignBlock
-		}
+	if blockHeader.BlockWitness.Get(consensusNode.Order) != nil {
+		return nil
 	}
-	return nil
+
+	c.cond.L.Lock()
+	defer c.cond.L.Unlock()
+	if err := c.checkNodeSign(blockHeader, consensusNode, signature); err != nil {
+		return err
+	}
+
+	if err := c.updateBlockSignature(blockHeader, consensusNode.Order, signature); err != nil {
+		return err
+	}
+	return c.eventDispatcher.Post(event.BlockSignatureEvent{BlockHash: *blockHash, Signature: signature, XPub: xPub})
 }
 
 // SignBlock signing the block if current node is consensus node
 func (c *Chain) SignBlock(block *types.Block) ([]byte, error) {
 	xprv := config.CommonConfig.PrivateKey()
 	xpubStr := xprv.XPub().String()
-	node, err := c.consensusNodeManager.getConsensusNode(&block.PreviousBlockHash, xpubStr)
+	node, err := c.getConsensusNode(&block.PreviousBlockHash, xpubStr)
 	if err == errNotFoundConsensusNode {
 		return nil, nil
 	} else if err != nil {
 		return nil, err
 	}
 
-	c.cond.L.Lock()
-	defer c.cond.L.Unlock()
-	//check double sign in same block height
-	blockNodes := c.consensusNodeManager.blockIndex.NodesByHeight(block.Height)
-	for _, blockNode := range blockNodes {
-		// Has already signed the same height block
-		if ok, err := blockNode.BlockWitness.Test(uint32(node.Order)); err == nil && ok {
-			return nil, nil
-		}
-	}
-
-	for blockNode := c.index.GetNode(&block.PreviousBlockHash); !c.index.InMainchain(blockNode.Hash); blockNode = blockNode.Parent {
-		if blockNode.Height <= c.bestIrreversibleNode.Height {
-			return nil, errSignForkChain
-		}
+	if err := c.checkDoubleSign(&block.BlockHeader, node.XPub.String()); err == errDoubleSignBlock {
+		return nil, nil
+	} else if err != nil {
+		return nil, err
 	}
 
-	signature := block.Witness[node.Order]
+	signature := block.Get(node.Order)
 	if len(signature) == 0 {
 		signature = xprv.Sign(block.Hash().Bytes())
-		block.Witness[node.Order] = signature
+		block.Set(node.Order, signature)
 	}
 	return signature, nil
 }
-
-func (c *Chain) updateBlockSignature(blockNode *state.BlockNode, nodeOrder uint64, signature []byte) error {
-	if err := blockNode.BlockWitness.Set(uint32(nodeOrder)); err != nil {
-		return err
-	}
-
-	block, err := c.store.GetBlock(&blockNode.Hash)
-	if err != nil {
-		return err
-	}
-
-	block.Witness[nodeOrder] = signature
-	txStatus, err := c.store.GetTransactionStatus(&blockNode.Hash)
-	if err != nil {
-		return err
-	}
-
-	if err := c.store.SaveBlock(block, txStatus); err != nil {
-		return err
-	}
-
-	c.cond.L.Lock()
-	defer c.cond.L.Unlock()
-	if c.isIrreversible(blockNode) && blockNode.Height > c.bestIrreversibleNode.Height {
-		if err := c.store.SaveChainStatus(c.bestNode, blockNode, state.NewUtxoViewpoint(), []*state.VoteResult{}); err != nil {
-			return err
-		}
-
-		c.bestIrreversibleNode = blockNode
-	}
-	return nil
-}