X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=protocol%2Fbbft.go;h=5667bc6f13154aa2bae26f28656b749ff34763be;hb=33703f3e14106dbf91be25a78e7909c5664baf45;hp=987397fa31c857a9f67d0492d80f1e57deeda733;hpb=07a5ac4a0643fb1ef59421162d5b80680e7d5c74;p=bytom%2Fvapor.git diff --git a/protocol/bbft.go b/protocol/bbft.go index 987397fa..5667bc6f 100644 --- a/protocol/bbft.go +++ b/protocol/bbft.go @@ -4,14 +4,10 @@ import ( "encoding/hex" "fmt" - "github.com/golang/groupcache/lru" log "github.com/sirupsen/logrus" "github.com/vapor/config" - "github.com/vapor/crypto/ed25519" - "github.com/vapor/crypto/ed25519/chainkd" "github.com/vapor/errors" - "github.com/vapor/event" "github.com/vapor/protocol/bc" "github.com/vapor/protocol/bc/types" "github.com/vapor/protocol/state" @@ -27,101 +23,72 @@ var ( errInvalidSignature = errors.New("the signature of block is invalid") ) -type bbft struct { - consensusNodeManager *consensusNodeManager - orphanManage *OrphanManage - signatureCache *lru.Cache - eventDispatcher *event.Dispatcher +func signCacheKey(blockHash, pubkey string) string { + return fmt.Sprintf("%s:%s", blockHash, pubkey) } -func newBbft(store Store, blockIndex *state.BlockIndex, orphanManage *OrphanManage, eventDispatcher *event.Dispatcher) *bbft { - return &bbft{ - orphanManage: orphanManage, - consensusNodeManager: newConsensusNodeManager(store, blockIndex), - signatureCache: lru.New(maxSignatureCacheSize), - eventDispatcher: eventDispatcher, - } -} - -func (b *bbft) isIrreversible(block *types.Block) bool { - consensusNodes, err := b.consensusNodeManager.getConsensusNodesByVoteResult(&block.PreviousBlockHash) +func (c *Chain) isIrreversible(blockNode *state.BlockNode) bool { + consensusNodes, err := c.consensusNodeManager.getConsensusNodesByVoteResult(&blockNode.Parent.Hash) if err != nil { return false } - signNum, err := b.validateSign(block) - if err != nil { - return false + signCount := 0 + for i := 0; i < len(consensusNodes); i++ { + if ok, _ := blockNode.BlockWitness.Test(uint32(i)); ok { + signCount++ + } } - return signNum > (uint64(len(consensusNodes)) * 2 / 3) + return signCount > len(consensusNodes)*2/3 } // NextLeaderTime returns the start time of the specified public key as the next leader node -func (b *bbft) NextLeaderTimeRange(pubkey []byte, bestBlockHash *bc.Hash) (uint64, uint64, error) { - return b.consensusNodeManager.nextLeaderTimeRange(pubkey, bestBlockHash) -} - -func (b *bbft) ApplyBlock(voteResultMap map[uint64]*state.VoteResult, block *types.Block) (err error) { - return b.consensusNodeManager.applyBlock(voteResultMap, block) -} - -func (b *bbft) DetachBlock(voteResultMap map[uint64]*state.VoteResult, block *types.Block) error { - return b.consensusNodeManager.detachBlock(voteResultMap, block) +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 (b *bbft) ProcessBlockSignature(signature []byte, xPub [64]byte, blockHeight uint64, blockHash *bc.Hash) (bool, error) { - block, err := b.consensusNodeManager.store.GetBlock(blockHash) - if err != nil { - // block is not exist, save the signature - key := fmt.Sprintf("%s:%s", blockHash.String(), hex.EncodeToString(xPub[:])) - b.signatureCache.Add(key, signature) - return false, err +func (c *Chain) ProcessBlockSignature(signature []byte, xPub [64]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 := b.consensusNodeManager.getConsensusNode(&block.PreviousBlockHash, hex.EncodeToString(xPub[:])) + consensusNode, err := c.consensusNodeManager.getConsensusNode(&blockNode.Parent.Hash, xpubStr) if err != nil { - return false, err + return err } - if chainkd.XPub(xPub).Verify(blockHash.Bytes(), signature) { - return false, errInvalidSignature + if consensusNode.XPub.Verify(blockHash.Bytes(), signature) { + return errInvalidSignature } - isDoubleSign, err := b.checkDoubleSign(consensusNode.order, blockHeight, *blockHash) + isDoubleSign, err := c.checkDoubleSign(consensusNode.Order, blockNode.Height, *blockHash) if err != nil { - return false, err + return err } if isDoubleSign { - log.WithFields(log.Fields{"module": logModule, "blockHash": blockHash.String(), "xPub": hex.EncodeToString(xPub[:])}).Warn("the consensus node double sign the same height of different block") - return false, errDoubleSignBlock + return errDoubleSignBlock } - orphanBlock, ok := b.orphanManage.Get(blockHash) - if ok { - orphanBlock.Witness[consensusNode.order] = signature - return false, nil - } - - if err := b.updateBlockSignature(block, consensusNode.order, signature); err != nil { - return false, err - } - - return b.isIrreversible(block), nil -} - -// ValidateBlock verify whether the block is valid -func (b *bbft) ValidateBlock(block *types.Block) error { - signNum, err := b.validateSign(block) - if err != nil { + if err := c.updateBlockSignature(&blockNode.Hash, consensusNode.Order, signature); err != nil { return err } - if signNum == 0 { - return errors.New("no valid signature") + if c.isIrreversible(blockNode) && blockNode.Height > c.bestIrreversibleNode.Height { + bestIrreversibleNode := c.index.GetNode(blockHash) + if err := c.store.SaveChainNodeStatus(c.bestNode, bestIrreversibleNode); err != nil { + return err + } + + c.bestIrreversibleNode = bestIrreversibleNode } return nil } @@ -129,78 +96,72 @@ func (b *bbft) ValidateBlock(block *types.Block) error { // 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 -func (b *bbft) validateSign(block *types.Block) (uint64, error) { - var correctSignNum uint64 - consensusNodeMap, err := b.consensusNodeManager.getConsensusNodesByVoteResult(&block.PreviousBlockHash) +func (c *Chain) validateSign(block *types.Block) (uint64, error) { + consensusNodeMap, err := c.consensusNodeManager.getConsensusNodesByVoteResult(&block.PreviousBlockHash) if err != nil { return 0, err } hasBlockerSign := false + signCount := uint64(0) + blockHash := block.Hash() for pubKey, node := range consensusNodeMap { - if len(block.Witness) <= int(node.order) { + if len(block.Witness) <= int(node.Order) { continue } - blockHash := block.Hash() - if block.Witness[node.order] == nil { - key := fmt.Sprintf("%s:%s", blockHash.String(), pubKey) - signature, ok := b.signatureCache.Get(key) - if ok { - block.Witness[node.order] = signature.([]byte) + if block.Witness[node.Order] == nil { + cachekey := signCacheKey(blockHash.String(), pubKey) + if signature, ok := c.signatureCache.Get(cachekey); ok { + block.Witness[node.Order] = signature.([]byte) + } else { + continue } } - pubKeyBytes, err := hex.DecodeString(pubKey) + if ok := node.XPub.Verify(blockHash.Bytes(), block.Witness[node.Order]); !ok { + block.Witness[node.Order] = nil + continue + } + + isDoubleSign, err := c.checkDoubleSign(node.Order, block.Height, block.Hash()) if err != nil { return 0, err } - if ed25519.Verify(ed25519.PublicKey(pubKeyBytes[:32]), blockHash.Bytes(), block.Witness[node.order]) { - isDoubleSign, err := b.checkDoubleSign(node.order, block.Height, block.Hash()) - if err != nil { - return 0, err - } + if isDoubleSign { + // Consensus node is signed twice with the same block height, discard the signature + 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 + continue + } - if isDoubleSign { - log.WithFields(log.Fields{"module": logModule, "blockHash": blockHash.String(), "pubKey": pubKey}).Warn("the consensus node double sign the same height of different block") - // Consensus node is signed twice with the same block height, discard the signature - block.Witness[node.order] = nil - } else { - correctSignNum++ - isBlocker, err := b.consensusNodeManager.isBlocker(block, pubKey) - if err != nil { - return 0, err - } - if isBlocker { - hasBlockerSign = true - } - } - } else { - // discard the invalid signature - block.Witness[node.order] = nil + signCount++ + isBlocker, err := c.consensusNodeManager.isBlocker(&block.PreviousBlockHash, pubKey, block.Timestamp) + if err != nil { + return 0, err + } + + if isBlocker { + hasBlockerSign = true } + } + if !hasBlockerSign { return 0, errors.New("the block has no signature of the blocker") } - return correctSignNum, nil + return signCount, nil } -func (b *bbft) checkDoubleSign(nodeOrder, blockHeight uint64, blockHash bc.Hash) (bool, error) { - blockNodes := b.consensusNodeManager.blockIndex.NodesByHeight(blockHeight) +func (c *Chain) checkDoubleSign(nodeOrder, blockHeight uint64, blockHash bc.Hash) (bool, error) { + blockNodes := c.consensusNodeManager.blockIndex.NodesByHeight(blockHeight) for _, blockNode := range blockNodes { if blockNode.Hash == blockHash { continue } if ok, err := blockNode.BlockWitness.Test(uint32(nodeOrder)); err != nil && ok { - block, err := b.consensusNodeManager.store.GetBlock(&blockHash) - if err != nil { - return false, err - } - - // reset nil to discard signature - if err := b.updateBlockSignature(block, nodeOrder, nil); err != nil { + if err := c.updateBlockSignature(&blockHash, nodeOrder, nil); err != nil { return false, err } @@ -211,10 +172,10 @@ func (b *bbft) checkDoubleSign(nodeOrder, blockHeight uint64, blockHash bc.Hash) } // SignBlock signing the block if current node is consensus node -func (b *bbft) SignBlock(block *types.Block) ([]byte, error) { +func (c *Chain) SignBlock(block *types.Block) ([]byte, error) { xprv := config.CommonConfig.PrivateKey() xpub := [64]byte(xprv.XPub()) - node, err := b.consensusNodeManager.getConsensusNode(&block.PreviousBlockHash, hex.EncodeToString(xpub[:])) + node, err := c.consensusNodeManager.getConsensusNode(&block.PreviousBlockHash, hex.EncodeToString(xpub[:])) if err != nil && err != errNotFoundConsensusNode { return nil, err } @@ -223,18 +184,24 @@ func (b *bbft) SignBlock(block *types.Block) ([]byte, error) { return nil, nil } - signature := block.Witness[node.order] + 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 + } + } + + signature := block.Witness[node.Order] if len(signature) == 0 { signature = xprv.Sign(block.Hash().Bytes()) - block.Witness[node.order] = signature + block.Witness[node.Order] = signature } return signature, nil } -func (b *bbft) updateBlockSignature(block *types.Block, nodeOrder uint64, signature []byte) error { - blockHash := block.Hash() - blockNode := b.consensusNodeManager.blockIndex.GetNode(&blockHash) - +func (c *Chain) updateBlockSignature(blockHash *bc.Hash, nodeOrder uint64, signature []byte) error { + blockNode := c.consensusNodeManager.blockIndex.GetNode(blockHash) if len(signature) != 0 { if err := blockNode.BlockWitness.Set(uint32(nodeOrder)); err != nil { return err @@ -245,11 +212,16 @@ func (b *bbft) updateBlockSignature(block *types.Block, nodeOrder uint64, signat } } + block, err := c.store.GetBlock(blockHash) + if err != nil { + return err + } + block.Witness[nodeOrder] = signature - txStatus, err := b.consensusNodeManager.store.GetTransactionStatus(&blockHash) + txStatus, err := c.consensusNodeManager.store.GetTransactionStatus(blockHash) if err != nil { return err } - return b.consensusNodeManager.store.SaveBlock(block, txStatus) + return c.consensusNodeManager.store.SaveBlock(block, txStatus) }